[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161206.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161206.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161206.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-21.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 7.4-SNAPSHOT on 3101 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java:25: Extra separation in import group before 'org.apache.tomcat.util.http.FastHttpDateFormat' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java:23: Extra separation in import group before 'java.util.Hashtable' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/filters/TestExpiresFilter.java:36: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java:31: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java:32: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/tomcat/websocket/server/TestClose.java:39: Extra separation in import group before 'org.junit.Test' [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:538: Got 6 errors and 0 warnings. Total time: 20 seconds - To subscribe to this information via
[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 21 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161206.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161206.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161206.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-21.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 7.4-SNAPSHOT on 3018 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/catalina/valves/rewrite/ResolverImpl.java:25: Extra separation in import group before 'org.apache.tomcat.util.http.FastHttpDateFormat' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java:23: Extra separation in import group before 'java.util.Hashtable' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/catalina/filters/TestExpiresFilter.java:36: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java:31: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/runtime/TestPageContextImpl.java:32: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/tomcat/websocket/server/TestClose.java:41: Extra separation in import group before 'org.junit.Test' [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:550: Got 6 errors and 0 warnings. Total time: 21 seconds - To subscribe to this in
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 18 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161206.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161206.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161206.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-21.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 7.4-SNAPSHOT on 2653 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/catalina/realm/JNDIRealm.java:66: Extra separation in import group before 'org.ietf.jgss.GSSCredential' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/filters/TestExpiresFilter.java:36: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java:31: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/runtime/TestPageContextImpl.java:32: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/tomcat/websocket/server/TestClose.java:41: Extra separation in import group before 'org.junit.Test' [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:533: Got 5 errors and 0 warnings. Total time: 18 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Trackin
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 13 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 16 mins 58 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161206.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexe cute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161206-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161206-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20161206.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/
[Bug 60138] protocol TLSV1.2 causes exception text sslUtilBase.noneSupported
https://bz.apache.org/bugzilla/show_bug.cgi?id=60138 --- Comment #4 from Paul Scott --- Verified fix in 8.5.6 -- 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
[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 32 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 19 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161206.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161206.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161206.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-21.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 7.4-SNAPSHOT on 3101 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java:25: Extra separation in import group before 'org.apache.tomcat.util.http.FastHttpDateFormat' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java:23: Extra separation in import group before 'java.util.Hashtable' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/filters/TestExpiresFilter.java:36: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java:31: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java:32: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/tomcat/websocket/server/TestClose.java:39: Extra separation in import group before 'org.junit.Test' [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:538: Got 6 errors and 0 warnings. Total time: 19 seconds
[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 32 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161206.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161206.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161206.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-21.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 7.4-SNAPSHOT on 3018 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/catalina/valves/rewrite/ResolverImpl.java:25: Extra separation in import group before 'org.apache.tomcat.util.http.FastHttpDateFormat' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java:23: Extra separation in import group before 'java.util.Hashtable' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/catalina/filters/TestExpiresFilter.java:36: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java:31: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/runtime/TestPageContextImpl.java:32: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/tomcat/websocket/server/TestClose.java:41: Extra separation in import group before 'org.junit.Test' [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:550: Got 6 errors and 0 warnings. Total time: 20 seconds ---
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 32 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 17 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161206.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161206.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161206.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-21.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.4-SNAPSHOT.jar downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 7.4-SNAPSHOT on 2653 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/catalina/realm/JNDIRealm.java:66: Extra separation in import group before 'org.ietf.jgss.GSSCredential' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/filters/TestExpiresFilter.java:36: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java:31: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/runtime/TestPageContextImpl.java:32: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/tomcat/websocket/server/TestClose.java:41: Extra separation in import group before 'org.junit.Test' [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:533: Got 5 errors and 0 warnings. Total time: 17 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml
svn commit: r1772805 - in /tomcat/tc8.5.x/trunk: java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java webapps/docs/changelog.xml
Author: markt
Date: Mon Dec 5 21:00:22 2016
New Revision: 1772805
URL: http://svn.apache.org/viewvc?rev=1772805&view=rev
Log:
Expand the search process for a server certificate when OpenSSL is used with a
JSSE connector and an explicit alias has not been configured.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1772805&r1=1772804&r2=1772805&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Dec 5 21:00:22 2016
@@ -23,6 +23,8 @@ import java.security.cert.CertificateExc
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -47,6 +49,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
import
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
import org.apache.tomcat.util.res.StringManager;
@@ -276,6 +279,10 @@ public class OpenSSLContext implements o
alias = "tomcat";
}
X509Certificate[] chain =
keyManager.getCertificateChain(alias);
+if (chain == null) {
+alias = findAlias(keyManager, certificate);
+chain = keyManager.getCertificateChain(alias);
+}
PrivateKey key = keyManager.getPrivateKey(alias);
StringBuilder sb = new StringBuilder(BEGIN_KEY);
String encoded =
BASE64_ENCODER.encodeToString(key.getEncoded());
@@ -342,6 +349,33 @@ public class OpenSSLContext implements o
}
}
+/*
+ * Find a valid alias when none was specified in the config.
+ */
+private static String findAlias(X509KeyManager keyManager,
+SSLHostConfigCertificate certificate) {
+
+Type type = certificate.getType();
+String result = null;
+
+List candidiateTypes = new ArrayList<>();
+if (Type.UNDEFINED.equals(type)) {
+// Try all types to find an suitable alias
+candidiateTypes.addAll(Arrays.asList(Type.values()));
+candidiateTypes.remove(Type.UNDEFINED);
+} else {
+// Look for the specific type to find a suitable alias
+candidiateTypes.add(type);
+}
+
+Iterator iter = candidiateTypes.iterator();
+while (result == null && iter.hasNext()) {
+result = keyManager.chooseServerAlias(iter.next().toString(),
null, null);
+}
+
+return result;
+}
+
private static X509KeyManager chooseKeyManager(KeyManager[] managers)
throws Exception {
for (KeyManager manager : managers) {
if (manager instanceof JSSEKeyManager) {
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1772805&r1=1772804&r2=1772805&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Dec 5 21:00:22 2016
@@ -45,6 +45,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Expand the search process for a server certificate when OpenSSL is used
+with a JSSE connector and an explicit alias has not been configured.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772802 - in /tomcat/trunk: java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java webapps/docs/changelog.xml
Author: markt
Date: Mon Dec 5 20:56:57 2016
New Revision: 1772802
URL: http://svn.apache.org/viewvc?rev=1772802&view=rev
Log:
Expand the search process for a server certificate when OpenSSL is used with a
JSSE connector and an explicit alias has not been configured.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1772802&r1=1772801&r2=1772802&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Dec 5 20:56:57 2016
@@ -23,7 +23,9 @@ import java.security.cert.CertificateExc
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Base64;
+import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -47,6 +49,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
import
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
import org.apache.tomcat.util.res.StringManager;
@@ -271,6 +274,10 @@ public class OpenSSLContext implements o
alias = "tomcat";
}
X509Certificate[] chain =
keyManager.getCertificateChain(alias);
+if (chain == null) {
+alias = findAlias(keyManager, certificate);
+chain = keyManager.getCertificateChain(alias);
+}
PrivateKey key = keyManager.getPrivateKey(alias);
StringBuilder sb = new StringBuilder(BEGIN_KEY);
sb.append(Base64.getMimeEncoder(64, new byte[]
{'\n'}).encodeToString(key.getEncoded()));
@@ -333,6 +340,33 @@ public class OpenSSLContext implements o
}
}
+/*
+ * Find a valid alias when none was specified in the config.
+ */
+private static String findAlias(X509KeyManager keyManager,
+SSLHostConfigCertificate certificate) {
+
+Type type = certificate.getType();
+String result = null;
+
+List candidiateTypes = new ArrayList<>();
+if (Type.UNDEFINED.equals(type)) {
+// Try all types to find an suitable alias
+candidiateTypes.addAll(Arrays.asList(Type.values()));
+candidiateTypes.remove(Type.UNDEFINED);
+} else {
+// Look for the specific type to find a suitable alias
+candidiateTypes.add(type);
+}
+
+Iterator iter = candidiateTypes.iterator();
+while (result == null && iter.hasNext()) {
+result = keyManager.chooseServerAlias(iter.next().toString(),
null, null);
+}
+
+return result;
+}
+
private static X509KeyManager chooseKeyManager(KeyManager[] managers)
throws Exception {
for (KeyManager manager : managers) {
if (manager instanceof JSSEKeyManager) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1772802&r1=1772801&r2=1772802&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 5 20:56:57 2016
@@ -45,6 +45,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Expand the search process for a server certificate when OpenSSL is used
+with a JSSE connector and an explicit alias has not been configured.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 8.5.9
The proposed Apache Tomcat 8.5.9 release is now available for voting. The major changes compared to the 8.5.8 release are: - Improvements to SPNEGO authentication. Patches provided by Michael Osipov. - Correct regression in I/O buffer handling. - Improve handling of varargs in UEL expressions. Based on a patch by Ben. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.9/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1109/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ The proposed 8.5.9 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.8 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r17250 [1/2] - in /dev/tomcat/tomcat-8/v8.5.9: ./ bin/ bin/embed/ bin/extras/ src/
Author: markt Date: Mon Dec 5 20:43:01 2016 New Revision: 17250 Log: Upload 8.5.9 for voting Added: dev/tomcat/tomcat-8/v8.5.9/ dev/tomcat/tomcat-8/v8.5.9/KEYS (with props) dev/tomcat/tomcat-8/v8.5.9/README.html (with props) dev/tomcat/tomcat-8/v8.5.9/RELEASE-NOTES dev/tomcat/tomcat-8/v8.5.9/bin/ dev/tomcat/tomcat-8/v8.5.9/bin/README.html (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.tar.gz.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.zip (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.zip.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.zip.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-deployer.zip.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-fulldocs.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-fulldocs.tar.gz.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-fulldocs.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x64.zip (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x64.zip.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x64.zip.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x64.zip.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x86.zip (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x86.zip.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x86.zip.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9-windows-x86.zip.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.exe (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.exe.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.exe.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.exe.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.tar.gz.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip (with props) dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip.asc dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip.md5 dev/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/embed/ dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.tar.gz.asc dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.zip (with props) dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.zip.asc dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.zip.md5 dev/tomcat/tomcat-8/v8.5.9/bin/embed/apache-tomcat-8.5.9-embed.zip.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/extras/ dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-8/v8.5.9/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-8/v8.5.9/src/ dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.tar.gz.asc dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip (with props) dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.asc dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.md5 dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.sha1 Added: dev/tomcat/tomcat-8/v8.5.9/KEYS == --- dev/tomcat/tomcat-8/v8.5.9/KEYS (added) +++ dev/tomcat/tomcat-8/v8.5.9/KEYS Mon Dec 5 20:43:01 2016 @@ -0,0 +1,616 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main
svn commit: r17250 [2/2] - in /dev/tomcat/tomcat-8/v8.5.9: ./ bin/ bin/embed/ bin/extras/ src/
Propchange: dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.asc == --- dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.asc Mon Dec 5 20:43:01 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJYRcyTAAoJEBDAHFovYFnn6sEP/jzARHeNzIJORqDQ8bJLm89C +fa489sCudGaESPgEs0b6UZKPPfenb0TnimKu/A5hVCRnBzbLBob2pcDocLQ49eq1 +JVOECupzI12pyBP0NuAdfyXGtMjc+lRFfmm8gwhXrrAawbOq7a4FZ/OXZjRKQA4g +kL9v10Enx2aqSBh1syHeedb61D6iO/ITXzonDNRa0tLOZf2JfTYX72X3WhtHFNyT +3wDtrYwxshovs4ZWi/4bdsIFmFDCcFrHaAcXC2GR7BrvQEdOg9jl/tBiDgAuf/Aa +tcOOXIIHpy4/3k6LvFVFSvPU+Hg3QKG1XWJ8rfOOHHCOB8NAfBrpV/yZqkBCfEM9 +Vm6qAKXsuOj3FUHvdTH6NkoegaFnrDZ+vplRR5IppFyjydvV91eGO+FWT3sKqi5N +iLVH57v3EnVbG7+LAmZED8r3qwrLWnY3hzInWmXUd8UsMdZJJs8KiApBsF9COM/L +LXxCzoiHKM9z3P2SjfybpcqCS2VLNBox+OIWj4IWBY3WZnaMV/IFeVjBQYn1Pj0v +5tDZ9j5pO+IMIO3cUuNpKQx8X8MK8wCDDFnYmH53c0t53FMZck19ZMaPvuywcCcs +V9XMsbAq1zsHd/Np920rfx2MfqO5MJxePFrjY/dxoli9QE+d/8EEDrnvFhinejvS +xtk12NU4kqOIUuhclYV7 +=yhlE +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.md5 Mon Dec 5 20:43:01 2016 @@ -0,0 +1 @@ +b53f6b1740e3a47885f1d3f352d25c2c *apache-tomcat-8.5.9-src.zip \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.sha1 == --- dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.sha1 (added) +++ dev/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.zip.sha1 Mon Dec 5 20:43:01 2016 @@ -0,0 +1 @@ +5ee8b0c3f9998b733627672255b8549908f7b89d *apache-tomcat-8.5.9-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772789 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Dec 5 20:36:13 2016 New Revision: 1772789 URL: http://svn.apache.org/viewvc?rev=1772789&view=rev Log: Bump version number for next dev cycle Modified: tomcat/tc8.5.x/trunk/build.properties.default tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1772789&r1=1772788&r2=1772789&view=diff == --- tomcat/tc8.5.x/trunk/build.properties.default (original) +++ tomcat/tc8.5.x/trunk/build.properties.default Mon Dec 5 20:36:13 2016 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=9 +version.build=10 version.patch=0 version.suffix=-dev Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1772789&r1=1772788&r2=1772789&view=diff == --- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Mon Dec 5 20:36:13 2016 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=8.5.9 +maven.asf.release.deploy.version=8.5.10 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1772789&r1=1772788&r2=1772789&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Dec 5 20:36:13 2016 @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772784 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_9: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Dec 5 20:15:53 2016 New Revision: 1772784 URL: http://svn.apache.org/viewvc?rev=1772784&view=rev Log: Tag 8.5.9 Added: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ (props changed) - copied from r1772778, tomcat/tc8.5.x/trunk/ Modified: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/build.properties.default tomcat/tc8.5.x/tags/TOMCAT_8_5_9/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- bugtraq:append = false Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Dec 5 20:15:53 2016 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 5 20:15:53 2016 @@ -0,0 +1,8 @@ +.* +build.properties +logs +nbproject +output +work +*.iml +temp Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_9/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Dec 5 20:15:53 2016 @@ -0,0 +1 @@ +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757
svn commit: r1772770 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Dec 5 20:01:38 2016 New Revision: 1772770 URL: http://svn.apache.org/viewvc?rev=1772770&view=rev Log: Bump version number for next dev cycle Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/maven/mvn.properties.default tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1772770&r1=1772769&r2=1772770&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Dec 5 20:01:38 2016 @@ -27,7 +27,7 @@ version.major=9 version.minor=0 version.build=0 version.patch=0 -version.suffix=.M15-dev +version.suffix=.M16-dev # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1772770&r1=1772769&r2=1772770&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Mon Dec 5 20:01:38 2016 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=9.0.0.M15 +maven.asf.release.deploy.version=9.0.0.M16 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1772770&r1=1772769&r2=1772770&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 5 20:01:38 2016 @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.0.M15
On 05/12/2016 14:47, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.0.M15 release is now available for voting. > > This is a milestone release for the 9.0.x branch. It should be > noted that, as a milestone release: > - Servlet 4.0 is not finalised > - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 > > The major changes compared to the 9.0.0.M13 release are: > > - Improvements to SPNEGO authentication. Patches provided by Michael > Osipov. > > - Correct regression in I/O buffer handling. > > - Improve handling of varargs in UEL expressions. Based on a patch by > Ben. > > Along with lots of other bug fixes and improvements > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M15/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1108/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M15/ > > The proposed 9.0.0.M15 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M15 Tests pass on Windows, Linux and OSX for NIO, NIO2 and APR/native (1.2.10) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Missing commit for CVE-2016-5018 on the security pages
On 05/12/2016 15:17, Emmanuel Bourg wrote: > Hi, > > I've backported the fix for CVE-2016-5018 in Debian which removed the > PrivilegedIntrospectHelper inner class in JspRuntimeLibrary, but I got > bitten by the bug 60101 (the removed class was loaded though reflection > in two other classes). The security pages do not mention the extra > commit addressing this issue. Could someone update the pages and mention > the commits please? Done. For 6.0.x as well. Mark > > Tomcat 7: https://svn.apache.org/r1760309 > Tomcat 8: https://svn.apache.org/r1760307 > Tomcat 8.5: https://svn.apache.org/r1760305 > Tomcat 9: https://svn.apache.org/r1760300 > > Thank you, > > Emmanuel Bourg > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772707 - in /tomcat/site/trunk: docs/security-6.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-6.xml xdocs/security-7.xml xdocs/security-8.xml xdocs/s
Author: markt Date: Mon Dec 5 16:08:41 2016 New Revision: 1772707 URL: http://svn.apache.org/viewvc?rev=1772707&view=rev Log: Add additional commit for CVE-2016-5018 fix Modified: tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml tomcat/site/trunk/xdocs/security-8.xml tomcat/site/trunk/xdocs/security-9.xml Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1772707&r1=1772706&r2=1772707&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Mon Dec 5 16:08:41 2016 @@ -484,7 +484,8 @@ applications. -This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1754904";>1754904. +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1754904";>1754904 and +http://svn.apache.org/viewvc?view=rev&rev=1761718";>1761718. This issue was discovered by Alvaro Munoz and Alexander Mirosh of the HP Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1772707&r1=1772706&r2=1772707&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Mon Dec 5 16:08:41 2016 @@ -510,7 +510,8 @@ applications. -This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1754902";>1754902. +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1754902";>1754902 and + http://svn.apache.org/viewvc?view=rev&rev=1760309";>1760309. This issue was discovered by Alvaro Munoz and Alexander Mirosh of the HP Modified: tomcat/site/trunk/docs/security-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1772707&r1=1772706&r2=1772707&view=diff == --- tomcat/site/trunk/docs/security-8.html (original) +++ tomcat/site/trunk/docs/security-8.html Mon Dec 5 16:08:41 2016 @@ -542,9 +542,10 @@ applications. -This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1754900";>1754900 for - 8.5.x and revision http://svn.apache.org/viewvc?view=rev&rev=1754901";>1754901 for - 8.0.x. +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1754900";>1754900 and + http://svn.apache.org/viewvc?view=rev&rev=1760305";>1760305 for 8.5.x and revisions + http://svn.apache.org/viewvc?view=rev&rev=1754901";>1754901 and + http://svn.apache.org/viewvc?view=rev&rev=1760307";>1760307 for 8.0.x. This issue was discovered by Alvaro Munoz and Alexander Mirosh of the HP Modified: tomcat/site/trunk/docs/security-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1772707&r1=1772706&r2=1772707&view=diff == --- tomcat/site/trunk/docs/security-9.html (original) +++ tomcat/site/trunk/docs/security-9.html Mon Dec 5 16:08:41 2016 @@ -448,7 +448,8 @@ applications. -This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1754714";>1754714. +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1754714";>1754714 and + http://svn.apache.org/viewvc?view=rev&rev=1760300";>1760300. This issue was discovered by Alvaro Munoz and Alexander Mirosh of the HP Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1772707&r1=1772706&r2=1772707&view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Mon Dec 5 16:08:41 2016 @@ -148,7 +148,8 @@ SecurityManager via a Tomcat utility method that was accessible to web applications. -This was fixed in revision 1754904. +This was fixed in revisions 1754904 and +1761718. This issue was discovered by Alvaro Munoz and Alexander Mirosh of the HP Enterprise Security Team and reported to the Apache Tomcat Security Team Modified: tomcat/site/trunk/xdocs/security-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1772707&r1=1772706&r2=1772707&view=diff == --- tomcat/site/trunk/xdocs/security-7.xml (original) +++ tomcat/site/trunk/xdocs/security-7.xml Mon Dec 5 16:08:41 2016 @@ -150,7 +150,8 @@ SecurityManager via a Tomcat ut
svn commit: r1772687 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Author: markt
Date: Mon Dec 5 15:20:30 2016
New Revision: 1772687
URL: http://svn.apache.org/viewvc?rev=1772687&view=rev
Log:
Refactor. Reduce duplication identified by Simian.
No functional change.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1772687&r1=1772686&r2=1772687&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Mon Dec 5
15:20:30 2016
@@ -27,6 +27,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.JmxEnabled;
+import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.Service;
import org.apache.catalina.Valve;
@@ -203,6 +204,7 @@ public class MBeanFactory {
return createConnector(parent, address, port, true, false);
}
+
/**
* Create a new DataSource Realm.
*
@@ -230,20 +232,28 @@ public class MBeanFactory {
realm.setUserTable(userTable);
// Add the new instance to its parent component
+return addRealmToParent(parent, realm);
+}
+
+
+private String addRealmToParent(String parent, Realm realm) throws
Exception {
ObjectName pname = new ObjectName(parent);
Container container = getParentContainerFromParent(pname);
// Add the new instance to its parent component
container.setRealm(realm);
// Return the corresponding MBean name
-ObjectName oname = realm.getObjectName();
+ObjectName oname = null;
+if (realm instanceof JmxEnabled) {
+oname = ((JmxEnabled) realm).getObjectName();
+}
if (oname != null) {
return (oname.toString());
} else {
return null;
}
-
}
+
/**
* Create a new HttpConnector
*
@@ -259,6 +269,7 @@ public class MBeanFactory {
return createConnector(parent, address, port, false, false);
}
+
/**
* Create a new Connector
*
@@ -311,6 +322,7 @@ public class MBeanFactory {
return createConnector(parent, address, port, false, true);
}
+
/**
* Create a new JDBC Realm.
*
@@ -335,19 +347,7 @@ public class MBeanFactory {
realm.setConnectionURL(connectionURL);
// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-Container container = getParentContainerFromParent(pname);
-// Add the new instance to its parent component
-container.setRealm(realm);
-// Return the corresponding MBean name
-ObjectName oname = realm.getObjectName();
-
-if (oname != null) {
-return (oname.toString());
-} else {
-return null;
-}
-
+return addRealmToParent(parent, realm);
}
@@ -359,27 +359,13 @@ public class MBeanFactory {
*
* @exception Exception if an MBean cannot be created or registered
*/
-public String createJNDIRealm(String parent)
-throws Exception {
+public String createJNDIRealm(String parent) throws Exception {
// Create a new JNDIRealm instance
JNDIRealm realm = new JNDIRealm();
// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-Container container = getParentContainerFromParent(pname);
-// Add the new instance to its parent component
-container.setRealm(realm);
-// Return the corresponding MBean name
-ObjectName oname = realm.getObjectName();
-
-if (oname != null) {
-return (oname.toString());
-} else {
-return null;
-}
-
-
+return addRealmToParent(parent, realm);
}
@@ -391,25 +377,13 @@ public class MBeanFactory {
*
* @exception Exception if an MBean cannot be created or registered
*/
-public String createMemoryRealm(String parent)
-throws Exception {
+public String createMemoryRealm(String parent) throws Exception {
// Create a new MemoryRealm instance
MemoryRealm realm = new MemoryRealm();
// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-Container container = getParentContainerFromParent(pname);
-// Add the new instance to its parent component
-container.setRealm(realm);
-// Return the corresponding MBean name
-ObjectName oname = realm.getObjectName();
-if (oname != null) {
-return (oname.toString());
-} else {
-return
Missing commit for CVE-2016-5018 on the security pages
Hi, I've backported the fix for CVE-2016-5018 in Debian which removed the PrivilegedIntrospectHelper inner class in JspRuntimeLibrary, but I got bitten by the bug 60101 (the removed class was loaded though reflection in two other classes). The security pages do not mention the extra commit addressing this issue. Could someone update the pages and mention the commits please? Tomcat 7: https://svn.apache.org/r1760309 Tomcat 8: https://svn.apache.org/r1760307 Tomcat 8.5: https://svn.apache.org/r1760305 Tomcat 9: https://svn.apache.org/r1760300 Thank you, Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 9.0.0.M15
The proposed Apache Tomcat 9.0.0.M15 release is now available for voting. This is a milestone release for the 9.0.x branch. It should be noted that, as a milestone release: - Servlet 4.0 is not finalised - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 The major changes compared to the 9.0.0.M13 release are: - Improvements to SPNEGO authentication. Patches provided by Michael Osipov. - Correct regression in I/O buffer handling. - Improve handling of varargs in UEL expressions. Based on a patch by Ben. Along with lots of other bug fixes and improvements For full details, see the changelog: http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M15/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1108/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M15/ The proposed 9.0.0.M15 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 9.0.0.M15 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60443] Web.xml disappearance sometimes
https://bz.apache.org/bugzilla/show_bug.cgi?id=60443 Chuck Caldarale changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Chuck Caldarale --- Bugzilla is not a support forum. Post your issue on the Tomcat users' mailing list. Read this first: http://www.catb.org/~esr/faqs/smart-questions.html -- 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 60443] Web.xml disappearance sometimes
https://bz.apache.org/bugzilla/show_bug.cgi?id=60443 Eric changed: What|Removed |Added OS||All -- 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: r17237 [1/2] - in /dev/tomcat/tomcat-9/v9.0.0.M15: ./ bin/ bin/embed/ bin/extras/ src/
Author: markt Date: Mon Dec 5 14:40:35 2016 New Revision: 17237 Log: Upload 9.0.0.M15 for voting Added: dev/tomcat/tomcat-9/v9.0.0.M15/ dev/tomcat/tomcat-9/v9.0.0.M15/KEYS (with props) dev/tomcat/tomcat-9/v9.0.0.M15/README.html (with props) dev/tomcat/tomcat-9/v9.0.0.M15/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.0.M15/bin/ dev/tomcat/tomcat-9/v9.0.0.M15/bin/README.html (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.tar.gz.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.tar.gz.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.tar.gz.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.zip.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.zip.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-deployer.zip.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-fulldocs.tar.gz.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-fulldocs.tar.gz.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x64.zip.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x64.zip.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x64.zip.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x86.zip.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x86.zip.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15-windows-x86.zip.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.exe (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.exe.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.exe.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.exe.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.tar.gz.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.tar.gz.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.tar.gz.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.zip (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.zip.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.zip.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/apache-tomcat-9.0.0.M15.zip.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/ dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.tar.gz.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.tar.gz.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.tar.gz.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.zip.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.zip.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/embed/apache-tomcat-9.0.0.M15-embed.zip.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/ dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-9/v9.0.0.M15/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/src/ dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.asc dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.md5 dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.sha1 dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip (with props) dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.asc dev/tomcat/tomcat-9/v9.0.0.M15/src/apa
[Bug 60443] New: Web.xml disappearance sometimes
https://bz.apache.org/bugzilla/show_bug.cgi?id=60443 Bug ID: 60443 Summary: Web.xml disappearance sometimes Product: Tomcat 6 Version: 6.0.28 Hardware: PC Status: NEW Severity: critical Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: eric.cc...@gmail.com Target Milestone: default Web.xml disappeared,when tomcat restart -- 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: r17237 [2/2] - in /dev/tomcat/tomcat-9/v9.0.0.M15: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.md5 == --- dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.md5 Mon Dec 5 14:40:35 2016 @@ -0,0 +1 @@ +5311a9808cf87e2da236aba19910116d *apache-tomcat-9.0.0.M15-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.sha1 == --- dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.sha1 (added) +++ dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz.sha1 Mon Dec 5 14:40:35 2016 @@ -0,0 +1 @@ +59909ade3b760bea978a8dd7d31573e2314ec1c3 *apache-tomcat-9.0.0.M15-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.asc == --- dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.asc (added) +++ dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.asc Mon Dec 5 14:40:35 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJYRXBCAAoJEBDAHFovYFnnPQEQANF+a0eap+cgOA92rq2waC8/ +lvQ/Dl+vlSvzh94kylx5VUlg8MSEVZyJQmmOYo5ZxL0y5iOhcLE4Z5xt/9e/u/vt +S6kg6/o3JqHdg877OiXGPxM6LAxIHxXGRu232AfCvIfZHAfif55iSaxPD1ZzE46D +iDTWHS6HhEaFDz5RQI29Qv4TWBgMUAVOPOliU0p55bWyn3Z3KZGrloefCSF6A9Zr +ajD2QYlI7Xicy6WeXN+wfvIS+1yCeFCCKD34XRsY36zJ9P1ffU/fIIVEk4gmSiyP +D4jwJQSToXsW0ck6LjVcLe9Lx/gBOGPYY6evSt7rRWGz5bC0zejYN+aTdUI74UU0 +INojlJB7G5WzGq6Hq+VuJ+qR9hLBgq0izmqRoUDpwxRJJ6kAg3yQx1tOsx+7NjuN +a9s4XG0ksyEUmhSs2I2RNoYDBuL1inF5tgHClPnRbmcn6Hsn3ukynMKko6qmrmqt +Dysaj1t1g1HEQrwiMzYHw7KGIuELw2Xfsh0nf5SveZlk9SVVBO7lq4rWODAMKE8S +X9o+yixXqEv+SMfDgS/HFu/hl+FPKRdTp/fZXFTDmb03RTlrcfbLdxrns9+g9w1B +kuPf4twG1OizTVSfrtKfg/ExnNT8MWX7Z2JwuzbLWtcx9rnWlZ0BdjhgMmldiA1S +WNPKrLJitF97uagtGXY5 +=jjyM +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.md5 == --- dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.md5 (added) +++ dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.md5 Mon Dec 5 14:40:35 2016 @@ -0,0 +1 @@ +ea3a1deae7a71bca5155531e530f4058 *apache-tomcat-9.0.0.M15-src.zip \ No newline at end of file Added: dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.sha1 == --- dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.sha1 (added) +++ dev/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.zip.sha1 Mon Dec 5 14:40:35 2016 @@ -0,0 +1 @@ +e6105dfc99189529a2c1d7bd74af9c64da7440ad *apache-tomcat-9.0.0.M15-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58154] web.xml in /apache-tomcat/webapps/manager/WEB-INF disappeared sometime
https://bz.apache.org/bugzilla/show_bug.cgi?id=58154 Eric changed: What|Removed |Added CC||eric.cc...@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
svn commit: r1772668 - in /tomcat/tags/TOMCAT_9_0_0_M15: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Dec 5 13:41:00 2016 New Revision: 1772668 URL: http://svn.apache.org/viewvc?rev=1772668&view=rev Log: Tag 9.0.0.M15 Added: tomcat/tags/TOMCAT_9_0_0_M15/ - copied from r1772667, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_9_0_0_M15/build.properties.default tomcat/tags/TOMCAT_9_0_0_M15/webapps/docs/changelog.xml Modified: tomcat/tags/TOMCAT_9_0_0_M15/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M15/build.properties.default?rev=1772668&r1=1772667&r2=1772668&view=diff == --- tomcat/tags/TOMCAT_9_0_0_M15/build.properties.default (original) +++ tomcat/tags/TOMCAT_9_0_0_M15/build.properties.default Mon Dec 5 13:41:00 2016 @@ -27,7 +27,7 @@ version.major=9 version.minor=0 version.build=0 version.patch=0 -version.suffix=.M15-dev +version.suffix=.M15 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/tags/TOMCAT_9_0_0_M15/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M15/webapps/docs/changelog.xml?rev=1772668&r1=1772667&r2=1772668&view=diff == --- tomcat/tags/TOMCAT_9_0_0_M15/webapps/docs/changelog.xml (original) +++ tomcat/tags/TOMCAT_9_0_0_M15/webapps/docs/changelog.xml Mon Dec 5 13:41:00 2016 @@ -44,7 +44,7 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772667 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Dec 5 13:38:59 2016 New Revision: 1772667 URL: http://svn.apache.org/viewvc?rev=1772667&view=rev Log: Bump version number after local build problem (built from checkout rather than export) Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/maven/mvn.properties.default tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1772667&r1=1772666&r2=1772667&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Dec 5 13:38:59 2016 @@ -27,7 +27,7 @@ version.major=9 version.minor=0 version.build=0 version.patch=0 -version.suffix=.M14-dev +version.suffix=.M15-dev # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1772667&r1=1772666&r2=1772667&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Mon Dec 5 13:38:59 2016 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=9.0.0.M14 +maven.asf.release.deploy.version=9.0.0.M15 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1772667&r1=1772666&r2=1772667&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 5 13:38:59 2016 @@ -44,7 +44,18 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + + + + +Increment version due a local build configuration error with 9.0.0.M14 +that wasn't caught until after digital signing had been completed +Signing requires unique names so a new tag was required. (markt) + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772664 - in /tomcat/tags/TOMCAT_9_0_0_M14: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Dec 5 13:10:49 2016 New Revision: 1772664 URL: http://svn.apache.org/viewvc?rev=1772664&view=rev Log: Tag 9.0.0.M14 Added: tomcat/tags/TOMCAT_9_0_0_M14/ - copied from r1772663, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_9_0_0_M14/build.properties.default tomcat/tags/TOMCAT_9_0_0_M14/webapps/docs/changelog.xml Modified: tomcat/tags/TOMCAT_9_0_0_M14/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M14/build.properties.default?rev=1772664&r1=1772663&r2=1772664&view=diff == --- tomcat/tags/TOMCAT_9_0_0_M14/build.properties.default (original) +++ tomcat/tags/TOMCAT_9_0_0_M14/build.properties.default Mon Dec 5 13:10:49 2016 @@ -27,7 +27,7 @@ version.major=9 version.minor=0 version.build=0 version.patch=0 -version.suffix=.M14-dev +version.suffix=.M14 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/tags/TOMCAT_9_0_0_M14/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M14/webapps/docs/changelog.xml?rev=1772664&r1=1772663&r2=1772664&view=diff == --- tomcat/tags/TOMCAT_9_0_0_M14/webapps/docs/changelog.xml (original) +++ tomcat/tags/TOMCAT_9_0_0_M14/webapps/docs/changelog.xml Mon Dec 5 13:10:49 2016 @@ -44,7 +44,7 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772647 - /tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
Author: markt
Date: Mon Dec 5 11:46:20 2016
New Revision: 1772647
URL: http://svn.apache.org/viewvc?rev=1772647&view=rev
Log:
Fix FindBugs warning. Previous code would always return null so simplify it.
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1772647&r1=1772646&r2=1772647&view=diff
==
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
Mon Dec 5 11:46:20 2016
@@ -186,7 +186,7 @@ public class StatementCache extends Stat
}
/**
- * @param sql The SQL to attempt to match to entires in the statement cache
+ * @param sql The SQL to attempt to match to entries in the statement cache
*
* @return The CachedStatement for the given SQL
*
@@ -194,10 +194,7 @@ public class StatementCache extends Stat
*/
@Deprecated
public CachedStatement isCached(String sql) {
-@SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
-return cache.get(sql);
+return null;
}
public CachedStatement isCached(Method method, Object[] args) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772648 - /tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Mon Dec 5 11:46:51 2016 New Revision: 1772648 URL: http://svn.apache.org/viewvc?rev=1772648&view=rev Log: Mark remaining FindBugs warnings as false positives. Modified: tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml?rev=1772648&r1=1772647&r2=1772648&view=diff == --- tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml Mon Dec 5 11:46:51 2016 @@ -172,6 +172,12 @@ + + + + + + @@ -230,7 +236,12 @@ - + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772643 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Mon Dec 5 11:35:25 2016
New Revision: 1772643
URL: http://svn.apache.org/viewvc?rev=1772643&view=rev
Log:
ws
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1772643&r1=1772642&r2=1772643&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Dec 5 11:35:25 2016
@@ -117,7 +117,7 @@ import org.xml.sax.SAXParseException;
*/
public class ContextConfig implements LifecycleListener {
-private static final Log log = LogFactory.getLog( ContextConfig.class );
+private static final Log log = LogFactory.getLog(ContextConfig.class);
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772642 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
Author: markt
Date: Mon Dec 5 11:32:41 2016
New Revision: 1772642
URL: http://svn.apache.org/viewvc?rev=1772642&view=rev
Log:
FindBugs
pos doesn't need to be static.
It gets reset from indent at the beginning of every line and a StoreAppender
instance is always responsible for an entire line so there is no need to share
this between appender instances.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1772642&r1=1772641&r2=1772642&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
Mon Dec 5 11:32:41 2016
@@ -41,7 +41,7 @@ public class StoreAppender {
Float.class, Float.TYPE, Long.class, Long.TYPE, Short.class,
Short.TYPE, InetAddress.class };
-private static int pos = 0;
+private int pos = 0;
/**
* Print the closing tag.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772641 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: markt
Date: Mon Dec 5 11:30:23 2016
New Revision: 1772641
URL: http://svn.apache.org/viewvc?rev=1772641&view=rev
Log:
Fix possible NPE identified by FindBugs
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1772641&r1=1772640&r2=1772641&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon Dec 5 11:30:23 2016
@@ -411,6 +411,9 @@ public abstract class AbstractReplicated
}
public Member[] getMapMembersExcl(Member[] exclude) {
+if (exclude == null) {
+return null;
+}
synchronized (mapMembers) {
@SuppressWarnings("unchecked") // mapMembers has the correct type
HashMap list = (HashMap)mapMembers.clone();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/863 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1772631 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772640 - in /tomcat/tc8.5.x/trunk: java/org/apache/coyote/http11/filters/ChunkedInputFilter.java res/findbugs/filter-false-positives.xml
Author: markt
Date: Mon Dec 5 11:26:05 2016
New Revision: 1772640
URL: http://svn.apache.org/viewvc?rev=1772640&view=rev
Log:
Back-port findbugs fixes from trunk
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1772640&r1=1772639&r2=1772640&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Dec 5 11:26:05 2016
@@ -152,6 +152,7 @@ public class ChunkedInputFilter implemen
* @deprecated Unused. Will be removed in Tomcat 9. Use
* {@link #doRead(ApplicationBufferHandler)}
*/
+@Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
if (endChunk) {
@@ -504,6 +505,7 @@ public class ChunkedInputFilter implemen
}
}
+// readBytes() above will set readChunk unless it returns a value < 0
chr = readChunk.get(readChunk.position());
// CRLF terminates the request
@@ -530,6 +532,7 @@ public class ChunkedInputFilter implemen
}
}
+// readBytes() above will set readChunk unless it returns a value
< 0
chr = readChunk.get(readChunk.position());
if ((chr >= Constants.A) && (chr <= Constants.Z)) {
chr = (byte) (chr - Constants.LC_OFFSET);
Modified: tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml?rev=1772640&r1=1772639&r2=1772640&view=diff
==
--- tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml Mon Dec 5
11:26:05 2016
@@ -418,6 +418,12 @@
+
+
+
+
+
+
@@ -452,6 +458,12 @@
+
+
+
+
+
+
@@ -931,6 +943,12 @@
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772638 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/coyote/http2/Http2TestBase.java test/org/apache/coyote/http2/TestStreamProcessor.java
Author: markt Date: Mon Dec 5 11:16:08 2016 New Revision: 1772638 URL: http://svn.apache.org/viewvc?rev=1772638&view=rev Log: Add unit test for HTTP/2 plus async Added: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java - copied, changed from r1772353, tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:16:08 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1
svn commit: r1772637 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/AbstractProcessor.java java/org/apache/coyote/http2/StreamProcessor.java
Author: markt Date: Mon Dec 5 11:13:43 2016 New Revision: 1772637 URL: http://svn.apache.org/viewvc?rev=1772637&view=rev Log: Fix NPE when starting async Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:13:43 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1
svn commit: r1772636 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java java/org/apache/coyote/http2/StreamProcessor.java
Author: markt Date: Mon Dec 5 11:12:25 2016 New Revision: 1772636 URL: http://svn.apache.org/viewvc?rev=1772636&view=rev Log: Partial fix for async with HTTP/2 Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:12:25 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,176
svn commit: r1772635 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/AbstractProcessor.java
Author: markt Date: Mon Dec 5 11:12:06 2016 New Revision: 1772635 URL: http://svn.apache.org/viewvc?rev=1772635&view=rev Log: Re-factor calls to SocketWrapper.processSocket(SocketEvent, boolean) Move these calls to a dedicated method to make it easier for sub-classes to over-ride the default behaviour Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:12:06 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-176351
svn commit: r1772634 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http2/ java/org/apache/tomcat/util/net/
Author: markt Date: Mon Dec 5 11:11:40 2016 New Revision: 1772634 URL: http://svn.apache.org/viewvc?rev=1772634&view=rev Log: Refactor dispatches processing Processors such as HTTP/2 need to process these per stream so it needs to be handled in the Processor, not in the SocketWrapper. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:11:40 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,17
svn commit: r1772633 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java java/org/apache/coyote/http2/StreamProcessor.java java/org/apache/coyote/http2/StreamRunnable.
Author: markt Date: Mon Dec 5 11:11:11 2016 New Revision: 1772633 URL: http://svn.apache.org/viewvc?rev=1772633&view=rev Log: Extract the Runnable implementation from the StreamProcessor Added: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamRunnable.java - copied unchanged from r1772603, tomcat/trunk/java/org/apache/coyote/http2/StreamRunnable.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:11:11 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,
svn commit: r1772632 - /tomcat/tc7.0.x/trunk/
Author: markt Date: Mon Dec 5 11:06:34 2016 New Revision: 1772632 URL: http://svn.apache.org/viewvc?rev=1772632&view=rev Log: Fix warning logged during tests Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:06:34 2016 @@ -1,3 +1,3 @@ /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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702 742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1 726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,1755891,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348,1757355,1757423,1757501,1757535,1758488,1758493,1758500,1758589,1759275,1761629,1761741,1762124,1762297,1762354-1762355,1762358,1762375,1762770,1763233,176341
svn commit: r1772631 - /tomcat/tc8.0.x/trunk/
Author: markt Date: Mon Dec 5 11:06:07 2016 New Revision: 1772631 URL: http://svn.apache.org/viewvc?rev=1772631&view=rev Log: Fix warning logged during tests Modified: tomcat/tc8.0.x/trunk/ (props changed) Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:06:07 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,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,1649973,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,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,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,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,169
svn commit: r1772630 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
Author: markt Date: Mon Dec 5 11:05:35 2016 New Revision: 1772630 URL: http://svn.apache.org/viewvc?rev=1772630&view=rev Log: Fix warning logged during tests Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 5 11:05:35 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1
svn commit: r1772616 - /tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Author: markt
Date: Mon Dec 5 09:49:37 2016
New Revision: 1772616
URL: http://svn.apache.org/viewvc?rev=1772616&view=rev
Log:
Bug 58103 has been fixed (maxConnections support for NIO2) so restore this test.
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1772616&r1=1772615&r2=1772616&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Mon
Dec 5 09:49:37 2016
@@ -24,7 +24,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.core.StandardContext;
@@ -40,8 +39,6 @@ public class TestMaxConnections extends
@Test
public void testConnector() throws Exception {
init();
-Assume.assumeFalse("This feature is not available for NIO2 (BZ58103)",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"));
ConnectThread[] t = new ConnectThread[10];
for (int i=0; i
svn commit: r1772615 - in /tomcat/trunk: java/org/apache/coyote/http11/filters/ChunkedInputFilter.java res/findbugs/filter-false-positives.xml
Author: markt
Date: Mon Dec 5 09:46:13 2016
New Revision: 1772615
URL: http://svn.apache.org/viewvc?rev=1772615&view=rev
Log:
Review current FindBugs failures (all false positives)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1772615&r1=1772614&r2=1772615&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Dec 5 09:46:13 2016
@@ -446,6 +446,7 @@ public class ChunkedInputFilter implemen
}
}
+// readBytes() above will set readChunk unless it returns a value < 0
chr = readChunk.get(readChunk.position());
// CRLF terminates the request
@@ -472,6 +473,7 @@ public class ChunkedInputFilter implemen
}
}
+// readBytes() above will set readChunk unless it returns a value
< 0
chr = readChunk.get(readChunk.position());
if ((chr >= Constants.A) && (chr <= Constants.Z)) {
chr = (byte) (chr - Constants.LC_OFFSET);
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1772615&r1=1772614&r2=1772615&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Mon Dec 5 09:46:13
2016
@@ -424,6 +424,12 @@
+
+
+
+
+
+
@@ -458,6 +464,12 @@
+
+
+
+
+
+
@@ -937,6 +949,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772607 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java http2/StreamProcessor.java
Author: markt
Date: Mon Dec 5 09:02:40 2016
New Revision: 1772607
URL: http://svn.apache.org/viewvc?rev=1772607&view=rev
Log:
Fix NPE when starting async
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1772607&r1=1772606&r2=1772607&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Dec 5
09:02:40 2016
@@ -59,22 +59,12 @@ public abstract class AbstractProcessor
private ErrorState errorState = ErrorState.NONE;
-/**
- * Used by HTTP/2.
- * @param coyoteRequest The request
- * @param coyoteResponse The response
- */
-protected AbstractProcessor(Request coyoteRequest, Response
coyoteResponse) {
-this(null, coyoteRequest, coyoteResponse);
-}
-
-
public AbstractProcessor(AbstractEndpoint endpoint) {
this(endpoint, new Request(), new Response());
}
-private AbstractProcessor(AbstractEndpoint endpoint, Request
coyoteRequest,
+protected AbstractProcessor(AbstractEndpoint endpoint, Request
coyoteRequest,
Response coyoteResponse) {
this.endpoint = endpoint;
asyncStateMachine = new AsyncStateMachine(this);
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1772607&r1=1772606&r2=1772607&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Mon Dec 5
09:02:40 2016
@@ -43,8 +43,9 @@ class StreamProcessor extends AbstractPr
private final Stream stream;
-StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter
adapter, SocketWrapperBase socketWrapper) {
-super(stream.getCoyoteRequest(), stream.getCoyoteResponse());
+StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter
adapter,
+SocketWrapperBase socketWrapper) {
+super(socketWrapper.getEndpoint(), stream.getCoyoteRequest(),
stream.getCoyoteResponse());
this.handler = handler;
this.stream = stream;
setAdapter(adapter);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772609 - /tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
Author: markt
Date: Mon Dec 5 09:02:54 2016
New Revision: 1772609
URL: http://svn.apache.org/viewvc?rev=1772609&view=rev
Log:
Add test for async dispatch
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java?rev=1772609&r1=1772608&r2=1772609&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java Mon Dec
5 09:02:54 2016
@@ -76,7 +76,38 @@ public class TestStreamProcessor extends
"3-Body-17\n" +
"3-Body-8\n" +
"3-EndOfStream\n", output.getTrace());
+}
+
+
+@Test
+public void testAsyncDispatch() throws Exception {
+enableHttp2();
+
+Tomcat tomcat = getTomcatInstance();
+
+// Map the async servlet to /simple so we can re-use the HTTP/2
handling
+// logic from the super class.
+Context ctxt = tomcat.addContext("", null);
+Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
+ctxt.addServletMappingDecoded("/simple", "simple");
+Wrapper w = Tomcat.addServlet(ctxt, "async", new AsyncDispatch());
+w.setAsyncSupported(true);
+ctxt.addServletMappingDecoded("/async", "async");
+
+tomcat.start();
+
+openClientConnection();
+doHttpUpgrade();
+sendClientPreface();
+validateHttp2InitialResponse();
+
+byte[] frameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+buildGetRequest(frameHeader, headersPayload, null, 3, "/async");
+writeFrame(frameHeader, headersPayload);
+readSimpleGetResponse();
+Assert.assertEquals(getSimpleResponseTrace(3), output.getTrace());
}
@@ -108,6 +139,30 @@ public class TestStreamProcessor extends
} catch (Exception e) {
e.printStackTrace();
}
+}
+});
+}
+}
+
+
+private static final class AsyncDispatch extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest request, HttpServletResponse
response)
+throws ServletException, IOException {
+
+final AsyncContext asyncContext = request.startAsync(request,
response);
+asyncContext.start(new Runnable() {
+
+@Override
+public void run() {
+try {
+asyncContext.dispatch("/simple");
+} catch (Exception e) {
+e.printStackTrace();
+}
}
});
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772608 - /tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
Author: markt
Date: Mon Dec 5 09:02:47 2016
New Revision: 1772608
URL: http://svn.apache.org/viewvc?rev=1772608&view=rev
Log:
Test passes
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java?rev=1772608&r1=1772607&r2=1772608&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestStreamProcessor.java Mon Dec
5 09:02:47 2016
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -36,7 +35,6 @@ import org.apache.catalina.startup.Tomca
public class TestStreamProcessor extends Http2TestBase {
-@Ignore // Disabled until it passes
@Test
public void testAsyncComplete() throws Exception {
enableHttp2();
@@ -65,6 +63,9 @@ public class TestStreamProcessor extends
writeFrame(frameHeader, headersPayload);
readSimpleGetResponse();
+// Flush before startAsync means body is written in two packets so an
+// additional frame needs to be read
+parser.readFrame(true);
Assert.assertEquals(
"3-HeadersStart\n" +
@@ -72,7 +73,8 @@ public class TestStreamProcessor extends
"3-Header-[content-type]-[text/plain;charset=UTF-8]\n" +
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
"3-HeadersEnd\n" +
-"3-Body-25\n" +
+"3-Body-17\n" +
+"3-Body-8\n" +
"3-EndOfStream\n", output.getTrace());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772606 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java StreamProcessor.java
Author: markt
Date: Mon Dec 5 09:00:52 2016
New Revision: 1772606
URL: http://svn.apache.org/viewvc?rev=1772606&view=rev
Log:
Partial fix for async with HTTP/2
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1772606&r1=1772605&r2=1772606&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Dec
5 09:00:52 2016
@@ -268,8 +268,13 @@ class Http2UpgradeHandler extends Abstra
private void processStreamOnContainerThread(Stream stream) {
StreamProcessor streamProcessor = new StreamProcessor(this, stream,
adapter, socketWrapper);
-StreamRunnable streamRunnable = new StreamRunnable(streamProcessor,
SocketEvent.OPEN_READ);
streamProcessor.setSslSupport(sslSupport);
+processStreamOnContainerThread(streamProcessor, SocketEvent.OPEN_READ);
+}
+
+
+void processStreamOnContainerThread(StreamProcessor streamProcessor,
SocketEvent event) {
+StreamRunnable streamRunnable = new StreamRunnable(streamProcessor,
event);
if (streamConcurrency == null) {
socketWrapper.getEndpoint().getExecutor().execute(streamRunnable);
} else {
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1772606&r1=1772605&r2=1772606&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Mon Dec 5
09:00:52 2016
@@ -17,6 +17,7 @@
package org.apache.coyote.http2;
import java.io.IOException;
+import java.util.Iterator;
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
@@ -28,6 +29,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -150,6 +152,16 @@ class StreamProcessor extends AbstractPr
@Override
+protected void processSocketEvent(SocketEvent event, boolean dispatch) {
+if (dispatch) {
+handler.processStreamOnContainerThread(this, event);
+} else {
+this.process(event);
+}
+}
+
+
+@Override
protected final boolean isRequestBodyFullyRead() {
return stream.getInputBuffer().isRequestBodyFullyRead();
}
@@ -169,8 +181,17 @@ class StreamProcessor extends AbstractPr
@Override
protected final void executeDispatches() {
-StreamRunnable streamRunnable = new StreamRunnable(this,
SocketEvent.OPEN_READ);
-getSocketWrapper().getEndpoint().getExecutor().execute(streamRunnable);
+Iterator dispatches = getIteratorAndClearDispatches();
+synchronized (this) {
+/*
+ * TODO Check if this sync is necessary.
+ * Compare with superrclass that uses SocketWrapper
+ */
+while (dispatches != null && dispatches.hasNext()) {
+DispatchType dispatchType = dispatches.next();
+processSocketEvent(dispatchType.getSocketStatus(), false);
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772605 - /tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
Author: markt
Date: Mon Dec 5 08:56:13 2016
New Revision: 1772605
URL: http://svn.apache.org/viewvc?rev=1772605&view=rev
Log:
Refactor calls to SocketWrapper.processSocket(SocketEvent, boolean)
Move these calls to a dedicated method to make it easier for sub-classes
to ovre-ride the default behaviour
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1772605&r1=1772604&r2=1772605&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Dec 5
08:56:13 2016
@@ -107,7 +107,7 @@ public abstract class AbstractProcessor
// Set the request attribute so that the async onError() event is
// fired when the error event is processed
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
-socketWrapper.processSocket(SocketEvent.ERROR, true);
+processSocketEvent(SocketEvent.ERROR, true);
}
}
@@ -381,13 +381,13 @@ public abstract class AbstractProcessor
case ASYNC_COMPLETE: {
clearDispatches();
if (asyncStateMachine.asyncComplete()) {
-socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
+processSocketEvent(SocketEvent.OPEN_READ, true);
}
break;
}
case ASYNC_DISPATCH: {
if (asyncStateMachine.asyncDispatch()) {
-socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
+processSocketEvent(SocketEvent.OPEN_READ, true);
}
break;
}
@@ -523,10 +523,7 @@ public abstract class AbstractProcessor
private void doTimeoutAsync() {
// Avoid multiple timeouts
setAsyncTimeout(-1);
-SocketWrapperBase socketWrapper = getSocketWrapper();
-if (socketWrapper != null) {
-socketWrapper.processSocket(SocketEvent.TIMEOUT, true);
-}
+processSocketEvent(SocketEvent.TIMEOUT, true);
}
@@ -640,6 +637,14 @@ public abstract class AbstractProcessor
}
+protected void processSocketEvent(SocketEvent event, boolean dispatch) {
+SocketWrapperBase socketWrapper = getSocketWrapper();
+if (socketWrapper != null) {
+socketWrapper.processSocket(event, dispatch);
+}
+}
+
+
protected abstract boolean isRequestBodyFullyRead();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1772604 - in /tomcat/trunk/java/org/apache: coyote/AbstractProcessor.java coyote/ajp/AjpProcessor.java coyote/http11/Http11Processor.java coyote/http2/StreamProcessor.java tomcat/util/net
Author: markt
Date: Mon Dec 5 08:55:10 2016
New Revision: 1772604
URL: http://svn.apache.org/viewvc?rev=1772604&view=rev
Log:
Refactor dispatches processing
Processors such as HTTP/2 need to process these per stream so it needs
to be handled in the Processor, not in the SocketWrapper.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1772604&r1=1772603&r2=1772604&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Dec 5
08:55:10 2016
@@ -19,6 +19,7 @@ package org.apache.coyote;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
+import java.util.Iterator;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -470,10 +471,7 @@ public abstract class AbstractProcessor
break;
}
case DISPATCH_EXECUTE: {
-SocketWrapperBase wrapper = socketWrapper;
-if (wrapper != null) {
-executeDispatches(wrapper);
-}
+executeDispatches();
break;
}
@@ -651,7 +649,36 @@ public abstract class AbstractProcessor
protected abstract boolean isReady();
-protected abstract void executeDispatches(SocketWrapperBase wrapper);
+protected void executeDispatches() {
+SocketWrapperBase socketWrapper = getSocketWrapper();
+Iterator dispatches = getIteratorAndClearDispatches();
+if (socketWrapper != null) {
+synchronized (socketWrapper) {
+/*
+ * This method is called when non-blocking IO is initiated by
defining
+ * a read and/or write listener in a non-container thread. It
is called
+ * once the non-container thread completes so that the first
calls to
+ * onWritePossible() and/or onDataAvailable() as appropriate
are made by
+ * the container.
+ *
+ * Processing the dispatches requires (for APR/native at least)
+ * that the socket has been added to the waitingRequests
queue. This may
+ * not have occurred by the time that the non-container thread
completes
+ * triggering the call to this method. Therefore, the coded
syncs on the
+ * SocketWrapper as the container thread that initiated this
+ * non-container thread holds a lock on the SocketWrapper. The
container
+ * thread will add the socket to the waitingRequests queue
before
+ * releasing the lock on the socketWrapper. Therefore, by
obtaining the
+ * lock on socketWrapper before processing the dispatches, we
can be
+ * sure that the socket has been added to the waitingRequests
queue.
+ */
+while (dispatches != null && dispatches.hasNext()) {
+DispatchType dispatchType = dispatches.next();
+
socketWrapper.processSocket(dispatchType.getSocketStatus(), false);
+}
+}
+}
+}
/**
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1772604&r1=1772603&r2=1772604&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Dec 5
08:55:10 2016
@@ -1264,12 +1264,6 @@ public class AjpProcessor extends Abstra
}
-@Override
-protected final void executeDispatches(SocketWrapperBase wrapper) {
-wrapper.executeNonBlockingDispatches(getIteratorAndClearDispatches());
-}
-
-
/**
* Read at least the specified amount of bytes, and place them
* in the input buffer. Note that if any data is available to read then
this
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1772604&r1=1772603&r2=1772604&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java
svn commit: r1772603 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java StreamProcessor.java StreamRunnable.java
Author: markt
Date: Mon Dec 5 08:54:49 2016
New Revision: 1772603
URL: http://svn.apache.org/viewvc?rev=1772603&view=rev
Log:
Extract the Runnable implementation from the StreamProcessor
Added:
tomcat/trunk/java/org/apache/coyote/http2/StreamRunnable.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1772603&r1=1772602&r2=1772603&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Dec
5 08:54:49 2016
@@ -144,7 +144,7 @@ class Http2UpgradeHandler extends Abstra
// Stream concurrency control
private int maxConcurrentStreamExecution =
Http2Protocol.DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
private AtomicInteger streamConcurrency = null;
-private Queue queuedProcessors = null;
+private Queue queuedRunnable = null;
// Limits
private Set allowedTrailerHeaders = Collections.emptySet();
@@ -191,7 +191,7 @@ class Http2UpgradeHandler extends Abstra
// Init concurrency control if needed
if (maxConcurrentStreamExecution <
localSettings.getMaxConcurrentStreams()) {
streamConcurrency = new AtomicInteger(0);
-queuedProcessors = new ConcurrentLinkedQueue<>();
+queuedRunnable = new ConcurrentLinkedQueue<>();
}
parser = new Http2Parser(connectionId, this, this);
@@ -268,15 +268,16 @@ class Http2UpgradeHandler extends Abstra
private void processStreamOnContainerThread(Stream stream) {
StreamProcessor streamProcessor = new StreamProcessor(this, stream,
adapter, socketWrapper);
+StreamRunnable streamRunnable = new StreamRunnable(streamProcessor,
SocketEvent.OPEN_READ);
streamProcessor.setSslSupport(sslSupport);
if (streamConcurrency == null) {
-socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+socketWrapper.getEndpoint().getExecutor().execute(streamRunnable);
} else {
if (getStreamConcurrency() < maxConcurrentStreamExecution) {
increaseStreamConcurrency();
-
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+
socketWrapper.getEndpoint().getExecutor().execute(streamRunnable);
} else {
-queuedProcessors.offer(streamProcessor);
+queuedRunnable.offer(streamRunnable);
}
}
}
@@ -440,10 +441,10 @@ class Http2UpgradeHandler extends Abstra
}
decreaseStreamConcurrency();
if (getStreamConcurrency() < maxConcurrentStreamExecution) {
-StreamProcessor streamProcessor = queuedProcessors.poll();
-if (streamProcessor != null) {
+StreamRunnable streamRunnable = queuedRunnable.poll();
+if (streamRunnable != null) {
increaseStreamConcurrency();
-
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+
socketWrapper.getEndpoint().getExecutor().execute(streamRunnable);
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1772603&r1=1772602&r2=1772603&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Mon Dec 5
08:54:49 2016
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.net.Socket
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
-class StreamProcessor extends AbstractProcessor implements Runnable {
+class StreamProcessor extends AbstractProcessor {
private static final Log log = LogFactory.getLog(StreamProcessor.class);
private static final StringManager sm =
StringManager.getManager(StreamProcessor.class);
@@ -50,8 +50,7 @@ class StreamProcessor extends AbstractPr
}
-@Override
-public final void run() {
+final void process(SocketEvent event) {
try {
// FIXME: the regular processor syncs on socketWrapper, but here
this deadlocks
synchronized (this) {
@@ -60,7 +59,7 @@ class StreamProcessor extends AbstractPr
ContainerThreadMarker.set();
SocketState state = SocketState.CLOSED;
try {
-state = process(socketWrapper, SocketEvent.OPEN_READ);
+
