[tomcat8] 05/11: More patch cleanup

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch jessie
in repository tomcat8.

commit 2a7f8fb7f754569e8c7f50d2b43979a3c711365b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 23 00:26:09 2016 +0200

    More patch cleanup
---
 debian/patches/CVE-2015-5345.patch |  8 --------
 debian/patches/CVE-2015-5346.patch | 14 ++++----------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/patches/CVE-2015-5345.patch b/debian/patches/CVE-2015-5345.patch
index 01aad21..32904fe 100644
--- a/debian/patches/CVE-2015-5345.patch
+++ b/debian/patches/CVE-2015-5345.patch
@@ -196,14 +196,6 @@ Origin: backport, https://svn.apache.org/r1715207
                      // Note: this mutates the path: do not do any processing
                      // after this (since we set the redirectPath, there
                      // shouldn't be any)
-@@ -1015,7 +1017,6 @@
- 
-         path.setOffset(pathOffset);
-         path.setEnd(pathEnd);
--
-     }
- 
- 
 --- a/java/org/apache/catalina/servlets/DefaultServlet.java
 +++ b/java/org/apache/catalina/servlets/DefaultServlet.java
 @@ -342,6 +342,10 @@
diff --git a/debian/patches/CVE-2015-5346.patch b/debian/patches/CVE-2015-5346.patch
index 5b10e6a..d13aa24 100644
--- a/debian/patches/CVE-2015-5346.patch
+++ b/debian/patches/CVE-2015-5346.patch
@@ -68,15 +68,10 @@ Origin: backport, https://svn.apache.org/r1713185
  
          if (Globals.IS_SECURITY_ENABLED || Connector.RECYCLE_FACADES) {
              parameterMap = new ParameterMap<>();
-@@ -531,11 +524,32 @@
+@@ -531,6 +524,31 @@
      }
  
  
--    /**
--     * Clear cached encoders (to save memory for Comet requests).
--     */
--    public boolean read()
--        throws IOException {
 +    protected void recycleSessionInfo() {
 +        if (session != null) {
 +            try {
@@ -102,10 +97,9 @@ Origin: backport, https://svn.apache.org/r1713185
 +        }
 +    }
 +
-+    public boolean read() throws IOException {
-         return (inputBuffer.realReadBytes(null, 0, 0) > 0);
-     }
- 
+     /**
+      * Clear cached encoders (to save memory for Comet requests).
+      */
 --- a/webapps/docs/changelog.xml
 +++ b/webapps/docs/changelog.xml
 @@ -168,6 +168,10 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git