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

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 133 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 mins 38 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-8.0.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20180207/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0
 .2/dest-20180207/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 

Re: [VOTE] Release Apache Tomcat 8.5.28

[Huxing Zhang]

Hi,

The proposed 8.5.28 release is:
[ ] Broken - do not release
[ X ] Stable - go ahead and release as 8.5.28

Unit test passed.
Examples ok.
Our test web application works fine.

On Wed, Feb 7, 2018 at 7:33 AM, Mark Thomas  wrote:
> The proposed Apache Tomcat 8.5.28 release is now available for voting.
>
> The major changes compared to the 8.5.27 release are:
>
> - Fix truncated request input streams when using NIO2 with TLS.
>
> - Improved error handling and reporting for TLS configuration.
>
> - Enhance the JMX support for jdbc-pool in order to expose
>   PooledConnection and JdbcInterceptors.
>
> Along with lots of other bug fixes and improvements.
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.28/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1171/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
>
> The proposed 8.5.28 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.28
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Best Regards！
Huxing

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

[VOTE] Release Apache Tomcat 8.5.28

[Mark Thomas]

The proposed Apache Tomcat 8.5.28 release is now available for voting.

The major changes compared to the 8.5.27 release are:

- Fix truncated request input streams when using NIO2 with TLS.

- Improved error handling and reporting for TLS configuration.

- Enhance the JMX support for jdbc-pool in order to expose
  PooledConnection and JdbcInterceptors.

Along with lots of other bug fixes and improvements.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.28/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1171/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_28/

The proposed 8.5.28 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.28

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

svn commit: r24763 [1/2] - in /dev/tomcat/tomcat-8/v8.5.28: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Tue Feb  6 23:31:18 2018
New Revision: 24763

Log:
Upload 8.5.28 for voting

