[tomcat6] 08/13: drop cve-2012-2733.patch

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository tomcat6.

commit d4f88006b267137bfbbe08bdca283d98fc2bb6ce
Author: tony mancill <tmancill at debian.org>
Date:   Sat Aug 3 21:29:33 2013 -0700

    drop cve-2012-2733.patch
---
 debian/patches/cve-2012-2733.patch |   31 -------------------------------
 debian/patches/series              |    1 -
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/cve-2012-2733.patch b/debian/patches/cve-2012-2733.patch
deleted file mode 100644
index 8172ccb..0000000
--- a/debian/patches/cve-2012-2733.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java	2012/07/02 12:47:54	1356207
-+++ trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java	2012/07/02 13:01:28	1356208
-@@ -673,10 +673,6 @@
-         
-         do {
-             status = parseHeader();
--        } while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
--        if (status == HeaderParseStatus.DONE) {
--            parsingHeader = false;
--            end = pos;
-             // Checking that
-             // (1) Headers plus request line size does not exceed its limit
-             // (2) There are enough bytes to avoid expanding the buffer when
-@@ -685,11 +681,15 @@
-             // limitation to enforce the meaning of headerBufferSize
-             // From the way how buf is allocated and how blank lines are being
-             // read, it should be enough to check (1) only.
--            if (end - skipBlankLinesBytes > headerBufferSize
--                    || buf.length - end < socketReadBufferSize) {
-+            if (pos - skipBlankLinesBytes > headerBufferSize
-+                    || buf.length - pos < socketReadBufferSize) {
-                 throw new IllegalArgumentException(
-                         sm.getString("iib.requestheadertoolarge.error"));
-             }
-+        } while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
-+        if (status == HeaderParseStatus.DONE) {
-+            parsingHeader = false;
-+            end = pos;
-             return true;
-         } else {
-             return false;
diff --git a/debian/patches/series b/debian/patches/series
index 6d9df1c..e49f51c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,5 @@
 0007-add-OSGi-headers-to-servlet-api.patch
 0008-add-OSGI-headers-to-jsp-api.patch
 0010-Use-java.security.policy-file-in-catalina.sh.patch
-cve-2012-2733.patch
 cve-2012-3439.patch
 0017-eclipse-compiler-update.patch

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/tomcat6.git