svn commit: r1682320 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/pool2: ./ impl/BaseGenericObjectPool.java impl/GenericKeyedObjectPool.java impl/GenericKeyedObjectPoolConfig.java impl/GenericObject

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:09:07 2015 New Revision: 1682320 URL: http://svn.apache.org/r1682320 Log: Update Commons Pool fork to 2.4.0 Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)

svn commit: r1682326 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/disk/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:33:45 2015 New Revision: 1682326 URL: http://svn.apache.org/r1682326 Log: Update fork of Commons FileUpload from r1596086 to r1682322 to pick the 1.3.1 release and subsequent fixes. Modified: tomcat/tc7.0.x/trunk/ (props changed)

svn commit: r1682332 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/codec/ java/org/apache/tomcat/util/codec/binary/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:43:15 2015 New Revision: 1682332 URL: http://svn.apache.org/r1682332 Log: Update fork of Apache Commons codec from r1609340 to r1682326. Javadoc fixes only. No functional change. Modified: tomcat/tc7.0.x/trunk/ (props changed)

svn commit: r1682330 - in /tomcat/trunk/java/org/apache/tomcat/util/codec: ./ DecoderException.java EncoderException.java binary/Base64.java binary/BaseNCodec.java binary/StringUtils.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:39:26 2015 New Revision: 1682330 URL: http://svn.apache.org/r1682330 Log: Update fork of Apache Commons codec from r1609340 to r1682326. Javadoc fixes only. No functional change. Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/ (props changed)

svn commit: r1682319 - /tomcat/trunk/TOMCAT-NEXT.txt

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:04:03 2015 New Revision: 1682319 URL: http://svn.apache.org/r1682319 Log: Update Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL:

svn commit: r1682324 - in /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: ./ FileUploadBase.java ParameterParser.java disk/DiskFileItem.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:29:15 2015 New Revision: 1682324 URL: http://svn.apache.org/r1682324 Log: Update fork of Commons FileUpload from r1596086 to r1682322 to pick thew 1.3.1 release and subsequent fixes. Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/

buildbot exception in ASF Buildbot on tomcat-trunk

2015-05-28 Thread buildbot
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1290 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The

svn commit: r1682318 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:02:42 2015 New Revision: 1682318 URL: http://svn.apache.org/r1682318 Log: Update DBCP fork to DBCP 2.1 + additional fixes to r1682314 Added: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java - copied unchanged from

buildbot success in ASF Buildbot on tomcat-8-trunk

2015-05-28 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/280 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The

svn commit: r1682322 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/dbcp/pool2/ java/org/apache/tomcat/dbcp/pool2/impl/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:10:13 2015 New Revision: 1682322 URL: http://svn.apache.org/r1682322 Log: Update Commons Pool fork to 2.4.0 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)

svn commit: r1682325 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/disk/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:31:12 2015 New Revision: 1682325 URL: http://svn.apache.org/r1682325 Log: Update fork of Commons FileUpload from r1596086 to r1682322 to pick thew 1.3.1 release and subsequent fixes. Modified: tomcat/tc8.0.x/trunk/ (props changed)

svn commit: r1682331 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/codec/ java/org/apache/tomcat/util/codec/binary/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 20:42:01 2015 New Revision: 1682331 URL: http://svn.apache.org/r1682331 Log: Update fork of Apache Commons codec from r1609340 to r1682326. Javadoc fixes only. No functional change. Modified: tomcat/tc8.0.x/trunk/ (props changed)

[Bug 57969] New: @PathParam annotation captures incorrect value under high load

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57969 Bug ID: 57969 Summary: @PathParam annotation captures incorrect value under high load Product: Tomcat 7 Version: 7.0.59 Hardware: PC OS: Linux

svn commit: r1682312 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 19:15:45 2015 New Revision: 1682312 URL: http://svn.apache.org/r1682312 Log: Merge BCEL changes from r1614166 to r1682271 The changes consist of: - code clean-up - Javadoc tweaks - some renaming There are no functional changes Modified: tomcat/tc8.0.x/trunk/

svn commit: r1682317 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2: ./ datasources/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 19:57:56 2015 New Revision: 1682317 URL: http://svn.apache.org/r1682317 Log: Update DBCP fork to DBCP 2.1 + additional fixes to r1682314 Added: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java - copied, changed from r1682314,

