[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-apr (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.x-test-apr 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 Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.5.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-apr/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-apr.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 mins 17 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20180913/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.p
 ath=/srv/gump/public/workspace/openssl-1.0.2/dest-20180913/bin/openssl 
-Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 

[Bug 62705] tomcat 8.5.33+ requires jdk 9

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62705

Brett Sutton  changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED

--- Comment #5 from Brett Sutton  ---
Just for others.

The problem was that I had hand installed ant into my user account but when the
build tools ran they ran as sudo which didn't have the ant environment vars
pointing at the wrong version.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio2 (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.x-test-nio2 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 Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.5.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 mins
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20180913/bin/openssl
 -Dexe
 cute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 

[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.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 Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.5.x-test-nio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 mins 10 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20180913/bin/openssl
 -Dexecu
 te.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 

[Bug 62705] tomcat 8.5.33+ requires jdk 9

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62705

--- Comment #4 from Brett Sutton  ---
apologies, looks like ti was a path issue.

I've re-ran the code and yes it does compile with ant 1.10.5 and jdk 8.

So closing this one out.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62674] org.apache.jasper.JspC no longer compiles

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62674

--- Comment #7 from Paul  ---
Created attachment 36148
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36148=edit
output of 'ant -d'

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62674] org.apache.jasper.JspC no longer compiles

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62674

--- Comment #6 from Paul  ---
Created attachment 36147
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36147=edit
output of 'strace ant'

-- 
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: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Mark Thomas
On 12/09/18 22:20, Mark Thomas wrote:



> I tend to lean more
> towards trying to speed up start/stop as a way to reduce the test time
> as we do that so many times.

With this in mind and with the help of YourKit's Java Profiler I bring
you a 20% reduce in unit test run time :)

I'm still looking at the profiler results. I doubt I'll find anything as
good but I'll keep looking for a little while.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840768 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 22:08:20 2018
New Revision: 1840768

URL: http://svn.apache.org/viewvc?rev=1840768=rev
Log:
Minor performance tweak.
Don't create an Exception (with an expensive to populate stack trace) unless we 
have to.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 22:08:20 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1840767 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 22:08:04 2018
New Revision: 1840767

URL: http://svn.apache.org/viewvc?rev=1840767=rev
Log:
Reduce unit test run time by ~20%

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 22:08:04 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1840766 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 22:07:34 2018
New Revision: 1840766

URL: http://svn.apache.org/viewvc?rev=1840766=rev
Log:
Minor performance tweak.
Don't create an Exception (with an expensive to populate stack trace) unless we 
have to.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 22:07:34 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840765 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 22:07:10 2018
New Revision: 1840765

URL: http://svn.apache.org/viewvc?rev=1840765=rev
Log:
Reduce unit test run time by ~20%

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 22:07:10 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840764 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 22:06:42 2018
New Revision: 1840764

URL: http://svn.apache.org/viewvc?rev=1840764=rev
Log:
Minor performance tweak.
Don't create an Exception (with an expensive to populate stack trace) unless we 
have to.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1840764=1840763=1840764=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Sep 12 
22:06:42 2018
@@ -944,18 +944,21 @@ public abstract class ContainerBase exte
 results.add(startStopExecutor.submit(new StartChild(children[i])));
 }
 
-MultiThrowable multiThrowable = new MultiThrowable();
+MultiThrowable multiThrowable = null;
 
 for (Future result : results) {
 try {
 result.get();
 } catch (Throwable e) {
 log.error(sm.getString("containerBase.threadedStartFailed"), 
e);
+if (multiThrowable == null) {
+multiThrowable = new MultiThrowable();
+}
 multiThrowable.add(e);
 }
 
 }
-if (multiThrowable.size() > 0) {
+if (multiThrowable != null) {
 throw new 
LifecycleException(sm.getString("containerBase.threadedStartFailed"),
 multiThrowable.getThrowable());
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840763 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 22:05:50 2018
New Revision: 1840763

URL: http://svn.apache.org/viewvc?rev=1840763=rev
Log:
Reduce unit test run time by ~20%

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1840763=1840762=1840763=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Wed Sep 
12 22:05:50 2018
@@ -915,8 +915,8 @@ public abstract class AbstractEndpoint acceptor : acceptors) {
 while (waitLeft > 0 &&
 acceptor.getState() == AcceptorState.RUNNING) {
-Thread.sleep(50);
-waitLeft -= 50;
+Thread.sleep(5);
+waitLeft -= 5;
 }
 }
 } catch(Throwable t) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] tomcat issue #121: restart.bat

2018-09-12 Thread kkolinko
Github user kkolinko commented on the issue:

https://github.com/apache/tomcat/pull/121
  
1. This does not conform to code style. The "echo off" command and license 
header are missing.
2. This approach is naive and does not work. The "shutdown.bat" script does 
not stop Tomcat! It just commands Tomcat to stop. The shutting down may take 
some time.
3. A rather rare use case.
If one is developing, I think an IDE should know how restart Tomcat (e.g. 
Eclipse IDE knows how to do it and how to stop Tomcat process forcefully if it 
does not shut down in time). 

Thus I am -1 on merging this.

4. IMHO, the proper place to file enhancement requests is Bugzilla, so that 
they can be referenced in changelog.


---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Mark Thomas
On 12/09/18 17:25, Christopher Schultz wrote:
> Mark,
> On 9/12/18 7:12 AM, Mark Thomas wrote:



>> Testing all 12 combinations (4 OpenSSL * 3 Tomcat) seems like
>> overkill.
> 
> I would propose building+testing against both 1.0.2 (LTS) and 1.1.1
> (LTS) but leaving 1.1.0 and master out of the automated builds.
> Certainly, both 1.1.0 and master should be testable, but I don't think
> automated testing should be necessary.

Testing with master has given us a heads up when OpenSSL adds new
ciphers and/or disables old ciphers so we can update what is effectively
our port of the OpenSSL cipher configuration string parsing code and
ensure that - as far as we can - we keep out code consistent with OpenSSL.

> Ideally, Tomcat itself should not need testing with tcnative *at all*.

Ideally, I agree. But the two are tightly coupled so that would be hard
to achieve. Maybe with Native 2.0...

> The testing of tcnative *itself* should be able to determine whether
> various combinations of tcnative+OpenSSL x.y.z will work together. A
> smoke-test that tcnative continues to work with both the APR and
> NIO/NIO2 connectors should be sufficient in most cases. This may not
> be possible given our current set of unit tests for tcnative.

The current unit tests are, um, 'minimal' (and imported from Tomcat) so
I'd have to say "may not be possible" is putting a very positive spin on
it ;)

> (I'm always irritated whenever every. Single. Unit. Test. must be run
> against all connector types even when the connector-type should have
> zero impact on the test.)

I hear you. No solution jumps to mind. Any ideas? I tend to lean more
towards trying to speed up start/stop as a way to reduce the test time
as we do that so many times.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62676] Documentation of CORS Filter is now misleading

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62676

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 OS||All
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Thanks for the report. I've added some additional wording to the docs.

Fixed in:
- trunk for 9.0.13 onwards
- 8.5.x for 8.5.35 onwards
- 7.0.x for 7.0.91 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: r1840761 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/filter.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 21:04:24 2018
New Revision: 1840761

URL: http://svn.apache.org/viewvc?rev=1840761=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62676
Expand the CORS filter documentation to make it clear that explicit 
configuration is required to enable support for cross-origin requests.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 21:04:24 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1840760 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/filter.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 21:02:46 2018
New Revision: 1840760

URL: http://svn.apache.org/viewvc?rev=1840760=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62676
Expand the CORS filter documentation to make it clear that explicit 
configuration is required to enable support for cross-origin requests.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/filter.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 21:02:46 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840759 - in /tomcat/trunk/webapps/docs: changelog.xml config/filter.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 21:02:16 2018
New Revision: 1840759

URL: http://svn.apache.org/viewvc?rev=1840759=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62676
Expand the CORS filter documentation to make it clear that explicit 
configuration is required to enable support for cross-origin requests.

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/filter.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840759=1840758=1840759=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 12 21:02:16 2018
@@ -76,6 +76,11 @@
 62712: Correct NPE in Manager application when attempting to
 view configured certificates for an APR/native TLS connector. (markt)
   
+  
+62676: Expand the CORS filter documentation to make it clear
+that explicit configuration is required to enable support for
+cross-origin requests. (markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1840759=1840758=1840759=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Wed Sep 12 21:02:16 2018
@@ -116,6 +116,15 @@
   CorsFilter
   /*
 ]]>
+The above configuration enables the filter but does not relax the
+cross-origin policy. As a minimum, you will need to add a
+cors.allowed.origins initialisation parameter as described
+below to enable cross-origin requests. Depending on your requirements, you
+may need to provide additional configuration.
+An instance of this filter can only implement one policy. If you want to
+apply different policies (e.g. different allowed origins) to different URLs
+or sets of URLs within your web application you will need to configure a
+separate instance of this filter for each policy you wish to configure.
   
   
 The filter class name for the CORS Filter is



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: JDBC drivers in WEB-INF/lib

2018-09-12 Thread Michael Osipov

Am 2018-09-11 um 23:53 schrieb Christopher Schultz:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Michael,

On 9/11/18 3:33 PM, Michael Osipov wrote:

in bug 62670 [1] -- contrary to my statement -- Mark pointed out
that is it pefectly legal to have a JDBC driver in WEB-INF/lib.
While I was living for years with the assumption that this is
discouraged because the DriverManager is VM wide and not
classloader-wide, plus numerous SO questions have been asked about
this.


Most answers are based upon speculation and age-old wisdom about
decades-old versions of Tomcat. Most of those questions haven't been
answered by anyone who actually knows the answers.


While reading [2] it is still not clear why this is a perfectly
legal case.


Putting a JDBC library into WEB-INF/lib is a supported use-case in
Tomcat, full stop. That's why it's a legal case: simply because we say
it is.


How can we improve the docs to make it crystal clear for users
under which circumstances a driver is valid in WEB-INF/lib?


I can't imagine a case where it should *not* be valid.

The documentation[2] simply says that the application won't be able to
rely on auto-registration of JDBC drivers (which has, in my
experience, always been flaky anyway) and you'll have to go back to
the practice of calling Class.forName(driverName) and possibly calling
newInstance() on the Class object, just like it was still 1995.

I haven't checked, but presumably both of the JDBC pools shipped with
Tomcat perform this operation for you, so you don't have to have a
ServletContextListener that does it, but you will want to take care to
de-register your JDBC driver when your application shuts-down, or you
will have a ClassLoader-pinning leak (DriverManager[app CL] -> JDBC
Driver Class [webapp CL] -> webapp CL -> all classes loaded for the
webapp).

There are some drivers (notably MySQL's Connector/J) that are
notoriously difficult to kill because they are written by people who
don't understand why drivers would ever have to be removed from
memory, but that's a different problem.

At $work, we still use CATALINA_BASE/lib for out JDBC drivers, but
that's simply due to historical deployment strategy.

- -chris

References left in-tact:

[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=62670#c2 [2]
http://tomcat.apache.org/tomcat-9.0-doc/jndi-datasource-examples-howto

.html


Thank you very much for your elaboration. I will keep this as a 
reference. It still makes sense to put the driver into CATALINA_HOME/lib 
if you multiple apps running with the same database type.


Regards,

Michael

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.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.5.x-test-nio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 8 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20180912/bin/openssl
 -Dexecu
 te.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 
ild/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util-scan.jar:/srv/gump/public

[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-apr (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.x-test-apr 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.5.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-APR
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/logs-APR]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-apr/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-apr.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 7 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20180912/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.p
 ath=/srv/gump/public/workspace/openssl-1.0.2/dest-20180912/bin/openssl 
-Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 
ild/lib/tomcat-util.jar:/srv/gump/public

buildbot success in on tomcat-trunk

2018-09-12 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3578

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1840747
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



[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio2 (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.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.5.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO2
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO2]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 7 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20180912/bin/openssl
 -Dexe
 cute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 
ild/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util-scan.jar:/srv/gump

[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-bio (in module tomcat-8.5.x) failed

2018-09-12 Thread Bill Barker
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.5.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.5.x-test-bio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-BIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/logs-BIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-BIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-BIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-bio/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-bio.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 7 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-BIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20180912/bin/openssl
 -Dexec
 ute.test.bio=true -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 
ild/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util-scan.jar:/srv/gump/public

[Bug 62713] caching of classes/statics doesn't work

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62713

Mark Thomas  changed:

   What|Removed |Added

 OS||All
 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Caching has to be per JSP / tag file as each can have a different set of
imports.

The look-ups that Tomcat is performing are those required by the spec. The
additions in the EL 3.0 spec have significantly added to the overhead
associated with using EL in some scenarios. 

There is an optimisation in 8.5.33 that might help. It depends on the type of
expressions that are being used.

With a concrete, real-world example of a poorly performing JSP we can look to
see what further optimisations might be possible although the code is already
heavily optimised.

Generally, the users mailing list is the place to start when facing a
performance issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

--- Comment #6 from Michael Osipov  ---
(In reply to Mark Thomas from comment #5)
> Thanks for the report.
> 
> Fixed in:
> - trunk for 9.0.13 onwards
> - 8.5.x for 8.5.35 onwards

Charming, thanks!

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #5 from Mark Thomas  ---
Thanks for the report.

Fixed in:
- trunk for 9.0.13 onwards
- 8.5.x for 8.5.35 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: r1840748 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 19:48:31 2018
New Revision: 1840748

URL: http://svn.apache.org/viewvc?rev=1840748=rev
Log:
Additional fix for BZ 62712

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 19:48:31 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840747 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 19:47:54 2018
New Revision: 1840747

URL: http://svn.apache.org/viewvc?rev=1840747=rev
Log:
Additional fix for BZ 62712

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1840747=1840746=1840747=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Sep 
12 19:47:54 2018
@@ -1857,17 +1857,22 @@ public class ManagerServlet extends Http
 for (SSLHostConfig sslHostConfig : sslHostConfigs) {
 String name = connector.toString() + "-" + 
sslHostConfig.getHostName();
 List certList = new ArrayList<>();
-SSLContext sslContext =
-
sslHostConfig.getCertificates().iterator().next().getSslContext();
-X509Certificate[] certs = sslContext.getAcceptedIssuers();
-if (certs == null) {
-
certList.add(sm.getString("managerServlet.certsNotAvailable"));
-} else if (certs.length == 0) {
-
certList.add(sm.getString("managerServlet.trustedCertsNotConfigured"));
-} else {
-for (Certificate cert : certs) {
-certList.add(cert.toString());
+if (sslHostConfig.getOpenSslContext().longValue() == 0) {
+// Not set. Must be JSSE based.
+SSLContext sslContext =
+
sslHostConfig.getCertificates().iterator().next().getSslContext();
+X509Certificate[] certs = 
sslContext.getAcceptedIssuers();
+if (certs == null) {
+
certList.add(sm.getString("managerServlet.certsNotAvailable"));
+} else if (certs.length == 0) {
+
certList.add(sm.getString("managerServlet.trustedCertsNotConfigured"));
+} else {
+for (Certificate cert : certs) {
+certList.add(cert.toString());
+}
 }
+} else {
+
certList.add(sm.getString("managerServlet.certsNotAvailable"));
 }
 result.put(name, certList);
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

--- Comment #4 from Mark Thomas  ---
No need. I'll have it patched shortly.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

--- Comment #3 from Michael Osipov  ---
The same issue applies to the button below the one mentioned. Shall I spawn a
new ticket for that?

-- 
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



buildbot failure in on tomcat-trunk

2018-09-12 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3577

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1840737
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840738 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 18:50:23 2018
New Revision: 1840738

URL: http://svn.apache.org/viewvc?rev=1840738=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62712
Correct NPE in Manager application when attempting to view configured 
certificates for an APR/native TLS connector.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 18:50:23 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840737 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 18:49:31 2018
New Revision: 1840737

URL: http://svn.apache.org/viewvc?rev=1840737=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62712
Correct NPE in Manager application when attempting to view configured 
certificates for an APR/native TLS connector.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1840737=1840736=1840737=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Sep 
12 18:49:31 2018
@@ -1806,25 +1806,33 @@ public class ManagerServlet extends Http
 if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 SSLHostConfig[] sslHostConfigs = 
connector.getProtocolHandler().findSslHostConfigs();
 for (SSLHostConfig sslHostConfig : sslHostConfigs) {
-Set sslHostConfigCerts =
-sslHostConfig.getCertificates();
-for (SSLHostConfigCertificate sslHostConfigCert : 
sslHostConfigCerts) {
-String name = connector.toString() + "-" + 
sslHostConfig.getHostName() +
-"-" + sslHostConfigCert.getType();
-List certList = new ArrayList<>();
-SSLContext sslContext = 
sslHostConfigCert.getSslContext();
-String alias = 
sslHostConfigCert.getCertificateKeyAlias();
-if (alias == null) {
-alias = "tomcat";
-}
-X509Certificate[] certs = 
sslContext.getCertificateChain(alias);
-if (certs == null) {
-
certList.add(sm.getString("managerServlet.certsNotAvailable"));
-} else {
-for (Certificate cert : certs) {
-certList.add(cert.toString());
+if (sslHostConfig.getOpenSslContext().longValue() == 0) {
+// Not set. Must be JSSE based.
+Set sslHostConfigCerts =
+sslHostConfig.getCertificates();
+for (SSLHostConfigCertificate sslHostConfigCert : 
sslHostConfigCerts) {
+String name = connector.toString() + "-" + 
sslHostConfig.getHostName() +
+"-" + sslHostConfigCert.getType();
+List certList = new ArrayList<>();
+SSLContext sslContext = 
sslHostConfigCert.getSslContext();
+String alias = 
sslHostConfigCert.getCertificateKeyAlias();
+if (alias == null) {
+alias = "tomcat";
 }
+X509Certificate[] certs = 
sslContext.getCertificateChain(alias);
+if (certs == null) {
+
certList.add(sm.getString("managerServlet.certsNotAvailable"));
+} else {
+for (Certificate cert : certs) {
+certList.add(cert.toString());
+}
+}
+result.put(name, certList);
 }
+} else {
+List certList = new ArrayList<>();
+
certList.add(sm.getString("managerServlet.certsNotAvailable"));
+String name = connector.toString() + "-" + 
sslHostConfig.getHostName();
 result.put(name, certList);
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840737=1840736=1840737=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 12 18:49:31 2018
@@ -70,6 +70,14 @@
   
 
   
+  
+
+  
+62712: Correct NPE in Manager application when attempting to
+view configured certificates for an APR/native TLS connector. (markt)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] tomcat issue #121: restart.bat

2018-09-12 Thread akag98
Github user akag98 commented on the issue:

https://github.com/apache/tomcat/pull/121
  
Thanks @isapir for your review.
I will surely look into that.
Thanks :)



---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

--- Comment #2 from Mark Thomas  ---
It is the APR connector it doesn't like. Neither NIO+JSSE and NIO+OpenSSL
trigger an NPE in this case. It happens in 9.0.x as well. Investigating...

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62713] New: caching of classes/statics doesn't work

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62713

Bug ID: 62713
   Summary: caching of classes/statics doesn't work
   Product: Tomcat 8
   Version: 8.5.32
  Hardware: PC
Status: NEW
  Severity: critical
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: eseve...@novomind.com
  Target Milestone: 

The method resolveClass of class ImportHandler uses a cache named "clazzes".
This cache is useless since during every jsp evaluation a bunch of instances of
class ImportHandler were created and every instance has its own cache.

The result is that on all our live shop systems with tomcat 8 (e-commerce
applications) we see blocked threads due to concurrent calls to class loader
getResource.


   java.lang.Thread.State: BLOCKED (on object monitor)
at java.util.zip.ZipFile.getEntry(ZipFile.java:314)
- waiting to lock <0x0003ee5ab130> (a java.util.jar.JarFile)
at java.util.jar.JarFile.getEntry(JarFile.java:240)
at java.util.jar.JarFile.getJarEntry(JarFile.java:223)
at
org.apache.catalina.webresources.AbstractSingleArchiveResourceSet.getArchiveEntry(AbstractSingleArchiveResourceSet.java:97)
at
org.apache.catalina.webresources.AbstractArchiveResourceSet.getResource(AbstractArchiveResourceSet.java:272)
at
org.apache.catalina.webresources.StandardRoot.getResourceInternal(StandardRoot.java:281)
at org.apache.catalina.webresources.Cache.getResource(Cache.java:62)
at
org.apache.catalina.webresources.StandardRoot.getResource(StandardRoot.java:216)
at
org.apache.catalina.webresources.StandardRoot.getClassLoaderResource(StandardRoot.java:225)
at
org.apache.catalina.loader.WebappClassLoaderBase.findResource(WebappClassLoaderBase.java:902)
at
org.apache.catalina.loader.WebappClassLoaderBase.getResource(WebappClassLoaderBase.java:1023)
at javax.el.ImportHandler.findClass(ImportHandler.java:202)
at javax.el.ImportHandler.resolveClass(ImportHandler.java:164)
at
javax.servlet.jsp.el.ScopedAttributeELResolver.getValue(ScopedAttributeELResolver.java:85)
at
org.apache.jasper.el.JasperELResolver.getValue(JasperELResolver.java:110)
at org.apache.el.parser.AstIdentifier.getValue(AstIdentifier.java:94)
at org.apache.el.parser.AstValue.getValue(AstValue.java:137)
at
org.apache.el.ValueExpressionImpl.getValue(ValueExpressionImpl.java:190)
at
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:944)

simple example to show the wrong behaviour:

use a local tomcat and a single jsp containing an undefined expression, e.g.:
${a.b}

At every execution of this jsp the ImportHandler tries to find a class named
"a" with the resource loader and the cache is empty.

-- 
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: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 9/12/18 7:12 AM, Mark Thomas wrote:
> All,
> 
> Gump currently tests 7.0.x, 8.5.x and 9.0.x
> 
> Support for OpenSSL cipher names is available in 8.5.x onwards and
> we have various unit tests to ensure that our parsing code remains
> in sync with OpenSSL. All versions have TLS unit tests that check
> the APR/Native connector is working as expected.
> 
> OpenSSL currently has the following four active development
> branches: Master (a.k.a. 1.1.2-dev) 1.1.1  (LTS supported until at
> least 2018-09-11 1.1.0  (supported until 2019-09-11) 1.0.2  (LTS
> supported until 2019-12-31)
> 
> Gump currently builds OpenSSL master and 1.0.2
> 
> 
> Tomcat Native has two branches 1.2.x and 1.1.x. 1.1.x will reach
> EOL at the end of this month.
> 
> Gump currently builds Native 1.1.x with OpenSSL 1.0.2 Native 1.2.x
> with OpenSSL 1.0.2 Native 1.2.x with OpenSSL master
> 
> 
> Gump then tests 9.0.x with Native 1.2.x/OpenSSL master 8.5.x with
> Native 1.2.x/OpenSSL 1.0.2 7.0.x with Native 1.2.x/OpenSSL 1.0.2
> 
> 
> We currently are only testing 3 out of a possible 24 combinations.
> If we ignore Native 1.1.x then that becomes 3 out of a possible 12
> combinations.
> 
> Do we want to change / increase / decrease the combinations we
> test?
> 
> As a starting point for discussion how about: - Build all current
> OpenSSL versions (currently 4) - Build Tomcat Native 1.2.x for each
> OpenSSL version (i.e. 4) - No Tomcat Native 1.1.x builds - Test
> 9.0.x with all Native/OpenSSL combinations (i.e. 4) - Test 8.5.x
> with Native/OpenSSL 1.1.1 (latest LTS) - Test 7.0.x with
> Native/OpenSSL 1.0.2 (other LTS)
> 
> Testing all 12 combinations (4 OpenSSL * 3 Tomcat) seems like
> overkill.

I would propose building+testing against both 1.0.2 (LTS) and 1.1.1
(LTS) but leaving 1.1.0 and master out of the automated builds.
Certainly, both 1.1.0 and master should be testable, but I don't think
automated testing should be necessary.

Ideally, Tomcat itself should not need testing with tcnative *at all*.
The testing of tcnative *itself* should be able to determine whether
various combinations of tcnative+OpenSSL x.y.z will work together. A
smoke-test that tcnative continues to work with both the APR and
NIO/NIO2 connectors should be sufficient in most cases. This may not
be possible given our current set of unit tests for tcnative.

(I'm always irritated whenever every. Single. Unit. Test. must be run
against all connector types even when the connector-type should have
zero impact on the test.)

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAluZPesACgkQHPApP6U8
pFiLnxAAlY3m7YcCE8zDxbfvFDBx6uXcixroQSSukdJL84upPXeVrclf+3U29qR9
SaMh5aNtoQUT1A63PToBySGvojnHYf0t27pYwU0dF1B96fI/tlLX1P7Ka9DPsUu9
pQ09FNzjnQUNhkB0f3Azj2FClK8ikmjLZEOhZJ/5tDh8ejd1un3m2ySQzhNAszZp
Mck+ECzx0k1fHd3DAsC42p1/DsNN9V8Hw34PlQ+thO1YSvtWsO6hP/rfE72hxRIY
NCAK1DU2qjEV3Tr5kn554+OXYdNMWnD4M144sqNDp8WD3A860wnvNHaBWdaKHn6J
KlEnPYxr1UKneXEYtv1F7r2NUAOc8OCsWn+NdOJCY36No/IednWAbnN/5IZaQrcT
rseQfxbq0X+tkQQqcuLFKZw+hlVdTC5Qy8RhQATSZBb8f4jddHX2BCib1sOmDivv
R+C5YR3JNNE1GISWOOu0Xsl8Q0DbMNWJhdn9ur1XxQPbcuLx7Jfnesgjo1vCayKv
Cw9b00Hs4tVm6VmmMfjLSg5nBNvgdZbUnoaR34ukwBvFuinErChrSuMXf7farvA3
LhT13qHfEdzKfp2IytCsugLdLrlth8BjnA/IYSQDNuHwVdazx0k9V+YrCEErd98V
gNd3Jae9yHFHIuMMHk2yAlLF7CAU34+iIOIfACJ4rVlXXO4g73U=
=G4R5
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Mark Thomas
On 12/09/18 15:57, Rainer Jung wrote:
> Am 12.09.2018 um 13:12 schrieb Mark Thomas:
>> Gump currently tests 7.0.x, 8.5.x and 9.0.x
>>
>> Support for OpenSSL cipher names is available in 8.5.x onwards and we
>> have various unit tests to ensure that our parsing code remains in sync
>> with OpenSSL.
>> All versions have TLS unit tests that check the APR/Native connector is
>> working as expected.
>>
>> OpenSSL currently has the following four active development branches:
>> Master (a.k.a. 1.1.2-dev)
>> 1.1.1  (LTS supported until at least 2018-09-11
>> 1.1.0  (supported until 2019-09-11)
>> 1.0.2  (LTS supported until 2019-12-31)
>>
>> Gump currently builds OpenSSL master and 1.0.2
>>
>>
>> Tomcat Native has two branches 1.2.x and 1.1.x.
>> 1.1.x will reach EOL at the end of this month.
>>
>> Gump currently builds
>> Native 1.1.x with OpenSSL 1.0.2
>> Native 1.2.x with OpenSSL 1.0.2
>> Native 1.2.x with OpenSSL master
>>
>>
>> Gump then tests
>> 9.0.x with Native 1.2.x/OpenSSL master
>> 8.5.x with Native 1.2.x/OpenSSL 1.0.2
>> 7.0.x with Native 1.2.x/OpenSSL 1.0.2
>>
>>
>> We currently are only testing 3 out of a possible 24 combinations. If we
>> ignore Native 1.1.x then that becomes 3 out of a possible 12
>> combinations.
>>
>> Do we want to change / increase / decrease the combinations we test?
>>
>> As a starting point for discussion how about:
>> - Build all current OpenSSL versions (currently 4)
>> - Build Tomcat Native 1.2.x for each OpenSSL version (i.e. 4)
>> - No Tomcat Native 1.1.x builds
>> - Test 9.0.x with all Native/OpenSSL combinations (i.e. 4)
>> - Test 8.5.x with Native/OpenSSL 1.1.1 (latest LTS)
>> - Test 7.0.x with Native/OpenSSL 1.0.2 (other LTS)
>>
>> Testing all 12 combinations (4 OpenSSL * 3 Tomcat) seems like overkill.
>>
>> Thoughts?
> 
> I like it. Broad coverage for our latest branch and some additional
> checks for the older branches.
> 
> A variation we could think about, is dropping OpenSSL master at least
> until that branch produces alpha releases for 1.1.2. Since 1.1.1 is now
> GA I think it will be the relevant newest version for quite some time.
> Probably master will not become relevant for us before EOL for 1.1.0.

It is almost easier to leave to master build in place.

I've added the additional OpenSSL builds for 1.1.0 and 1.1.1. I'll wait
and see what happens with those builds in the next Gump run first in
case I have missed something in setting them up.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Mark Thomas
On 12/09/18 16:47, Christopher Schultz wrote:
> Mark,
> 
> On 9/12/18 7:12 AM, Mark Thomas wrote:
>> OpenSSL currently has the following four active development
>> branches: Master (a.k.a. 1.1.2-dev) 1.1.1  (LTS supported until at
>> least 2018-09-11
> 
> A slight correction:
> 
> 1.1.1 was *initially* released 2018-09-11 with a support outlook of 5
> years, so the EOL date should be more like 2023-09-11.

ACK. I forgot to add 5.

Mark

> 
> 1.1.1 is quite important as it is the first release of OpenSSL which
> includes support for TLSv1.3. It should be drop-in replaceable for
> existing 1.1.0 environments, so you (may be able to) get TLSv1.3
> support through little to no effort.
> 
> -chris
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62674] org.apache.jasper.JspC no longer compiles

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62674

Mark Thomas  changed:

   What|Removed |Added

   Severity|blocker |major

--- Comment #5 from Mark Thomas  ---
Dropping severity back to default. This isn't going to block a release.

-- 
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: r1840716 - in /tomcat/tc8.5.x/trunk: ./ MERGE.txt

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 16:03:12 2018
New Revision: 1840716

URL: http://svn.apache.org/viewvc?rev=1840716=rev
Log:
Update DBCP merge info (no changes)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 16:03:12 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

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

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 16:02:26 2018
New Revision: 1840715

URL: http://svn.apache.org/viewvc?rev=1840715=rev
Log:
Update the internal fork of Apache Commons Pool 2 to d4e0e88 (2018-09-12) to 
pick up some clean-up.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 16:02:26 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 

svn commit: r1840713 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/codec/

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 16:01:06 2018
New Revision: 1840713

URL: http://svn.apache.org/viewvc?rev=1840713=rev
Log:
Update merge info (no changes)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/   (props changed)

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 16:01:06 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840712 - /tomcat/trunk/MERGE.txt

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 15:55:56 2018
New Revision: 1840712

URL: http://svn.apache.org/viewvc?rev=1840712=rev
Log:
Update DBCP merge info (no changes)

Modified:
tomcat/trunk/MERGE.txt

Modified: tomcat/trunk/MERGE.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1840712=1840711=1840712=diff
==
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Wed Sep 12 15:55:56 2018
@@ -69,7 +69,7 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-abc048454398d8c9924a1af9c04501817f44a11d
+171528a88cca65f5b192be643c2425458d1edfbb
 
 Pool2
 Sub-tree



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840709 - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/pool2/impl/ webapps/docs/

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 15:49:58 2018
New Revision: 1840709

URL: http://svn.apache.org/viewvc?rev=1840709=rev
Log:
Update the internal fork of Apache Commons Pool 2 to d4e0e88 (2018-09-12) to 
pick up some clean-up.

Modified:
tomcat/trunk/MERGE.txt

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/MERGE.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1840709=1840708=1840709=diff
==
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Wed Sep 12 15:49:58 2018
@@ -75,4 +75,4 @@ Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-3e02523b6907fb22f3582544fe362c785821bcb8
+d4e0e88227ad91d8c8ef36ba01d656f71c770f83

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1840709=1840708=1840709=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java 
Wed Sep 12 15:49:58 2018
@@ -217,7 +217,7 @@ public abstract class BaseGenericObjectP
 this.blockWhenExhausted = blockWhenExhausted;
 }
 
-protected void setConfig(BaseObjectPoolConfig conf) {
+protected void setConfig(final BaseObjectPoolConfig conf) {
 setLifo(conf.getLifo());
 setMaxWaitMillis(conf.getMaxWaitMillis());
 setBlockWhenExhausted(conf.getBlockWhenExhausted());
@@ -785,6 +785,12 @@ public abstract class BaseGenericObjectP
 }
 
 /**
+ * Stops the evictor.
+ */
+void stopEvitor() {
+startEvictor(-1L);
+}
+/**
  * Tries to ensure that the configured minimum number of idle instances are
  * available in the pool.
  * @throws Exception if an error occurs creating idle instances

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java?rev=1840709=1840708=1840709=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java Wed 
Sep 12 15:49:58 2018
@@ -107,23 +107,23 @@ class EvictionTimer {
 }
 
 /**
- * Thread factory that creates a thread, with the context classloader from 
this class.
+ * Thread factory that creates a thread, with the context class loader 
from this class.
  */
 private static class EvictorThreadFactory implements ThreadFactory {
 
 @Override
-public Thread newThread(final Runnable r) {
-final Thread t = new Thread(null, r, 
"commons-pool-evictor-thread");
+public Thread newThread(final Runnable runnable) {
+final Thread thread = new Thread(null, runnable, 
"commons-pool-evictor-thread");
 
 AccessController.doPrivileged(new PrivilegedAction() {
 @Override
 public Void run() {
-
t.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
+
thread.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
 return null;
 }
 });
 
-return t;
+return thread;
 }
 }
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java?rev=1840709=1840708=1840709=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java 
Wed Sep 12 15:49:58 2018
@@ -689,7 +689,7 @@ public class GenericKeyedObjectPoolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java?rev=1840709=1840708=1840709=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java 
(original)
+++ 

Re: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 9/12/18 7:12 AM, Mark Thomas wrote:
> OpenSSL currently has the following four active development
> branches: Master (a.k.a. 1.1.2-dev) 1.1.1  (LTS supported until at
> least 2018-09-11

A slight correction:

1.1.1 was *initially* released 2018-09-11 with a support outlook of 5
years, so the EOL date should be more like 2023-09-11.

1.1.1 is quite important as it is the first release of OpenSSL which
includes support for TLSv1.3. It should be drop-in replaceable for
existing 1.1.0 environments, so you (may be able to) get TLSv1.3
support through little to no effort.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAluZNRwACgkQHPApP6U8
pFgM8Q//aiijCTedd4FZ0EhQiqkYKIC+TS3j5G9RV9Twu9wuotGpVHmX9lynpj7I
UkWCDaCB/aFncPt0jrUmCpMMGicMEQqOy20+BdXPxDUfquMTvJftD9niRw45kPri
xSWTuZ/432NO5oL287mEd0Y2CvHvaORi6VhRImHcqE+fvikWQuYw4D+5NkdAGzPX
q3Y0vwLWtKYRb41riomRpcphNYpazRgSe86poO+v3WZMSQ7x21axVPOjrhIfRWUW
Gxs33GCSEmyvwo2n7Ck/lai2ZEv0kGmFG0BR7jyZuayfkO2e78pSjLQ2iu08ho7M
mZ38fQ4icwWKQycf92ozAryJUwhOLwDxmV0iIYnZojhuA9RroxqwMUok/00XDglG
YdqeqVFUylbae4FMtSaNBQJe7jGwWAejOW23jYdQ5SgD1oqmfZDBWoC6XGHmIVps
9+nmft8C3vq/3egYmH6GRv8t0y0U2EER7/89qlaveEZrRRbNrYWuIvjTq0h7o91u
yWndOIrKryaeGCD1EgAA/7qs9mEg7YejWa1pzQ//8iEPN9duv77ULdhTQ5mNGsUt
fbh//nZfftW19MyP71xTlV7ihm+hdLWLf4zHGBROz9jZw/IffRhB+eAovZ0RnxhS
nSV+MMzGY+/Wwj1Tt6EXkmCuBEtbMJDqE4bUkBZ6YX0hfEJSAcM=
=x9v1
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840707 - /tomcat/trunk/java/org/apache/tomcat/util/codec/

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 15:41:26 2018
New Revision: 1840707

URL: http://svn.apache.org/viewvc?rev=1840707=rev
Log:
Update mergeinfo (no changes)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/codec/   (props changed)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/codec/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 15:41:26 2018
@@ -1 +1 @@
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1837734
+/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1840706



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840706 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 15:38:27 2018
New Revision: 1840706

URL: http://svn.apache.org/viewvc?rev=1840706=rev
Log:
Update mergeinfo (no changes)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/   (props changed)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 15:38:27 2018
@@ -1,3 +1,3 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1837733
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1840705
 
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1747272
 /jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] tomcat issue #121: restart.bat

2018-09-12 Thread isapir
Github user isapir commented on the issue:

https://github.com/apache/tomcat/pull/121
  
While I like the idea of adding an easy way to restart, I'd prefer to add a 
switch to startup rather than add a new script just for that, e.g. `startup 
-restart` or `catalina restart`.


---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Rainer Jung

Am 12.09.2018 um 13:12 schrieb Mark Thomas:

Gump currently tests 7.0.x, 8.5.x and 9.0.x

Support for OpenSSL cipher names is available in 8.5.x onwards and we
have various unit tests to ensure that our parsing code remains in sync
with OpenSSL.
All versions have TLS unit tests that check the APR/Native connector is
working as expected.

OpenSSL currently has the following four active development branches:
Master (a.k.a. 1.1.2-dev)
1.1.1  (LTS supported until at least 2018-09-11
1.1.0  (supported until 2019-09-11)
1.0.2  (LTS supported until 2019-12-31)

Gump currently builds OpenSSL master and 1.0.2


Tomcat Native has two branches 1.2.x and 1.1.x.
1.1.x will reach EOL at the end of this month.

Gump currently builds
Native 1.1.x with OpenSSL 1.0.2
Native 1.2.x with OpenSSL 1.0.2
Native 1.2.x with OpenSSL master


Gump then tests
9.0.x with Native 1.2.x/OpenSSL master
8.5.x with Native 1.2.x/OpenSSL 1.0.2
7.0.x with Native 1.2.x/OpenSSL 1.0.2


We currently are only testing 3 out of a possible 24 combinations. If we
ignore Native 1.1.x then that becomes 3 out of a possible 12 combinations.

Do we want to change / increase / decrease the combinations we test?

As a starting point for discussion how about:
- Build all current OpenSSL versions (currently 4)
- Build Tomcat Native 1.2.x for each OpenSSL version (i.e. 4)
- No Tomcat Native 1.1.x builds
- Test 9.0.x with all Native/OpenSSL combinations (i.e. 4)
- Test 8.5.x with Native/OpenSSL 1.1.1 (latest LTS)
- Test 7.0.x with Native/OpenSSL 1.0.2 (other LTS)

Testing all 12 combinations (4 OpenSSL * 3 Tomcat) seems like overkill.

Thoughts?


I like it. Broad coverage for our latest branch and some additional 
checks for the older branches.


A variation we could think about, is dropping OpenSSL master at least 
until that branch produces alpha releases for 1.1.2. Since 1.1.1 is now 
GA I think it will be the relevant newest version for quite some time. 
Probably master will not become relevant for us before EOL for 1.1.0.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

--- Comment #1 from Michael Osipov <1983-01...@gmx.net> ---
The same happens for Trusted Certificates.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62712] New: NPE in Manager TLS connector configuration diagnostics/Certificates

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62712

Bug ID: 62712
   Summary: NPE in Manager TLS connector configuration
diagnostics/Certificates
   Product: Tomcat 8
   Version: 8.5.34
  Hardware: HP
OS: HP-UX
Status: NEW
  Severity: major
  Priority: P2
 Component: Manager
  Assignee: dev@tomcat.apache.org
  Reporter: 1983-01...@gmx.net
  Target Milestone: 

Created attachment 36146
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36146=edit
Debugging session in Eclipse

When pressing this button, I do get a NPE:

> java.lang.NullPointerException
>   
> org.apache.catalina.manager.ManagerServlet.getConnectorCerts(ManagerServlet.java:1814)
>   
> org.apache.catalina.manager.HTMLManagerServlet.sslConnectorCerts(HTMLManagerServlet.java:770)
>   
> org.apache.catalina.manager.HTMLManagerServlet.doGet(HTMLManagerServlet.java:144)
>   
> org.apache.catalina.manager.HTMLManagerServlet.doPost(HTMLManagerServlet.java:227)
>   javax.servlet.http.HttpServlet.service(HttpServlet.java:661)
>   javax.servlet.http.HttpServlet.service(HttpServlet.java:742)
>   
> org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:136)
>   org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
>   
> org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109)