Added:
dev/tomcat/tomcat-8/v8.5.28/
dev/tomcat/tomcat-8/v8.5.28/KEYS
dev/tomcat/tomcat-8/v8.5.28/README.html
dev/tomcat/tomcat-8/v8.5.28/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.28/bin/
dev/tomcat/tomcat-8/v8.5.28/bin/README.html
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.exe   (with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.exe.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.exe.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.exe.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.exe.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.zip   (with props)
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.zip.asc
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.zip.md5
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.zip.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/apache-tomcat-8.5.28.zip.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/embed/
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.tar.gz.sha1

dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/embed/apache-tomcat-8.5.28-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/extras/
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.28/bin/extras/catalina-ws.jar.sha512

svn commit: r24763 [2/2] - in /dev/tomcat/tomcat-8/v8.5.28: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Propchange: dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.asc Tue Feb  6 
23:31:18 2018
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iEYEABECAAYFAlp6NqwACgkQb7IeiTPGAkMcAACeLjfSKi349Rfj0mHxMR7CMUBq
+c/UAn1B8nmNDcB/G5AFwCvTM08nMGibS
+=ewhj
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.md5
==
--- dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.md5 (added)
+++ dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.md5 Tue Feb  6 
23:31:18 2018
@@ -0,0 +1 @@
+80b6aadccbc8a0952da1434e3aeb2f29 *apache-tomcat-8.5.28-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.sha1
==
--- dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.sha1 Tue Feb  
6 23:31:18 2018
@@ -0,0 +1 @@
+02a8d256cda2874fb95fbd820df9e5f2442c35bf *apache-tomcat-8.5.28-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.zip.sha512 Tue Feb 
 6 23:31:18 2018
@@ -0,0 +1 @@
+8a56a7ae71f5ce9fc6c6f1e8efb0c5e747e31cc9535b4b2ee860027174794e8a9f08852b9c71b393d4e72d8f3945694795327ccad6ba448f45976c228ed1aa31
 *apache-tomcat-8.5.28-src.zip
\ No newline at end of file



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

svn commit: r1823411 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 23:26:02 2018
New Revision: 1823411

URL: http://svn.apache.org/viewvc?rev=1823411=rev
Log:
Increment version for next development cycle.

Modified:
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1823411=1823410=1823411=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Tue Feb  6 23:26:02 2018
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=28
+version.build=29
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1823411=1823410=1823411=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Tue Feb  6 23:26:02 
2018
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.28
+maven.asf.release.deploy.version=8.5.29
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1823411=1823410=1823411=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Feb  6 23:26:02 2018
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

svn commit: r1823410 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 23:22:50 2018
New Revision: 1823410

URL: http://svn.apache.org/viewvc?rev=1823410=rev
Log:
Increment version for next development cycle.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1823410=1823409=1823410=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Feb  6 23:22:50 2018
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=5
+version.build=6
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1823410=1823409=1823410=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Tue Feb  6 23:22:50 2018
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.5
+maven.asf.release.deploy.version=9.0.6
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1823410=1823409=1823410=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb  6 23:22:50 2018
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

buildbot success in on tomcat-trunk

[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/3032

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] 1823402
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: r1823407 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_28: ./ build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 22:25:36 2018
New Revision: 1823407

URL: http://svn.apache.org/viewvc?rev=1823407=rev
Log:
Tag 8.5.28

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_28/   (props changed)
  - copied from r1823405, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_28/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_28/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Tue Feb  6 22:25:36 2018
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_28/
--
--- svn:ignore (added)
+++ svn:ignore Tue Feb  6 22:25:36 2018
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

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

svn commit: r1823402 - /tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java

[markt]

Author: markt
Date: Tue Feb  6 22:17:17 2018
New Revision: 1823402

URL: http://svn.apache.org/viewvc?rev=1823402=rev
Log:
Correct comment

Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java?rev=1823402=1823401=1823402=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
Tue Feb  6 22:17:17 2018
@@ -83,7 +83,7 @@ public class TestSocketServerAnyLocalAdd
 /* Accept the client connection */
 clientSocket = Socket.accept(serverSocket);
 
-/* Configure a 1s timeout for reading from client */
+/* Configure a 10s timeout for reading from client */
 Socket.timeoutSet(clientSocket, TIMEOUT_MICROSECONDS);
 
 byte [] buf = new byte[1];



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

[VOTE] Release Apache Tomcat 9.0.5

[Mark Thomas]

The proposed Apache Tomcat 9.0.5 release is now available for voting.

The major changes compared to the 9.0.4 release are:

- Refactor error handling to enable errors that occur before processing
  is passed to the application to be handled by the application provided
  error handling and/or the container provided error handling
  (ErrorReportValve) as appropriate.

- Enable strict validation of the provided host name and port for all
  connectors. Requests with invalid host names and/or ports will be
  rejected with a 400 response.

- Enhance the JMX support for jdbc-pool in order to expose
  PooledConnection and JdbcInterceptors.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.5/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1170/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_5/

The proposed 9.0.5 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.5

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

Re: svn commit: r1823392 - /tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java

[Konstantin Kolinko]

2018-02-07 0:00 GMT+03:00  :
> Author: markt
> Date: Tue Feb  6 21:00:52 2018
> New Revision: 1823392
>
> URL: http://svn.apache.org/viewvc?rev=1823392=rev
> Log:
> Make test more robust
>
> Modified:
> 
> tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
>
> Modified: 
> tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java?rev=1823392=1823391=1823392=diff
> ==
> --- 
> tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
> (original)
> +++ 
> tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
> Tue Feb  6 21:00:52 2018
> @@ -33,6 +33,9 @@ import org.junit.Test;
>   */
>  public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
>
> +// Excessive but allows for slow systems
> +private static final int TIMEOUT_MICROSECONDS = 10 * 1000 * 1000;
> +
>  private long serverSocket = 0;
>  private long clientSocket = 0;
>
> @@ -80,8 +83,8 @@ public class TestSocketServerAnyLocalAdd
>  /* Accept the client connection */
>  clientSocket = Socket.accept(serverSocket);
>
> -/* Configure a 2ms timeout for reading from client */
> -Socket.timeoutSet(clientSocket, 1);
> +/* Configure a 1s timeout for reading from client */
> +Socket.timeoutSet(clientSocket, TIMEOUT_MICROSECONDS);

The above comment is wrong. The constant value is 10 seconds.

(The old comment was wrong as well.)

Constant name is ok.  JNI Socket method expects microseconds (10^-6 second)
http://tomcat.apache.org/tomcat-9.0-doc/api/org/apache/tomcat/jni/Socket.html#timeoutSet-long-long-

https://en.wikipedia.org/wiki/Microsecond
(Looking up. To be sure I count the zeros correctly).

APR api called here:
http://apr.apache.org/docs/apr/1.6/group__apr__network__io.html#ga945bdbe807ec5635d65a6fd9ddb78c29
http://apr.apache.org/docs/apr/1.6/group__apr__time.html#gaae2129185a395cc393f76fabf4f43e47

>  byte [] buf = new byte[1];
>  while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
> @@ -122,8 +125,8 @@ public class TestSocketServerAnyLocalAdd
>  try {
>  InetSocketAddress connectAddress = 
> getConnectAddress(serverSocket);
>  java.net.Socket sock = new java.net.Socket();
> -sock.connect(connectAddress, 1);
> -sock.setSoTimeout(1);
> +sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
> +sock.setSoTimeout(TIMEOUT_MICROSECONDS);

The above is 1000 times more than expected.

https://docs.oracle.com/javase/7/docs/api/java/net/Socket.html#connect(java.net.SocketAddress,%20int)
https://docs.oracle.com/javase/7/docs/api/java/net/Socket.html#setSoTimeout(int)

java.net.Socket here expects milliseconds (10^-3 second)


>  OutputStream ou = sock.getOutputStream();
>  InputStream in =  sock.getInputStream();
>  ou.write('A');
> @@ -135,8 +138,8 @@ public class TestSocketServerAnyLocalAdd
>  }
>
>  sock = new java.net.Socket();

Again, a JRE Socket here. Milliseconds (10^-3).

> -sock.connect(connectAddress, 1);
> -sock.setSoTimeout(1);
> +sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
> +sock.setSoTimeout(TIMEOUT_MICROSECONDS);
>  ou = sock.getOutputStream();
>  ou.write('E');
>  ou.flush();

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: r24761 [1/2] - in /dev/tomcat/tomcat-9/v9.0.5: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Tue Feb  6 22:04:50 2018
New Revision: 24761

Log:
Upload 9.0.5 for voting

Added:
dev/tomcat/tomcat-9/v9.0.5/
dev/tomcat/tomcat-9/v9.0.5/KEYS
dev/tomcat/tomcat-9/v9.0.5/README.html
dev/tomcat/tomcat-9/v9.0.5/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.5/bin/
dev/tomcat/tomcat-9/v9.0.5/bin/README.html
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-fulldocs.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-fulldocs.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x64.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x64.zip.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x86.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x86.zip.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.exe   (with props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.exe.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.exe.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.exe.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.exe.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.zip   (with props)
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.zip.asc
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.zip.md5
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.zip.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/apache-tomcat-9.0.5.zip.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/embed/
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.zip.md5
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/embed/apache-tomcat-9.0.5-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/extras/
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-jmx-remote.jar   (with props)
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.5/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-9/v9.0.5/src/
dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.tar.gz   (with props)

svn commit: r24761 [2/2] - in /dev/tomcat/tomcat-9/v9.0.5: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Added: dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.md5
==
--- dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.md5 (added)
+++ dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.md5 Tue Feb  6 
22:04:50 2018
@@ -0,0 +1 @@
+7f2737f16c41efc9c39e210a3ced6fe4 *apache-tomcat-9.0.5-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.sha1
==
--- dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.sha1 Tue Feb  6 
22:04:50 2018
@@ -0,0 +1 @@
+6ee42a7dcbbbed098d168a0f9ff7a21fc34ae70a *apache-tomcat-9.0.5-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.sha512
==
--- dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.zip.sha512 Tue Feb  
6 22:04:50 2018
@@ -0,0 +1 @@
+fc1b1c7917ddb776f1b0705ecf6b32fcdb9c489e9a8141139bcbee978bbba4691143e8c011cfe0f1a6672cc53724836074f91e82bc85170592c8e90e4be0db44
 *apache-tomcat-9.0.5-src.zip
\ No newline at end of file



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

svn commit: r1823396 - in /tomcat/site/trunk: docs/res/css/tomcat.css xdocs/res/css/tomcat.css

[violetagg]

Author: violetagg
Date: Tue Feb  6 21:52:25 2018
New Revision: 1823396

URL: http://svn.apache.org/viewvc?rev=1823396=rev
Log:
Fixed searchbox appearance on Mac. Patch by Igal Sapir.

Modified:
tomcat/site/trunk/docs/res/css/tomcat.css
tomcat/site/trunk/xdocs/res/css/tomcat.css

Modified: tomcat/site/trunk/docs/res/css/tomcat.css
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/res/css/tomcat.css?rev=1823396=1823395=1823396=diff
==
--- tomcat/site/trunk/docs/res/css/tomcat.css (original)
+++ tomcat/site/trunk/docs/res/css/tomcat.css Tue Feb  6 21:52:25 2018
@@ -344,6 +344,10 @@ table.defaultTable th, table.defaultTabl
   right: 0;
 }
 
+input[type=search] {
+  -webkit-appearance: none;
+}
+
 @media (max-width: 960px){
   /* target screens smaller than max-width */
   #header h1 {

Modified: tomcat/site/trunk/xdocs/res/css/tomcat.css
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/res/css/tomcat.css?rev=1823396=1823395=1823396=diff
==
--- tomcat/site/trunk/xdocs/res/css/tomcat.css (original)
+++ tomcat/site/trunk/xdocs/res/css/tomcat.css Tue Feb  6 21:52:25 2018
@@ -344,6 +344,10 @@ table.defaultTable th, table.defaultTabl
   right: 0;
 }
 
+input[type=search] {
+  -webkit-appearance: none;
+}
+
 @media (max-width: 960px){
   /* target screens smaller than max-width */
   #header h1 {



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

Re: buildbot failure in on tomcat-trunk

[Konstantin Kolinko]

2018-02-07 0:20 GMT+03:00  :
> 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/3031
>
> 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] 1823392
> Blamelist: markt
>
> BUILD FAILED: failed compile_1

Failed test:

https://ci.apache.org/projects/tomcat/tomcat9/logs/1823392/TEST-org.apache.catalina.connector.TestCoyoteOutputStream.NIO2.txt

Testcase: testNonBlockingWriteOnceBlockingWriteOnceNonContainerThread
took 0.234 sec
Caused an ERROR
Bogus chunk size
java.io.IOException: Bogus chunk size
at sun.net.www.http.ChunkedInputStream.processRaw(ChunkedInputStream.java:319)
at 
sun.net.www.http.ChunkedInputStream.readAheadBlocking(ChunkedInputStream.java:572)
at sun.net.www.http.ChunkedInputStream.readAhead(ChunkedInputStream.java:609)
at sun.net.www.http.ChunkedInputStream.read(ChunkedInputStream.java:696)
at java.io.FilterInputStream.read(FilterInputStream.java:133)
at 
sun.net.www.protocol.http.HttpURLConnection$HttpInputStream.read(HttpURLConnection.java:3393)
at java.io.BufferedInputStream.fill(BufferedInputStream.java:246)
at java.io.BufferedInputStream.read1(BufferedInputStream.java:286)
at java.io.BufferedInputStream.read(BufferedInputStream.java:345)
at java.io.FilterInputStream.read(FilterInputStream.java:107)
at org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:696)
at org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:654)
at org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:648)
at 
org.apache.catalina.connector.TestCoyoteOutputStream.doNonBlockingTest(TestCoyoteOutputStream.java:145)
at 
org.apache.catalina.connector.TestCoyoteOutputStream.testNonBlockingWriteOnceBlockingWriteOnceNonContainerThread(TestCoyoteOutputStream.java:97)




