This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch jessie in repository tomcat7.
commit f70c7f935f6bca9e8ba3b6570c31c12553e61f0b Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 23 22:40:45 2016 +0100 Fixed the test failure in Test*NonLoginAndBasicAuthenticator caused by recent JREs --- debian/changelog | 2 + .../fix-TestNonLoginAndBasicAuthenticator.patch | 79 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 82 insertions(+) diff --git a/debian/changelog b/debian/changelog index 13f86f2..9a40e3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ tomcat7 (7.0.56-3+deb8u6) UNRELEASED; urgency=medium + * Backported a fix for a test failure in Test*NonLoginAndBasicAuthenticator + with recent JREs * Refreshed the expired SSL certificates used by the tests * Set the locale when running the tests to prevent locale sensitive tests from failing diff --git a/debian/patches/fix-TestNonLoginAndBasicAuthenticator.patch b/debian/patches/fix-TestNonLoginAndBasicAuthenticator.patch new file mode 100644 index 0000000..159575c --- /dev/null +++ b/debian/patches/fix-TestNonLoginAndBasicAuthenticator.patch @@ -0,0 +1,79 @@ +Description: Don't add ":" to cookie name. It is illegal in newer JREs +Origin: backport, https://svn.apache.org/r1715547 + https://svn.apache.org/r1715550 +--- a/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java ++++ b/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java +@@ -358,7 +358,7 @@ + new HashMap<String,List<String>>(); + + if (useCookie && (cookies != null)) { +- reqHeaders.put(CLIENT_COOKIE_HEADER + ":", cookies); ++ reqHeaders.put(CLIENT_COOKIE_HEADER, cookies); + } + + ByteChunk bc = new ByteChunk(); +@@ -382,7 +382,7 @@ + Map<String,List<String>> respHeaders = new HashMap<String,List<String>>(); + + if (useCookie && (cookies != null)) { +- reqHeaders.put(CLIENT_COOKIE_HEADER + ":", cookies); ++ reqHeaders.put(CLIENT_COOKIE_HEADER, cookies); + } + else { + if (credentials != null) { +@@ -568,7 +568,7 @@ + protected void addCookies(Map<String,List<String>> reqHeaders) { + + if ((cookies != null) && (cookies.size() > 0)) { +- reqHeaders.put(CLIENT_COOKIE_HEADER + ":", cookies); ++ reqHeaders.put(CLIENT_COOKIE_HEADER, cookies); + } + } + +@@ -655,4 +655,4 @@ + return credentials; + } + } +-} +\ No newline at end of file ++} +--- a/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java ++++ b/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java +@@ -485,7 +485,7 @@ + protected void addCookies(Map<String,List<String>> reqHeaders) { + + if ((cookies != null) && (cookies.size() > 0)) { +- reqHeaders.put(BROWSER_COOKIES + ":", cookies); ++ reqHeaders.put(BROWSER_COOKIES, cookies); + } + } +-} +\ No newline at end of file ++} +--- a/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java ++++ b/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java +@@ -412,7 +412,7 @@ + new HashMap<String,List<String>>(); + + if (useCookie && (cookies != null)) { +- reqHeaders.put(CLIENT_COOKIE_HEADER + ":", cookies); ++ reqHeaders.put(CLIENT_COOKIE_HEADER, cookies); + } + + ByteChunk bc = new ByteChunk(); +@@ -437,7 +437,7 @@ + new HashMap<String, List<String>>(); + + if (useCookie && (cookies != null)) { +- reqHeaders.put(CLIENT_COOKIE_HEADER + ":", cookies); ++ reqHeaders.put(CLIENT_COOKIE_HEADER, cookies); + } + else { + if (credentials != null) { +@@ -625,4 +625,4 @@ + return credentials; + } + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/series b/debian/patches/series index 52f7d70..49c4cdf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,6 +18,7 @@ 0022-use-tls-in-ssl-unit-tests.patch 0023-update-test-certificates.patch 0024-disable-unit-tests-depending-on-network-access.path +fix-TestNonLoginAndBasicAuthenticator.patch CVE-2014-7810.patch CVE-2015-5174.patch CVE-2015-5346.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