My server.xml is:

>maxHttpHeaderSize="24576" maxThreads="250"
>   SSLEnabled="true" scheme="https" secure="true"
>   defaultSSLHostConfigName="@main-host@">
>  honorCipherOrder="true" 
> ciphers="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!DSS">
>certificateFile="/etc/opt/ssl/@main-host@/cert/public.pem"
>   
> certificateKeyFile="/etc/opt/ssl/@main-host@/key/private.pem"
>   certificateKeyPassword="@password@"
>   type="RSA" />
>   
>  honorCipherOrder="true" 
> ciphers="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!DSS">
>certificateFile="/etc/opt/ssl/@alias-host@/cert/public.pem"
>   
> certificateKeyFile="/etc/opt/ssl/@alias-host@/key/private.pem"
>   certificateKeyPassword="@password@"
>   type="RSA" />
>   
> 
>

Runtime config is:

> 2018-09-11T11:18:31.570 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Server version:
> Apache Tomcat/8.5.34
> 2018-09-11T11:18:31.577 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Server built:  
> Sep 4 2018 22:28:22 UTC
> 2018-09-11T11:18:31.577 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Server number: 
> 8.5.34.0
> 2018-09-11T11:18:31.578 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log OS Name:   
> HP-UX
> 2018-09-11T11:18:31.578 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log OS Version:
> B.11.31
> 2018-09-11T11:18:31.578 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Architecture:  
> IA64N
> 2018-09-11T11:18:31.578 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Java Home: 
> /opt/java8/jre
> 2018-09-11T11:18:31.579 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log JVM Version:   
> 1.8.0.14-hp-ux-b1
> 2018-09-11T11:18:31.579 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log JVM Vendor:
> Hewlett Packard Enterprise Company
> 2018-09-11T11:18:31.579 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log CATALINA_BASE: 
> /var/opt/tomcat-services
> 2018-09-11T11:18:31.580 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log CATALINA_HOME: 
> /opt/apache-tomcat-8.5.34
> 2018-09-11T11:18:31.580 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Command line argument: 
> -Djava.util.logging.config.file=/var/opt/tomcat-services/conf/logging.properties
> 2018-09-11T11:18:31.581 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Command line argument: 
> -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
> 2018-09-11T11:18:31.581 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Command line argument: 
> -Xms256M
> 2018-09-11T11:18:31.581 INFORMATION [main] 
> org.apache.catalina.startup.VersionLoggerListener.log Command line argument: 
> -Xmx512M
> 2018-09-11T11:18:31.582 INFORMATION [main] 
> 

[Bug 62685] Changes to hostname parsing in HttpParser breaks hostname with trailing dot

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62685

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Mark Thomas  ---
Many thanks for the report, the analysis and the patch.

Fixed in:
- trunk for 9.0.13 onwards
- 8.5.x for 8.5.35 onwards
- 7.0.x for 7.0.91 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: r1840691 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/changelog.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 14:18:04 2018
New Revision: 1840691

URL: http://svn.apache.org/viewvc?rev=1840691=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62685
Correct an error in host name validation parsing that did not allow a fully 
qualified domain name to terminate with a period.
Patch provided by AG.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 14:18:04 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1840690 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/changelog.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 14:15:50 2018
New Revision: 1840690

URL: http://svn.apache.org/viewvc?rev=1840690=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62685
Correct an error in host name validation parsing that did not allow a fully 
qualified domain name to terminate with a period.
Patch provided by AG.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 14:15:50 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

[GitHub] tomcat pull request #121: restart.bat

2018-09-12 Thread akag98
GitHub user akag98 opened a pull request:

https://github.com/apache/tomcat/pull/121

restart.bat

Bat file that calls shutdown.bat and then startup.bat to restart the server.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/akag98/tomcat patch-1

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/121.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #121


commit fb0c22e07acfa92b3c22942563478db02cc90e35
Author: akag98 <38176157+akag98@...>
Date:   2018-09-12T14:05:31Z

restart.bat 

Bat file that calls shutdown.bat and then startup.bat to restart the server.




---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot success in on tomcat-trunk

2018-09-12 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3574

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1840681
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



buildbot failure in on tomcat-trunk

2018-09-12 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3573

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1840674
Blamelist: remm

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840681 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/changelog.xml

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 13:15:43 2018
New Revision: 1840681

URL: http://svn.apache.org/viewvc?rev=1840681=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62685
Correct an error in host name validation parsing that did not allow a fully 
qualified domain name to terminate with a period.
Patch provided by AG.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1840681=1840680=1840681=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Wed 
Sep 12 13:15:43 2018
@@ -865,7 +865,7 @@ public class HttpParser {
 NEW( true, false, false, false, " at the start of"),
 ALPHA(   true,  true,  true,  true, " after a letter in"),
 NUMERIC( true,  true,  true,  true, " after a number in"),
-PERIOD(  true, false, false, false, " after a period in"),
+PERIOD(  true, false, false,  true, " after a period in"),
 HYPHEN(  true,  true, false, false, " after a hypen in"),
 COLON(  false, false, false, false, " after a colon in"),
 END(false, false, false, false, " at the end of");

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java?rev=1840681=1840680=1840681=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java 
Wed Sep 12 13:15:43 2018
@@ -56,7 +56,6 @@ public class TestHttpParserHost {
 result.add(new Object[] { TestType.IPv4, "0.0.0.0:8080", 
Integer.valueOf(7), null} );
 // IPv4 - invalid
 result.add(new Object[] { TestType.IPv4, ".0.0.0", 
Integer.valueOf(-1), IAE} );
-result.add(new Object[] { TestType.IPv4, "0.0.0.", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "0..0.0", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "0]", Integer.valueOf(-1), 
IAE} );
 // Domain Name - valid
@@ -126,14 +125,18 @@ public class TestHttpParserHost {
 result.add(new Object[] { TestType.IPv4, "myapp-t.my-domain.c-om", 
Integer.valueOf(-1), null} );
 result.add(new Object[] { TestType.IPv4, 
"myapp-t.my-domain.c-om:8080", Integer.valueOf(22), null} );
 result.add(new Object[] { TestType.IPv4, 
"gateway.demo-ilt-latest-demo:9000", Integer.valueOf(28), null} );
+// Domain Name with trailing dot - valid
+result.add(new Object[] { TestType.IPv4, "0.0.0.", 
Integer.valueOf(-1), null} );
+result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com.", 
Integer.valueOf(-1), null} );
+result.add(new Object[] { TestType.IPv4, "myapp-t.mydomain.com.:8080", 
Integer.valueOf(21), null} );
+result.add(new Object[] { TestType.IPv4, "foo.bar.", 
Integer.valueOf(-1), null} );
+result.add(new Object[] { TestType.IPv4, "foo.bar.:8080", 
Integer.valueOf(8), null} );
 // Domain Name - invalid
 result.add(new Object[] { TestType.IPv4, ".", Integer.valueOf(-1), 
IAE} );
 result.add(new Object[] { TestType.IPv4, ".:8080", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, ".foo.bar", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "-foo.bar", 
Integer.valueOf(-1), IAE} );
-result.add(new Object[] { TestType.IPv4, "foo.bar.", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "foo.bar-", 
Integer.valueOf(-1), IAE} );
-result.add(new Object[] { TestType.IPv4, "foo.bar.:8080", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "foo.bar-:8080", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "^foo.bar", 
Integer.valueOf(-1), IAE} );
 result.add(new Object[] { TestType.IPv4, "foo-.bar", 
Integer.valueOf(-1), IAE} );

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840681=1840680=1840681=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 12 13:15:43 2018
@@ -53,6 +53,15 @@
   
 
   
+  
+
+  
+   

svn commit: r1840674 - in /tomcat/trunk: java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java webapps/docs/changelog.xml

2018-09-12 Thread remm
Author: remm
Date: Wed Sep 12 12:59:40 2018
New Revision: 1840674

URL: http://svn.apache.org/viewvc?rev=1840674=rev
Log:
Port single DBCP commit d49d45e.

Modified:

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java?rev=1840674=1840673=1840674=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
 Wed Sep 12 12:59:40 2018
@@ -29,6 +29,7 @@ import org.apache.tomcat.dbcp.dbcp2.Conn
 import org.apache.tomcat.dbcp.dbcp2.PoolableConnection;
 import org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory;
 import org.apache.tomcat.dbcp.dbcp2.PoolingDataSource;
+import org.apache.tomcat.dbcp.dbcp2.Utils;
 
 /**
  * 
@@ -63,7 +64,7 @@ public class BasicManagedDataSource exte
 /** XA data source instance */
 private XADataSource xaDataSourceInstance;
 
-/** Transaction Manager */
+/** Transaction Synchronization Registry */
 private transient TransactionSynchronizationRegistry 
transactionSynchronizationRegistry;
 
 /**
@@ -198,7 +199,7 @@ public class BasicManagedDataSource exte
 
 // finally, create the XAConnectionFactory using the XA data source
 final XAConnectionFactory xaConnectionFactory = new 
DataSourceXAConnectionFactory(getTransactionManager(),
-xaDataSourceInstance, getUsername(), getPassword());
+xaDataSourceInstance, getUsername(), 
Utils.toCharArray(getPassword()), getTransactionSynchronizationRegistry());
 transactionRegistry = xaConnectionFactory.getTransactionRegistry();
 return xaConnectionFactory;
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840674=1840673=1840674=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 12 12:59:40 2018
@@ -61,6 +61,14 @@
   
 
   
+  
+
+  
+Port DBCP transaction synchronization registry fix
+(commit d49d45e). (remm)
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62696] Consider use of sha256 for signing of .exe files of Tomcat installer.

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62696

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #5 from Mark Thomas  ---
Request has gone in to Symantec / Digicert. I'll update this issue when I
receive a response.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62708] date of *_jsp.java and *_jsp.class always 1.1.1970

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62708

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Those timestamps are set to the timestamp of the source JSP file to aid
modification tracking. The generation time is in a comment at the top of the
.java file.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62709] out.write got inefficient with respect to newline in *_jsp.java

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62709

Ralf Hauser  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #1 from Ralf Hauser  ---
oops, seems to be the 

  mappedfile=false

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62709] New: out.write got inefficient with respect to newline in *_jsp.java

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62709

Bug ID: 62709
   Summary: out.write got inefficient with respect to newline in
*_jsp.java
   Product: Tomcat 8
   Version: 8.5.14
  Hardware: All
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: hau...@acm.org
  Target Milestone: 

Just upgraded from debian oldstable to stable (9 stretch) and seeing a lot more
often

  The code of method _jspService(HttpServletRequest, HttpServletResponse) is
exceeding the 65535 bytes limit


(despite "trimspaces" as per
https://tomcat.apache.org/tomcat-8.5-doc/jasper-howto.html#Configuration)

When looking at the newly generated *_jsp.java, they create a new

  out.write("...\n");

after each newline of the page content. With debian8, this wasn't the case.

Please amend the documentation on how to get back to the more efficient
previous state!

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62708] New: date of *_jsp.java and *_jsp.class always 1.1.1970

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62708

Bug ID: 62708
   Summary: date of *_jsp.java and *_jsp.class always 1.1.1970
   Product: Tomcat 8
   Version: 8.5.14
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: hau...@acm.org
  Target Milestone: 

Debian stable

The date of these files in the filesystem is always the same.

When suspecting a caching issue, it would be helpful to have the real date to
see how outdated a file is

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Gump, Tomcat Native, OpenSSL and Tomcat versions

2018-09-12 Thread Mark Thomas
All,

Gump currently tests 7.0.x, 8.5.x and 9.0.x

Support for OpenSSL cipher names is available in 8.5.x onwards and we
have various unit tests to ensure that our parsing code remains in sync
with OpenSSL.
All versions have TLS unit tests that check the APR/Native connector is
working as expected.

OpenSSL currently has the following four active development branches:
Master (a.k.a. 1.1.2-dev)
1.1.1  (LTS supported until at least 2018-09-11
1.1.0  (supported until 2019-09-11)
1.0.2  (LTS supported until 2019-12-31)

Gump currently builds OpenSSL master and 1.0.2


Tomcat Native has two branches 1.2.x and 1.1.x.
1.1.x will reach EOL at the end of this month.

Gump currently builds
Native 1.1.x with OpenSSL 1.0.2
Native 1.2.x with OpenSSL 1.0.2
Native 1.2.x with OpenSSL master


Gump then tests
9.0.x with Native 1.2.x/OpenSSL master
8.5.x with Native 1.2.x/OpenSSL 1.0.2
7.0.x with Native 1.2.x/OpenSSL 1.0.2


We currently are only testing 3 out of a possible 24 combinations. If we
ignore Native 1.1.x then that becomes 3 out of a possible 12 combinations.

Do we want to change / increase / decrease the combinations we test?

As a starting point for discussion how about:
- Build all current OpenSSL versions (currently 4)
- Build Tomcat Native 1.2.x for each OpenSSL version (i.e. 4)
- No Tomcat Native 1.1.x builds
- Test 9.0.x with all Native/OpenSSL combinations (i.e. 4)
- Test 8.5.x with Native/OpenSSL 1.1.1 (latest LTS)
- Test 7.0.x with Native/OpenSSL 1.0.2 (other LTS)

Testing all 12 combinations (4 OpenSSL * 3 Tomcat) seems like overkill.

Thoughts?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840656 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 10:46:23 2018
New Revision: 1840656

URL: http://svn.apache.org/viewvc?rev=1840656=rev
Log:
OpenSSL master has bumped version number. Need to take account of this in 
version detection used in unit tests.
1.0.1 is no longer supported.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 12 10:46:23 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1840655 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 10:42:22 2018
New Revision: 1840655

URL: http://svn.apache.org/viewvc?rev=1840655=rev
Log:
Update OpenSSL support dates
Remove 1.0.1 related code as it is no longer supported.

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=1840655=1840654=1840655=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 Sep 12 10:42:22 2018
@@ -57,16 +57,14 @@ public class TesterOpenSSL {
 // Supported until at least 2023-09-11
 VERSION = 10101;
 } else if (versionString.startsWith("OpenSSL 1.1.0")) {
-// Support ends 2018-04-30
+// Support ends 2019-09-11
 VERSION = 10100;
 } else if (versionString.startsWith("OpenSSL 1.0.2")) {
-// Support ends 2019-12-31 (LTS)
-// Note: Gump current tests 8.0.x with OpenSSL 1.0.2
+// LTS
+// Support ends 2019-12-31
+// Note: Gump current tests 8.5.x with OpenSSL 1.0.2
 VERSION = 10002;
-} else if (versionString.startsWith("OpenSSL 1.0.1")) {
-// Support ends 2016-12-31
-VERSION = 10001;
-// Note: Release branches 1.0.0 and earlier are no longer supported by
+// Note: Release branches 1.0.1 and earlier are no longer supported by
 //   the OpenSSL team so these tests don't support them either.
 } else {
 VERSION = -1;
@@ -121,37 +119,6 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.TLS_AES_256_GCM_SHA384);
 unimplemented.add(Cipher.TLS_CHACHA20_POLY1305_SHA256);
 
-if (VERSION < 10002) {
-// These were implemented in 1.0.2 so won't be available in any
-// earlier version
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_DES_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384);
-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_DES_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA);
-unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA);
-} else {
-// These were removed in 1.0.2 so won't be available from that
-// version onwards.
-// None at present.
-}
-
 if (VERSION < 10100) {
 // These were implemented in 1.1.0 so won't be available in any
 // earlier version



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



8.0.x and Gump

2018-09-12 Thread Mark Thomas
Hi,

While looking at the OpenSSL builds on Gump, I noticed that Gmp was
building 8.0.x but not 8.5.x. I've just switched it. Hopefully it will
'just work'.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840653 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 10:28:32 2018
New Revision: 1840653

URL: http://svn.apache.org/viewvc?rev=1840653=rev
Log:
Better fix for OpenSSL 1.1.2
Add a comment to increase the chances of the right fix next time there is an 
OpenSSL version bump

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=1840653=1840652=1840653=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 Sep 12 10:28:32 2018
@@ -109,10 +109,17 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
 unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
 
-// These are TLS v1.3 ciphers that are not supported by any current
-// version
+// These are TLS v1.3 cipher suites
+// Java does not currently support these so they are excluded from the
+// testing.
+// Note: If OpenSSL is used then some of these may be available
+//   depending on the OpenSSL version used and the defaults for 
that
+//   version
 unimplemented.add(Cipher.TLS_AES_128_CCM_8_SHA256);
 unimplemented.add(Cipher.TLS_AES_128_CCM_SHA256);
+unimplemented.add(Cipher.TLS_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_CHACHA20_POLY1305_SHA256);
 
 if (VERSION < 10002) {
 // These were implemented in 1.0.2 so won't be available in any
@@ -328,18 +335,6 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA);
 }
 
-if (VERSION < 10102) {
-// These were implemented in 1.1.2 so won't be available in any
-// earlier version
-unimplemented.add(Cipher.TLS_AES_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_AES_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_CHACHA20_POLY1305_SHA256);
-} else {
-// These were removed in 1.1.2 so won't be available from that
-// version onwards
-/* Currently none */
-}
-
 OPENSSL_UNIMPLEMENTED_CIPHERS = 
Collections.unmodifiableSet(unimplemented);
 
 Map renamed = new HashMap<>();
@@ -389,7 +384,7 @@ public class TesterOpenSSL {
 // Standard command to list the ciphers
 args.add("ciphers");
 args.add("-v");
-if (VERSION == 10101) {
+if (VERSION >= 10101) {
 // Need to exclude the TLSv1.3 ciphers
 args.add("-ciphersuites");
 args.add("");



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



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

2018-09-12 Thread Mark Thomas
On 12/09/18 04:21, Bill Barker wrote:



>[concat] Testsuites with failed tests:
>[concat] TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt

The above failures have now been fixed.

>[concat] 
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO.txt

I'll be looking at these next.

More generally, I want to look at the OpenSSL versions were are testing
with on Gump and their current support state as I think we mat be
testing with some now unsupported versions.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840641 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 08:36:42 2018
New Revision: 1840641

URL: http://svn.apache.org/viewvc?rev=1840641=rev
Log:
OpenSSL 1.1.2 appears to have enabled some TLS 1.3 ciphers. Update the tests 
for this.

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=1840641=1840640=1840641=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 Sep 12 08:36:42 2018
@@ -109,12 +109,10 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
 unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
 
-// These are TLS v1.3 ciphers that the test suite doesn't yet handle
+// These are TLS v1.3 ciphers that are not supported by any current
+// version
 unimplemented.add(Cipher.TLS_AES_128_CCM_8_SHA256);
 unimplemented.add(Cipher.TLS_AES_128_CCM_SHA256);
-unimplemented.add(Cipher.TLS_AES_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_AES_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_CHACHA20_POLY1305_SHA256);
 
 if (VERSION < 10002) {
 // These were implemented in 1.0.2 so won't be available in any
@@ -329,6 +327,19 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA);
 unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA);
 }
+
+if (VERSION < 10102) {
+// These were implemented in 1.1.2 so won't be available in any
+// earlier version
+unimplemented.add(Cipher.TLS_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_CHACHA20_POLY1305_SHA256);
+} else {
+// These were removed in 1.1.2 so won't be available from that
+// version onwards
+/* Currently none */
+}
+
 OPENSSL_UNIMPLEMENTED_CIPHERS = 
Collections.unmodifiableSet(unimplemented);
 
 Map renamed = new HashMap<>();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840634 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 08:25:20 2018
New Revision: 1840634

URL: http://svn.apache.org/viewvc?rev=1840634=rev
Log:
OpenSSL master has bumped version number. Need to take account of this in 
version detection used in unit tests.

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=1840634=1840633=1840634=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 Sep 12 08:25:20 2018
@@ -48,9 +48,13 @@ public class TesterOpenSSL {
 } catch (IOException e) {
 versionString = "";
 }
-if (versionString.startsWith("OpenSSL 1.1.1")) {
+if (versionString.startsWith("OpenSSL 1.1.2")) {
 // Note: Gump currently tests 9.0.x with OpenSSL master
-//   (a.k.a 1.1.1-dev)
+//   (a.k.a 1.1.2-dev)
+VERSION = 10102;
+} else if (versionString.startsWith("OpenSSL 1.1.1")) {
+// LTS
+// Supported until at least 2023-09-11
 VERSION = 10101;
 } else if (versionString.startsWith("OpenSSL 1.1.0")) {
 // Support ends 2018-04-30



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1840629 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c common/jk_util.c common/jk_util.h iis/jk_isapi_plugin.c

2018-09-12 Thread markt
Author: markt
Date: Wed Sep 12 07:13:03 2018
New Revision: 1840629

URL: http://svn.apache.org/viewvc?rev=1840629=rev
Log:
Tab police

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/common/jk_util.h
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1840629=1840628=1840629=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Wed Sep 12 07:13:03 2018
@@ -2793,7 +2793,7 @@ static int jk_handler(request_rec * r)
 clean_uri = apr_pstrdup(r->pool, r->uri);
 rc = jk_servlet_normalize(clean_uri, xconf->log);
 if (rc != 0) {
-   return HTTP_BAD_REQUEST;
+return HTTP_BAD_REQUEST;
 }
 
 worker_name = map_uri_to_worker_ext(xconf->uw_map, clean_uri,
@@ -3810,7 +3810,7 @@ static int jk_translate(request_rec * r)
 clean_uri = apr_pstrdup(r->pool, r->uri);
 rc = jk_servlet_normalize(clean_uri, conf->log);
 if (rc != 0) {
-   return HTTP_BAD_REQUEST;
+return HTTP_BAD_REQUEST;
 }
 
 /* Special case to make sure that apache can serve a directory
@@ -4022,7 +4022,7 @@ static int jk_map_to_storage(request_rec
 clean_uri = apr_pstrdup(r->pool, r->uri);
 rc = jk_servlet_normalize(clean_uri, conf->log);
 if (rc != 0) {
-   return HTTP_BAD_REQUEST;
+return HTTP_BAD_REQUEST;
 }
 
 if (!conf->uw_map) {
@@ -4061,10 +4061,10 @@ static int jk_map_to_storage(request_rec
 if (conf->strip_session == JK_TRUE && 
conf->strip_session_name) {
 char *jsessionid;
 if (r->uri) {
-   jk_strip_session_id(r->uri, conf->strip_session_name, 
conf->log);
+jk_strip_session_id(r->uri, conf->strip_session_name, 
conf->log);
 }
 if (r->filename) {
-   jk_strip_session_id(r->filename, 
conf->strip_session_name, conf->log);
+jk_strip_session_id(r->filename, 
conf->strip_session_name, conf->log);
 }
 return DECLINED;
 }

Modified: tomcat/jk/trunk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1840629=1840628=1840629=diff
==
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Wed Sep 12 07:13:03 2018
@@ -2182,7 +2182,7 @@ int jk_servlet_normalize(char *path, jk_
 int l, w;
 
 if (JK_IS_DEBUG_LEVEL(logger)) {
-   jk_log(logger, JK_LOG_DEBUG, "URI on entering jk_servlet_normalize: 
[%s]", path);
+jk_log(logger, JK_LOG_DEBUG, "URI on entering jk_servlet_normalize: 
[%s]", path);
 }
 
 // This test allows the loops below to start at index 1 rather than 0.
@@ -2276,7 +2276,7 @@ int jk_servlet_normalize(char *path, jk_
 path[w] = '\0';
 
 if (JK_IS_DEBUG_LEVEL(logger)) {
-   jk_log(logger, JK_LOG_DEBUG, "URI on exiting jk_servlet_normalize: 
[%s]", path);
+jk_log(logger, JK_LOG_DEBUG, "URI on exiting jk_servlet_normalize: 
[%s]", path);
 }
 
 return 0;
@@ -2284,40 +2284,40 @@ int jk_servlet_normalize(char *path, jk_
 
 int jk_strip_session_id(char* path, char* session_name, jk_logger_t *logger) {
 
-   char *jsessionid;
+char *jsessionid;
 
 jsessionid = strstr(path, session_name);
 if (jsessionid) {
-   int i;
-   int j;
+int i;
+int j;
 if (JK_IS_DEBUG_LEVEL(logger)) {
 jk_log(logger, JK_LOG_DEBUG,
-   "removing session identifier for non servlet uri [%s]", 
path);
+"removing session identifier for non servlet uri [%s]", 
path);
 }
-   // Found a session path parameter.
-   // Need to skip at least as many characters as there are in
-   // strip_session_name
-   i = (int) strlen(session_name);
-   j = 0;
-   // Increment i until the first character after the parameter
-   while (jsessionid[i] != '\0' && jsessionid[i] != ';' && jsessionid[i] 
!= '/') {
-   i++;
-   }
-   // Copy until the end
-   while (jsessionid[i] != '\0') {
-   jsessionid[j++] = jsessionid[i++];
-   }
-   // Terminate
-   jsessionid[j] = '\0';
+// Found a session path parameter.
+// Need to skip at least as many characters as there are in
+// strip_session_name
+i = (int) 

Tagging Tomcat Connectors

2018-09-12 Thread Mark Thomas
Given the regression [1] in 1.2.44 I think we need a 1.2.45 release
soon. My current thinking is to tag late this week / early next with a
view to completing the release by the end of next week so it is complete
before ApacheCon.

In addition to fixing the regression, there has been a general review of
path parameter handling resulting in some clean-up and edge-case
improvements for both httpd and IIS. Therefore, any additional review of
the fixes would be most welcome.

If anyone wants a Windows binary to test with before the RC and isn't
set up to built it themselves, I'm happy to provide one (although if you
have time to set up the build environment that would be a worthwhile
investment as it is the same for JK, Native and Daemon).

Mark

[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=62689

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62705] tomcat 8.5.33+ requires jdk 9

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62705

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|--- |WORKSFORME
 Status|NEW |RESOLVED

--- Comment #3 from Konstantin Kolinko  ---
> build/build.xml:675: javac doesn't support the "release" attribute

The above message means that the "javac" task of Ant does not know the
"release" attribute, cannot process the build file. Support for "release"
attribute was added in Ant 1.9.8 and 1.10.0.

The required minimum version of Ant is documented in BUILDING.txt file of
Tomcat.


The official release of Tomcat 8.5.34 was built with Ant 1.9.9 and JDK 7u80,
as can be seen in MANIFEST.MF files in jars.

The release of Tomcat 9.0.12 was built with Ant 1.9.9 and JDK 8u181.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62705] tomcat 8.5.33+ requires jdk 9

2018-09-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62705

--- Comment #2 from Igal Sapir  ---
I just built again with Java 1.8.0_181 and Ant 1.10.5 on Fedora 28 with no
issue.

Ant output shows that the --release switch is ignored on a sub-9 Java version:

[javac] Support for javac --release has been added in Java9 ignoring it

-- 
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