date:20180601

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

2018-06-01 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-trunk-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-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-APR]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 3 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180602/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=true -Dtest.reports=output/logs-APR -Dexecute.tes
 t.nio2=false 
-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-trunk/dest-20180602/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja

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

2018-06-01 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-trunk-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-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 4 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/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-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180602/bin/openssl
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.tes
 t.nio=false -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=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-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja

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

2018-06-01 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-trunk-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-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 12 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/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-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180602/bin/openssl
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test
 .nio=true -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=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-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja

[Bug 62389] Add ipv6 loopback address to the default internalProxies

2018-06-01 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=62389

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.9 onwards
- 8.5.x for 8.5.32 onwards
- 8.0.x for 8.0.53 onwards
- 7.0.x for 7.0.89 onwards

Thanks for the patch.

-- 
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: r1832710 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/doc

2018-06-01 Thread markt

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1832710=1832709=1832710=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun  1 18:13:03 2018
@@ -94,6 +94,11 @@
 becoming associated with a web application class loader causing log
 messages to be lost if the web application is stopped. (markt)
   
+  
+62389: Add the IPv6 loopback address to the default
+internalProxies regular expression. Patch by Craig 
Andrews.
+(markt)
+  
 
   
   

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml?rev=1832710=1832709=1832710=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml Fri Jun  1 18:13:03 2018
@@ -1554,7 +1554,7 @@ FINE: Request "/docs/config/manager.html
 Internal proxies that appear in the remoteIpHeader 
will
 be trusted and will not appear in the proxiesHeader
 value. If not specified the default value of 
-
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}
+
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|0:0:0:0:0:0:0:1
  will be used.
   
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1832710=1832709=1832710=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Fri Jun  1 18:13:03 2018
@@ -865,7 +865,7 @@
 Internal proxies that appear in the remoteIpHeader 
will
 be trusted and will not appear in the proxiesHeader
 value. If not specified the default value of 
-
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}
+
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|0:0:0:0:0:0:0:1
  will be used.
   
 



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

svn commit: r1832710 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/doc

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 18:13:03 2018
New Revision: 1832710

URL: http://svn.apache.org/viewvc?rev=1832710=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62389
Add the IPv6 loopback address to the default internalProxies regular expression.
Patch by Craig Andrews.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 18:13:03 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

buildbot success in on tomcat-8-trunk

2018-06-01 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/1334

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1832701
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 success in on tomcat-trunk

2018-06-01 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/3331

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] 1832704
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1832709 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/conf

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:53:50 2018
New Revision: 1832709

URL: http://svn.apache.org/viewvc?rev=1832709=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62389
Add the IPv6 loopback address to the default internalProxies regular expression.
Patch by Craig Andrews.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/filter.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 16:53:50 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1779898,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042,1831557,1831569,1832269,1832271,1832693
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1

svn commit: r1832708 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/conf

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:52:47 2018
New Revision: 1832708

URL: http://svn.apache.org/viewvc?rev=1832708=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62389
Add the IPv6 loopback address to the default internalProxies regular expression.
Patch by Craig Andrews.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/filter.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 16:52:47 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 #111: Add ipv6 loopback address to the RemoteIpFilter an...

2018-06-01 Thread asfgit

Github user asfgit closed the pull request at:

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


---

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

svn commit: r1832707 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/config/filter.x

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:51:48 2018
New Revision: 1832707

URL: http://svn.apache.org/viewvc?rev=1832707=rev
Log:
Add the IPv6 loopback address to the default internalProxies regular expression.
Patch by Craig Andrews.
This closes #111

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1832707=1832706=1832707=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Fri Jun  
1 16:51:48 2018
@@ -113,9 +113,10 @@ import org.apache.juli.logging.LogFactor
  * 10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|
  * 169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|
  * 172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|
- * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}
+ * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}|
+ * 0:0:0:0:0:0:0:1
  * 
- * By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are 
allowed.
+ * By default, 10/8, 192.168/16, 169.254/16, 127/8, 172.16/12, and 
0:0:0:0:0:0:0:1 are allowed.
  * 
  * 
  * proxiesHeader
@@ -724,7 +725,8 @@ public class RemoteIpFilter extends Gene
 "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
 "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
 "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
-"172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}");
+"172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
+"0:0:0:0:0:0:0:1");
 
 /**
  * @see #setProtocolHeader(String)
@@ -1041,7 +1043,7 @@ public class RemoteIpFilter extends Gene
  * Regular expression that defines the internal proxies.
  * 
  * 
- * Default value : 
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254.\d{1,3}.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}
+ * Default value : 
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254.\d{1,3}.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|0:0:0:0:0:0:0:1
  * 
  * @param internalProxies The regexp
  */

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1832707=1832706=1832707=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Fri Jun  1 
16:51:48 2018
@@ -92,9 +92,10 @@ import org.apache.tomcat.util.http.MimeH
  * 10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|
  * 169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|
  * 172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|
- * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}
+ * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}|
+ * 0:0:0:0:0:0:0:1
  * 
- * By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are 
allowed.
+ * By default, 10/8, 192.168/16, 169.254/16, 127/8, 172.16/12, and ::1 are 
allowed.
  * 
  * 
  * proxiesHeader
@@ -412,7 +413,8 @@ public class RemoteIpValve extends Valve
 "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
 "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
 "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
-"172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}");
+"172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
+"0:0:0:0:0:0:0:1");
 
 /**
  * @see #setProtocolHeader(String)
@@ -754,7 +756,7 @@ public class RemoteIpValve extends Valve
  * Regular expression that defines the internal proxies.
  * 
  * 
- * Default value : 
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254.\d{1,3}.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}
+ * Default value : 
10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254.\d{1,3}.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|0:0:0:0:0:0:0:1
  * 
  * @param internalProxies The proxy regular expression
  */

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832707=1832706=1832707=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun  1 16:51:48 2018
@@ -132,6 +132,11 @@
 becoming associated with a web application class loader causing log
 messages to be lost if the web application is stopped.

svn commit: r1832705 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:17:28 2018
New Revision: 1832705

URL: http://svn.apache.org/viewvc?rev=1832705=rev
Log:
This class is a singleton so need to obtain logger each time it is required to 
avoid problems.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 16:17:28 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: r1832704 - /tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:17:00 2018
New Revision: 1832704

URL: http://svn.apache.org/viewvc?rev=1832704=rev
Log:
This class is a singleton so need to obtain logger each time it is required to 
avoid problems.

Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java?rev=1832704=1832703=1832704=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
 Fri Jun  1 16:17:00 2018
@@ -39,7 +39,6 @@ import org.apache.tomcat.util.res.String
  */
 public class CallbackHandlerImpl implements CallbackHandler {
 
-private final Log log = LogFactory.getLog(CallbackHandlerImpl.class); // 
must not be static
 private static final StringManager sm = 
StringManager.getManager(CallbackHandlerImpl.class);
 
 private static CallbackHandler instance;
@@ -82,6 +81,9 @@ public class CallbackHandlerImpl impleme
 GroupPrincipalCallback gpc = (GroupPrincipalCallback) 
callback;
 groups = gpc.getGroups();
 } else {
+// This is a singleton so need to get correct Logger for
+// current TCCL
+Log log = LogFactory.getLog(CallbackHandlerImpl.class);
 
log.error(sm.getString("callbackHandlerImpl.jaspicCallbackMissing",
 callback.getClass().getName()));
 }



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

svn commit: r1832702 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina/tribes/tipis/ catalina/util/ j

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:15:15 2018
New Revision: 1832702