Good news: it is not the test that was fixed in r1823392.
(r1823392 did not break things).

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: r1823394 - in /tomcat/tags/TOMCAT_9_0_5: ./ build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 21:40:33 2018
New Revision: 1823394

URL: http://svn.apache.org/viewvc?rev=1823394=rev
Log:
Tag 9.0.5

Added:
tomcat/tags/TOMCAT_9_0_5/   (props changed)
  - copied from r1823393, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_5/build.properties.default
tomcat/tags/TOMCAT_9_0_5/webapps/docs/changelog.xml

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
bugtraq:append = false

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Tue Feb  6 21:40:33 2018
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
--- svn:ignore (added)
+++ svn:ignore Tue Feb  6 21:40:33 2018
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb  6 21:40:33 2018
@@ -0,0 +1,2 @@
+/tomcat/tc8.0.x/trunk:1809644
+/tomcat/tc8.5.x/trunk:1802799,1808880,1809646

Propchange: tomcat/tags/TOMCAT_9_0_5/
--
svnmailer:content-charset = utf-8

Modified: tomcat/tags/TOMCAT_9_0_5/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_5/build.properties.default?rev=1823394=1823393=1823394=diff
==
--- tomcat/tags/TOMCAT_9_0_5/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_5/build.properties.default Tue Feb  6 21:40:33 2018
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=5
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_5/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_5/webapps/docs/changelog.xml?rev=1823394=1823393=1823394=diff
==
--- tomcat/tags/TOMCAT_9_0_5/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_5/webapps/docs/changelog.xml Tue Feb  6 21:40:33 2018
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   



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

buildbot failure in on tomcat-trunk

[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/3031

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] 1823392
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: r1823392 - /tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java

[markt]

Author: markt
Date: Tue Feb  6 21:00:52 2018
New Revision: 1823392

URL: http://svn.apache.org/viewvc?rev=1823392=rev
Log:
Make test more robust

Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java?rev=1823392=1823391=1823392=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java 
Tue Feb  6 21:00:52 2018
@@ -33,6 +33,9 @@ import org.junit.Test;
  */
 public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
 
+// Excessive but allows for slow systems
+private static final int TIMEOUT_MICROSECONDS = 10 * 1000 * 1000;
+
 private long serverSocket = 0;
 private long clientSocket = 0;
 
@@ -80,8 +83,8 @@ public class TestSocketServerAnyLocalAdd
 /* Accept the client connection */
 clientSocket = Socket.accept(serverSocket);
 
-/* Configure a 2ms timeout for reading from client */
-Socket.timeoutSet(clientSocket, 1);
+/* Configure a 1s timeout for reading from client */
+Socket.timeoutSet(clientSocket, TIMEOUT_MICROSECONDS);
 
 byte [] buf = new byte[1];
 while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