svn commit: r1682315 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter: ConnectionImpl.java DriverAdapterCPDS.java PooledConnectionImpl.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 19:40:25 2015 New Revision: 1682315 URL: http://svn.apache.org/r1682315 Log: (empty) Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java

buildbot exception in ASF Buildbot on tomcat-8-trunk

2015-05-28 Thread buildbot
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/278 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The

svn commit: r1682313 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 19:22:12 2015 New Revision: 1682313 URL: http://svn.apache.org/r1682313 Log: Merge BCEL changes from r1614166 to r1682271 The changes consist of: - code clean-up - Javadoc tweaks - some renaming There are no functional changes Modified: tomcat/tc7.0.x/trunk/

svn commit: r1682311 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel: ./ classfile/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 19:12:19 2015 New Revision: 1682311 URL: http://svn.apache.org/r1682311 Log: Merge BCEL changes from r1614166 to r1682271 The changes consist of: - code clean-up - Javadoc tweaks - some renaming There are no functional changes Modified:

[Bug 57971] New: Description of recoverySleepTime doesn't correspond with the implementation

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57971 Bug ID: 57971 Summary: Description of recoverySleepTime doesn't correspond with the implementation Product: Tomcat 8 Version: trunk Hardware: All OS: All

svn commit: r1682164 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 08:06:37 2015 New Revision: 1682164 URL: http://svn.apache.org/r1682164 Log: Pull up longPoll() to the base Protocol implementation Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

svn commit: r1682167 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Protocol.java Http11AprProtocol.java Http11Nio2Protocol.java Http11NioProtocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 08:23:01 2015 New Revision: 1682167 URL: http://svn.apache.org/r1682167 Log: Pull up release() Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java

svn commit: r1682163 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java http11/Http11AprProtocol.java http11/Http11Nio2Pro

2015-05-28 Thread markt
Author: markt Date: Thu May 28 08:02:10 2015 New Revision: 1682163 URL: http://svn.apache.org/r1682163 Log: Pull up longPoll() Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java

[Bug 57959] Deadlock in FileHandler.java when log is rotated

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57959 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Resolution|--- |FIXED