URL: http://svn.apache.org/viewvc?rev=1832702=rev
Log:
Add comment to non-static loggers

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/WebXml.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832702=1832701=1832702=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 Fri Jun  1 16:15:15 2018
@@ -79,7 +79,7 @@ import org.apache.tomcat.util.res.String
 public abstract class AuthenticatorBase extends ValveBase
 implements Authenticator {
 
-private final Log log = LogFactory.getLog(AuthenticatorBase.class);
+private final Log log = LogFactory.getLog(AuthenticatorBase.class); // 
must not be static
 
 
 //-- Constructor

Modified:

svn commit: r1832701 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina/tribes/tipis/ catalina/util/ j

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:13:57 2018
New Revision: 1832701

URL: http://svn.apache.org/viewvc?rev=1832701=rev
Log:
Add comment to non-static loggers

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832701=1832700=1832701=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 Fri Jun  1 16:13:57 2018
@@ -75,7 +75,7 @@ import org.apache.tomcat.util.res.String
 public abstract class AuthenticatorBase extends ValveBase
 implements Authenticator {
 
-private final Log log = LogFactory.getLog(AuthenticatorBase.class);
+private final Log log = LogFactory.getLog(AuthenticatorBase.class); // 
must not be static

svn commit: r1832699 - in /tomcat/tc8.5.x/trunk/java/org/apache: catalina/authenticator/ catalina/authenticator/jaspic/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:12:32 2018
New Revision: 1832699

URL: http://svn.apache.org/viewvc?rev=1832699=rev
Log:
Add comment to non-static loggers

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832699=1832698=1832699=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

svn commit: r1832700 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/jasper/servlet/TestTldScanner.java

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:12:45 2018
New Revision: 1832700

URL: http://svn.apache.org/viewvc?rev=1832700=rev
Log:
Fix broken test

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 16:12:45 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1779898,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042,1831557,1831569,1832269,1832271,1832693
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1

svn commit: r1832698 - in /tomcat/trunk/java/org/apache: catalina/authenticator/ catalina/authenticator/jaspic/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina/tribes/

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 16:11:10 2018
New Revision: 1832698

URL: http://svn.apache.org/viewvc?rev=1832698=rev
Log:
Add comment to non-static loggers

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java

tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832698=1832697=1832698=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Fri Jun  1 16:11:10 2018
@@ -90,7 +90,7 @@ import org.apache.tomcat.util.res.String
 public abstract class AuthenticatorBase extends ValveBase
 implements Authenticator, RegistrationListener {
 
-private final Log log = LogFactory.getLog(AuthenticatorBase.class);
+private final Log log = LogFactory.getLog(AuthenticatorBase.class); // 
must not be static
 
 /**
  * "Expires" header always set to Date(1), so generate once only

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1832698=1832697=1832698=diff

Re: Static loggers

2018-06-01 Thread Mark Thomas

On 01/06/18 16:35, Konstantin Kolinko wrote:
> 2018-06-01 17:13 GMT+03:00 Mark Thomas :
>> Hi,
>>
>> I've stumbled across a problem with some static loggers. The general
>> pattern is:
>>
>> - TCCL is web application class loader
>> - static logger is created
>> - static logger is associated with web application class loader
>> - web application is undeployed
>> - appenders are removed from logger
>> - further logger output is lost
>>
>> In most cases we avoid this issue by using a non-static logger. I've
>> found a few places where we need to switch from static to non-static
>> loggers. That in turn is triggering some refactoring (as static methods
>> can't access a non-static logger).
>>
>> I should have something ready to commit later today.
> 
> So effectively now each web application can have its own logging
> configuration (in WEB-INF/classes/logging.properties) for those
> classes.

Yes. Although before this was also possible and it would end up being
controlled by whichever web application triggered the logger's creation.

> Reviewing r1832692 : OK

Thanks for looking at this.

> 1. CallbackHandlerImpl:
> 
> It exists in one instance only.See "private static CallbackHandler
> instance;", and the constructor of this class is private.
> 
> If a web application creates this class, you will have the same
> problem with lifespan of the logger when the application is
> undeployed. The bug is not fixed here.

I didn't see this one in my testing. However, that testing wasn't
exhaustive. I'll take a look at this one.

> 2. Jasper's SecurityClassLoad class
> It is a bit odd that its logging can be controlled by a web
> application, but it is OK.
> 
> 3. Maybe add a comment, e.g. // Non-static. A web application can have
> its own configuration of logging.
> Not really needed, but my first thought was that I want to see one.

Fair point. The ones we have fixed previously have:
// must not be static

I'll look at adding those everywhere there isn't one.

> Alternatives:
> a) a helper method that unsets TCCL, creates a logger and restores TCCL.

I thought about that. My concern was that you only want to unset the
TCCL for Tomcat provided classes. That starts to look like a maintenance
headache. You also need to deal with running under a security manager
and we'd need to check performance. Overall, there were sufficient
(potential) issues I went for a different option.

> b) preload the class,
> but a system property reading bug a month ago showed that simple
> preloading as done by SecurityClassLoad classes does not cause
> initialization of static fields.
> https://bz.apache.org/bugzilla/show_bug.cgi?id=62350#c7

Indeed. We'd need to init the class as well. Not a big deal. I opted for
making the loggers non-static as that was consistent with what we had
done previously. The pre-loading has been more for security manager issues.

Thanks again for the review.

Mark

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

svn commit: r1832697 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/jasper/servlet/TestTldScanner.java

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 15:49:58 2018
New Revision: 1832697

URL: http://svn.apache.org/viewvc?rev=1832697=rev
Log:
Fix broken test

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 15:49:58 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: r1832696 - /tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 15:48:36 2018
New Revision: 1832696

URL: http://svn.apache.org/viewvc?rev=1832696=rev
Log:
Fix broken test

Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java

Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1832696=1832695=1832696=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Fri Jun  1 
15:48:36 2018
@@ -18,6 +18,7 @@ package org.apache.jasper.servlet;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
@@ -29,6 +30,7 @@ import org.junit.Test;
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.Jar;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.scan.JarFactory;
@@ -94,6 +96,9 @@ public class TestTldScanner extends Tomc
 @Test
 public void testBug57647() throws Exception {
 TldScanner scanner = EasyMock.createMock(TldScanner.class);
+Field f = TldScanner.class.getDeclaredField("log");
+f.setAccessible(true);
+f.set(scanner, LogFactory.getLog(TldScanner.class));
 Constructor constructor =
 
TldScanner.TldScannerCallback.class.getDeclaredConstructor(TldScanner.class);
 constructor.setAccessible(true);



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

buildbot failure in on tomcat-8-trunk

2018-06-01 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/1333

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

Buildslave for this Build: silvanus_ubuntu

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

Re: Static loggers

2018-06-01 Thread Konstantin Kolinko

2018-06-01 17:13 GMT+03:00 Mark Thomas :
> Hi,
>
> I've stumbled across a problem with some static loggers. The general
> pattern is:
>
> - TCCL is web application class loader
> - static logger is created
> - static logger is associated with web application class loader
> - web application is undeployed
> - appenders are removed from logger
> - further logger output is lost
>
> In most cases we avoid this issue by using a non-static logger. I've
> found a few places where we need to switch from static to non-static
> loggers. That in turn is triggering some refactoring (as static methods
> can't access a non-static logger).
>
> I should have something ready to commit later today.

So effectively now each web application can have its own logging
configuration (in WEB-INF/classes/logging.properties) for those
classes.

Reviewing r1832692 : OK

1. CallbackHandlerImpl:

It exists in one instance only.See "private static CallbackHandler
instance;", and the constructor of this class is private.

If a web application creates this class, you will have the same
problem with lifespan of the logger when the application is
undeployed. The bug is not fixed here.

2. Jasper's SecurityClassLoad class
It is a bit odd that its logging can be controlled by a web
application, but it is OK.

3. Maybe add a comment, e.g. // Non-static. A web application can have
its own configuration of logging.
Not really needed, but my first thought was that I want to see one.


Alternatives:
a) a helper method that unsets TCCL, creates a logger and restores TCCL.

b) preload the class,
but a system property reading bug a month ago showed that simple
preloading as done by SecurityClassLoad classes does not cause
initialization of static fields.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62350#c7

Best regards,
Konstantin Kolinko

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

svn commit: r1832695 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/session/ jav

2018-06-01 Thread markt

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1832695=1832694=1832695=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
Fri Jun  1 15:33:56 2018
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,6 +18,9 @@
 
 package org.apache.jasper.security;
 
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
 /**
  * Static class used to preload java classes when using the
  * Java SecurityManager so that the defineClassInPackage
@@ -28,9 +31,6 @@ package org.apache.jasper.security;
 
 public final class SecurityClassLoad {
 
-private static final org.apache.juli.logging.Log log=
-org.apache.juli.logging.LogFactory.getLog( SecurityClassLoad.class );
-
 public static void securityClassLoad(ClassLoader loader){
 
 if( System.getSecurityManager() == null ){
@@ -46,7 +46,7 @@ public final class SecurityClassLoad {
 
 loader.loadClass( basePackage +
 "runtime.JspRuntimeLibrary");
-
+
 loader.loadClass( basePackage +
 "runtime.ServletResponseWrapperInclude");
 loader.loadClass( basePackage +
@@ -61,16 +61,17 @@ public final class SecurityClassLoad {
 loadAnonymousInnerClasses(loader, basePackage + 
"runtime.PageContextImpl");
 
 loader.loadClass( basePackage +
-"runtime.JspContextWrapper");   
+"runtime.JspContextWrapper");
 
 // Trigger loading of class and reading of property
 SecurityUtil.isPackageProtectionEnabled();
-
+
 loader.loadClass( basePackage +
 "servlet.JspServletWrapper");
 
 loadAnonymousInnerClasses(loader, "runtime.JspWriterImpl");
 } catch (ClassNotFoundException ex) {
+Log log = LogFactory.getLog(SecurityClassLoad.class);
 log.error("SecurityClassLoad", ex);
 }
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1832695=1832694=1832695=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
 Fri Jun  1 15:33:56 2018
@@ -36,7 +36,6 @@ import org.xml.sax.ext.EntityResolver2;
  */
 public class DigesterFactory {
 
-private static final Log log = LogFactory.getLog(DigesterFactory.class);
 private static final StringManager sm =
 StringManager.getManager(Constants.PACKAGE_NAME);
 
@@ -135,6 +134,7 @@ public class DigesterFactory {
 location = CLASS_JSP_CONTEXT.getResource("resources/" + name);
 }
 if (location == null) {
+Log log = LogFactory.getLog(DigesterFactory.class);
 log.warn(sm.getString("digesterFactory.missingSchema", name));
 return null;
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java?rev=1832695=1832694=1832695=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java 
Fri Jun  1 15:33:56 2018
@@ -5,15 +5,15 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions

svn commit: r1832695 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/session/ jav

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 15:33:56 2018
New Revision: 1832695

URL: http://svn.apache.org/viewvc?rev=1832695=rev
Log:
Switch to non-static loggers where there is a possibility of a logger becoming 
associated with a web application class loader causing log messages to be lost 
if the web application is stopped.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 15:33:56 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

buildbot failure in on tomcat-trunk

2018-06-01 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/3329

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] 1832692
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: r1832694 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/session/ java/org/

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 15:22:08 2018
New Revision: 1832694

URL: http://svn.apache.org/viewvc?rev=1832694=rev
Log:
Switch to non-static loggers where there is a possibility of a logger becoming 
associated with a web application class loader causing log messages to be lost 
if the web application is stopped.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 15:22:08 2018
@@ -1,2 +1,2 @@
-/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1779898,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042,1831557,1831569,1832269,1832271
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886

svn commit: r1832693 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/core/ java/org/apache/catalina/filte

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 15:15:33 2018
New Revision: 1832693

URL: http://svn.apache.org/viewvc?rev=1832693=rev
Log:
Switch to non-static loggers where there is a possibility of a logger becoming 
associated with a web application class loader causing log messages to be lost 
if the web application is stopped.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/TldScanner.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 15:15:33 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

svn commit: r1832692 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/or

2018-06-01 Thread markt

Author: markt
Date: Fri Jun  1 15:03:49 2018
New Revision: 1832692

URL: http://svn.apache.org/viewvc?rev=1832692=rev
Log:
Switch to non-static loggers where there is a possibility of a logger becoming 
associated with a web application class loader causing log messages to be lost 
if the web application is stopped.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832692=1832691=1832692=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Fri Jun  1 15:03:49 2018
@@ -90,7 +90,7 @@ import org.apache.tomcat.util.res.String
 public abstract class AuthenticatorBase extends ValveBase
 implements Authenticator, RegistrationListener {
 
-private static final Log log = LogFactory.getLog(AuthenticatorBase.class);
+private final Log log = LogFactory.getLog(AuthenticatorBase.class);
 
 /**
  * "Expires" header always set to Date(1), so generate once only

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1832692=1832691=1832692=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
Fri Jun  1 15:03:49 2018
@@ -45,7 +45,7 @@ import org.apache.tomcat.util.codec.bina
  */
 public class BasicAuthenticator extends AuthenticatorBase {
 
-private static final Log log = LogFactory.getLog(BasicAuthenticator.class);
+private final Log log = LogFactory.getLog(BasicAuthenticator.class);
 
 private Charset charset = StandardCharsets.ISO_8859_1;
 private String charsetString = null;

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1832692=1832691=1832692=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
(original)
+++

Static loggers

2018-06-01 Thread Mark Thomas

Hi,

I've stumbled across a problem with some static loggers. The general
pattern is:

- TCCL is web application class loader
- static logger is created
- static logger is associated with web application class loader
- web application is undeployed
- appenders are removed from logger
- further logger output is lost

In most cases we avoid this issue by using a non-static logger. I've
found a few places where we need to switch from static to non-static
loggers. That in turn is triggering some refactoring (as static methods
can't access a non-static logger).

I should have something ready to commit later today.

Mark

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

[Bug 62423] Wrong Attribute Name for Certificate Revocation Lists

2018-06-01 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=62423

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #2 from Remy Maucherat  ---
The fix will be in 9.0.9 and 8.5.32.

-- 
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: r1832666 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml

2018-06-01 Thread remm

Author: remm
Date: Fri Jun  1 08:17:04 2018
New Revision: 1832666

URL: http://svn.apache.org/viewvc?rev=1832666=rev
Log:
62423: Fix attribute typo.

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/http.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 08:17:04 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: r1832665 - in /tomcat/trunk/webapps/docs: changelog.xml config/http.xml

2018-06-01 Thread remm

Author: remm
Date: Fri Jun  1 08:15:01 2018
New Revision: 1832665

URL: http://svn.apache.org/viewvc?rev=1832665=rev
Log:
62423: Fix attribute typo.

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832665=1832664=1832665=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun  1 08:15:01 2018
@@ -173,6 +173,9 @@
 Correctly handle an invalid quality value in an
 Accept-Language header. (markt)
   
+  
+62423: Fix SSL docs CRL attribute typo. (remm)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1832665=1832664=1832665=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Fri Jun  1 08:15:01 2018
@@ -1164,7 +1164,7 @@
   lists for the certificate authorities. The format is PEM-encoded. If not
   defined, client certificates will not be checked against a certificate
   revocation list (unless an OpenSSL based connector is used and
-  certificateRevocationPath is defined). Relative paths
+  certificateRevocationListPath is defined). Relative 
paths
   will be resolved against $CATALINA_BASE. JSSE based
   connectors may also specify a URL for this attribute.
 
@@ -1576,7 +1576,7 @@
 
 
 
-  This is an alias for the certificateRevocationFile
+  This is an alias for the certificateRevocationListFile
   attribute of the default
   SSLHostConfig element.
 
@@ -1732,13 +1732,13 @@
 
 
 
-  This is an alias for the certificateRevocationFile
+  This is an alias for the certificateRevocationListFile
   attribute of the default
   SSLHostConfig element.
 
 
 
-  This is an alias for the certificateRevocationPath
+  This is an alias for the certificateRevocationListPath
   attribute of the default
   SSLHostConfig element.
 



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

Re: Thoughts on suggestions for new contributors

2018-06-01 Thread Mark Thomas

On 31/05/18 18:58, Igal Sapir wrote:
> On 5/31/2018 3:28 AM, Mark Thomas wrote:
>> 
>>
>> As you may have noticed I have been working on the HttpParser unit tests
>> over the last few days. This was prompted, as a result of the recent
>> fqdn parsing issues, to ensure that the unit tests were covering all of
>> the edge cases. While the fqdn parsing was fine, working on the unit
>> tests to expand code coverage uncovered three related bugs in the
>> handling of some error cases in the HTTP header parsing.
>>
>> In light of the above experience, I now think suggesting improving the
>> unit test coverage is a great place to suggest for a contributor to get
>> started when they don;t have their own itch to scratch.
>>
>> Thoughts?
> I, for one, would be very happy to work on things like that as it will
> allow me to get familiarized with the code better.
> 
> I will look at your recent unit tests for HttpParser and other classes,
> but are there any written guidelines regarding test cases?

No written guidelines I'm afraid.

A large proportion of the tests are closer to integration tests (they
run up an embedded Tomcat instance) than a unit test but we don't
differentiate unless a class needs both types in which case the
integration tests have 'integration' added to the class name.

Generally, follow the style of the existing tests and you should be on
the right lines.

Mark

-
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 (in module tomcat-trunk) failed

2018-06-01 Thread Mark Thomas

On 31/05/18 14:13, Mark Thomas wrote:
> On 31/05/18 10:07, Bill Barker wrote:
> 
> 
> 
>> /srv/gump/public/workspace/tomcat-trunk/build.xml:3037: Problem: failed to 
>> create task or type bndwrap
> 
> I have made an attempt to fix this. I based my fix on how the Eclipse
> JDT jar is referenced. I think I did it correctly but we'll need to wait
> until the next Gump run to find out.

Not working yet. I missed once place where I needed to add bnd. I've
just added this. The next Gump run will tell us if this was sufficient.

Mark

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

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

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

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

[Bug 62389] Add ipv6 loopback address to the default internalProxies

svn commit: r1832710 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/doc

svn commit: r1832710 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/doc

buildbot success in on tomcat-8-trunk

buildbot success in on tomcat-trunk

svn commit: r1832709 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/conf

svn commit: r1832708 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/conf

[GitHub] tomcat pull request #111: Add ipv6 loopback address to the RemoteIpFilter an...

svn commit: r1832707 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/config/filter.x

svn commit: r1832705 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

svn commit: r1832704 - /tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java

svn commit: r1832702 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina/tribes/tipis/ catalina/util/ j

svn commit: r1832701 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina/tribes/tipis/ catalina/util/ j

svn commit: r1832699 - in /tomcat/tc8.5.x/trunk/java/org/apache: catalina/authenticator/ catalina/authenticator/jaspic/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina

svn commit: r1832700 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/jasper/servlet/TestTldScanner.java

svn commit: r1832698 - in /tomcat/trunk/java/org/apache: catalina/authenticator/ catalina/authenticator/jaspic/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/session/ catalina/tribes/

Re: Static loggers

svn commit: r1832697 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/jasper/servlet/TestTldScanner.java

svn commit: r1832696 - /tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java

buildbot failure in on tomcat-8-trunk

Re: Static loggers

svn commit: r1832695 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/session/ jav

svn commit: r1832695 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/session/ jav

buildbot failure in on tomcat-trunk

svn commit: r1832694 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/session/ java/org/

svn commit: r1832693 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/core/ java/org/apache/catalina/filte

svn commit: r1832692 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/or

Static loggers

[Bug 62423] Wrong Attribute Name for Certificate Revocation Lists

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

svn commit: r1832665 - in /tomcat/trunk/webapps/docs: changelog.xml config/http.xml

Re: Thoughts on suggestions for new contributors

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

36 matches

Site Navigation

Mail list logo

Footer information