@@ -122,8 +125,8 @@ public class TestSocketServerAnyLocalAdd
 try {
 InetSocketAddress connectAddress = 
getConnectAddress(serverSocket);
 java.net.Socket sock = new java.net.Socket();
-sock.connect(connectAddress, 1);
-sock.setSoTimeout(1);
+sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
+sock.setSoTimeout(TIMEOUT_MICROSECONDS);
 OutputStream ou = sock.getOutputStream();
 InputStream in =  sock.getInputStream();
 ou.write('A');
@@ -135,8 +138,8 @@ public class TestSocketServerAnyLocalAdd
 }
 
 sock = new java.net.Socket();
-sock.connect(connectAddress, 1);
-sock.setSoTimeout(1);
+sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
+sock.setSoTimeout(TIMEOUT_MICROSECONDS);
 ou = sock.getOutputStream();
 ou.write('E');
 ou.flush();



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

Re: Responsive Website for tomcat.apache.org

[Igal @ Lucee.org]

Violeta,

On 1/26/2018 9:57 AM, Violeta Georgieva wrote:

I still see odd "OK" button on Chrome and Safari, only Firefox is ok.
Regards,
Violeta

- MacOS High Sierra
-
https://github.com/violetagg/tomcat-website-screenshots/tree/master/r1822283
- no cache
- the version is provided with every screenshot


This patch should fix the issue on MacOS:
https://github.com/isapir/tomcat-site/commit/286454b

Also, can anyone confirm if they can still see the menu in Print? And if 
so, on what platform/browser?  I can not reproduce that.


Igal Sapir
Lucee Core Developer
Lucee.org 

buildbot success in on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1823359
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: r1823359 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java

[markt]

Author: markt
Date: Tue Feb  6 16:20:56 2018
New Revision: 1823359

URL: http://svn.apache.org/viewvc?rev=1823359=rev
Log:
Switch tests to using per connection control of redirects rather than
changing the default which may fail when testing with concurrent
threads.

Modified:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java?rev=1823359=1823358=1823359=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
 Tue Feb  6 16:20:56 2018
@@ -18,7 +18,6 @@ package org.apache.tomcat.util.http.mapp
 
 import java.io.File;
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.util.HashMap;
 import java.util.List;
 
@@ -229,61 +228,54 @@ public class TestMapperWebapps extends T
 
 @Test
 public void testRedirect() throws Exception {
-// Disable the following of redirects for this test only
-boolean originalValue = HttpURLConnection.getFollowRedirects();
-HttpURLConnection.setFollowRedirects(false);
-try {
-Tomcat tomcat = getTomcatInstance();
-
-// Use standard test webapp as ROOT
-File rootDir = new File("test/webapp-3.0");
-org.apache.catalina.Context root =
-tomcat.addWebapp(null, "", rootDir.getAbsolutePath());
-
-// Add a security constraint
-SecurityConstraint constraint = new SecurityConstraint();
-SecurityCollection collection = new SecurityCollection();
-collection.addPattern("/welcome-files/*");
-collection.addPattern("/welcome-files");
-constraint.addCollection(collection);
-constraint.addAuthRole("foo");
-root.addConstraint(constraint);
-
-// Also make examples available
-File examplesDir = new File(getBuildDirectory(), 
"webapps/examples");
-org.apache.catalina.Context examples  = tomcat.addWebapp(
-null, "/examples", examplesDir.getAbsolutePath());
-examples.setMapperContextRootRedirectEnabled(false);
-// Then block access to the examples to test redirection
-RemoteAddrValve rav = new RemoteAddrValve();
-rav.setDeny(".*");
-rav.setDenyStatus(404);
-examples.getPipeline().addValve(rav);
-
-tomcat.start();
-
-// Redirects within a web application
-doRedirectTest("/welcome-files", 401);
-doRedirectTest("/welcome-files/", 401);
-
-doRedirectTest("/jsp", 302);
-doRedirectTest("/jsp/", 404);
-
-doRedirectTest("/WEB-INF", 404);
-doRedirectTest("/WEB-INF/", 404);
-
-// Redirects between web applications
-doRedirectTest("/examples", 404);
-doRedirectTest("/examples/", 404);
-} finally {
-HttpURLConnection.setFollowRedirects(originalValue);
-}
+Tomcat tomcat = getTomcatInstance();
+
+// Use standard test webapp as ROOT
+File rootDir = new File("test/webapp-3.0");
+org.apache.catalina.Context root =
+tomcat.addWebapp(null, "", rootDir.getAbsolutePath());
+
+// Add a security constraint
+SecurityConstraint constraint = new SecurityConstraint();
+SecurityCollection collection = new SecurityCollection();
+collection.addPattern("/welcome-files/*");
+collection.addPattern("/welcome-files");
+constraint.addCollection(collection);
+constraint.addAuthRole("foo");
+root.addConstraint(constraint);
+
+// Also make examples available
+File examplesDir = new File(getBuildDirectory(), "webapps/examples");
+org.apache.catalina.Context examples  = tomcat.addWebapp(
+null, "/examples", examplesDir.getAbsolutePath());
+examples.setMapperContextRootRedirectEnabled(false);
+// Then block access to the examples to test redirection
+RemoteAddrValve rav = new RemoteAddrValve();
+rav.setDeny(".*");
+rav.setDenyStatus(404);
+examples.getPipeline().addValve(rav);
+
+tomcat.start();
+
+// Redirects within a web application
+doRedirectTest("/welcome-files", 401);
+doRedirectTest("/welcome-files/", 401);
+
+doRedirectTest("/jsp", 302);
+doRedirectTest("/jsp/", 404);
+
+doRedirectTest("/WEB-INF", 404);
+doRedirectTest("/WEB-INF/", 404);
+
+// Redirects between web applications
+

svn commit: r1823357 - /tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 16:08:16 2018
New Revision: 1823357

URL: http://svn.apache.org/viewvc?rev=1823357=rev
Log:
Fix compilation error

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1823357=1823356=1823357=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
Tue Feb  6 16:08:16 2018
@@ -74,7 +74,7 @@ import org.apache.tomcat.util.scan.Stand
  * don't have to keep writing the cleanup code.
  */
 public abstract class TomcatBaseTest extends LoggingBaseTest {
-private static final int DEFAULT_CLIENT_TIMEOUT_MS = 300_000;
+protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300_000;
 private Tomcat tomcat;
 private boolean accessLogEnabled = false;
 



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

buildbot failure in on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

buildbot success in on tomcat-8-trunk

[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/1241

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] 1823348
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: r1823348 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/mapper/TestMapperWebapps.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

[markt]

Author: markt
Date: Tue Feb  6 15:02:41 2018
New Revision: 1823348

URL: http://svn.apache.org/viewvc?rev=1823348=rev
Log:
Switch tests to using per connection control of redirects rather than
changing the default which may fail when testing with concurrent
threads.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 15:02:41 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,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
-/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: r1823347 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/mapper/TestMapperWebapps.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

[markt]

Author: markt
Date: Tue Feb  6 15:02:14 2018
New Revision: 1823347

URL: http://svn.apache.org/viewvc?rev=1823347=rev
Log:
Switch tests to using per connection control of redirects rather than
changing the default which may fail when testing with concurrent
threads.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 15:02:14 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
 

buildbot failure in on tomcat-8-trunk

[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/1240

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] 1823342
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: r1823346 - in /tomcat/trunk/java/org/apache/catalina: Wrapper.java core/StandardContext.java core/StandardWrapper.java

[markt]

Author: markt
Date: Tue Feb  6 14:43:17 2018
New Revision: 1823346

URL: http://svn.apache.org/viewvc?rev=1823346=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1823346=1823345=1823346=diff
==
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Tue Feb  6 14:43:17 2018
@@ -368,26 +368,6 @@ public interface Wrapper extends Contain
 public void setEnabled(boolean enabled);
 
 /**
- * This method is no longer used. All implementations should be NO-OPs.
- *
- * @param b Unused.
- *
- * @deprecated This will be removed in Tomcat 9.
- */
-@Deprecated
-public void setServletSecurityAnnotationScanRequired(boolean b);
-
-/**
- * This method is no longer used. All implementations should be NO-OPs.
- *
- * @throws ServletException Never thrown
- *
- * @deprecated This will be removed in Tomcat 9.
- */
-@Deprecated
-public void servletSecurityAnnotationScan() throws ServletException;
-
-/**
  * Is the Servlet overridable by a ServletContainerInitializer?
  *
  * @return true if the Servlet can be overridden in a 
ServletContainerInitializer

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1823346=1823345=1823346=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Feb  6 
14:43:17 2018
@@ -4342,20 +4342,6 @@ public class StandardContext extends Con
 return null;
 }
 
-/**
- * Create a servlet registration.
- *
- * @param wrapper The wrapper for which the registration should be created.
- *
- * @return An appropriate registration
- *
- * @deprecated This will be removed in Tomcat 9. The registration should be
- * created directly.
- */
-@Deprecated
-public ServletRegistration.Dynamic dynamicServletAdded(Wrapper wrapper) {
-return new ApplicationServletRegistration(wrapper, this);
-}
 
 /**
  * Hook to track which Servlets were created via

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1823346=1823345=1823346=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Feb  6 
14:43:17 2018
@@ -605,17 +605,8 @@ public class StandardWrapper extends Con
 }
 
 
-/**
- * {@inheritDoc}
- */
-@Override
-public void setServletSecurityAnnotationScanRequired(boolean b) {
-// NO-OP
-}
-
 // - Public Methods
 
-
 /**
  * Execute a periodic task, such as reloading, etc. This method will be
  * invoked inside the classloading context of this container. Unexpected
@@ -1106,14 +1097,6 @@ public class StandardWrapper extends Con
 
 }
 
-/**
- * {@inheritDoc}
- */
-@Override
-public void servletSecurityAnnotationScan() throws ServletException {
-// NO-OP
-}
-
 
 private synchronized void initServlet(Servlet servlet)
 throws ServletException {



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

svn commit: r1823345 - in /tomcat/tc7.0.x/trunk: ./ test/javax/servlet/annotation/ test/javax/servlet/annotation/TestServletSecurity.java test/javax/servlet/annotation/TestServletSecurityMappings.java

[markt]

Author: markt
Date: Tue Feb  6 14:39:20 2018
New Revision: 1823345

URL: http://svn.apache.org/viewvc?rev=1823345=rev
Log:
Test cases for processing ServletSecurity annotations at web application
start

Added:
tomcat/tc7.0.x/trunk/test/javax/servlet/annotation/
  - copied from r1823339, 
tomcat/tc8.5.x/trunk/test/javax/servlet/annotation/
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/javax/servlet/annotation/TestServletSecurity.java

tomcat/tc7.0.x/trunk/test/javax/servlet/annotation/TestServletSecurityMappings.java

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

svn commit: r1823344 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 14:37:39 2018
New Revision: 1823344

URL: http://svn.apache.org/viewvc?rev=1823344=rev
Log:
Add option for test to control if redirects are followed or not

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 14:37:39 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
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341

svn commit: r1823343 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 14:36:34 2018
New Revision: 1823343

URL: http://svn.apache.org/viewvc?rev=1823343=rev
Log:
Back-port required constant

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 14:36:34 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
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165

svn commit: r1823342 - in /tomcat/tc8.0.x/trunk: ./ test/javax/servlet/annotation/ test/org/apache/catalina/core/TestStandardContext.java

[markt]

Author: markt
Date: Tue Feb  6 14:35:39 2018
New Revision: 1823342

URL: http://svn.apache.org/viewvc?rev=1823342=rev
Log:
Test cases for processing ServletSecurity annotations at web application
start

Added:
tomcat/tc8.0.x/trunk/test/javax/servlet/annotation/
  - copied from r1823337, tomcat/trunk/test/javax/servlet/annotation/
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 14:35:39 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,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
-/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: r1823341 - /tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 14:34:54 2018
New Revision: 1823341

URL: http://svn.apache.org/viewvc?rev=1823341=rev
Log:
Back-port required constant

Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1823341=1823340=1823341=diff
==
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
Tue Feb  6 14:34:54 2018
@@ -73,6 +73,7 @@ import org.apache.tomcat.websocket.CaseI
 public abstract class TomcatBaseTest extends LoggingBaseTest {
 private Tomcat tomcat;
 private boolean accessLogEnabled = false;
+protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300_000;
 
 public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
 
@@ -625,12 +626,12 @@ public abstract class TomcatBaseTest ext
 
 public static int headUrl(String path, ByteChunk out, Map resHead)
 throws IOException {
-return methodUrl(path, out, 100, null, resHead, "HEAD");
+return methodUrl(path, out, DEFAULT_CLIENT_TIMEOUT_MS, null, resHead, 
"HEAD");
 }
 
 public static int getUrl(String path, ByteChunk out, Map reqHead,
 Map resHead) throws IOException {
-return getUrl(path, out, 100, reqHead, resHead);
+return getUrl(path, out, DEFAULT_CLIENT_TIMEOUT_MS, reqHead, resHead);
 }
 
 public static int getUrl(String path, ByteChunk out, int readTimeout,



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

svn commit: r1823340 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 14:31:47 2018
New Revision: 1823340

URL: http://svn.apache.org/viewvc?rev=1823340=rev
Log:
Add option for test to control if redirects are followed or not

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 14:31:47 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,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
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1823339 - in /tomcat/tc8.5.x/trunk: ./ test/javax/servlet/annotation/ test/org/apache/catalina/core/TestStandardContext.java

[markt]

Author: markt
Date: Tue Feb  6 14:31:06 2018
New Revision: 1823339

URL: http://svn.apache.org/viewvc?rev=1823339=rev
Log:
Test cases for processing ServletSecurity annotations at web application
start

Added:
tomcat/tc8.5.x/trunk/test/javax/servlet/annotation/
  - copied from r1823337, tomcat/trunk/test/javax/servlet/annotation/
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContext.java

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

svn commit: r1823338 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 14:29:35 2018
New Revision: 1823338

URL: http://svn.apache.org/viewvc?rev=1823338=rev
Log:
Add option for test to control if redirects are followed or not

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 14:29:35 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: r1823337 - in /tomcat/trunk/test: javax/servlet/annotation/ javax/servlet/annotation/TestServletSecurity.java javax/servlet/annotation/TestServletSecurityMappings.java org/apache/catalina/

[markt]

Author: markt
Date: Tue Feb  6 14:17:50 2018
New Revision: 1823337

URL: http://svn.apache.org/viewvc?rev=1823337=rev
Log:
Test cases for processing ServletSecurity annotations at web application
start

Added:
tomcat/trunk/test/javax/servlet/annotation/
tomcat/trunk/test/javax/servlet/annotation/TestServletSecurity.java   (with 
props)
tomcat/trunk/test/javax/servlet/annotation/TestServletSecurityMappings.java 
  (with props)
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java

Added: tomcat/trunk/test/javax/servlet/annotation/TestServletSecurity.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/annotation/TestServletSecurity.java?rev=1823337=auto
==
--- tomcat/trunk/test/javax/servlet/annotation/TestServletSecurity.java (added)
+++ tomcat/trunk/test/javax/servlet/annotation/TestServletSecurity.java Tue Feb 
 6 14:17:50 2018
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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 and
+ * limitations under the License.
+ */
+package javax.servlet.annotation;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestServletSecurity extends TomcatBaseTest {
+
+@Test
+public void testFooThenFooBar() throws Exception {
+doTestFooAndFooBar(true);
+}
+
+
+@Test
+public void testFooBarThenFoo() throws Exception {
+doTestFooAndFooBar(false);
+}
+
+
+public void doTestFooAndFooBar(boolean fooFirst) throws Exception {
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+Tomcat.addServlet(ctx, "Foo", Foo.class.getName());
+ctx.addServletMappingDecoded("/foo/*", "Foo");
+
+Tomcat.addServlet(ctx, "FooBar", FooBar.class.getName());
+ctx.addServletMappingDecoded("/foo/bar/*", "FooBar");
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc;
+
+if (fooFirst) {
+rc = getUrl("http://localhost:; + getPort() + "/foo", bc, null, 
null);
+} else {
+rc = getUrl("http://localhost:; + getPort() + "/foo/bar", bc, 
null, null);
+}
+
+bc.recycle();
+Assert.assertEquals(403, rc);
+
+if (fooFirst) {
+rc = getUrl("http://localhost:; + getPort() + "/foo/bar", bc, 
null, null);
+} else {
+rc = getUrl("http://localhost:; + getPort() + "/foo", bc, null, 
null);
+}
+
+Assert.assertEquals(403, rc);
+}
+
+
+@ServletSecurity(@HttpConstraint(ServletSecurity.EmptyRoleSemantic.DENY))
+public static class Foo extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.getWriter().print("OK: Foo");
+}
+}
+
+
+public static class FooBar extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.getWriter().print("OK: FooBar");
+}
+}
+}

Propchange: tomcat/trunk/test/javax/servlet/annotation/TestServletSecurity.java
--
svn:eol-style = native

Added: 
tomcat/trunk/test/javax/servlet/annotation/TestServletSecurityMappings.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/annotation/TestServletSecurityMappings.java?rev=1823337=auto
==
--- 

[Bug 62080] EL Util class should have doPrivileged block

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

Summary|EL Util class should have   |EL Util class should have
   |doPrivledge block   |doPrivileged block

-- 
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: r1823322 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/doc

[markt]

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1823322=1823321=1823322=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue 
Feb  6 12:49:49 2018
@@ -5,17 +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 and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.core;
 
 import java.io.PrintStream;
@@ -44,11 +42,9 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.ServletSecurityElement;
 import javax.servlet.SingleThreadModel;
 import javax.servlet.UnavailableException;
 import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.annotation.ServletSecurity;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.ContainerServlet;
@@ -114,12 +110,12 @@ public class StandardWrapper extends Con
  * servlet is considered permanent.
  */
 protected long available = 0L;
-
+
 /**
- * The broadcaster that sends j2ee notifications. 
+ * The broadcaster that sends j2ee notifications.
  */
 protected NotificationBroadcasterSupport broadcaster = null;
-
+
 /**
  * The count of allocations that are currently active (even if they
  * are for the same instance, as will be true on a non-STM servlet).
@@ -231,12 +227,12 @@ public class StandardWrapper extends Con
  */
 protected Stack instancePool = null;
 
-
+
 /**
  * Wait time for servlet unload in ms.
  */
 protected long unloadDelay = 2000;
-
+
 
 /**
  * True if this StandardWrapper is for the JspServlet
@@ -259,12 +255,12 @@ public class StandardWrapper extends Con
 protected StandardWrapperValve swValve;
 protected long loadTime=0;
 protected int classLoadTime=0;
-
+
 /**
  * Multipart config
  */
 protected MultipartConfigElement multipartConfigElement = null;
-
+
 /**
  * Async support
  */
@@ -275,26 +271,24 @@ public class StandardWrapper extends Con
  */
 protected boolean enabled = true;
 
-protected volatile boolean servletSecurityAnnotationScanRequired = false;
-
 private boolean overridable = false;
-
+
 /**
- * Static class array used when the SecurityManager is turned on and 
+ * Static class array used when the SecurityManager is turned on and
  * Servlet.init is invoked.
  */
 protected static Class[] classType = new Class[]{ServletConfig.class};
-
-
+
+
 /**
- * Static class array used when the SecurityManager is turned on and 
+ * Static class array used when the SecurityManager is turned on and
  * Servlet.service  is invoked.
- */ 
+ */
 @Deprecated
 protected static Class[] classTypeUsedInService = new Class[]{
  ServletRequest.class,
  
ServletResponse.class};
-
+
 
 private final ReentrantReadWriteLock parametersLock =
 new ReentrantReadWriteLock();
@@ -625,7 +619,7 @@ public class StandardWrapper extends Con
 public String[] getServletMethods() throws ServletException {
 
 instance = loadServlet();
-
+
 Class servletClazz = instance.getClass();
 if (!javax.servlet.http.HttpServlet.class.isAssignableFrom(
 servletClazz)) {
@@ -665,8 +659,8 @@ public class StandardWrapper extends Con
 public Servlet getServlet() {
 return instance;
 }
-
-
+
+
 /**
  * Set the associated servlet instance.
  */
@@ -675,13 +669,13 @@ public class StandardWrapper extends Con
 instance = servlet;
 }
 
-
+
 /**
  * {@inheritDoc}
  */
 @Override
 public void setServletSecurityAnnotationScanRequired(boolean b) {
-this.servletSecurityAnnotationScanRequired = b;
+// NO-OP
 }
 
 // - Public Methods
@@ -695,19 +689,19 

svn commit: r1823322 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/doc

[markt]

Author: markt
Date: Tue Feb  6 12:49:49 2018
New Revision: 1823322

URL: http://svn.apache.org/viewvc?rev=1823322=rev
Log:
Process all ServletSecurity annotations at web application start rather
than at servlet load time to ensure constraints are applied
consistently.

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

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:49:49 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
 

svn commit: r1823321 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/WebAnnotationSet.java

[markt]

Author: markt
Date: Tue Feb  6 12:36:51 2018
New Revision: 1823321

URL: http://svn.apache.org/viewvc?rev=1823321=rev
Log:
Code clean-up.
No functional change.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:36:51 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
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165

svn commit: r1823320 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 12:28:30 2018
New Revision: 1823320

URL: http://svn.apache.org/viewvc?rev=1823320=rev
Log:
When using Tomcat embedded, only perform Authenticator configuration once 
during web application start.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:28:30 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
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165

svn propchange: r1823314 - svn:log

[markt]

Author: markt
Revision: 1823314
Modified property: svn:log

Modified: svn:log at Tue Feb  6 12:27:02 2018
--
--- svn:log (original)
+++ svn:log Tue Feb  6 12:27:02 2018
@@ -1,2 +1,3 @@
-Correctly apply security constraints mapped to the context root using a
-URL pattern of ""
+Process all ServletSecurity annotations at web application start rather
+than at servlet load time to ensure constraints are applied
+consistently.


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

svn commit: r1823319 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/

[markt]

Author: markt
Date: Tue Feb  6 12:26:13 2018
New Revision: 1823319

URL: http://svn.apache.org/viewvc?rev=1823319=rev
Log:
Process all ServletSecurity annotations at web application start rather
than at servlet load time to ensure constraints are applied
consistently.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:26:13 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,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
-/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: r1823317 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/WebAnnotationSet.java

[markt]

Author: markt
Date: Tue Feb  6 12:18:36 2018
New Revision: 1823317

URL: http://svn.apache.org/viewvc?rev=1823317=rev
Log:
Code clean-up.
No functional change.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:18:36 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,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
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1823315 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 12:16:34 2018
New Revision: 1823315

URL: http://svn.apache.org/viewvc?rev=1823315=rev
Log:
When using Tomcat embedded, only perform Authenticator configuration once 
during web application start.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:16:34 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,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
-/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: r1823314 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/

[markt]

Author: markt
Date: Tue Feb  6 12:15:40 2018
New Revision: 1823314

URL: http://svn.apache.org/viewvc?rev=1823314=rev
Log:
Correctly apply security constraints mapped to the context root using a
URL pattern of ""

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

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1823313 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/WebAnnotationSet.java

[markt]

Author: markt
Date: Tue Feb  6 12:14:12 2018
New Revision: 1823313

URL: http://svn.apache.org/viewvc?rev=1823313=rev
Log:
Code clean-up.
No functional change.

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

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

svn commit: r1823312 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 12:13:35 2018
New Revision: 1823312

URL: http://svn.apache.org/viewvc?rev=1823312=rev
Log:
When using Tomcat embedded, only perform Authenticator configuration once 
during web application start.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 12:13:35 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: r1823310 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/

[markt]

Author: markt
Date: Tue Feb  6 12:08:26 2018
New Revision: 1823310

URL: http://svn.apache.org/viewvc?rev=1823310=rev
Log:
Process all ServletSecurity annotations at web application start rather
than at servlet load time to ensure constraints are applied
consistently.

Modified:
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1823310=1823309=1823310=diff
==
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Tue Feb  6 12:08:26 2018
@@ -368,21 +368,23 @@ public interface Wrapper extends Contain
 public void setEnabled(boolean enabled);
 
 /**
- * Set the flag that indicates
- * {@link javax.servlet.annotation.ServletSecurity} annotations must be
- * scanned when the Servlet is first used.
+ * This method is no longer used. All implementations should be NO-OPs.
  *
- * @param b The new value of the flag
+ * @param b Unused.
+ *
+ * @deprecated This will be removed in Tomcat 9.
  */
+@Deprecated
 public void setServletSecurityAnnotationScanRequired(boolean b);
 
 /**
- * Scan for (if necessary) and process (if found) the
- * {@link javax.servlet.annotation.ServletSecurity} annotations for the
- * Servlet associated with this wrapper.
+ * This method is no longer used. All implementations should be NO-OPs.
+ *
+ * @throws ServletException Never thrown
  *
- * @throws ServletException if an annotation scanning error occurs
+ * @deprecated This will be removed in Tomcat 9.
  */
+@Deprecated
 public void servletSecurityAnnotationScan() throws ServletException;
 
 /**

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=1823310=1823309=1823310=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Tue Feb  6 12:08:26 2018
@@ -52,7 +52,6 @@ import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
 import org.apache.catalina.TomcatPrincipal;
 import org.apache.catalina.Valve;
-import org.apache.catalina.Wrapper;
 import org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl;
 import org.apache.catalina.authenticator.jaspic.MessageInfoImpl;
 import org.apache.catalina.connector.Request;
@@ -479,13 +478,6 @@ public abstract class AuthenticatorBase
 
 boolean authRequired = isContinuationRequired(request);
 
-// The Servlet may specify security constraints through annotations.
-// Ensure that they have been processed before constraints are checked
-Wrapper wrapper = request.getWrapper();
-if (wrapper != null) {
-wrapper.servletSecurityAnnotationScan();
-}
-
 Realm realm = this.context.getRealm();
 // Is this request URI subject to a security constraint?
 SecurityConstraint[] constraints = 
realm.findSecurityConstraints(request, this.context);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1823310=1823309=1823310=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Feb  
6 12:08:26 2018
@@ -49,8 +49,10 @@ import javax.servlet.ServletRegistration
 import javax.servlet.ServletRegistration.Dynamic;
 import javax.servlet.ServletRequestAttributeListener;
 import javax.servlet.ServletRequestListener;
+import javax.servlet.ServletSecurityElement;
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
+import javax.servlet.annotation.ServletSecurity;
 import javax.servlet.descriptor.JspConfigDescriptor;
 import 

[Bug 62080] EL Util class should have doPrivledge block

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO
 OS||All

--- Comment #1 from Mark Thomas  ---
Can you provide a simple test case that demonstrates the problem?

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

[Bug 62067] HttpConstraint not applied when Servlet mapped ""

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.5 onwards
- 8.5.x for 8.5.28 onwards
- 8.0.x for 8.0.50 onwards
- 7.0.x for 7.0.85 onwards

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

svn commit: r1823309 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 11:41:16 2018
New Revision: 1823309

URL: http://svn.apache.org/viewvc?rev=1823309=rev
Log: (empty)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 11:41:16 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
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165

svn commit: r1823308 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 11:40:42 2018
New Revision: 1823308

URL: http://svn.apache.org/viewvc?rev=1823308=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62067
Correctly apply security constraints mapped to the context root using a
URL pattern of ""

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 11:40:42 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,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
-/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: r1823307 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 11:40:05 2018
New Revision: 1823307

URL: http://svn.apache.org/viewvc?rev=1823307=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62067
Correctly apply security constraints mapped to the context root using a
URL pattern of ""

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  6 11:40:05 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: r1823306 - in /tomcat/trunk: java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  6 11:38:09 2018
New Revision: 1823306

URL: http://svn.apache.org/viewvc?rev=1823306=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62067
Correctly apply security constraints mapped to the context root using a
URL pattern of ""

Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1823306=1823305=1823306=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Tue Feb  6 
11:38:09 2018
@@ -546,9 +546,9 @@ public abstract class RealmBase extends
 
 // Check each defined security constraint
 String uri = request.getRequestPathMB().toString();
-// Bug47080 - in rare cases this may be null
+// Bug47080 - in rare cases this may be null or ""
 // Mapper treats as '/' do the same to prevent NPE
-if (uri == null) {
+if (uri == null || uri.length() == 0) {
 uri = "/";
 }
 
@@ -580,7 +580,8 @@ public abstract class RealmBase extends
 }
 
 for(int k=0; k < patterns.length; k++) {
-if(uri.equals(patterns[k])) {
+// Exact match including special case for the context root.
+if(uri.equals(patterns[k]) || patterns[k].length() == 0 && 
uri.equals("/")) {
 found = true;
 if(collection[j].findMethod(method)) {
 if(results == null) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1823306=1823305=1823306=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb  6 11:38:09 2018
@@ -91,6 +91,10 @@
 When using Tomcat embedded, only perform Authenticator configuration
 once during web application start. (markt)
   
+  
+62067: Correctly apply security constraints mapped to the
+context root using a URL pattern of . (markt)
+  
 
   
   



-
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

[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/3026

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] 1823283
Blamelist: remm

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: r1823283 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

[remm]

Author: remm
Date: Tue Feb  6 08:48:16 2018
New Revision: 1823283

URL: http://svn.apache.org/viewvc?rev=1823283=rev
Log:
int -> long. Not going to happen of course.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1823283=1823282=1823283=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Feb  6 
08:48:16 2018
@@ -878,7 +878,7 @@ public class Nio2Endpoint extends Abstra
 private class ScatterReadCompletionHandler implements 
CompletionHandler {
 @Override
 public void completed(Long nBytes, OperationState state) {
-if (nBytes.intValue() < 0) {
+if (nBytes.longValue() < 0) {
 failed(new EOFException(), state);
 } else {
 state.nBytes += nBytes.longValue();



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

svn commit: r1823282 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

[remm]

Author: remm
Date: Tue Feb  6 08:47:19 2018
New Revision: 1823282

URL: http://svn.apache.org/viewvc?rev=1823282=rev
Log:
Add FIXME to remind about revisiting.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1823282=1823281=1823282=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Feb 
 6 08:47:19 2018
@@ -726,6 +726,7 @@ public class SecureNio2Channel extends N
 } else {
 unwrapBeforeRead = false;
 }
+// FIXME: 61751 implies that this algorithm can still return 0 in 
some cases
 return Integer.valueOf(read);
 }
 }



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

[Bug 61751] NIO2 connector cuts incoming request

[bugzilla]

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

--- Comment #15 from Remy Maucherat  ---
On second thought, this will need to be revisited as the blocking read of
SecureNio2Channel is supposed to block until it returns non 0. Of course, the
algorithm is complex already ...
I will add a TODO comment in trunk about that.

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