[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 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-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 50 mins 40 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute .test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160302/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/g
OpenSSL vulnerabilities
All, I'm primarily looking at the window builds for Tomcat Native. tc-native 1.1.34 was built with OpenSSL 1.0.1q tc-native 1.2.4 was built with OpenSSL 1.0.2e. Looking at the latest OpenSSL security vulnerabilities: CVE-2016-0800: SSLv2 disabled by default. Not an issue. CVE-2016-0705: Low. Considered rare. CVE-2016-0798: Feature not used. Not an issue. CVE-2016-0797: Config data is trusted. Not an issue. CVE-2016-0799: Feature not used. Not an issue. CVE-2016-0702: Low. Limited exploit potential. CVE-2016-0703: Fixed in the versions we used. CVE-2016-0704: Fixed in the versions we used. So my reading of this is that folks that deliberately re-enable SSLv2 are going to have issues. But you could argue enabling SSLv2 does that all on its own. The other two issues are rare/hard to exploit. I don't see a need to rush out a tc-native release. On the other hand, a 1.2.5 wouldn't hurt and the version numbering reporting looks like a useful change. What does everyone think to a tc-native 1.2.5 release followed by 9.0.x and 8.0.x releases to pick up the new Windows binaries? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
On 03/01/2016 11:30 PM, Rémy Maucherat wrote: > 2016-03-01 23:12 GMT+01:00 Mark Thomas : > >> To summarise where I think this discussion is going: >> >> - Create 8.5.x from 9.0.x with the following changes >> - revert all changes to spec APIs >> > > Yes. Do we have a plan when everyone wants to do a push ? (I'm really not a > fan of it ...) Through a "private" API until we do 9? Cheers Jean-Frederic > > >> - make any necessary changes to work with Java 7 >> >> - Release 8.0.x and 8.5.x in parallel for ~6 months then stop 8.0.x >> releases >> >> - If users report problems caused by removal of a deprecated API in >> 8.5.x, restore it. >> >> Did I miss anything? Any additional concerns to address? >> >> That sounds good ! > > Rémy > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
On 02/25/2016 02:52 PM, Rémy Maucherat wrote: > b) A more radical option is to use 9 as 8.x but remove the Servlet API > changes. This would force Java 8 and many incompatible changes. That looks the best for me, tomcat-8.5.x Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
2016-03-02 9:56 GMT+01:00 jean-frederic clere : > On 03/01/2016 11:30 PM, Rémy Maucherat wrote: > > 2016-03-01 23:12 GMT+01:00 Mark Thomas : > > > >> To summarise where I think this discussion is going: > >> > >> - Create 8.5.x from 9.0.x with the following changes > >> - revert all changes to spec APIs > >> > > > > Yes. Do we have a plan when everyone wants to do a push ? (I'm really > not a > > fan of it ...) > > Through a "private" API until we do 9? > > The public interface can be removed, the implementation remains. But obviously it becomes harder to use. PushBuilder -> o.a.catalina.core.ApplicationPushBuilder Rémy
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (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-bio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 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-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/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-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 37 mins 24 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-BIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.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=true -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160302.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.
[Bug 59092] Shutdown of ISAPI filter leads to infinite wait and hangs whole IIS
https://bz.apache.org/bugzilla/show_bug.cgi?id=59092 Thomas Reiser changed: What|Removed |Added OS||All CC||thomas.reiser@speed4trade.c ||om -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
On 02/03/2016 09:13, Rémy Maucherat wrote: > 2016-03-02 9:56 GMT+01:00 jean-frederic clere : > >> On 03/01/2016 11:30 PM, Rémy Maucherat wrote: >>> 2016-03-01 23:12 GMT+01:00 Mark Thomas : >>> To summarise where I think this discussion is going: - Create 8.5.x from 9.0.x with the following changes - revert all changes to spec APIs >>> >>> Yes. Do we have a plan when everyone wants to do a push ? (I'm really >> not a >>> fan of it ...) >> >> Through a "private" API until we do 9? >> > The public interface can be removed, the implementation remains. But > obviously it becomes harder to use. > PushBuilder -> o.a.catalina.core.ApplicationPushBuilder We could add a (deprecated) PushBuilder interface to o.a.catalina so all users would have to do is rename the import to move from 8.5.x to 9.0.x. Users would also have to cast the request object in order to call getPushBuilder(). Not perfect but not awful considering this is early access to Servlet 4.0 API and that that API could change anyway. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 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-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 44 mins 35 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160302/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-nat ive-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160302/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/pub
Re: Tomcat 8.next
2016-03-02 10:24 GMT+01:00 Mark Thomas : > We could add a (deprecated) PushBuilder interface to o.a.catalina so all > users would have to do is rename the import to move from 8.5.x to 9.0.x. > > Users would also have to cast the request object in order to call > getPushBuilder(). > > Not perfect but not awful considering this is early access to Servlet > 4.0 API and that that API could change anyway. > > Yes, same, although I don't really see a big value add with using an interim o.a.catalina.PushBuilder interface over ApplicationPushBuilder. But it's a detail, I'm fine with it if you prefer it. Next decision is when to branch ? If doing b) a 8.5.x branch will need to be created from the main trunk. Rémy
Re: Tomcat 8.next
Hi, 2016-03-02 0:12 GMT+02:00 Mark Thomas : > > To summarise where I think this discussion is going: > > - Create 8.5.x from 9.0.x with the following changes > - revert all changes to spec APIs > - make any necessary changes to work with Java 7 > > - Release 8.0.x and 8.5.x in parallel for ~6 months then stop 8.0.x > releases > > - If users report problems caused by removal of a deprecated API in > 8.5.x, restore it. > > Did I miss anything? Any additional concerns to address? Let's do it. Regards, Violeta > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: Tomcat 8.next
On 02/03/2016 10:26, Rémy Maucherat wrote: > 2016-03-02 10:24 GMT+01:00 Mark Thomas : > >> We could add a (deprecated) PushBuilder interface to o.a.catalina so all >> users would have to do is rename the import to move from 8.5.x to 9.0.x. >> >> Users would also have to cast the request object in order to call >> getPushBuilder(). >> >> Not perfect but not awful considering this is early access to Servlet >> 4.0 API and that that API could change anyway. >> > Yes, same, although I don't really see a big value add with using an > interim o.a.catalina.PushBuilder interface over ApplicationPushBuilder. But > it's a detail, I'm fine with it if you prefer it. I'm not sure I do prefer it. It was more a suggestion. I'm not sure it is worth it. The required search and replace is going to be trivial either way. > Next decision is when to branch ? If doing b) a 8.5.x branch will need to > be created from the main trunk. How about this for a plan? Copy the tag for the next 9.0.x release to create the 8.5.x branch. Fix the various issues (Java 7, API, etc) and release 8.5.0 alpha shortly after 9.0.next. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59065] catalina.sh should check for colon _after_ cygwin path sanitization
https://bz.apache.org/bugzilla/show_bug.cgi?id=59065 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- Thanks for the report and the patch. I've tested this locally and I can confirm both the problem and the fix. The patch has been applied to 9.0.x for 9.0.0.M4 onwards nd 8.0.x for 8.0.33 onwards. -- 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: r1733247 - in /tomcat/trunk: bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Wed Mar 2 10:45:03 2016 New Revision: 1733247 URL: http://svn.apache.org/viewvc?rev=1733247&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59065 Correct the timing of the check for colons in paths on non-Windows systems implemented in catalina.sh so it works correctly with Cygwin. Patch provided by Ed Randall. Modified: tomcat/trunk/bin/catalina.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1733247&r1=1733246&r2=1733247&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Wed Mar 2 10:45:03 2016 @@ -123,20 +123,6 @@ PRGDIR=`dirname "$PRG"` # Copy CATALINA_BASE from CATALINA_HOME if not already set [ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME" -# Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon -# as this is used as the separator in the classpath and Java provides no -# mechanism for escaping if the same character appears in the path. -case $CATALINA_HOME in - *:*) echo "Using CATALINA_HOME: $CATALINA_HOME"; - echo "Unable to start as CATALINA_HOME contains a colon (:) character"; - exit 1; -esac -case $CATALINA_BASE in - *:*) echo "Using CATALINA_BASE: $CATALINA_BASE"; - echo "Unable to start as CATALINA_BASE contains a colon (:) character"; - exit 1; -esac - # Ensure that any user defined CLASSPATH variables are not used on startup, # but allow them to be specified in setenv.sh, in rare case when it is needed. CLASSPATH= @@ -156,6 +142,20 @@ if $cygwin; then [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi +# Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon +# as this is used as the separator in the classpath and Java provides no +# mechanism for escaping if the same character appears in the path. +case $CATALINA_HOME in + *:*) echo "Using CATALINA_HOME: $CATALINA_HOME"; + echo "Unable to start as CATALINA_HOME contains a colon (:) character"; + exit 1; +esac +case $CATALINA_BASE in + *:*) echo "Using CATALINA_BASE: $CATALINA_BASE"; + echo "Unable to start as CATALINA_BASE contains a colon (:) character"; + exit 1; +esac + # For OS400 if $os400; then # Set job priority to standard for interactive (interactive - 6) by using Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1733247&r1=1733246&r2=1733247&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 2 10:45:03 2016 @@ -140,6 +140,11 @@ Fix incorrect parsing of the NE and NC flags in rewrite rules. (remm) + +59065: Correct the timing of the check for colons in paths +on non-Windows systems implemented in catalina.sh so it +works correctly with Cygwin. Patch provided by Ed Randall. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
2016-03-02 11:37 GMT+01:00 Mark Thomas : > On 02/03/2016 10:26, Rémy Maucherat wrote: > > 2016-03-02 10:24 GMT+01:00 Mark Thomas : > > > >> We could add a (deprecated) PushBuilder interface to o.a.catalina so all > >> users would have to do is rename the import to move from 8.5.x to 9.0.x. > >> > >> Users would also have to cast the request object in order to call > >> getPushBuilder(). > >> > >> Not perfect but not awful considering this is early access to Servlet > >> 4.0 API and that that API could change anyway. > >> > > Yes, same, although I don't really see a big value add with using an > > interim o.a.catalina.PushBuilder interface over ApplicationPushBuilder. > But > > it's a detail, I'm fine with it if you prefer it. > > I'm not sure I do prefer it. It was more a suggestion. I'm not sure it > is worth it. The required search and replace is going to be trivial > either way. > > > Next decision is when to branch ? If doing b) a 8.5.x branch will need to > > be created from the main trunk. > > How about this for a plan? > > Copy the tag for the next 9.0.x release to create the 8.5.x branch. > > Fix the various issues (Java 7, API, etc) and release 8.5.0 alpha > shortly after 9.0.next. > > +1 Rémy
svn commit: r1733248 - in /tomcat/tc8.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Wed Mar 2 10:48:45 2016 New Revision: 1733248 URL: http://svn.apache.org/viewvc?rev=1733248&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59065 Correct the timing of the check for colons in paths on non-Windows systems implemented in catalina.sh so it works correctly with Cygwin. Patch provided by Ed Randall. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/bin/catalina.sh tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 2 10:48:45 2016 @@ -1 +1 @@ -/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,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 8 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-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/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-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 55 mins 52 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-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.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=true -Dexec ute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160302/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160302.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-
svn commit: r1733251 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Author: markt Date: Wed Mar 2 10:57:16 2016 New Revision: 1733251 URL: http://svn.apache.org/viewvc?rev=1733251&view=rev Log: Populate change log with remaining changes since last tag Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1733251&r1=1733250&r2=1733251&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Mar 2 10:57:16 2016 @@ -47,6 +47,10 @@ return the OpenSSL run time version, not the compile time version. (rjung) + + Track changes in the OpenSSL master branch so it is possible to build + Tomcat Native with that branch. (billbarker) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733253 - in /tomcat/native/trunk: download_deps.sh native/srclib/VERSIONS
Author: markt Date: Wed Mar 2 10:59:13 2016 New Revision: 1733253 URL: http://svn.apache.org/viewvc?rev=1733253&view=rev Log: Update default OpenSSL version Modified: tomcat/native/trunk/download_deps.sh tomcat/native/trunk/native/srclib/VERSIONS Modified: tomcat/native/trunk/download_deps.sh URL: http://svn.apache.org/viewvc/tomcat/native/trunk/download_deps.sh?rev=1733253&r1=1733252&r2=1733253&view=diff == --- tomcat/native/trunk/download_deps.sh (original) +++ tomcat/native/trunk/download_deps.sh Wed Mar 2 10:59:13 2016 @@ -5,7 +5,7 @@ -SSL=openssl-1.0.2d.tar.gz +SSL=openssl-1.0.2g.tar.gz APR=apr-1.5.2.tar.gz mkdir -p deps Modified: tomcat/native/trunk/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=1733253&r1=1733252&r2=1733253&view=diff == --- tomcat/native/trunk/native/srclib/VERSIONS (original) +++ tomcat/native/trunk/native/srclib/VERSIONS Wed Mar 2 10:59:13 2016 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.5.1, http://apr.apache.org -- OpenSSL 1.0.2e or later, http://www.openssl.org +- OpenSSL 1.0.2g or later, http://www.openssl.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733255 - /tomcat/native/trunk/java/org/apache/tomcat/
Author: markt Date: Wed Mar 2 11:09:30 2016 New Revision: 1733255 URL: http://svn.apache.org/viewvc?rev=1733255&view=rev Log: Update external Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Wed Mar 2 11:09:30 2016 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1725266 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1731008 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733258 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_5: ./ build.properties.default java/org/apache/tomcat/ java/org/apache/tomcat/Apr.java java/org/apache/tomcat/apr.properties native/incl
Author: markt
Date: Wed Mar 2 11:16:31 2016
New Revision: 1733258
URL: http://svn.apache.org/viewvc?rev=1733258&view=rev
Log:
Tag 1.2.5
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_5/
- copied from r1733254, tomcat/native/trunk/
tomcat/native/tags/TOMCAT_NATIVE_1_2_5/java/org/apache/tomcat/
- copied from r1733255, tomcat/native/trunk/java/org/apache/tomcat/
tomcat/native/tags/TOMCAT_NATIVE_1_2_5/java/org/apache/tomcat/Apr.java
- copied unchanged from r1733254,
tomcat/native/trunk/java/org/apache/tomcat/Apr.java
tomcat/native/tags/TOMCAT_NATIVE_1_2_5/java/org/apache/tomcat/apr.properties
- copied unchanged from r1733254,
tomcat/native/trunk/java/org/apache/tomcat/apr.properties
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_5/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_5/native/include/tcn_version.h
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_5/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_5/build.properties.default?rev=1733258&r1=1733254&r2=1733258&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_5/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_5/build.properties.default Wed Mar 2
11:16:31 2016
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=5
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_5/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_5/native/include/tcn_version.h?rev=1733258&r1=1733254&r2=1733258&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_5/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_5/native/include/tcn_version.h Wed Mar
2 11:16:31 2016
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: 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 24 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.apache.org/gump/public/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.apache.org/gump/public/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: 40 mins 27 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.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.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-20160302-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160302.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.
buildbot success in on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/479 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] 1733248 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r12588 - /release/tomcat/tomcat-connectors/native/1.2.3/
Author: markt Date: Wed Mar 2 12:02:34 2016 New Revision: 12588 Log: Drop old version Removed: release/tomcat/tomcat-connectors/native/1.2.3/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
2016-03-02 12:37 GMT+02:00 Mark Thomas : > > On 02/03/2016 10:26, Rémy Maucherat wrote: > > 2016-03-02 10:24 GMT+01:00 Mark Thomas : > > > >> We could add a (deprecated) PushBuilder interface to o.a.catalina so all > >> users would have to do is rename the import to move from 8.5.x to 9.0.x. > >> > >> Users would also have to cast the request object in order to call > >> getPushBuilder(). > >> > >> Not perfect but not awful considering this is early access to Servlet > >> 4.0 API and that that API could change anyway. > >> > > Yes, same, although I don't really see a big value add with using an > > interim o.a.catalina.PushBuilder interface over ApplicationPushBuilder. But > > it's a detail, I'm fine with it if you prefer it. > > I'm not sure I do prefer it. It was more a suggestion. I'm not sure it > is worth it. The required search and replace is going to be trivial > either way. > > > Next decision is when to branch ? If doing b) a 8.5.x branch will need to > > be created from the main trunk. > > How about this for a plan? > > Copy the tag for the next 9.0.x release to create the 8.5.x branch. > > Fix the various issues (Java 7, API, etc) and release 8.5.0 alpha > shortly after 9.0.next. +1 > Mark > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: Tomcat 8.next
2016-03-02 1:12 GMT+03:00 Mark Thomas : > To summarise where I think this discussion is going: > > - Create 8.5.x from 9.0.x with the following changes > - revert all changes to spec APIs > - make any necessary changes to work with Java 7 > > - Release 8.0.x and 8.5.x in parallel for ~6 months then stop 8.0.x > releases > > - If users report problems caused by removal of a deprecated API in > 8.5.x, restore it. > > Did I miss anything? Any additional concerns to address? The plan looks good. Concerns: 1. Eclipse IDE has 1 year cycle of major releases. If we go in March, I think we have chances to have 8.5 support in next major release this summer. (Provided that somebody does an effort to actually implement it, as with any volunteer work). I think that 6 months are counted from first stable release, not from 8.5.alpha. This time interval of 6 months sounds right for major adoption, but as we have always provided a 1 year advance notice of EOL I think we should be ready to provide security fixes and such for 1 year. These releases should not be monthly (as with current 8.0), but occasional ones. E.g. once in 3-6 months. 2. The feature of auto-switching sslImplementationName with availability of TCNative library needs better documentation. I suspect that it may come as a surprise. There is documentation of sslImplementationName attribute on config/http.html, but the attribute of AprLifecycleListener (useAprConnector) is not documented at all. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: OpenSSL vulnerabilities
Am 02.03.2016 um 09:48 schrieb Mark Thomas: All, I'm primarily looking at the window builds for Tomcat Native. tc-native 1.1.34 was built with OpenSSL 1.0.1q tc-native 1.2.4 was built with OpenSSL 1.0.2e. Looking at the latest OpenSSL security vulnerabilities: CVE-2016-0800: SSLv2 disabled by default. Not an issue. And if users ask: tcnative 1.2.4 has it disabled hard, no way to enable. 1.1.x has it disabled by default (at least in the latest releases of each TC branch), but IMHO you could enable using connector config. CVE-2016-0705: Low. Considered rare. CVE-2016-0798: Feature not used. Not an issue. CVE-2016-0797: Config data is trusted. Not an issue. CVE-2016-0799: Feature not used. Not an issue. CVE-2016-0702: Low. Limited exploit potential. CVE-2016-0703: Fixed in the versions we used. CVE-2016-0704: Fixed in the versions we used. Agreed. So my reading of this is that folks that deliberately re-enable SSLv2 are going to have issues. But you could argue enabling SSLv2 does that all on its own. The other two issues are rare/hard to exploit. With 1.2.4 no way to enable. I don't see a need to rush out a tc-native release. On the other hand, a 1.2.5 wouldn't hurt and the version numbering reporting looks like a useful change. What does everyone think to a tc-native 1.2.5 release followed by 9.0.x and 8.0.x releases to pick up the new Windows binaries? +1 Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59077] DataSourceFactory creates a neutered data source
https://bz.apache.org/bugzilla/show_bug.cgi?id=59077 Mark Thomas changed: What|Removed |Added Component|Catalina|jdbc-pool Version|8.0.30 |unspecified Product|Tomcat 8|Tomcat Modules Target Milestone||--- OS||All --- Comment #1 from Mark Thomas --- Correct product. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1733080 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/UriUtil.java webapps/docs/changelog.xml
Hi Mark,
On Tue, Mar 1, 2016 at 6:53 PM, Mark Thomas wrote:
> On 01/03/2016 14:57, Martin Grigorov wrote:
> > On Tue, Mar 1, 2016 at 3:37 PM, wrote:
> >
> >> Author: markt
> >> Date: Tue Mar 1 14:37:46 2016
> >> New Revision: 1733080
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1733080&view=rev
> >> Log:
> >> Expand the fix for BZ 59001 to cover the special sequences used in
> >> Tomcat's custom jar:war: URL
>
>
>
> > How often this method is expected to be called? I guess at least once per
> > request.
>
> That is not correct. It is generally called during web application
> start. I'd typically expect it to be called twice per JAR plus a few
> more times per web application for configuration files (depending on
> Host configuration).
>
OK. If the method is not called very often then it is not a big deal.
>
> > My concern is about the performance of String#replaceAll. It uses Regex
> and
> > is slower than custom solutions like
> >
> https://github.com/apache/wicket/blob/ffa34c6bfbd2ccd8340e23ff1601edd3e0e941d6/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java#L748
> >
> > When I don't have access to such util methods in the classpath then I
> > prefer to pre-compile the Pattern as a constant and just match on it:
> > e.g. PERCENT_21_PATTERN.matcher(input).replaceAll("%21/")
>
> Given how infrequently this code will be called, when it will be called
> and the overhead of JAR handling overall compared to the contribution of
> these calls I don't think a custom replaceAll() is necessary (although
> if user feedback is different for some use cases we can always revisit
> that).
>
> The pre-compiled Pattern approach might be worth looking at. I'll see if
> I can put together a simple benchmark and add it to the unit tests.
>
I've seen the following commit with the compiled Pattern!
>
> > Additionally I have the feeling that 'tmp.replaceAll("^/", "%5e/");'
> won't
> > behave as desired. I think it would match for any String that starts
> with a
> > slash because of '^'. You may need to Pattern.quote() it.
>
> It does behave as intended. There was a test case that checked that that
> wasn't checked in with the original commit.
>
Are you sure? ;-)
public static void main(String[] args) {
System.err.println("aaa^/bbb".replaceAll("^/", "C"));
System.err.println("aaa^/bbb".replaceAll("\\^/", "C"));
}
Executing this prints:
aaa^/bbb
aaaCbbb
In the following commit this is escaped and works correctly!
Thanks!
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
svn commit: r12592 - in /dev/tomcat/tomcat-connectors/native/1.2.5: ./ binaries/ source/
Author: markt Date: Wed Mar 2 13:30:29 2016 New Revision: 12592 Log: Upload Tomcat Native 1.2.5 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.5/ dev/tomcat/tomcat-connectors/native/1.2.5/binaries/ dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.2.5/source/ dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-src.tar.gz.md5 dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-src.tar.gz.sha1 dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-win32-src.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.5/source/tomcat-native-1.2.5-win32-src.zip.sha1 Added: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.asc Wed Mar 2 13:30:29 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJW1taaAAoJEBDAHFovYFnnMOIP/jbjwlIrJNQJo8WNZ5v5PFH7 +ZG3CqwcOPAlQ+hFAyOKtO9OujZPtdkCxOY4iSgVHp8j17MXQ0N4PejwN1/G0yzXR +OTriCDJMXXAZTvgBiAsgvhJRexO+GKVgOP5sj4Tb1ZzPPDxZsCDUmS141IB5KGun +A86Ma+yoL0J2mBkja2c63pdodoQWRg2//lGswuzYJ4bAHm2SlJqVbQM5978Wk1Y0 +/cvL8EjQwwY+0DM4X82KddpfCeHK4TET0jQ7juQN48zaN5iL5b75VTmjuwBjU1Om +YEjEoebfhCwq0lxadeb+0n0ok2vOHH/Jhbiuonhs21yWAFgd+veHyUFcXuFZ37kp +FZMTsURguZR1dNV/qB4kfenn0ZxWHNVQHQtbkwKl+110wJuenk6GGSLrYhZPTdA4 +gM1BvgA/qcbSRIsj+i4nzRFl4xkqvwO+bwi6ow7QHY5458SpQiGKrlqtDp8XP+JO +ZtRSNdKxztrZojWiQ/M+ZoAt1LTYvXjV9QY1isJV0U7wyQDy5VOym9MRP7GkPjuu +EZGmGXnayPXRRfVhMtm5BJefn0JUXWLu02CiV+Lt1J8e0NDNcQPAS3gtoAtBJQde +iQZzTc7FWWYeu38g+58xTYPN4+4kO9b7AqCJBGAFgBF/j0J3Pf7VwsPTLQoJ2/EQ +QEUdIV1U/xyHe9FiiTSr +=6ZKh +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.md5 == --- dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.md5 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.md5 Wed Mar 2 13:30:29 2016 @@ -0,0 +1 @@ +f7a6e63ed96cf345b606987ac09f6954 *tomcat-native-1.2.5-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.sha1 == --- dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.sha1 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-ocsp-win32-bin.zip.sha1 Wed Mar 2 13:30:29 2016 @@ -0,0 +1 @@ +faa18312bd5a64b950ebca68142d9c19633a1caf *tomcat-native-1.2.5-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.5/binaries/tomcat-native-1.2.5-win32-bin.zip -- svn:mime
svn commit: r1733285 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc xdocs/miscellaneous/changelog.xml
Author: markt
Date: Wed Mar 2 13:35:09 2016
New Revision: 1733285
URL: http://svn.apache.org/viewvc?rev=1733285&view=rev
Log:
Update version for next release cycle
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1733285&r1=1733284&r2=1733285&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Wed Mar 2 13:35:09 2016
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=5
+version.build=6
version.patch=0
version.suffix=-dev
Modified: tomcat/native/trunk/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1733285&r1=1733284&r2=1733285&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Wed Mar 2 13:35:09 2016
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 5
+#define TCN_PATCH_VERSION 6
/**
* This symbol is defined for internal, "development" copies of TCN. This
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1733285&r1=1733284&r2=1733285&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Wed Mar 2 13:35:09 2016
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.5"
+#define TCN_VERSION "1.2.6"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,5,0
- PRODUCTVERSION 1,2,5,0
+ FILEVERSION 1,2,6,0
+ PRODUCTVERSION 1,2,6,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1733285&r1=1733284&r2=1733285&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Mar 2 13:35:09
2016
@@ -34,6 +34,10 @@
This is the Changelog for Tomcat Native 1.2.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8.next
2016-03-02 13:15 GMT+01:00 Konstantin Kolinko : > 2016-03-02 1:12 GMT+03:00 Mark Thomas : > > To summarise where I think this discussion is going: > > > > - Create 8.5.x from 9.0.x with the following changes > > - revert all changes to spec APIs > > - make any necessary changes to work with Java 7 > > > > - Release 8.0.x and 8.5.x in parallel for ~6 months then stop 8.0.x > > releases > > > > - If users report problems caused by removal of a deprecated API in > > 8.5.x, restore it. > > > > Did I miss anything? Any additional concerns to address? > > The plan looks good. > > Concerns: > 1. Eclipse IDE has 1 year cycle of major releases. If we go in March, > I think we have chances to have 8.5 support in next major release this > summer. (Provided that somebody does an effort to actually implement > it, as with any volunteer work). > > I think that 6 months are counted from first stable release, not from > 8.5.alpha. > > This time interval of 6 months sounds right for major adoption, but as > we have always provided a 1 year advance notice of EOL I think we > should be ready to provide security fixes and such for 1 year. These > releases should not be monthly (as with current 8.0), but occasional > ones. E.g. once in 3-6 months. > The "base" 6 months after a stable release seems ok to me. Hoepfully the road to stable isn't too long though. > > > 2. The feature of auto-switching sslImplementationName with > availability of TCNative library needs better documentation. I suspect > that it may come as a surprise. > > There is documentation of sslImplementationName attribute on > config/http.html, but the attribute of AprLifecycleListener > (useAprConnector) is not documented at all. > It is supposed to be documented as of r1729644. OTOH, I'm not that good with that kind of thing, and maybe it is still confusing. Rémy
[VOTE] Release Apache Tomcat Native 1.2.5
Version 1.2.4 includes the following changes: - Report runtime rather than compile time version for OpenSSL - Fixes to allow continued building with master The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.5 is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.5/ [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_5 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.5
On 02/03/2016 13:43, Mark Thomas wrote: > Version 1.2.4 includes the following changes: > > - Report runtime rather than compile time version for OpenSSL > - Fixes to allow continued building with master > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.5 is > [X] Stable, go ahead and release > [ ] Broken because of ... Unit tests pass for APR/native on trunk with Windows binaries from the RC. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733297 - in /tomcat/tc8.0.x/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java test/org/ap
Author: markt
Date: Wed Mar 2 14:22:08 2016
New Revision: 1733297
URL: http://svn.apache.org/viewvc?rev=1733297&view=rev
Log:
Sync OpenSSL<->JSSE cipher handling with 9.0.x
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1733297&r1=1733296&r2=1733297&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Wed Mar 2 14:22:08 2016
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -1290,7 +1291,7 @@ public enum Cipher {
false,
56,
128,
-new String[] {"SSL_RSA_EXPORT1024_WITH_RC2_CBC_56_MD"},
+new String[] {"SSL_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5"},
null
),
// Cipher 62
@@ -4651,7 +4652,7 @@ public enum Cipher {
} else {
this.openSSLAltNames = Collections.emptySet();
}
-Set jsseNames = new HashSet<>();
+Set jsseNames = new LinkedHashSet<>();
if (jsseAltNames != null && jsseAltNames.length != 0) {
jsseNames.addAll(Arrays.asList(jsseAltNames));
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java?rev=1733297&r1=1733296&r2=1733297&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Wed Mar 2 14:22:08 2016
@@ -704,7 +704,8 @@ public class OpenSSLCipherConfigurationP
}
/**
- * Parse the specified expression according to the OpenSSL syntax and
returns a list of standard cipher names.
+ * Parse the specified expression according to the OpenSSL syntax and
+ * returns a list of standard JSSE cipher names.
*
* @param expression the openssl expression to define a list of cipher.
* @return the corresponding list of ciphers.
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1733297&r1=1733296&r2=1733297&view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Wed Mar 2 14:22:08 2016
@@ -331,6 +331,29 @@ public class TesterOpenSSL {
unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA);
unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA);
unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cip
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (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-test-nio2 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-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 39 mins 8 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.o penssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160302/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomca
svn commit: r1733343 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Author: markt Date: Wed Mar 2 18:04:19 2016 New Revision: 1733343 URL: http://svn.apache.org/viewvc?rev=1733343&view=rev Log: Simplify the check and make failures easier to debug Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1733343&r1=1733342&r2=1733343&view=diff == --- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java Wed Mar 2 18:04:19 2016 @@ -660,9 +660,9 @@ public class TestOpenSSLCipherConfigurat TesterOpenSSL.removeUnimplementedCiphersJsse(jsseCipherListFromParser); -// First check the lists have the same entries -Assert.assertEquals(jsseCipherListFromOpenSSL.size(), jsseCipherListFromParser.size()); - Assert.assertTrue(jsseCipherListFromOpenSSL.containsAll(jsseCipherListFromParser)); +// Check the lists have the same entries in the same order +Assert.assertEquals(jsseCipherListFromOpenSSL.toString(), +jsseCipherListFromParser.toString()); // OpenSSL treats many ciphers as having equal preference. The order // returned depends on the order they are requested. The following code - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733345 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Author: markt
Date: Wed Mar 2 18:06:13 2016
New Revision: 1733345
URL: http://svn.apache.org/viewvc?rev=1733345&view=rev
Log:
Update tests:
- 0.9.8 and 1.0.0 are no longer supported
- Support for LOW and EXPORT ciphers has been removed from all supported
versions
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1733345&r1=1733344&r2=1733345&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Wed Mar 2 18:06:13 2016
@@ -50,10 +50,8 @@ public class TesterOpenSSL {
VERSION = 10002;
} else if (versionString.startsWith("OpenSSL 1.0.1")) {
VERSION = 10001;
-} else if (versionString.startsWith("OpenSSL 1.0.0")) {
-VERSION = 1;
-} else if (versionString.startsWith("OpenSSL 0.9.8")) {
-VERSION = 908;
+// Note: Release branches 1.0.0 and earlier are no longer supported by
+// the OpenSSL team so these tests don't support them either.
} else {
VERSION = -1;
}
@@ -74,92 +72,26 @@ public class TesterOpenSSL {
unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256);
unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256);
unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256);
-
-if (VERSION < 1) {
-// These were implemented in 1.0.0 so won't be available in any
-// earlier version
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_NULL_SHA);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_anon_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_RC4_128_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_3DES_EDE_CBC_SHA);
-} else {
-// These were removed in 1.0.0 so won't be available from that
-// version onwards.
-// None at present.
-}
-
-if (VERSION < 10001) {
-// These were added in 1.0.1 so won't be available in any earlier
-// version
-unimplemented.add(Cipher.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_AES_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256);
-unimplemented.add(Cipher.TLS_DHE_DSS_
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (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-test-nio 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-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.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 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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 50 mins 6 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.open ssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160302/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/out
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (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-test-bio 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-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 44 mins 7 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.ope nssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160302/bin/openssl -Dexecute.test.bio=true -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/out
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (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-bio 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-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/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-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 40 mins 55 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-BIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.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=true -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160302.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/public/workspace/tomca
svn commit: r1733372 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
Author: markt
Date: Wed Mar 2 21:36:21 2016
New Revision: 1733372
URL: http://svn.apache.org/viewvc?rev=1733372&view=rev
Log:
Update comment to align with OpenSSL notation
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java?rev=1733372&r1=1733371&r2=1733372&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
Wed Mar 2 21:36:21 2016
@@ -18,7 +18,7 @@
package org.apache.tomcat.util.net.openssl.ciphers;
enum KeyExchange {
-EECDH /* SSL_kECDHE - ephemeral ECDH */,
+EECDH /* SSL_kEECDH - ephemeral ECDH */,
RSA /* SSL_kRSA - RSA key exchange */,
DHr /* SSL_kDHr - DH cert, RSA CA cert */ /* no such ciphersuites
supported! */,
DHd /* SSL_kDHd - DH cert, DSA CA cert */ /* no such ciphersuite
supported! */,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733373 - in /tomcat/trunk: java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigur
Author: markt
Date: Wed Mar 2 21:38:38 2016
New Revision: 1733373
URL: http://svn.apache.org/viewvc?rev=1733373&view=rev
Log:
kECDHE and ECDHE are now supported.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1733373&r1=1733372&r2=1733373&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
Wed Mar 2 21:38:38 2016
@@ -426,8 +426,12 @@ public class OpenSSLCipherConfigurationP
addListAlias(kECDHe, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.ECDHe)));
addListAlias(kECDH, filterByKeyExchange(allCiphers, new
HashSet<>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr;
addListAlias(ECDH, filterByKeyExchange(allCiphers, new
HashSet<>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr,
KeyExchange.EECDH;
-addListAlias(kECDHE, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.ECDHe)));
-aliases.put(ECDHE, aliases.get(kECDHE));
+addListAlias(kECDHE, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH)));
+
+Set ecdhe = filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH));
+remove(ecdhe, aNULL);
+addListAlias(ECDHE, ecdhe);
+
addListAlias(kEECDH, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH)));
aliases.put(EECDHE, aliases.get(kEECDH));
Set eecdh = filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH));
@@ -526,7 +530,7 @@ public class OpenSSLCipherConfigurationP
ciphers.addAll(aliases.get(alias));
}
-static void remove(final LinkedHashSet ciphers, final String
alias) {
+static void remove(final Set ciphers, final String alias) {
ciphers.removeAll(aliases.get(alias));
}
@@ -550,6 +554,10 @@ public class OpenSSLCipherConfigurationP
return result;
}
+/*
+ * See
+ *
https://github.com/openssl/openssl/blob/7c96dbcdab959fef74c4caae63cdebaa354ab252/ssl/ssl_ciph.c#L1371
+ */
static LinkedHashSet defaultSort(final LinkedHashSet
ciphers) {
final LinkedHashSet result = new
LinkedHashSet<>(ciphers.size());
/* Now arrange all ciphers by preference: */
@@ -564,9 +572,6 @@ public class OpenSSLCipherConfigurationP
/* Temporarily enable everything else for sorting */
result.addAll(ciphers);
-/* Low priority for SSLv2 */
-moveToEnd(result, filterByProtocol(result,
Collections.singleton(Protocol.SSLv2)));
-
/* Low priority for MD5 */
moveToEnd(result, filterByMessageDigest(result,
Collections.singleton(MessageDigest.MD5)));
@@ -579,7 +584,7 @@ public class OpenSSLCipherConfigurationP
moveToEnd(result, filterByAuthentication(result,
Collections.singleton(Authentication.ECDH)));
moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.RSA)));
moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.PSK)));
-moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.KRB5)));
+
/* RC4 is sort-of broken -- move the the end */
moveToEnd(result, filterByEncryption(result,
Collections.singleton(Encryption.RC4)));
return strengthSort(result);
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1733373&r1=1733372&r2=1733373&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Wed Mar 2 21:38:38 2016
@@ -281,14 +281,12 @@ public class TestOpenSSLCipherConfigurat
@Test
-@Ignore("Contrary to the docs, OpenSSL does not recognise kECDHE")
public void testkECDHE() throws Exception {
testSpecification("kECDHE");
}
@Test
-@Ignore("Contrary to the docs, OpenSSL does not recognise ECDHE")
public void tes
svn commit: r1733375 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
Author: markt Date: Wed Mar 2 21:56:14 2016 New Revision: 1733375 URL: http://svn.apache.org/viewvc?rev=1733375&view=rev Log: Fix ordering for newer ciphers suites only in OpenSSL master Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1733375&r1=1733374&r2=1733375&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java Wed Mar 2 21:56:14 2016 @@ -565,10 +565,11 @@ public class OpenSSLCipherConfigurationP /* Everything else being equal, prefer ephemeral ECDH over other key exchange mechanisms */ result.addAll(filterByKeyExchange(ciphers, Collections.singleton(KeyExchange.EECDH))); /* AES is our preferred symmetric cipher */ -moveToStart(result, filterByEncryption(result, new HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128GCM, -Encryption.AES256, Encryption.AES256GCM; -result.addAll(filterByEncryption(ciphers, new HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128GCM, -Encryption.AES256, Encryption.AES256GCM; +Set aes = new HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128CCM, +Encryption.AES128CCM8, Encryption.AES128GCM, Encryption.AES256, +Encryption.AES256CCM, Encryption.AES256CCM8, Encryption.AES256GCM)); +moveToStart(result, filterByEncryption(result, aes)); +result.addAll(filterByEncryption(ciphers, aes)); /* Temporarily enable everything else for sorting */ result.addAll(ciphers); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733376 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
Author: markt
Date: Wed Mar 2 22:02:52 2016
New Revision: 1733376
URL: http://svn.apache.org/viewvc?rev=1733376&view=rev
Log:
Update comment to align with OpenSSL notation
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java?rev=1733376&r1=1733375&r2=1733376&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
Wed Mar 2 22:02:52 2016
@@ -18,7 +18,7 @@
package org.apache.tomcat.util.net.jsse.openssl;
enum KeyExchange {
-EECDH /* SSL_kECDHE - ephemeral ECDH */,
+EECDH /* SSL_kEECDH - ephemeral ECDH */,
RSA /* SSL_kRSA - RSA key exchange */,
DHr /* SSL_kDHr - DH cert, RSA CA cert */ /* no such ciphersuites
supported! */,
DHd /* SSL_kDHd - DH cert, DSA CA cert */ /* no such ciphersuite
supported! */,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733377 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt
Date: Wed Mar 2 22:03:18 2016
New Revision: 1733377
URL: http://svn.apache.org/viewvc?rev=1733377&view=rev
Log:
Update tests:
- 0.9.8 and 1.0.0 are no longer supported
- Support for LOW and EXPORT ciphers has been removed from all supported
versions
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1733377&r1=1733376&r2=1733377&view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Wed Mar 2 22:03:18 2016
@@ -50,10 +50,8 @@ public class TesterOpenSSL {
VERSION = 10002;
} else if (versionString.startsWith("OpenSSL 1.0.1")) {
VERSION = 10001;
-} else if (versionString.startsWith("OpenSSL 1.0.0")) {
-VERSION = 1;
-} else if (versionString.startsWith("OpenSSL 0.9.8")) {
-VERSION = 908;
+// Note: Release branches 1.0.0 and earlier are no longer supported by
+// the OpenSSL team so these tests don't support them either.
} else {
VERSION = -1;
}
@@ -74,93 +72,26 @@ public class TesterOpenSSL {
unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256);
unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256);
unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256);
-
-if (VERSION < 1) {
-// These were implemented in 1.0.0 so won't be available in any
-// earlier version
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_NULL_SHA);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_anon_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_RC4_128_SHA);
-unimplemented.add(Cipher.TLS_PSK_WITH_3DES_EDE_CBC_SHA);
-} else {
-// These were removed in 1.0.0 so won't be available from that
-// version onwards.
-// None at present.
-}
-
-
-if (VERSION < 10001) {
-// These were added in 1.0.1 so won't be available in any earlier
-// version
-unimplemented.add(Cipher.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_RSA_WITH_AES_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256);
-unimplemen
svn commit: r1733378 - in /tomcat/tc8.0.x/trunk: java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfig
Author: markt
Date: Wed Mar 2 22:04:52 2016
New Revision: 1733378
URL: http://svn.apache.org/viewvc?rev=1733378&view=rev
Log:
kECDHE and ECDHE are now supported.
Fix ordering for newer ciphers only in OpenSSL master
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java?rev=1733378&r1=1733377&r2=1733378&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Wed Mar 2 22:04:52 2016
@@ -426,8 +426,12 @@ public class OpenSSLCipherConfigurationP
addListAlias(kECDHe, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.ECDHe)));
addListAlias(kECDH, filterByKeyExchange(allCiphers, new
HashSet<>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr;
addListAlias(ECDH, filterByKeyExchange(allCiphers, new
HashSet<>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr,
KeyExchange.EECDH;
-addListAlias(kECDHE, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.ECDHe)));
-aliases.put(ECDHE, aliases.get(kECDHE));
+addListAlias(kECDHE, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH)));
+
+Set ecdhe = filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH));
+remove(ecdhe, aNULL);
+addListAlias(ECDHE, ecdhe);
+
addListAlias(kEECDH, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH)));
aliases.put(EECDHE, aliases.get(kEECDH));
Set eecdh = filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.EECDH));
@@ -526,7 +530,7 @@ public class OpenSSLCipherConfigurationP
ciphers.addAll(aliases.get(alias));
}
-static void remove(final LinkedHashSet ciphers, final String
alias) {
+static void remove(final Set ciphers, final String alias) {
ciphers.removeAll(aliases.get(alias));
}
@@ -550,6 +554,10 @@ public class OpenSSLCipherConfigurationP
return result;
}
+/*
+ * See
+ *
https://github.com/openssl/openssl/blob/7c96dbcdab959fef74c4caae63cdebaa354ab252/ssl/ssl_ciph.c#L1371
+ */
static LinkedHashSet defaultSort(final LinkedHashSet
ciphers) {
final LinkedHashSet result = new
LinkedHashSet<>(ciphers.size());
/* Now arrange all ciphers by preference: */
@@ -557,16 +565,14 @@ public class OpenSSLCipherConfigurationP
/* Everything else being equal, prefer ephemeral ECDH over other key
exchange mechanisms */
result.addAll(filterByKeyExchange(ciphers,
Collections.singleton(KeyExchange.EECDH)));
/* AES is our preferred symmetric cipher */
-moveToStart(result, filterByEncryption(result, new
HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128GCM,
-Encryption.AES256, Encryption.AES256GCM;
-result.addAll(filterByEncryption(ciphers, new
HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128GCM,
-Encryption.AES256, Encryption.AES256GCM;
+Set aes = new HashSet<>(Arrays.asList(Encryption.AES128,
Encryption.AES128CCM,
+Encryption.AES128CCM8, Encryption.AES128GCM, Encryption.AES256,
+Encryption.AES256CCM, Encryption.AES256CCM8,
Encryption.AES256GCM));
+moveToStart(result, filterByEncryption(result, aes));
+result.addAll(filterByEncryption(ciphers, aes));
/* Temporarily enable everything else for sorting */
result.addAll(ciphers);
-/* Low priority for SSLv2 */
-moveToEnd(result, filterByProtocol(result,
Collections.singleton(Protocol.SSLv2)));
-
/* Low priority for MD5 */
moveToEnd(result, filterByMessageDigest(result,
Collections.singleton(MessageDigest.MD5)));
@@ -579,7 +585,7 @@ public class OpenSSLCipherConfigurationP
moveToEnd(result, filterByAuthentication(result,
Collections.singleton(Authentication.ECDH)));
moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.RSA)));
moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.PSK)));
-moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.KRB5)));
+
/* RC4 is sort-of broken -- move the the end */
moveToEnd(
svn commit: r1733381 - in /tomcat/native/trunk: native/src/sslcontext.c native/src/sslnetwork.c native/src/sslutils.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Wed Mar 2 22:10:19 2016
New Revision: 1733381
URL: http://svn.apache.org/viewvc?rev=1733381&view=rev
Log:
Fix some compiler warnings in native ssl code.
Modified:
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/native/src/sslnetwork.c
tomcat/native/trunk/native/src/sslutils.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1733381&r1=1733380&r2=1733381&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Mar 2 22:10:19 2016
@@ -978,7 +978,7 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
jbyteArray javaCert,
jbyteArray javaKey, jint idx)
{
#ifdef HAVE_ECC
-#if defined(SSL_CTX_set_ecdh_auto)
+#ifndef SSL_CTX_set_ecdh_auto
EC_KEY *eckey = NULL;
#endif
#endif
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1733381&r1=1733380&r2=1733381&view=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Wed Mar 2 22:10:19 2016
@@ -617,9 +617,6 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
tcn_ssl_conn_t *con;
int retVal;
-int ecode = SSL_ERROR_WANT_READ;
-apr_status_t rv;
-apr_interval_time_t timeout;
UNREFERENCED_STDARGS;
TCN_ASSERT(sock != 0);
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1733381&r1=1733380&r2=1733381&view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Wed Mar 2 22:10:19 2016
@@ -599,7 +599,7 @@ int select_next_proto(SSL *ssl, const un
const unsigned char *p;
const unsigned char *end;
const unsigned char *proto;
-unsigned char proto_len;
+unsigned char proto_len = '\0';
while (i < supported_protos_len) {
target_proto_len = *supported_protos;
@@ -630,11 +630,10 @@ int select_next_proto(SSL *ssl, const un
supported_protos += target_proto_len;
}
-if (failure_behavior == SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL) {
+if (supported_protos_len > 0 && inlen > 0 && failure_behavior ==
SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL) {
// There were no match but we just select our last protocol and hope
the other peer support it.
//
// decrement the pointer again so the pointer points to the start of
the protocol.
- /* XXX compiler warning: 'proto_len' and 'p' may be used
uninitialized in this function */
p -= proto_len;
*out = p;
*outlen = proto_len;
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1733381&r1=1733380&r2=1733381&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Mar 2 22:10:19
2016
@@ -36,6 +36,9 @@
+
+ Fix some compiler warnings in native ssl code. (rjung)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Tomcat 8.next
FYI: Support for Tomcat 9.0 was added to WTP 3.8 for Eclipse Neon last weekend. I can add 8.5 support, but it would be best if it could be added in March or April. If it's delayed beyond that, it might have to move to the first maintenance release that comes out in late September. I'll try to keep an eye on this. Cheers, Larry -Original Message- From: Rémy Maucherat [mailto:r...@apache.org] Sent: Wed, March 02, 2016 8:43 AM To: Tomcat Developers List Subject: Re: Tomcat 8.next 2016-03-02 13:15 GMT+01:00 Konstantin Kolinko : > 2016-03-02 1:12 GMT+03:00 Mark Thomas : > > To summarise where I think this discussion is going: > > > > - Create 8.5.x from 9.0.x with the following changes > > - revert all changes to spec APIs > > - make any necessary changes to work with Java 7 > > > > - Release 8.0.x and 8.5.x in parallel for ~6 months then stop 8.0.x > > releases > > > > - If users report problems caused by removal of a deprecated API in > > 8.5.x, restore it. > > > > Did I miss anything? Any additional concerns to address? > > The plan looks good. > > Concerns: > 1. Eclipse IDE has 1 year cycle of major releases. If we go in March, > I think we have chances to have 8.5 support in next major release this > summer. (Provided that somebody does an effort to actually implement > it, as with any volunteer work). > > I think that 6 months are counted from first stable release, not from > 8.5.alpha. > > This time interval of 6 months sounds right for major adoption, but as > we have always provided a 1 year advance notice of EOL I think we > should be ready to provide security fixes and such for 1 year. These > releases should not be monthly (as with current 8.0), but occasional > ones. E.g. once in 3-6 months. > The "base" 6 months after a stable release seems ok to me. Hoepfully the road to stable isn't too long though. > > > 2. The feature of auto-switching sslImplementationName with > availability of TCNative library needs better documentation. I suspect > that it may come as a surprise. > > There is documentation of sslImplementationName attribute on > config/http.html, but the attribute of AprLifecycleListener > (useAprConnector) is not documented at all. > It is supposed to be documented as of r1729644. OTOH, I'm not that good with that kind of thing, and maybe it is still confusing. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: 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. 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.apache.org/gump/public/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.apache.org/gump/public/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: 31 mins 34 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.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160302.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-20160302-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160302-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160302.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/public/workspace/tomca
svn commit: r1733387 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Author: markt
Date: Wed Mar 2 22:58:22 2016
New Revision: 1733387
URL: http://svn.apache.org/viewvc?rev=1733387&view=rev
Log:
Simplify by restricting to supported versions
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1733387&r1=1733386&r2=1733387&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Wed Mar 2 22:58:22 2016
@@ -29,11 +29,7 @@ public class TestOpenSSLCipherConfigurat
// EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
// behaviour
// DES, RC2 and RC4 were removed from default in 1.1.0-dev
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 excludes EC ciphers unless explicitly enabled
-// (using aRSA:!SSLv2:!eNULL as an EC alias isn't available)
-
testSpecification("DEFAULT:!EXPORT:aRSA:!SSLv2:!eNULL:!DES:!RC2:!RC4");
-} else if (TesterOpenSSL.VERSION < 10100) {
+if (TesterOpenSSL.VERSION < 10100) {
testSpecification("DEFAULT:!EXPORT:!DES:!RC2:!RC4");
} else {
testSpecification("DEFAULT:!EXPORT");
@@ -59,29 +55,13 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testALL() throws Exception {
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 excludes aNULL unless explicitly enabled whereas
-// later versions include it.
-// OpenSSL 0.9.8 excludes EC ciphers unless explicitly enabled
-// (using aRSA:kECDHr as an EC alias isn't available)
-testSpecification("ALL:aNULL:aRSA:kECDHr");
-} else {
-testSpecification("ALL");
-}
+testSpecification("ALL");
}
@Test
public void testCOMPLEMENTOFALL() throws Exception {
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 excludes aNULL unless explicitly enabled whereas
-// later versions include it.
-// OpenSSL 0.9.8 excludes EC ciphers unless explicitly enabled
-// (using aRSA:kECDHr as an EC alias isn't available)
-testSpecification("COMPLEMENTOFALL:!aNULL:!aRSA:!kECDHr");
-} else {
-testSpecification("COMPLEMENTOFALL");
-}
+testSpecification("COMPLEMENTOFALL");
}
@@ -93,56 +73,19 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testeNULL() throws Exception {
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 excludes aNULL unless explicitly enabled
-// OpenSSL 0.9.8 excludes EC ciphers unless explicitly enabled
-// (using aRSA as an EC alias isn't available)
-testSpecification("eNULL:eNULL+aNULL:eNULL+aRSA");
-} else {
-testSpecification("eNULL");
-}
+testSpecification("eNULL");
}
@Test
public void testHIGH() throws Exception {
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 excludes aNULL unless explicitly enabled
-// OpenSSL 0.9.8 describes the following ciphers as HIGH whereas
-// later versions use MEDIUM
-// TLS_ECDH_anon_WITH_RC4_128_SHA (AECDH-RC4-SHA)
-// TLS_ECDHE_RSA_WITH_RC4_128_SHA (ECDHE-RSA-RC4-SHA)
-// TLS_ECDH_RSA_WITH_RC4_128_SHA (ECDH-RSA-RC4-SHA)
-// TLS_ECDHE_RSA_WITH_NULL_SHA(ECDHE-RSA-NULL-SHA)
-// TLS_ECDH_RSA_WITH_NULL_SHA (ECDH-RSA-NULL-SHA)
-//
-// OpenSSL 0.9.8 describes TLS_ECDH_anon_WITH_NULL_SHA
-// (AECDH-NULL-SHA) as HIGH whereas later versions use STRONG_NONE
-// OpenSSL 0.9.8 excludes EC ciphers unless explicitly enabled
-// (using aRSA as an EC alias isn't available)
-testSpecification("HIGH:HIGH+aNULL:HIGH+aRSA:" +
-
"!AECDH-RC4-SHA:!ECDHE-RSA-RC4-SHA:!ECDH-RSA-RC4-SHA:!ECDHE-RSA-NULL-SHA:!ECDH-RSA-NULL-SHA:"
+
-"!AECDH-NULL-SHA");
-} else {
-testSpecification("HIGH");
-}
+testSpecification("HIGH");
}
@Test
public void testMEDIUM() throws Exception {
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 describes the following ciphers as HIGH whereas
-// later versions use MEDIUM
-// TLS_ECDH_anon_WITH_RC4_128_SHA (AECDH-RC4-SHA)
-// TLS
svn commit: r1733389 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Author: markt
Date: Wed Mar 2 23:10:21 2016
New Revision: 1733389
URL: http://svn.apache.org/viewvc?rev=1733389&view=rev
Log:
More test simplification by limiting tests to supported versions.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1733389&r1=1733388&r2=1733389&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Wed Mar 2 23:10:21 2016
@@ -26,29 +26,22 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testDEFAULT() throws Exception {
-// EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
-// behaviour
-// DES, RC2 and RC4 were removed from default in 1.1.0-dev
+// RC4 was removed from default in 1.1.0-dev
if (TesterOpenSSL.VERSION < 10100) {
-testSpecification("DEFAULT:!EXPORT:!DES:!RC2:!RC4");
+testSpecification("DEFAULT:!RC4");
} else {
-testSpecification("DEFAULT:!EXPORT");
+testSpecification("DEFAULT");
}
}
@Test
public void testCOMPLEMENTOFDEFAULT() throws Exception {
-// EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
-// behaviour
-// DES, RC2 and RC4 were removed from default in 1.1.0-dev
-if (TesterOpenSSL.VERSION < 1) {
-// OpenSSL 0.9.8 excludes aNULL unless explicitly enabled
-testSpecification("COMPLEMENTOFDEFAULT:EXPORT:aNULL:DES:RC2:RC4");
-} else if (TesterOpenSSL.VERSION < 10100) {
-testSpecification("COMPLEMENTOFDEFAULT:EXPORT:aNULL:DES:RC2:RC4");
+// NULL and RC4 were removed from default in 1.1.0-dev
+if (TesterOpenSSL.VERSION < 10100) {
+testSpecification("COMPLEMENTOFDEFAULT:RC4:aNULL");
} else {
-testSpecification("COMPLEMENTOFDEFAULT:EXPORT");
+testSpecification("COMPLEMENTOFDEFAULT");
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1733390 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/openssl/ciphers/ test/org/apache/tomcat/util/net/openssl/ciphers/ webapps/docs/
Author: markt
Date: Wed Mar 2 23:13:25 2016
New Revision: 1733390
URL: http://svn.apache.org/viewvc?rev=1733390&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59081
Retain the user defined cipher order when defining ciphers
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java?rev=1733390&r1=1733389&r2=1733390&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java Wed Mar 2
23:13:25 2016
@@ -70,8 +70,8 @@ public abstract class SSLUtilBase implem
// can be done at this point.
enabled.addAll(configured);
} else {
-enabled.addAll(implemented);
-enabled.retainAll(configured);
+enabled.addAll(configured);
+enabled.retainAll(implemented);
if (enabled.isEmpty()) {
// Don't use the defaults in this case. They may be less secure
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1733390&r1=1733389&r2=1733390&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
Wed Mar 2 23:13:25 2016
@@ -695,7 +695,7 @@ public class OpenSSLCipherConfigurationP
}
}
ciphers.removeAll(removedCiphers);
-return defaultSort(ciphers);
+return ciphers;
}
public static List convertForJSSE(Collection ciphers) {
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java?rev=1733390&r1=1733389&r2=1733390&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
Wed Mar 2 23:13:25 2016
@@ -76,4 +76,21 @@ public class TestOpenSSLCipherConfigurat
Assert.assertEquals(expected, result);
}
+
+@Test
+public void testCustomOrdering() throws Exception {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=59081
+LinkedHashSet result = OpenSSLCipherConfigurationParser.parse(
+
"ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:" +
+"DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DES-CBC3-SHA");
+LinkedHashSet expected = new LinkedHashSet<>();
+expected.add(Cipher.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384);
+expected.add(Cipher.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA);
+expected.add(Cipher.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA);
+expected.add(Cipher.TLS_DHE_RSA_WITH_AES_256_CBC_SHA);
+expected.add(Cipher.TLS_DHE_RSA_WITH_AES_128_CBC_SHA);
+expected.add(Cipher.TLS_RSA_WITH_3DES_EDE_CBC_SHA);
+
+Assert.assertEquals(expected.toString(), result.toString());
+}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1733390&r1=1733389&r2=1733390&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 2 23:13:25 2016
@@ -168,6 +168,10 @@
Align cipher aliases for kECDHE and ECDHE
with
the current OpenSSL implementation. (markt)
+
+59081: Retain the user defined cipher order when defining
+ciphers. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1733390 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/openssl/ciphers/ test/org/apache/tomcat/util/net/openssl/ciphers/ webapps/docs/
On 02/03/2016 23:13, ma...@apache.org wrote:
> Author: markt
> Date: Wed Mar 2 23:13:25 2016
> New Revision: 1733390
>
> URL: http://svn.apache.org/viewvc?rev=1733390&view=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59081
> Retain the user defined cipher order when defining ciphers
Note: This works for 1.0.2 but I am currently seeing test failures with
OpenSSL master. I'm working on a fix but expect Gump to complain about
some of the Cipher tests until I'm done.
Mark
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
>
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
>
> tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java?rev=1733390&r1=1733389&r2=1733390&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java Wed Mar 2
> 23:13:25 2016
> @@ -70,8 +70,8 @@ public abstract class SSLUtilBase implem
> // can be done at this point.
> enabled.addAll(configured);
> } else {
> -enabled.addAll(implemented);
> -enabled.retainAll(configured);
> +enabled.addAll(configured);
> +enabled.retainAll(implemented);
>
> if (enabled.isEmpty()) {
> // Don't use the defaults in this case. They may be less
> secure
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1733390&r1=1733389&r2=1733390&view=diff
> ==
> ---
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> (original)
> +++
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> Wed Mar 2 23:13:25 2016
> @@ -695,7 +695,7 @@ public class OpenSSLCipherConfigurationP
> }
> }
> ciphers.removeAll(removedCiphers);
> -return defaultSort(ciphers);
> +return ciphers;
> }
>
> public static List convertForJSSE(Collection ciphers) {
>
> Modified:
> tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java?rev=1733390&r1=1733389&r2=1733390&view=diff
> ==
> ---
> tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
> (original)
> +++
> tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
> Wed Mar 2 23:13:25 2016
> @@ -76,4 +76,21 @@ public class TestOpenSSLCipherConfigurat
>
> Assert.assertEquals(expected, result);
> }
> +
> +@Test
> +public void testCustomOrdering() throws Exception {
> +// https://bz.apache.org/bugzilla/show_bug.cgi?id=59081
> +LinkedHashSet result =
> OpenSSLCipherConfigurationParser.parse(
> +
> "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:" +
> +"DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DES-CBC3-SHA");
> +LinkedHashSet expected = new LinkedHashSet<>();
> +expected.add(Cipher.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384);
> +expected.add(Cipher.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA);
> +expected.add(Cipher.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA);
> +expected.add(Cipher.TLS_DHE_RSA_WITH_AES_256_CBC_SHA);
> +expected.add(Cipher.TLS_DHE_RSA_WITH_AES_128_CBC_SHA);
> +expected.add(Cipher.TLS_RSA_WITH_3DES_EDE_CBC_SHA);
> +
> +Assert.assertEquals(expected.toString(), result.toString());
> +}
> }
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1733390&r1=1733389&r2=1733390&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 2 23:13:25 2016
> @@ -168,6 +168,10 @@
> Align cipher aliases for kECDHE and ECDHE
> with
> the current OpenSSL implementation. (markt)
>
svn commit: r1733394 - in /tomcat/trunk: java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigur
Author: markt
Date: Thu Mar 3 00:22:52 2016
New Revision: 1733394
URL: http://svn.apache.org/viewvc?rev=1733394&view=rev
Log:
Fix ordering exposed by latest changes with OpenSSL master
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1733394&r1=1733393&r2=1733394&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
Thu Mar 3 00:22:52 2016
@@ -560,17 +560,22 @@ public class OpenSSLCipherConfigurationP
*/
static LinkedHashSet defaultSort(final LinkedHashSet
ciphers) {
final LinkedHashSet result = new
LinkedHashSet<>(ciphers.size());
-/* Now arrange all ciphers by preference: */
+final LinkedHashSet ecdh = new LinkedHashSet<>(ciphers.size());
/* Everything else being equal, prefer ephemeral ECDH over other key
exchange mechanisms */
-result.addAll(filterByKeyExchange(ciphers,
Collections.singleton(KeyExchange.EECDH)));
+ecdh.addAll(filterByKeyExchange(ciphers,
Collections.singleton(KeyExchange.EECDH)));
+
/* AES is our preferred symmetric cipher */
Set aes = new HashSet<>(Arrays.asList(Encryption.AES128,
Encryption.AES128CCM,
Encryption.AES128CCM8, Encryption.AES128GCM, Encryption.AES256,
Encryption.AES256CCM, Encryption.AES256CCM8,
Encryption.AES256GCM));
-moveToStart(result, filterByEncryption(result, aes));
+
+/* Now arrange all ciphers by preference: */
+result.addAll(filterByEncryption(ecdh, aes));
result.addAll(filterByEncryption(ciphers, aes));
-/* Temporarily enable everything else for sorting */
+
+/* Add everything else */
+result.addAll(ecdh);
result.addAll(ciphers);
/* Low priority for MD5 */
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java?rev=1733394&r1=1733393&r2=1733394&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
Thu Mar 3 00:22:52 2016
@@ -67,6 +67,23 @@ public class TestOpenSSLCipherConfigurat
}
@Test
+public void testDefaultSort03() throws Exception {
+// Reproducing a failure observed on Gump with OpenSSL 1.1.x
+
+// AES should beat CAMELLIA
+LinkedHashSet input = new LinkedHashSet<>();
+input.add(Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384);
+input.add(Cipher.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384);
+LinkedHashSet result =
OpenSSLCipherConfigurationParser.defaultSort(input);
+
+LinkedHashSet expected = new LinkedHashSet<>();
+expected.add(Cipher.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384);
+expected.add(Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384);
+
+Assert.assertEquals(expected.toString(), result.toString());
+}
+
+@Test
public void testRename01() throws Exception {
// EDH -> DHE
LinkedHashSet result =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (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-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 runs. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 1 sec 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160303-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160303/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160303-native-src.tar.gz -Dtest.temp=out put/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160303/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/worksp
[GUMP@vmgump]: Project tomcat-trunk-test-nio (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-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 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-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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 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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 54 mins 30 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160303-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.t est.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160303/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/o
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (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-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.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 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. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 4 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160303-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.open ssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160303/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspa
