svn commit: r1662635 - in /tomcat/taglibs/site: changes.xml src/site/xdoc/index.xml src/site/xdoc/standard/index.xml
Author: jboynes Date: Fri Feb 27 05:31:51 2015 New Revision: 1662635 URL: http://svn.apache.org/r1662635 Log: Update taglibs website for 1.2.3 release Modified: tomcat/taglibs/site/changes.xml tomcat/taglibs/site/src/site/xdoc/index.xml tomcat/taglibs/site/src/site/xdoc/standard/index.xml Modified: tomcat/taglibs/site/changes.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/changes.xml?rev=1662635r1=1662634r2=1662635view=diff == --- tomcat/taglibs/site/changes.xml (original) +++ tomcat/taglibs/site/changes.xml Fri Feb 27 05:31:51 2015 @@ -21,6 +21,8 @@ /properties body + release version=1.2.3 date=2015-02-20 description=Minor bugfix update/ + release version=1.2.2 date=2015-02-08 description=Release candidate withdrawn/ release version=1.2.1 date=2014-01-02 description=First release of our implementation of JSTL 1.2/ release version=1.2.0 description=JSTL 1.2 implementation - failed vote/ Modified: tomcat/taglibs/site/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/index.xml?rev=1662635r1=1662634r2=1662635view=diff == --- tomcat/taglibs/site/src/site/xdoc/index.xml (original) +++ tomcat/taglibs/site/src/site/xdoc/index.xml Fri Feb 27 05:31:51 2015 @@ -46,6 +46,12 @@ table border=0 cellspacing=5 cellpadding=5 width=100% + trtd bgcolor=#CCbfont size=-12015/02/20/font/b/tdtd bgcolor=#CCfont size=-1 +[a href=standard/Standard/a] + /fontfont size=-1 +The Apache Standard Taglib 1.2.3, a minor bugfix version, has been released. + /font/td/tr + trtd bgcolor=#CCbfont size=-12014/01/02/font/b/tdtd bgcolor=#CCfont size=-1 [a href=standard/Standard/a] /fontfont size=-1 Modified: tomcat/taglibs/site/src/site/xdoc/standard/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/standard/index.xml?rev=1662635r1=1662634r2=1662635view=diff == --- tomcat/taglibs/site/src/site/xdoc/standard/index.xml (original) +++ tomcat/taglibs/site/src/site/xdoc/standard/index.xml Fri Feb 27 05:31:51 2015 @@ -39,7 +39,7 @@ tdbGetting the Taglib/b/td /tr tr -tdStandard 1.2.1/td +tdStandard 1.2.3/td tdJSTL 1.2/td tdServlet 2.5, JavaServer Pages 2.1/td tda href=http://tomcat.apache.org/download-taglibs.cgi;download/a (a href=apidocs/javadoc/a)/td @@ -67,6 +67,10 @@ tdbItem/b/td /tr tr +td2015/02/20/td +tdThe Apache Standard Taglib 1.2.3, a minor bugfix version, has been released./td + /tr + tr td2014/01/02/td tdThe Apache Standard Taglib 1.2.1, an implementation of JSTL 1.2, has been released./td /tr - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662637 - in /tomcat/site/trunk: docs/ docs/taglibs/ docs/taglibs/site/ docs/taglibs/standard/ xdocs/
://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.md5;md5/a) +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar rel=nofollowtaglibs-standard-spec-1.2.3.jar/a +(a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.md5;md5/a) /li /ul @@ -326,9 +326,9 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar rel=nofollowtaglibs-standard-jstlel-1.2.1.jar/a -(a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar.md5;md5/a) +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar rel=nofollowtaglibs-standard-jstlel-1.2.3.jar/a +(a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.md5;md5/a) /li /ul @@ -340,9 +340,9 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar rel=nofollowtaglibs-standard-compat-1.2.1.jar/a -(a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar.md5;md5/a) +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar rel=nofollowtaglibs-standard-compat-1.2.3.jar/a +(a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.md5;md5/a) /li /ul Modified: tomcat/site/trunk/docs/taglibs/dependencies.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs/dependencies.html?rev=1662637r1=1662636r2=1662637view=diff == --- tomcat/site/trunk/docs/taglibs/dependencies.html (original) +++ tomcat/site/trunk/docs/taglibs/dependencies.html Fri Feb 27 05:43:12 2015 @@ -1,5 +1,5 @@ !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; -!-- Generated by Apache Maven Doxia Site Renderer 1.4 at 18 January 2014 -- +!-- Generated by Apache Maven Doxia Site Renderer 1.4 at 26 February 2015 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta http-equiv=Content-Type content=text/html; charset=UTF-8 / @@ -10,17 +10,17 @@ @import url(./css/site.css); /style link rel=stylesheet href=./css/print.css type=text/css media=print / -meta name=Date-Revision-mmdd content=20140118 / +meta name=Date-Revision-mmdd content=20150226 / meta http-equiv=Content-Language content=en / /head body class=composite div id=banner a href=../../ id=bannerLeft -img src=../images/tomcat.gif alt=Tomcat / +img src=../../images/tomcat.gif alt=Tomcat / /a a href=../ id=bannerRight -img src=images/taglibs.gif alt=Apache Taglibs / +img src=../images/taglibs.gif alt=Apache Taglibs / /a div class=clear hr/ @@ -30,7 +30,7 @@ div class=xleft -span id=publishDateLast Published: 18 January 2014/span +span id=publishDateLast Published: 26 February 2015/span /div div class=xrighta href=http://www.apachecon.com/; class=externalLink title=ApacheConApacheCon/a | @@ -116,7 +116,7 @@ /div div id=footer div class=xright - Copyright #169;2000-2014 + Copyright #169;2000-2015 a href=http://www.apache.org/;The Apache Software Foundation/a. All Rights Reserved. Modified: tomcat/site/trunk/docs/taglibs/dependency-info.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk
[ANN} Apache Standard Taglib 1.2.3 released
The Apache Tomcat team announces the immediate availability of Apache Standard Taglib 1.2.3. Apache Standard Taglib is an open source software implementation of the JSP Standard Tag Library (JSTL) technology. This release supports JSTL version 1.2 and includes bug-fixes and improvements on the previous 1.2.1 release. The notable changes include: - Updated -compat library to use container’s EL implementation for JSTL 1.0 - Better classloading support when deployed in-container vs. in-webapp - Improvements to XML processing, see binary README for additional flags https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt Please refer to the change log included in the distribution for a complete list of the issues addressed. Downloads: http://tomcat.apache.org/download-taglibs.cgi signature.asc Description: Message signed with OpenPGP using GPGMail
[SECURITY] CVE-2015-0254 XXE and RCE via XSL extension in JSTL XML tags
CVE-2015-0254 XXE and RCE via XSL extension in JSTL XML tags Severity: Important Vendor: The Apache Software Foundation Versions Affected: Standard Taglibs 1.2.1 The unsupported 1.0.x and 1.1.x versions may also be affected. Description: When an application uses x:parse or x:transform tags to process untrusted XML documents, a request may utilize external entity references to access resources on the host system or utilize XSLT extensions that may allow remote execution. Mitigation: Users should upgrade to Apache Standard Taglibs 1.2.3 or later. This version uses JAXP’s FEATURE_SECURE_PROCESSING to restrict XML processing. Depending on the Java runtime version in use, additional configuration may be required: Java8: External entity access is automatically disabled if a SecurityManager is active. Java7: JAXP properties may need to be used to disable external access. See http://docs.oracle.com/javase/tutorial/jaxp/properties/properties.html Java6 and earlier: A new system property org.apache.taglibs.standard.xml.accessExternalEntity may be used to specify the protocols that can be used to access external entities. This defaults to “all” if no SecurityManager is present and to “” (thereby disabling access) if a SecurityManager is detected. Credit: David Jorm of IIX signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r1662537 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Am 26. Februar 2015 22:59:11 MEZ, schrieb Christopher Schultz ch...@christopherschultz.net: Felix, On 2/26/15 1:46 PM, fschumac...@apache.org wrote: Author: fschumacher Date: Thu Feb 26 18:46:17 2015 New Revision: 1662537 URL: http://svn.apache.org/r1662537 Log: Don't create a session, if none is needed when using PersistentValve. Good catch. This could be a real pain in the neck. Thanks go to Jeremy for spotting this. Felix -chris Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 Merge r1662308 from /tomcat/trunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 18:46:17 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489 2 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165 7 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489 2
Re: Stabilizing the trunk (9.0.x) build
On 26/02/2015 21:58, Christopher Schultz wrote: Mark, On 2/23/15 4:16 AM, Mark Thomas wrote: Given that it is my changes that have triggered the problems I think I have a responsibility to fix them (and intend to do so over) but I'm not going to say no if anyone wants to pitch in. Therefore, I'm starting this thread so that we can co-ordinate work on fixing the various failures being reported. I'm going to start with why TestWsWebSocketContainer.testMaxMessageSize04() hangs on Windows. I'd like to commit Ognjen's patch for https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 (patch is https://bz.apache.org/bugzilla/attachment.cgi?id=32407action=diff). It's fairly innocuous, but since it will change the AbstractEndpoint class and you guys are trying to track-down irritating issues in there, would you prefer that I hold-off? No objections to committing the patch from me. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57629] sending large file with Expect: 100-continue wrong messages order
https://bz.apache.org/bugzilla/show_bug.cgi?id=57629 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #3 from Mark Thomas ma...@apache.org --- Tomcat will swallow the request body up to maxSwallowSize after which Tomcat will close the connection. Most clients will not read the response until the body is fully sent so if maxSwallowSize request body size then the client will just see a closed connection. You can increase maxSwallowSize to avoid this (at the cost of pointlessly reading more data). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Stabilizing the trunk (9.0.x) build
On 26/02/2015 12:25, Rémy Maucherat wrote: 2015-02-26 11:42 GMT+01:00 Mark Thomas ma...@apache.org: What I have at the moment is at: https://github.com/markt-asf/tomcat/tree/markt-trunk I'm currently running the unit tests. Looking good. Better, certainly. NIO tests pass on Windows, Linux and OSX. I've found a bug in NIO2 + SSL that is fairly common on Linux/OSX that I have fixed and am re-running the tests. I haven't really looked at APR/native yet but there did appear to be some unexpectedly long running tests on Windows (the only platform to get to APR/native so far) so I suspect there is still more to do. Overall I think things are heading in the right direction. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57629] sending large file with Expect: 100-continue wrong messages order
https://bz.apache.org/bugzilla/show_bug.cgi?id=57629 --- Comment #4 from Christopher Schultz ch...@christopherschultz.net --- Does this currently work when Tomcat /is/ managing the authentication and authorization? If so, then I agree with WONTFIX. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57629] sending large file with Expect: 100-continue wrong messages order
https://bz.apache.org/bugzilla/show_bug.cgi?id=57629 --- Comment #2 from Lorenzo Caenazzo lorenzo.caena...@emaze.net --- ok, I think the responability to send 100-continue header is not of contained application. But if the container send a 100 header I expect which it not closes the soket if the body of the request is big. Maybe if Tomcat send a 100 continue header it must take and discard (in some case) the request body. Because the client receve the 100 header and say ok now I can send a lot of data! but after a while the server hang up the connection. What do you think? P.S. for now I've implemented a preemptive authentication method. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57638] New: IllegalArgumentException in AjpNioProcessor when packetSize 8192
https://bz.apache.org/bugzilla/show_bug.cgi?id=57638 Bug ID: 57638 Summary: IllegalArgumentException in AjpNioProcessor when packetSize 8192 Product: Tomcat 8 Version: 8.0.20 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net For reference: http://markmail.org/thread/vu7kgdpqxdw7tlkz This stack trace is from 8.0.17 but I have been able to reproduce it in 8.0.20 and 7.0.56 - 7.0.59: java.lang.IllegalArgumentException at java.nio.Buffer.limit(Buffer.java:275) at org.apache.coyote.ajp.AjpNioProcessor.readSocket(AjpNioProcessor.java:179) at org.apache.coyote.ajp.AjpNioProcessor.read(AjpNioProcessor.java:159) at org.apache.coyote.ajp.AbstractAjpProcessor.readMessage(AbstractAjpProcessor.java:1067) at org.apache.coyote.ajp.AbstractAjpProcessor.receive(AbstractAjpProcessor.java:1005) at org.apache.coyote.ajp.AbstractAjpProcessor.refillReadBuffer(AbstractAjpProcessor.java:1131) Connector configuration: Connector port=@connector-port@ redirectPort=443 protocol=org.apache.coyote.ajp.AjpNioProtocol URIEncoding=UTF-8 packetSize=65536 executor=tomcatThreadPool / Here's what I know so far: 1. AjpNioProtocol fails under some conditions (my post-login page) with packetSize larger than the default (I have tried 65536, 32768, 16184, and 8200). The failing page is ~30k in size, enough to exceed the default packet size but not e.g. maximum 64k 2. Using AjpProtocol (BIO) connector solves the problem 3. Using the default AJP packet size (8192) solves the problem 4. Specifying socket.appReadBufSize and socket.appWriteBufSize to be the same as the packet size solves the problem I'm still working on a small test case to help motivate debugging. Wild-guessing that the root cause is mismatched buffer sizes, or lack of checking when using a smaller protocol buffer than whatever buffer is pumping into the protocol's buffer. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57178] Add CorsFilter configuration option to allow requests with Origin null
https://bz.apache.org/bugzilla/show_bug.cgi?id=57178 Arseniy Skvortsov ettav...@gmail.com changed: What|Removed |Added CC||ettav...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Stabilizing the trunk (9.0.x) build
2015-02-26 17:40 GMT+01:00 Mark Thomas ma...@apache.org: Better, certainly. NIO tests pass on Windows, Linux and OSX. Very good ! I've found a bug in NIO2 + SSL that is fairly common on Linux/OSX that I have fixed and am re-running the tests. Aw, *another* one ? I haven't really looked at APR/native yet but there did appear to be some unexpectedly long running tests on Windows (the only platform to get to APR/native so far) so I suspect there is still more to do. Overall I think things are heading in the right direction. Rémy
svn commit: r1662549 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java
Author: fschumacher Date: Thu Feb 26 19:44:39 2015 New Revision: 1662549 URL: http://svn.apache.org/r1662549 Log: Correct sentence in TODO Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 19:44:39 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
svn commit: r1662548 - /tomcat/trunk/webapps/docs/changelog.xml
Author: fschumacher Date: Thu Feb 26 19:43:41 2015 New Revision: 1662548 URL: http://svn.apache.org/r1662548 Log: Correct typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1662548r1=1662547r2=1662548view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 26 19:43:41 2015 @@ -42,7 +42,7 @@ Other fixed issues are added to the end of the list, chronologically. They eventually become mixed with the numbered issues. (I.e., numbered - issues to not pop up wrt. others). + issues do not pop up wrt. others). -- !-- Note: Until the first 9.0.x release, the only entries that should appear in - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662551 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml
Author: fschumacher Date: Thu Feb 26 19:47:23 2015 New Revision: 1662551 URL: http://svn.apache.org/r1662551 Log: Correct typo Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 19:47:23 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
svn commit: r1662552 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: fschumacher Date: Thu Feb 26 19:48:48 2015 New Revision: 1662552 URL: http://svn.apache.org/r1662552 Log: Correct typo Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1662552r1=1662551r2=1662552view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Feb 26 19:48:48 2015 @@ -170,7 +170,7 @@ in a different container thread complete correctly. (markt) /fix fix -Ensure that user name chekcing in the optional SecurityListener is +Ensure that user name checking in the optional SecurityListener is case-insensitive (as documented) and than the case-insensitive comparison is performed using the system default Locale. (markt) /fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662553 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml
Author: fschumacher Date: Thu Feb 26 19:50:11 2015 New Revision: 1662553 URL: http://svn.apache.org/r1662553 Log: Correct typo Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 19:50:11 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807 ,1659816,1659835-1659864,1659968,1660953,1660970,1662178,1662537,1662549 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
Re: Stabilizing the trunk (9.0.x) build
On 26/02/2015 17:34, Rémy Maucherat wrote: 2015-02-26 17:40 GMT+01:00 Mark Thomas ma...@apache.org: Better, certainly. NIO tests pass on Windows, Linux and OSX. Very good ! I've found a bug in NIO2 + SSL that is fairly common on Linux/OSX that I have fixed and am re-running the tests. Aw, *another* one ? Yes. Looks like it affects 8.0.x as well. This fixes it: https://github.com/markt-asf/tomcat/commit/f8eda8da61751b0b224d59dbd93ed9f5f1fa9441 I haven't really looked at APR/native yet but there did appear to be some unexpectedly long running tests on Windows (the only platform to get to APR/native so far) so I suspect there is still more to do. There was another issue but it looked to be a fairly simple one - one of the concurrent read/write fixes was breaking a bunch of stuff. Most likely the fix wasn't right but since we don't need it removing it was the simplest solution. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57629] sending large file with Expect: 100-continue wrong messages order
https://bz.apache.org/bugzilla/show_bug.cgi?id=57629 --- Comment #5 from Mark Thomas ma...@apache.org --- Yes. You get the right 4xx response along with a Connection: close header. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662537 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Author: fschumacher Date: Thu Feb 26 18:46:17 2015 New Revision: 1662537 URL: http://svn.apache.org/r1662537 Log: Don't create a session, if none is needed when using PersistentValve. Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 Merge r1662308 from /tomcat/trunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 18:46:17 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
[Bug 57637] PersistentValve always causes a new session to be created
https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 Felix Schumacher felix.schumac...@internetallee.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Felix Schumacher felix.schumac...@internetallee.de --- Will be included in tomcat 8.0.21 and 7.0.60. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662545 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Author: fschumacher Date: Thu Feb 26 19:40:39 2015 New Revision: 1662545 URL: http://svn.apache.org/r1662545 Log: Don't create a session, if none is needed when using PersistentValve. Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 Merge r1662537 from /tomcat/tc8.0.x/trunk (merged r1662308 from /tomcat/trunk) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 19:40:39 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807 ,1659816,1659835-1659864,1659968,1660953,1660970,1662178 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
svn commit: r1662550 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java
Author: fschumacher Date: Thu Feb 26 19:46:15 2015 New Revision: 1662550 URL: http://svn.apache.org/r1662550 Log: Correct sentence in TODO Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 19:46:15 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807 ,1659816,1659835-1659864,1659968,1660953,1660970,1662178,1662537 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
svn commit: r1662396 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Author: remm
Date: Thu Feb 26 09:14:49 2015
New Revision: 1662396
URL: http://svn.apache.org/r1662396
Log:
Revert after CI test run.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662396r1=1662395r2=1662396view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Thu Feb 26 09:14:49 2015
@@ -59,7 +59,6 @@ public class WsRemoteEndpointImplServer
private volatile long timeoutExpiry = -1;
private volatile boolean close;
-private final Object lock = new Object();
public WsRemoteEndpointImplServer(ServletInputStream sis,
ServletOutputStream sos,
WsServerContainer serverContainer) {
@@ -87,54 +86,52 @@ public class WsRemoteEndpointImplServer
public void onWritePossible(boolean useDispatch) {
-synchronized (lock) {
-ByteBuffer[] buffers = this.buffers;
-if (buffers == null) {
-// Servlet 3.1 will call the write listener once even if
nothing
-// was written
-return;
-}
-boolean complete = false;
-try {
-// If this is false there will be a call back when it is true
-while (sos.isReady()) {
-complete = true;
-for (ByteBuffer buffer : buffers) {
-if (buffer.hasRemaining()) {
-complete = false;
-sos.write(buffer.array(), buffer.arrayOffset(),
-buffer.limit());
-buffer.position(buffer.limit());
-break;
-}
+ByteBuffer[] buffers = this.buffers;
+if (buffers == null) {
+// Servlet 3.1 will call the write listener once even if nothing
+// was written
+return;
+}
+boolean complete = false;
+try {
+// If this is false there will be a call back when it is true
+while (sos.isReady()) {
+complete = true;
+for (ByteBuffer buffer : buffers) {
+if (buffer.hasRemaining()) {
+complete = false;
+sos.write(buffer.array(), buffer.arrayOffset(),
+buffer.limit());
+buffer.position(buffer.limit());
+break;
}
+}
+if (complete) {
+sos.flush();
+complete = sos.isReady();
if (complete) {
-sos.flush();
-complete = sos.isReady();
-if (complete) {
-wsWriteTimeout.unregister(this);
-clearHandler(null, useDispatch);
-if (close) {
-close();
-}
+wsWriteTimeout.unregister(this);
+clearHandler(null, useDispatch);
+if (close) {
+close();
}
-break;
}
+break;
}
-} catch (IOException | IllegalStateException e) {
-wsWriteTimeout.unregister(this);
-clearHandler(e, useDispatch);
-close();
}
+} catch (IOException | IllegalStateException e) {
+wsWriteTimeout.unregister(this);
+clearHandler(e, useDispatch);
+close();
+}
-if (!complete) {
-// Async write is in progress
-long timeout = getSendTimeout();
-if (timeout 0) {
-// Register with timeout thread
-timeoutExpiry = timeout + System.currentTimeMillis();
-wsWriteTimeout.register(this);
-}
+if (!complete) {
+// Async write is in progress
+long timeout = getSendTimeout();
+if (timeout 0) {
+// Register with timeout thread
+timeoutExpiry = timeout + System.currentTimeMillis();
+wsWriteTimeout.register(this);
}
}
}
-
To unsubscribe, e-mail:
Re: Stabilizing the trunk (9.0.x) build
On 25/02/2015 19:32, Rémy Maucherat wrote: 2015-02-25 19:36 GMT+01:00 Mark Thomas ma...@apache.org: I was planning on waiting until the build was stable but given that: - read/write concurrency is at the root of a lot of these issues - only WebSocket should be using it now in trunk - the plan is to refactor WebSocket to remove it I'm going to go back to what I have in git, rebase it to current trunk and see where we are. If the unit tests pass on the usual platforms I'd be tempted to commit it. WDYT? Ok. What I have at the moment is at: https://github.com/markt-asf/tomcat/tree/markt-trunk I'm currently running the unit tests. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Stabilizing the trunk (9.0.x) build
2015-02-26 11:42 GMT+01:00 Mark Thomas ma...@apache.org: What I have at the moment is at: https://github.com/markt-asf/tomcat/tree/markt-trunk I'm currently running the unit tests. Looking good. Rémy
Re: Stabilizing the trunk (9.0.x) build
Mark, On 2/23/15 4:16 AM, Mark Thomas wrote: Given that it is my changes that have triggered the problems I think I have a responsibility to fix them (and intend to do so over) but I'm not going to say no if anyone wants to pitch in. Therefore, I'm starting this thread so that we can co-ordinate work on fixing the various failures being reported. I'm going to start with why TestWsWebSocketContainer.testMaxMessageSize04() hangs on Windows. I'd like to commit Ognjen's patch for https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 (patch is https://bz.apache.org/bugzilla/attachment.cgi?id=32407action=diff). It's fairly innocuous, but since it will change the AbstractEndpoint class and you guys are trying to track-down irritating issues in there, would you prefer that I hold-off? Thanks, -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1662537 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Felix, On 2/26/15 1:46 PM, fschumac...@apache.org wrote: Author: fschumacher Date: Thu Feb 26 18:46:17 2015 New Revision: 1662537 URL: http://svn.apache.org/r1662537 Log: Don't create a session, if none is needed when using PersistentValve. Good catch. This could be a real pain in the neck. -chris Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637 Merge r1662308 from /tomcat/trunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 26 18:46:17 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489 2 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165 7 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489 2
svn commit: r1662627 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/res/ webapps/docs/ webapps/docs/config/
Author: schultz Date: Fri Feb 27 02:48:23 2015 New Revision: 1662627 URL: http://svn.apache.org/r1662627 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 Respect TLS server cipher ordering in JSSE-based connectors. Based upon a patch provided by Ognjen Blagojevic. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 27 02:48:23 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
[jira] [Commented] (MTOMCAT-255) Getting Target Unreachable, identifier 'pessoaBean' resolved to null on tomcat:run but not in tomcat:run-war
[ https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14339669#comment-14339669 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-255: maybe you could provide a patch :-) Getting Target Unreachable, identifier 'pessoaBean' resolved to null on tomcat:run but not in tomcat:run-war -- Key: MTOMCAT-255 URL: https://issues.apache.org/jira/browse/MTOMCAT-255 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.2 Environment: gilberto.andrade@A37710:~$ mvn -version Apache Maven 3.0.4 (r1232337; 2012-01-17 05:44:56-0300) Maven home: /home/gilberto.andrade/bin/maven Java version: 1.7.0_45, vendor: Oracle Corporation Java home: /usr/java/jdk1.7.0_45/jre Default locale: pt_BR, platform encoding: UTF-8 OS name: linux, version: 3.7.10-1.24-desktop, arch: amd64, family: unix Reporter: Gilberto C Andrade Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Fix For: 2.3 Attachments: MTOMCAT-255.zip Simple JSF 2.2 project with just one manage bean(PessoaMb) and one xhtml page. 1 Run mvn clean tomcat7:run 2 hitting http://localhost:8080/MTOMCAT-255/pessoaView.xhtml 3 enter some value on field or click the consultar button The same steps works when using tomcat7:run-war. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-255) Getting Target Unreachable, identifier 'pessoaBean' resolved to null on tomcat:run but not in tomcat:run-war
[ https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-255: --- Fix Version/s: (was: 2.3) 2.4 Getting Target Unreachable, identifier 'pessoaBean' resolved to null on tomcat:run but not in tomcat:run-war -- Key: MTOMCAT-255 URL: https://issues.apache.org/jira/browse/MTOMCAT-255 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.2 Environment: gilberto.andrade@A37710:~$ mvn -version Apache Maven 3.0.4 (r1232337; 2012-01-17 05:44:56-0300) Maven home: /home/gilberto.andrade/bin/maven Java version: 1.7.0_45, vendor: Oracle Corporation Java home: /usr/java/jdk1.7.0_45/jre Default locale: pt_BR, platform encoding: UTF-8 OS name: linux, version: 3.7.10-1.24-desktop, arch: amd64, family: unix Reporter: Gilberto C Andrade Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Fix For: 2.4 Attachments: MTOMCAT-255.zip Simple JSF 2.2 project with just one manage bean(PessoaMb) and one xhtml page. 1 Run mvn clean tomcat7:run 2 hitting http://localhost:8080/MTOMCAT-255/pessoaView.xhtml 3 enter some value on field or click the consultar button The same steps works when using tomcat7:run-war. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662632 - in /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse: JSSESocketFactory.java res/LocalStrings.properties
Author: schultz
Date: Fri Feb 27 04:05:46 2015
New Revision: 1662632
URL: http://svn.apache.org/r1662632
Log:
Additional fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=55988
Include support for useServerCipherSuiteOrder for Java BIO connector.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1662632r1=1662631r2=1662632view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Fri Feb 27 04:05:46 2015
@@ -22,6 +22,8 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -52,6 +54,7 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.ManagerFactoryParameters;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSession;
@@ -773,6 +776,52 @@ public class JSSESocketFactory implement
}
/**
+ * Configures SSLEngine to honor cipher suites ordering based upon
+ * endpoint configuration.
+ *
+ * @throws InvalidAlgorithmParameterException If the runtime JVM doesn't
+ * support this setting.
+ */
+protected void configureUseServerCipherSuitesOrder(SSLServerSocket socket)
{
+String useServerCipherSuitesOrderStr = endpoint
+.getUseServerCipherSuitesOrder().trim();
+
+// Only use this feature if the user explicitly requested its use.
+if(!.equals(useServerCipherSuitesOrderStr)) {
+SSLParameters sslParameters = socket.getSSLParameters();
+boolean useServerCipherSuitesOrder =
+(true.equalsIgnoreCase(useServerCipherSuitesOrderStr)
+||
yes.equalsIgnoreCase(useServerCipherSuitesOrderStr));
+
+try {
+// This method is only available in Java 8+
+// Check to see if the method exists, and then call it.
+Method m =
SSLParameters.class.getMethod(setUseCipherSuitesOrder,
+ Boolean.TYPE);
+
+m.invoke(sslParameters,
Boolean.valueOf(useServerCipherSuitesOrder));
+}
+catch (NoSuchMethodException nsme) {
+throw new
UnsupportedOperationException(sm.getString(endpoint.jsse.cannotHonorServerCipherOrder),
+nsme);
+} catch (InvocationTargetException ite) {
+// Should not happen
+throw new
UnsupportedOperationException(sm.getString(endpoint.jsse.cannotHonorServerCipherOrder),
+ite);
+} catch (IllegalArgumentException iae) {
+// Should not happen
+throw new
UnsupportedOperationException(sm.getString(endpoint.jsse.cannotHonorServerCipherOrder),
+iae);
+} catch (IllegalAccessException e) {
+// Should not happen
+throw new
UnsupportedOperationException(sm.getString(endpoint.jsse.cannotHonorServerCipherOrder),
+e);
+}
+socket.setSSLParameters(sslParameters);
+}
+}
+
+/**
* Configures the given SSL server socket with the requested cipher suites,
* protocol versions, and need for client authentication
*/
@@ -786,6 +835,7 @@ public class JSSESocketFactory implement
// we don't know if client auth is needed -
// after parsing the request we may re-handshake
configureClientAuth(socket);
+configureUseServerCipherSuitesOrder(socket);
}
/**
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties?rev=1662632r1=1662631r2=1662632view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
(original)
+++
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #19 from Christopher Schultz ch...@christopherschultz.net --- Support for BIO connector added in Tomcat 8.0.x in r1662632. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662633 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ java/org/apache/tomcat/util/net/jsse/res/ java/org/apache/tomcat/util/net/res
Author: schultz Date: Fri Feb 27 04:14:11 2015 New Revision: 1662633 URL: http://svn.apache.org/r1662633 Log: Back-port r1662627 and r1662632 to fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 Respect TLS server cipher ordering in JSSE-based connectors. Based upon patches provided by Ognjen Blagojevic. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 27 04:14:11 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807 ,1659816,1659835-1659864,1659968,1660953,1660970,1662178,1662537,1662549,1662551 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #20 from Christopher Schultz ch...@christopherschultz.net --- Fixed in Tomcat 7.0.x in r1662633. Will be in Tomcat 7.0.60. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662614 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java java/org/apache/tomcat/util/net/Nio2Endpoint.java java/org/apache/tomcat/util/net/NioEndpoint.java webapp
Author: schultz
Date: Fri Feb 27 01:37:19 2015
New Revision: 1662614
URL: http://svn.apache.org/r1662614
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55988
Respect TLS server cipher ordering in JSSE-based connectors.
Patch provided by Ognjen Blagojevic.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1662614r1=1662613r2=1662614view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Feb
27 01:37:19 2015
@@ -31,6 +31,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -964,6 +966,10 @@ public abstract class AbstractEndpointS
*/
public abstract String[] getCiphersUsed();
+private String useServerCipherSuitesOrder = false;
+public String getUseServerCipherSuitesOrder() { return
useServerCipherSuitesOrder;}
+public void setUseServerCipherSuitesOrder(String s) {
this.useServerCipherSuitesOrder = s;}
+
private String keyAlias = null;
public String getKeyAlias() { return keyAlias;}
public void setKeyAlias(String s ) { keyAlias = s;}
@@ -1065,6 +1071,22 @@ public abstract class AbstractEndpointS
protected final SetSocketWrapperBaseS waitingRequests = Collections
.newSetFromMap(new ConcurrentHashMapSocketWrapperBaseS,
Boolean());
+/**
+ * Configures SSLEngine to honor cipher suites ordering based upon
+ * endpoint configuration.
+ */
+protected void configureUseServerCipherSuitesOrder(SSLEngine engine) {
+String useServerCipherSuitesOrderStr = this
+.getUseServerCipherSuitesOrder().trim();
+
+SSLParameters sslParameters = engine.getSSLParameters();
+boolean useServerCipherSuitesOrder =
+(true.equalsIgnoreCase(useServerCipherSuitesOrderStr)
+|| yes.equalsIgnoreCase(useServerCipherSuitesOrderStr));
+
+sslParameters.setUseCipherSuitesOrder(useServerCipherSuitesOrder);
+engine.setSSLParameters(sslParameters);
+}
/**
* The async timeout thread.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1662614r1=1662613r2=1662614view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Feb 27
01:37:19 2015
@@ -545,6 +545,8 @@ public class Nio2Endpoint extends Abstra
engine.setEnabledCipherSuites(enabledCiphers);
engine.setEnabledProtocols(enabledProtocols);
+configureUseServerCipherSuitesOrder(engine);
+
return engine;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1662614r1=1662613r2=1662614view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Feb 27
01:37:19 2015
@@ -574,6 +574,8 @@ public class NioEndpoint extends Abstrac
engine.setEnabledCipherSuites(enabledCiphers);
engine.setEnabledProtocols(enabledProtocols);
+configureUseServerCipherSuitesOrder(engine);
+
return engine;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1662614r1=1662613r2=1662614view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 27 01:37:19 2015
@@ -69,6 +69,10 @@
Refactor HTTP upgrade and AJP implementations to reduce duplication.
(markt)
/scode
+ fix
+bug55988/bug: Add support for Java 8 JSSE server-preferred TLS
+cipher suite ordering. Patch provided by Ognjen Blagojevic. (schultz)
+ /fix
/changelog
/subsection
subsection
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #17 from Christopher Schultz ch...@christopherschultz.net --- Fixed in trunk in r1662614. I'll start preparing a patch for Tomcat 8. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #18 from Christopher Schultz ch...@christopherschultz.net --- Fixed in Tomcat 8.0.x in r1662627. Will be in Tomcat 8.0.21. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1662627 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/res/ webapps/docs/ webapps/docs/config/
All, On 2/26/15 9:48 PM, schu...@apache.org wrote: Author: schultz Date: Fri Feb 27 02:48:23 2015 New Revision: 1662627 URL: http://svn.apache.org/r1662627 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 Respect TLS server cipher ordering in JSSE-based connectors. Based upon a patch provided by Ognjen Blagojevic. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml I missed the JioEndpoint in this patch. I'm working on an additional patch to add it. -chris Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 27 02:48:23 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489 2 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165 7 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489 2