[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

2015-05-28 Thread Bill Barker
/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz

svn propchange: r1682152 - svn:log

2015-05-28 Thread violetagg
Author: violetagg Revision: 1682152 Modified property: svn:log Modified: svn:log at Thu May 28 06:57:30 2015 -- --- svn:log (original) +++ svn:log Thu May 28 06:57:30 2015 @@ -1,2 +1,3 @@ +Fix

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2015-05-28 Thread Bill Barker
/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz

svn commit: r1682152 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml

2015-05-28 Thread violetagg
Author: violetagg Date: Thu May 28 06:54:35 2015 New Revision: 1682152 URL: http://svn.apache.org/r1682152 Log: Partially merged revision 1582064 from tomcat/tc8.0.x/trunk: Fixed deadlock in org.apache.juli.FileHandler when log is rotated. Modified: tomcat/tc7.0.x/trunk/ (props changed)

buildbot success in ASF Buildbot on tomcat-7-trunk

2015-05-28 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/661 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

2015-05-28 Thread Bill Barker
-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz -Dexamples.sources.skip=true

svn commit: r1682184 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 09:37:40 2015 New Revision: 1682184 URL: http://svn.apache.org/r1682184 Log: No need to set the keep-alive timeout. It has already been set in the Processor Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Modified:

svn commit: r1682206 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11Nio2Protocol.java Http11NioProtocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 11:10:25 2015 New Revision: 1682206 URL: http://svn.apache.org/r1682206 Log: Align release(SocketWrapper) for NIO and NIO2 Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java

svn commit: r1682205 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 11:10:03 2015 New Revision: 1682205 URL: http://svn.apache.org/r1682205 Log: Fix typo Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL:

[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 --- Comment #3 from Anoop Kumar anoopayth...@gmail.com --- Full Stack Trace given below Unable to compile class for JSP org.apache.jasper.JasperException: Unable to compile class for JSP at

svn commit: r1682189 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProtocol.java AjpAprProtocol.java AjpNio2Protocol.java AjpNioProtocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 09:42:13 2015 New Revision: 1682189 URL: http://svn.apache.org/r1682189 Log: Pull up release() Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java

svn commit: r1682194 - in /tomcat/trunk: java/org/apache/coyote/ajp/AjpAprProtocol.java java/org/apache/coyote/http11/Http11AprProtocol.java webapps/docs/config/ajp.xml webapps/docs/config/http.xml

2015-05-28 Thread markt
Author: markt Date: Thu May 28 09:53:36 2015 New Revision: 1682194 URL: http://svn.apache.org/r1682194 Log: Remove APR specific pollerSize (it is a synonym for the general maxConnections) Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java

svn commit: r1682190 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 09:45:03 2015 New Revision: 1682190 URL: http://svn.apache.org/r1682190 Log: Pull up release() to base Protocol class Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java

[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 --- Comment #2 from Violeta Georgieva violet...@apache.org --- Hi, Please provide also a sample JSP that can be used to reproduce the issue. I tested Tomcat 8.0.23 with Java SE 8.0.45 and also JSP Servlet configuration below and Tomcat's JSP

[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 --- Comment #4 from Rainer Jung rainer.j...@kippdata.de --- Assuming this happens for you on Windows: there's a list of external reasons that can make this happen, including real-time virus scanning and long path names. Could you check, how

svn commit: r1682186 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 09:40:16 2015 New Revision: 1682186 URL: http://svn.apache.org/r1682186 Log: Align release() for NIO2 with NIO and APR. - remove (non-i18n) debug message - register for read if necessary (likely to be a NO-OP for NIO2 + AJP) Modified:

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2015-05-28 Thread Bill Barker
/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150528-native-src.tar.gz

[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from

[Bug 57966] New: Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 Bug ID: 57966 Summary: Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed Product: Tomcat 8

[Bug 57966] Tomcat 8 (8.0.22/ 8.0.23) + Java 8.0.45 failed to compile the JSPs - java.io.IOException: tmpFile.renameTo(classFile) failed

2015-05-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57966 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO --

svn commit: r1682240 - in /tomcat/trunk/java/org/apache: coyote/ coyote/ajp/ coyote/http11/ tomcat/util/net/

2015-05-28 Thread markt
Author: markt Date: Thu May 28 13:25:52 2015 New Revision: 1682240 URL: http://svn.apache.org/r1682240 Log: Fix various errors when stopping the APR connector via JMX (may occur in other scenarios) - prevent a crash by ensuring all connections are closed via the SocketWrapper - prevent a memory

svn commit: r1682247 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 13:53:32 2015 New Revision: 1682247 URL: http://svn.apache.org/r1682247 Log: Update comment Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL:

[GitHub] tomcat pull request: Recursively create document base directory

2015-05-28 Thread lvarvel
GitHub user lvarvel opened a pull request: https://github.com/apache/tomcat/pull/20 Recursively create document base directory The expand method will create the docBase directory, however sometimes this fails because the intermediate webapps directory has not been created already.

[GitHub] tomcat pull request: Recursively create document base directory

2015-05-28 Thread markt-asf
Github user markt-asf commented on the pull request: https://github.com/apache/tomcat/pull/20#issuecomment-106360093 Starting Tomcat with an appBase that is not an existing directory is an error and is reported as such in the logs. --- If your project is set up for it, you can reply

svn commit: r1682261 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractJsseEndpoint.java jsse/JSSEKeyManager.java jsse/JSSESocketFactory.java jsse/NioX509KeyManager.java

2015-05-28 Thread markt
Author: markt Date: Thu May 28 15:28:34 2015 New Revision: 1682261 URL: http://svn.apache.org/r1682261 Log: JSSEKeyManager and NioX509KeyManager were doing exactly the same thing and we were wrapping KeyManager instances twice. Remove the NioX509KeyManager completely and only wrap once. Also

Re: Supporting multiple certificates

2015-05-28 Thread Christopher Schultz
Mark, On 5/27/15 4:56 AM, Mark Thomas wrote: On 26/05/2015 08:28, Mark Thomas wrote: On 25/05/2015 15:18, Rainer Jung wrote: snip/ Mark has been doing a whole lot of work recently to both unify the TLS configuration across all connectors (OpenSSL and JSSE) as well as support SNI. Since