[Bug 61164] Add %X option to access log for connection status

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61164

--- Comment #5 from Zemian Deng  ---
Mark, I see org.apache.coyote.AbstractProcessor#dispatch() starting line 205
contains error handling code that says "occurred on 'non-container' thread". Is
this where what you want to start tracking with a new req attribute?

-- 
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 61164] Add %X option to access log for connection status

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61164

--- Comment #4 from Zemian Deng  ---
I have pushed a new commit to the PR. Please review.

As far as adding "container initiated (rather than client initiated) aborts", I
will need to study some more before I can determine where to add the new req
attr. (do give me a hint if you already know.)

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



[VOTE] Release Apache Tomcat 8.5.19

2017-07-24 Thread Mark Thomas
The proposed Apache Tomcat 8.5.19 release is now available for voting.

The major changes compared to the 8.5.16 release are:

- Enable TLS connectors to use Java key stores that contain multiple
  keys where each key has a separate password. Based on a patch by Frank
  Taffelt.

- Make asynchronous error handling more robust. In particular ensure
  that onError() is called for any registered AsyncListeners after an
  I/O error on a non-container thread.

- Sync SSL session access for the APR connector to prevent errors when
  accessing the session.


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.19/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1146/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_19/

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

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



[VOTE] Release Apache Tomcat 9.0.0.M25

2017-07-24 Thread Mark Thomas
The proposed Apache Tomcat 9.0.0.M25 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

Note that the 9.0.0.M23 and 9.0.0.M24 release votes were cancelled due
to regressions.

The major changes compared to the 9.0.0.M22 release are:

- Correct a regression in 9.0.0.M22 that prevented Tomcat from shutting
  down cleanly.

- Add LoadBalancerDrainingValve, a Valve designed to reduce the amount
  of time required for a node to drain its authenticated users.

- When generating JSP runtime error messages that quote the relevant JSP
  source code, switch from using the results of the JSP page parsing
  process to using the JSR 045 source map data to identify the correct
  part of the JSP source from the stack trace. This significantly
  reduces the memory footprint of Jasper in development mode, provides a
  small performance improvement for error page generation and enables
  source quotes to continue to be provided after a Tomcat restart.

- Add support for a Tomcat specific deployment descriptor,
  /WEB-INF/tomcat-web.xml

- Add ExtractingRoot, a new WebResourceRoot implementation that extracts
  JARs to the work directory for improved performance when deploying
  packed WAR files.

Along with lots of other bug fixes and improvements.


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

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

The proposed 9.0.0.M25 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 9.0.0.M25

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



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

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 23:07:37 2017
New Revision: 1802874

URL: http://svn.apache.org/viewvc?rev=1802874=rev
Log:
Increment version number 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=1802874=1802873=1802874=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Mon Jul 24 23:07:37 2017
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=19
+version.build=20
 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=1802874=1802873=1802874=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Mon Jul 24 23:07:37 
2017
@@ -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.19
+maven.asf.release.deploy.version=8.5.20
 
 #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=1802874=1802873=1802874=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Jul 24 23:07:37 2017
@@ -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: r1802873 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 23:03:45 2017
New Revision: 1802873

URL: http://svn.apache.org/viewvc?rev=1802873=rev
Log:
Increment version number 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=1802873=1802872=1802873=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jul 24 23:03:45 2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M25-dev
+version.suffix=.M26-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1802873=1802872=1802873=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Mon Jul 24 23:03:45 2017
@@ -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.0.M25
+maven.asf.release.deploy.version=9.0.0.M26
 
 #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=1802873=1802872=1802873=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 24 23:03:45 2017
@@ -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: r20615 - in /dev/tomcat/tomcat-8/v8.5.19: ./ bin/ bin/embed/ bin/extras/ src/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 21:24:16 2017
New Revision: 20615

Log:
Upload 8.5.19 for voting

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

Added: dev/tomcat/tomcat-8/v8.5.19/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.19/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.19/KEYS Mon Jul 24 21:24:16 2017
@@ -0,0 +1,616 @@
+This file contains the PGP keys of various Apache 

[Bug 61164] Add %X option to access log for connection status

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61164

--- Comment #3 from Zemian Deng  ---
Hi Mark, yes hence the PR wasn't that big. :)

I saw the comment you made on GitHub, I will take a further look later and let
you know.

-- 
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: r20613 - in /dev/tomcat/tomcat-9/v9.0.0.M25: ./ bin/ bin/embed/ bin/extras/ src/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 20:27:31 2017
New Revision: 20613

Log:
Upload 9.0.0.M25 for a release vote

Added:
dev/tomcat/tomcat-9/v9.0.0.M25/
dev/tomcat/tomcat-9/v9.0.0.M25/KEYS
dev/tomcat/tomcat-9/v9.0.0.M25/README.html
dev/tomcat/tomcat-9/v9.0.0.M25/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.0.M25/bin/
dev/tomcat/tomcat-9/v9.0.0.M25/bin/README.html
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-fulldocs.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-fulldocs.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-fulldocs.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x64.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x64.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x64.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x86.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x86.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x86.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.exe   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.exe.asc
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.exe.md5
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.exe.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M25/bin/apache-tomcat-9.0.0.M25.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.tar.gz   
(with props)

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M25/bin/embed/apache-tomcat-9.0.0.M25-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M25/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/src/
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M25/src/apache-tomcat-9.0.0.M25-src.zip.md5

svn commit: r1802865 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_19: ./ build.properties.default webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 20:15:35 2017
New Revision: 1802865

URL: http://svn.apache.org/viewvc?rev=1802865=rev
Log:
Tag 8.5.19

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

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

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

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_19/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Jul 24 20:15:35 2017
@@ -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_19/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

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

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_19/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul 24 20:15:35 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_19/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 24 20:15:35 2017
@@ -0,0 +1 @@
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 

svn commit: r20610 - in /dev/tomcat: tomcat-8/v8.5.18/ tomcat-9/v9.0.0.M24/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 20:11:14 2017
New Revision: 20610

Log:
Drop 8.5.18 and 9.0.0.M24 since the votes did not pass.

Removed:
dev/tomcat/tomcat-8/v8.5.18/
dev/tomcat/tomcat-9/v9.0.0.M24/


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



svn commit: r1802859 - in /tomcat/tags/TOMCAT_9_0_0_M25: ./ build.properties.default webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 20:02:37 2017
New Revision: 1802859

URL: http://svn.apache.org/viewvc?rev=1802859=rev
Log:
Tag 9.0.0.M25

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

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

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

Propchange: tomcat/tags/TOMCAT_9_0_0_M25/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Jul 24 20:02:37 2017
@@ -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_0_M25/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

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

Propchange: tomcat/tags/TOMCAT_9_0_0_M25/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul 24 20:02:37 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tags/TOMCAT_9_0_0_M25/
--
svn:mergeinfo = /tomcat/tc8.5.x/trunk:1802799

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

Modified: tomcat/tags/TOMCAT_9_0_0_M25/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M25/build.properties.default?rev=1802859=1802858=1802859=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M25/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M25/build.properties.default Mon Jul 24 20:02:37 
2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M25-dev
+version.suffix=.M25
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M25/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M25/webapps/docs/changelog.xml?rev=1802859=1802858=1802859=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M25/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M25/webapps/docs/changelog.xml Mon Jul 24 20:02:37 
2017
@@ -1,4 +1,4 @@
-
+
 
-
+
   
 
   



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



svn commit: r1802851 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 18:39:16 2017
New Revision: 1802851

URL: http://svn.apache.org/viewvc?rev=1802851=rev
Log:
9.5.18 release was cancelled

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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=1802851=1802850=1802851=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Jul 24 18:39:16 2017
@@ -86,7 +86,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1802850 - /tomcat/trunk/webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 18:39:01 2017
New Revision: 1802850

URL: http://svn.apache.org/viewvc?rev=1802850=rev
Log:
9.0.0.M24 release was cancelled

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1802850=1802849=1802850=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 24 18:39:01 2017
@@ -92,7 +92,7 @@
 
   
 
-
+
   
 
   



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



[GitHub] tomcat pull request #70: Add new accesslog valve pattern %X for recording co...

2017-07-24 Thread markt-asf
Github user markt-asf commented on a diff in the pull request:

https://github.com/apache/tomcat/pull/70#discussion_r129111529
  
--- Diff: java/org/apache/catalina/valves/AbstractAccessLogValve.java ---
@@ -1506,6 +1508,38 @@ public void addElement(CharArrayWriter buf, Date 
date, Request request,
 }
 }
 
+/**
+ * Write connection status when response is completed - %X
+ */
+protected static class ConnectionStatusElement implements 
AccessLogElement {
+@Override
+public void addElement(CharArrayWriter buf, Date date, Request 
request, Response response, long time) {
+if (response != null && request != null) {
+// Check for connection aborted cond
+boolean isConnAborted = false;
+if (response.isError()) {
+Throwable ex = 
(Throwable)request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
+if (ex instanceof ClientAbortException) {
+isConnAborted = true;
+buf.append('X');
+}
+}
+
+// Check whether connection is keep-alive or not
+if (!isConnAborted) {
+if 
(org.apache.coyote.http11.Constants.KEEPALIVE.equals(
+
request.getHeader(org.apache.coyote.http11.Constants.CONNECTION))) {
--- End diff --

The log message is intended to show if the connection remains in keep-alive 
after the current request finishes. You want to look at the Connection header 
(for close) on the response here to mimic the behaviour described for httpd.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



buildbot success in on tomcat-7-trunk

2017-07-24 Thread 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/826

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

Build succeeded!

Sincerely,
 -The Buildbot




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



buildbot success in on tomcat-8-trunk

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

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



[Bug 61313] JNDIRealm LDAP server failover to alternateURL takes very long 15m32s

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61313

--- Comment #8 from Peter  ---
Thanks. I tested commit 30e89f9efb571a19d2d3239db7b5e0c17f86b812 (tomcat85
repo) which works like the second possibly hacky patch.

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



buildbot success in on tomcat-trunk

2017-07-24 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2566

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

Build succeeded!

Sincerely,
 -The Buildbot




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



buildbot failure in on tomcat-7-trunk

2017-07-24 Thread 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/825

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



[Bug 61164] Add %X option to access log for connection status

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61164

--- Comment #2 from Mark Thomas  ---
This is a lot simpler than I imagined. My expectation was that the various
places where errors can occur in  in Http11Processor.service() would make this
tricky to implement. It looks like I was wrong. Because those errors set the
RequestDispatcher.ERROR_EXCEPTION, this actually makes implementation fairly
simple.

One aspect that I think needs a little more thought is container initiated
(rather than client initiated) aborts. The easiest way to detect these would be
to add another request attribute. Whether both get logged as 'X' or whether one
is logged as 'X' and the other as 'x' is open to discussion.

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



buildbot failure in on tomcat-8-trunk

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

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] 1802830
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: r1802839 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:50:45 2017
New Revision: 1802839

URL: http://svn.apache.org/viewvc?rev=1802839=rev
Log:
Follow-up to r1802831
Ensure the docBase is absolute

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

tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:50:45 2017
@@ -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,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,1802814

svn commit: r1802838 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:49:06 2017
New Revision: 1802838

URL: http://svn.apache.org/viewvc?rev=1802838=rev
Log:
Better temporary docBase name (easier to delete)

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:49:06 2017
@@ -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
-/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: r1802837 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:48:33 2017
New Revision: 1802837

URL: http://svn.apache.org/viewvc?rev=1802837=rev
Log:
Better temporary docBase name (easier to delete)

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:48:33 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802836 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:48:02 2017
New Revision: 1802836

URL: http://svn.apache.org/viewvc?rev=1802836=rev
Log:
Better temporary docBase name (easier to delete)

Modified:

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1802836=1802835=1802836=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java 
Mon Jul 24 15:48:02 2017
@@ -50,7 +50,7 @@ public class TestWebappClassLoaderWeavin
 @BeforeClass
 public static void setUpClass() throws Exception {
 
-String webappDocBase = "test/tmp/TestWebappClassLoaderWeaving";
+String webappDocBase = "test/tmpTestWebappClassLoaderWeaving";
 File webappDocBaseFile = new File(webappDocBase);
 WEBAPP_DOC_BASE = webappDocBaseFile.getCanonicalPath();
 File classes = new File(webappDocBaseFile, "/WEB-INF/classes/" + 
PACKAGE_PREFIX);



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



svn commit: r1802835 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:46:26 2017
New Revision: 1802835

URL: http://svn.apache.org/viewvc?rev=1802835=rev
Log:
Follow-up to r1802830
Ensure the docBase is absolute

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:46:26 2017
@@ -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
-/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: r1802834 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:46:04 2017
New Revision: 1802834

URL: http://svn.apache.org/viewvc?rev=1802834=rev
Log:
Follow-up to r1802829
Ensure the docBase is absolute

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:46:04 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802833 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:45:29 2017
New Revision: 1802833

URL: http://svn.apache.org/viewvc?rev=1802833=rev
Log:
Follow-up to r1802828
Ensure the docBase is absolute

Modified:

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1802833=1802832=1802833=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java 
Mon Jul 24 15:45:29 2017
@@ -50,8 +50,10 @@ public class TestWebappClassLoaderWeavin
 @BeforeClass
 public static void setUpClass() throws Exception {
 
-WEBAPP_DOC_BASE = "test/tmp/TestWebappClassLoaderWeaving";
-File classes = new File(WEBAPP_DOC_BASE + "/WEB-INF/classes/" + 
PACKAGE_PREFIX);
+String webappDocBase = "test/tmp/TestWebappClassLoaderWeaving";
+File webappDocBaseFile = new File(webappDocBase);
+WEBAPP_DOC_BASE = webappDocBaseFile.getCanonicalPath();
+File classes = new File(webappDocBaseFile, "/WEB-INF/classes/" + 
PACKAGE_PREFIX);
 classes.mkdirs();
 
 copyResource(PACKAGE_PREFIX + "/TesterNeverWeavedClass.class",



-
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

2017-07-24 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2565

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] 1802828
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: r1802831 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:23:27 2017
New Revision: 1802831

URL: http://svn.apache.org/viewvc?rev=1802831=rev
Log:
Fix a possible conflict when running multiple instances of the Tomcat unit 
tests on the same server.

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

tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:23:27 2017
@@ -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,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,1802814

svn commit: r1802830 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:22:32 2017
New Revision: 1802830

URL: http://svn.apache.org/viewvc?rev=1802830=rev
Log:
Fix a possible conflict when running multiple instances of the Tomcat unit 
tests on the same server.

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:22:32 2017
@@ -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
-/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: r1802829 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:22:07 2017
New Revision: 1802829

URL: http://svn.apache.org/viewvc?rev=1802829=rev
Log:
Fix a possible conflict when running multiple instances of the Tomcat unit 
tests on the same server.

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 15:22:07 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802828 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 15:21:40 2017
New Revision: 1802828

URL: http://svn.apache.org/viewvc?rev=1802828=rev
Log:
Fix a possible conflict when running multiple instances of the Tomcat unit 
tests on the same server.

Modified:

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1802828=1802827=1802828=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java 
Mon Jul 24 15:21:40 2017
@@ -50,7 +50,7 @@ public class TestWebappClassLoaderWeavin
 @BeforeClass
 public static void setUpClass() throws Exception {
 
-WEBAPP_DOC_BASE = System.getProperty("java.io.tmpdir") + 
"/TestWebappClassLoaderWeaving";
+WEBAPP_DOC_BASE = "test/tmp/TestWebappClassLoaderWeaving";
 File classes = new File(WEBAPP_DOC_BASE + "/WEB-INF/classes/" + 
PACKAGE_PREFIX);
 classes.mkdirs();
 



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



[Bug 61313] JNDIRealm LDAP server failover to alternateURL takes very long 15m32s

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61313

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #7 from Mark Thomas  ---
Thanks for the work on this and especially for the patches.

There is already retry code in the public authenticate() method.

Fundamentally this hits up against a problem that the previous code was trying
to deal with - how do you tell if a NamingException is something that requires
fail over? The short answer is you can't always tell and the previous code was
not failing over unless there was a clear indication (via the Exception type)
that such a fail over was required.

I have changed the logic so it always attempts to fail over. This won't be
perfect either but I'd rather it always attempted to fail over and therefore
always worked when it could and we get a few extra error messages than it
didn't try to fail over and therefore failed when a fail over could have
resulted in correct operation.

I've also included the readTimeout improvements.

Fixed in:
- trunk for 9.0.0.M25 onwards
- 8.5.x for 8.5.19 onwards
- 8.0.x for 8.0.46 onwards
- 7.0.x for 7.0.80 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: r1802825 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml webapps/docs/config/realm.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 14:59:27 2017
New Revision: 1802825

URL: http://svn.apache.org/viewvc?rev=1802825=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61313
Make the read timeout configurable in the JNDIRealm and ensure that a read 
timeout will result in an attempt to fail over to the alternateURL.
Based on patches by Peter Maloney and Felix Schumacher.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 14:59:27 2017
@@ -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,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,1802814

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

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 14:55:30 2017
New Revision: 1802823

URL: http://svn.apache.org/viewvc?rev=1802823=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61313
Make the read timeout configurable in the JNDIRealm and ensure that a read 
timeout will result in an attempt to fail over to the alternateURL.
Based on patches by Peter Maloney and Felix Schumacher.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 14:55:30 2017
@@ -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
-/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: r1802821 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml webapps/docs/config/realm.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 14:50:52 2017
New Revision: 1802821

URL: http://svn.apache.org/viewvc?rev=1802821=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61313
Make the read timeout configurable in the JNDIRealm and ensure that a read 
timeout will result in an attempt to fail over to the alternateURL.
Based on patches by Peter Maloney and Felix Schumacher.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 14:50:52 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802820 - in /tomcat/trunk: java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml webapps/docs/config/realm.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 14:49:59 2017
New Revision: 1802820

URL: http://svn.apache.org/viewvc?rev=1802820=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61313
Make the read timeout configurable in the JNDIRealm and ensure that a read 
timeout will result in an attempt to fail over to the alternateURL.
Based on patches by Peter Maloney and Felix Schumacher.

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

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1802820=1802819=1802820=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon Jul 24 
14:49:59 2017
@@ -417,6 +417,12 @@ public class JNDIRealm extends RealmBase
 protected String connectionTimeout = "5000";
 
 /**
+ * The timeout, in milliseconds, to use when trying to read from a 
connection
+ * to the directory. The default is 5000 (5 seconds).
+ */
+protected String readTimeout = "5000";
+
+/**
  * The sizeLimit (also known as the countLimit) to use when the realm is
  * configured with {@link #userSearch}. Zero for no limit.
  */
@@ -1037,6 +1043,27 @@ public class JNDIRealm extends RealmBase
 
 }
 
+/**
+ * @return the read timeout.
+ */
+public String getReadTimeout() {
+
+return readTimeout;
+
+}
+
+
+/**
+ * Set the read timeout.
+ *
+ * @param timeout The new read timeout
+ */
+public void setReadTimeout(String timeout) {
+
+this.readTimeout = timeout;
+
+}
+
 
 public long getSizeLimit() {
 return sizeLimit;
@@ -1259,11 +1286,22 @@ public class JNDIRealm extends RealmBase
 // Authenticate the specified username if possible
 principal = authenticate(context, username, credentials);
 
-} catch (NullPointerException | CommunicationException
-| ServiceUnavailableException e) {
-/* BZ 42449 - Catch NPE - Kludge Sun's LDAP provider
-   with broken SSL
-*/
+} catch (NullPointerException | NamingException e) {
+/*
+ * BZ 61313
+ * NamingException may or may not indicate an error that is
+ * recoverable via fail over. Therefore a decision needs to be
+ * made whether to fail over or not. Generally, attempting to
+ * fail over when it is not appropriate is better than not
+ * failing over when it is appropriate so the code always
+ * attempts to fail over for NamingExceptions.
+ */
+
+/*
+ * BZ 42449
+ * Catch NPE - Kludge Sun's LDAP provider with broken SSL.
+ */
+
 // log the exception so we know it's there.
 containerLog.info(sm.getString("jndiRealm.exception.retry"), 
e);
 
@@ -2511,6 +2549,8 @@ public class JNDIRealm extends RealmBase
 env.put(JNDIRealm.DEREF_ALIASES, derefAliases);
 if (connectionTimeout != null)
 env.put("com.sun.jndi.ldap.connect.timeout", connectionTimeout);
+if (readTimeout != null)
+env.put("com.sun.jndi.ldap.read.timeout", readTimeout);
 
 return env;
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1802820=1802819=1802820=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 24 14:49:59 2017
@@ -67,6 +67,12 @@
 cause an byte order mark character to appear at the start of content
 included by the DefaultServlet. (markt)
   
+  
+61313: Make the read timeout configurable in the
+JNDIRealm and ensure that a read timeout will result in an
+attempt to fail over to the alternateURL. Based on patches by Peter
+Maloney and Felix Schumacher. (markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1802820=1802819=1802820=diff
==
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Mon Jul 24 14:49:59 2017
@@ -470,6 +470,12 @@
  the providers default is used.
   
 
+  
+  The timeout, in milliseconds, to use when trying to read from a
+  connection 

[Bug 61322] Http11Processor.disableKeepAlivePercentage not work after code change in 60319

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61322

Mark Thomas  changed:

   What|Removed |Added

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

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

Both issues are fixed in:
- 8.0.x for 8.0.46 onwards
- 7.0.x for 7.0.80 onwards

Note since this affects the BIO connector, it does not apply to 8.5.x 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: r1802815 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11Processor.java java/org/apache/tomcat/util/net/AbstractEndpoint.java java/org/apache/tomcat/util/net/JIoEndpoint

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 13:49:43 2017
New Revision: 1802815

URL: http://svn.apache.org/viewvc?rev=1802815=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61322
Correct two regressions caused by the fix for bug 60319 when using BIO with an 
external Executor. Firstly, use the maxThreads setting from the Executor as the 
default for maxConnections if none is specified. Secondly, use maxThreads from 
the Executor when calculating the point at which to disable keep-alive.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 13:49:43 2017
@@ -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: r1802814 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/http11/Http11Processor.java java/org/apache/tomcat/util/net/AbstractEndpoint.java java/org/apache/tomcat/util/net/JIoEndpoint.ja

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 13:48:45 2017
New Revision: 1802814

URL: http://svn.apache.org/viewvc?rev=1802814=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61322
Correct two regressions caused by the fix for bug 60319 when using BIO with an 
external Executor. Firstly, use the maxThreads setting from the Executor as the 
default for maxConnections if none is specified. Secondly, use maxThreads from 
the Executor when calculating the point at which to disable keep-alive.

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1802814=1802813=1802814=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon 
Jul 24 13:48:45 2017
@@ -107,7 +107,7 @@ public class Http11Processor extends Abs
 // Only calculate a thread ratio when both are >0 to ensure we get a
 // sensible result
 int maxThreads, threadsBusy;
-if ((maxThreads = endpoint.getMaxThreads()) > 0
+if ((maxThreads = endpoint.getMaxThreadsWithExecutor()) > 0
 && (threadsBusy = endpoint.getCurrentThreadsBusy()) > 0) {
 threadRatio = (threadsBusy * 100) / maxThreads;
 }

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1802814=1802813=1802814=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
Mon Jul 24 13:48:45 2017
@@ -421,6 +421,19 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1802814=1802813=1802814=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon 
Jul 24 13:48:45 2017
@@ -348,7 +348,7 @@ public class JIoEndpoint extends Abstrac
 // Initialize maxConnections
 if (getMaxConnections() == 0) {
 // User hasn't set a value - use the default
-setMaxConnections(getMaxThreadsInternal());
+setMaxConnections(getMaxThreadsWithExecutor());
 }
 
 if (serverSocketFactory == null) {

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1802814=1802813=1802814=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Jul 24 13:48:45 2017
@@ -82,6 +82,18 @@
   
 
   
+  
+
+  
+61322: Correct two regressions caused by the fix for
+60319 when using BIO with an external Executor. Firstly, use
+the maxThreads setting from the Executor as the default 
for
+maxConnections if none is specified. Secondly, use
+maxThreads from the Executor when calculating the point at
+which to disable keep-alive. (markt)
+  
+
+  
   
 
   



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



Re: svn commit: r1802803 - /tomcat/trunk/build.xml

2017-07-24 Thread Mark Thomas
On 24/07/17 13:39, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Mon Jul 24 12:39:29 2017
> New Revision: 1802803
> 
> URL: http://svn.apache.org/viewvc?rev=1802803=rev
> Log:
> Followup to BZ 61316 fix. Change comment to correct a typo.

Tx.

Mark


> 
> Modified:
> tomcat/trunk/build.xml
> 
> Modified: tomcat/trunk/build.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1802803=1802802=1802803=diff
> ==
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Mon Jul 24 12:39:29 2017
> @@ -285,7 +285,7 @@
>  
>  
>  
> -
> +
>  
>  
>  
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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



svn commit: r1802809 - in /tomcat/tc7.0.x/trunk: ./ CONTRIBUTING.md README.md build.xml

2017-07-24 Thread kkolinko
Author: kkolinko
Date: Mon Jul 24 12:48:38 2017
New Revision: 1802809

URL: http://svn.apache.org/viewvc?rev=1802809=rev
Log:
Markdown markup files are text. Set svn:eol-style=native on and add them to 
"text.files" in build.xml.

Merged r1802808 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/CONTRIBUTING.md   (props changed)
tomcat/tc7.0.x/trunk/README.md   (props changed)
tomcat/tc7.0.x/trunk/build.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 12:48:38 2017
@@ -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,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

svn commit: r1802808 - in /tomcat/tc8.0.x/trunk: ./ CONTRIBUTING.md README.md build.xml

2017-07-24 Thread kkolinko
Author: kkolinko
Date: Mon Jul 24 12:46:40 2017
New Revision: 1802808

URL: http://svn.apache.org/viewvc?rev=1802808=rev
Log:
Markdown markup files are text. Set svn:eol-style=native on and add them to 
"text.files" in build.xml.

Merged r1802805 from tomcat/tc8.5.x/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/CONTRIBUTING.md   (props changed)
tomcat/tc8.0.x/trunk/README.md   (props changed)
tomcat/tc8.0.x/trunk/build.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 12:46:40 2017
@@ -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
-/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: r1802806 - in /tomcat/tc8.5.x/trunk: ./ build.xml

2017-07-24 Thread kkolinko
Author: kkolinko
Date: Mon Jul 24 12:43:00 2017
New Revision: 1802806

URL: http://svn.apache.org/viewvc?rev=1802806=rev
Log:
Followup to BZ 61316 fix. Change comment to correct a typo.

Merged r1802803 from tomcat/trunk.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 12:43:00 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802805 - in /tomcat/tc8.5.x/trunk: ./ CONTRIBUTING.md README.md build.xml

2017-07-24 Thread kkolinko
Author: kkolinko
Date: Mon Jul 24 12:41:29 2017
New Revision: 1802805

URL: http://svn.apache.org/viewvc?rev=1802805=rev
Log:
Markdown markup files are text. Set svn:eol-style=native on and add them to 
"text.files" in build.xml.

Merged r1802796 from tomcat/trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/CONTRIBUTING.md   (props changed)
tomcat/tc8.5.x/trunk/README.md   (props changed)
tomcat/tc8.5.x/trunk/build.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 12:41:29 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802803 - /tomcat/trunk/build.xml

2017-07-24 Thread kkolinko
Author: kkolinko
Date: Mon Jul 24 12:39:29 2017
New Revision: 1802803

URL: http://svn.apache.org/viewvc?rev=1802803=rev
Log:
Followup to BZ 61316 fix. Change comment to correct a typo.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1802803=1802802=1802803=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 24 12:39:29 2017
@@ -285,7 +285,7 @@
 
 
 
-
+
 
 
 



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



svn commit: r1802800 - in /tomcat/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/digester/LocalStrings.properties

2017-07-24 Thread csutherl
Author: csutherl
Date: Mon Jul 24 12:22:16 2017
New Revision: 1802800

URL: http://svn.apache.org/viewvc?rev=1802800=rev
Log:
Followup to r1802639, Use StringManager in log message

Modified:
tomcat/trunk/   (props changed)
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties

Propchange: tomcat/trunk/
--
svn:mergeinfo = /tomcat/tc8.5.x/trunk:1802799

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802800=1802799=1802800=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Jul 24 
12:22:16 2017
@@ -1923,7 +1923,7 @@ public class Digester extends DefaultHan
 newAttrs.setValue(i, newValue);
 }
 } catch (Exception e) {
-log.warn("Attribute [" + newAttrs.getLocalName(i) + "] failed 
to update and remains [" + value + "].", e);
+log.warn(sm.getString("digester.failedToUpdateAttributes", 
newAttrs.getLocalName(i), value), e);
 }
 }
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties?rev=1802800=1802799=1802800=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties 
Mon Jul 24 12:22:16 2017
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
\ No newline at end of file
+disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
+digester.failedToUpdateAttributes=Attribute [{0}] failed to update and remains 
[{1}]



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



svn commit: r1802799 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester: Digester.java LocalStrings.properties

2017-07-24 Thread csutherl
Author: csutherl
Date: Mon Jul 24 12:20:30 2017
New Revision: 1802799

URL: http://svn.apache.org/viewvc?rev=1802799=rev
Log:
Followup to r1802640, Use StringManager in log message

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802799=1802798=1802799=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon 
Jul 24 12:20:30 2017
@@ -1988,7 +1988,7 @@ public class Digester extends DefaultHan
 newAttrs.setValue(i, newValue);
 }
 } catch (Exception e) {
-log.warn("Attribute [" + newAttrs.getLocalName(i) + "] failed 
to update and remains [" + value + "].", e);
+log.warn(sm.getString("digester.failedToUpdateAttributes", 
newAttrs.getLocalName(i), value), e);
 }
 }
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties?rev=1802799=1802798=1802799=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
 Mon Jul 24 12:20:30 2017
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
\ No newline at end of file
+disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
+digester.failedToUpdateAttributes=Attribute [{0}] failed to update and remains 
[{1}]



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



Re: svn commit: r1802639 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-24 Thread Coty Sutherland
On Mon, Jul 24, 2017 at 4:56 AM, Rémy Maucherat  wrote:
> On Mon, Jul 24, 2017 at 10:38 AM, Mark Thomas  wrote:
>
>> On 21/07/17 20:45, csuth...@apache.org wrote:
>> > Author: csutherl
>> > Date: Fri Jul 21 19:45:38 2017
>> > New Revision: 1802639
>> >
>> > URL: http://svn.apache.org/viewvc?rev=1802639=rev
>> > Log:
>> > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253
>> >
>> > Add warn message when Digester.updateAttributes throws an exception
>> instead of ignoring it.
>> >
>> > Modified:
>> > tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
>> > tomcat/trunk/webapps/docs/changelog.xml
>> >
>> > Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.
>> java
>> > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
>> tomcat/util/digester/Digester.java?rev=1802639=1802638&
>> r2=1802639=diff
>> > 
>> ==
>> > --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
>> (original)
>> > +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri
>> Jul 21 19:45:38 2017
>> > @@ -1923,7 +1923,7 @@ public class Digester extends DefaultHan
>> >  newAttrs.setValue(i, newValue);
>> >  }
>> >  } catch (Exception e) {
>> > -// ignore - let the attribute have its original value
>> > +log.warn("Attribute [" + newAttrs.getLocalName(i) + "]
>> failed to update and remains [" + value + "].", e);
>>
>> Convention is that we use a StringManager instance for all new log
>> messages to support i18n. There are rare exceptions (e.g. some debug
>> messages or when a StringManager implementation isn't available on the
>> class path) but this isn't one of them.
>>
>> Most StringManager (and Log) instances are static but there are a
>> handful of exceptions - this is one - that are not. Generally, this is
>> because a static instance was found (or suspected) to be the cause of a
>> memory leak.
>>
>> There are a lot of legacy log messages that don't use a StringManager.
>> Those are slowly being cleaned up as folks are making changes nearby.
>>
>> +1, when adding new messages. There is a significant amount of old ones
> indeed :(

Oh yeah. I meant to do that before submitting, but forgot. Update
switching to the StringManager incoming...

> Rémy

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



[Bug 61330] Tomcat 8.5.16/Ubuntu ClassNotFoundException in ForkJoinPool

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61330

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Based on Konstantin's analysis (that I agree with) closing this since it isn't
cause by a Tomcat bug.

The users mailing list is the best place to ask any follow-up questions.

-- 
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: r1802796 - in /tomcat/trunk: CONTRIBUTING.md README.md build.xml

2017-07-24 Thread kkolinko
Author: kkolinko
Date: Mon Jul 24 11:58:04 2017
New Revision: 1802796

URL: http://svn.apache.org/viewvc?rev=1802796=rev
Log:
Markdown markup files are text. Set svn:eol-style=native on and add them to 
"text.files" in build.xml.

Modified:
tomcat/trunk/CONTRIBUTING.md   (props changed)
tomcat/trunk/README.md   (props changed)
tomcat/trunk/build.xml

Propchange: tomcat/trunk/CONTRIBUTING.md
--
svn:eol-style = native

Propchange: tomcat/trunk/README.md
--
svn:eol-style = native

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1802796=1802795=1802796=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 24 11:58:04 2017
@@ -263,6 +263,7 @@
 
 
 
+
 
 
 



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



[Bug 61316] Test files used by TestEncodingDetector test are broken in src.zip, src.tar.gz [8.5.18]

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61316

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M25 onwards
- 8.5.x for 8.5.19 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: r1802794 - in /tomcat/tc7.0.x/trunk: ./ test/webapp-3.0/bug49nnn/bug49464-utf8-bom.txt

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:54:36 2017
New Revision: 1802794

URL: http://svn.apache.org/viewvc?rev=1802794=rev
Log:
UTF-8 file. Set properties accordingly.
Should be OK, even with a BOM present

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug49nnn/bug49464-utf8-bom.txt   
(props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 11:54:36 2017
@@ -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,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

svn commit: r1802792 - in /tomcat/tc8.0.x/trunk: ./ test/webapp/bug49nnn/bug49464-utf8-bom.txt

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:47:18 2017
New Revision: 1802792

URL: http://svn.apache.org/viewvc?rev=1802792=rev
Log:
UTF-8 file. Set properties accordingly.
Should be OK, even with a BOM present

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt   (props 
changed)

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 11:47:18 2017
@@ -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
-/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: r1802790 - in /tomcat/tc8.5.x/trunk: ./ build.xml webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:46:15 2017
New Revision: 1802790

URL: http://svn.apache.org/viewvc?rev=1802790=rev
Log:
Fix corruption of UTF-16 encoded source files in released source distributions.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 11:46:15 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802789 - in /tomcat/tc8.5.x/trunk: ./ test/webapp/bug49nnn/bug49464-utf8-bom.txt

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:45:47 2017
New Revision: 1802789

URL: http://svn.apache.org/viewvc?rev=1802789=rev
Log:
UTF-8 file. Set properties accordingly.
Should be OK, even with a BOM present

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt   (props 
changed)

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 11:45:47 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 

svn commit: r1802788 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:44:38 2017
New Revision: 1802788

URL: http://svn.apache.org/viewvc?rev=1802788=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61316
Fix corruption of UTF-16 encoded source files in released source distributions.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1802788=1802787=1802788=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 24 11:44:38 2017
@@ -284,6 +284,10 @@
 
 
 
+
+
+
+
   
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1802788=1802787=1802788=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 24 11:44:38 2017
@@ -77,6 +77,14 @@
   
 
   
+  
+
+  
+61316: Fix corruption of UTF-16 encoded source files in
+released source distributions. (markt)
+  
+
+  
 
 
   



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



svn commit: r1802786 - /tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:32:36 2017
New Revision: 1802786

URL: http://svn.apache.org/viewvc?rev=1802786=rev
Log:
UTF-8 file. Set properties accordingly.
Should be OK, even with a BOM present

Modified:
tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt   (props changed)

Propchange: tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
--
svn:eol-style = native

Propchange: tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
--
--- svn:mime-type (original)
+++ svn:mime-type Mon Jul 24 11:32:36 2017
@@ -1 +1 @@
-application/octet-stream
+text/plain;charset=UTF-8



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



svn commit: r1802785 - in /tomcat/tc7.0.x/trunk: ./ conf/ java/org/apache/catalina/servlets/ java/org/apache/tomcat/util/buf/ test/org/apache/catalina/servlets/ test/webapp-3.0/bug49nnn/ webapps/docs/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 11:17:59 2017
New Revision: 1802785

URL: http://svn.apache.org/viewvc?rev=1802785=rev
Log:
Correct a further regression in the fix for bug 49464 that could cause an byte 
order mark character to appear at the start of content included by the 
DefaultServlet.

Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug49nnn/bug49464-utf8-bom.txt
  - copied unchanged from r1802783, 
tomcat/tc8.0.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 11:17:59 2017
@@ -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: r1802783 - in /tomcat/tc8.0.x/trunk: ./ conf/ java/org/apache/catalina/servlets/ test/org/apache/catalina/servlets/ test/webapp/bug49nnn/ webapps/docs/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 10:34:03 2017
New Revision: 1802783

URL: http://svn.apache.org/viewvc?rev=1802783=rev
Log:
Correct a further regression in the fix for bug 49464 that could cause an byte 
order mark character to appear at the start of content included by the 
DefaultServlet.

Added:
tomcat/tc8.0.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
  - copied unchanged from r1802780, 
tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/default-servlet.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 10:34:03 2017
@@ -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
-/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: r1802782 - in /tomcat/tc8.5.x/trunk: ./ conf/ java/org/apache/catalina/servlets/ test/org/apache/catalina/servlets/ test/webapp/bug49nnn/ webapps/docs/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 10:13:59 2017
New Revision: 1802782

URL: http://svn.apache.org/viewvc?rev=1802782=rev
Log:
Correct a further regression in the fix for bug 49464 that could cause an byte 
order mark character to appear at the start of content included by the 
DefaultServlet.

Added:
tomcat/tc8.5.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
  - copied unchanged from r1802780, 
tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/conf/web.xml
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 24 10:13:59 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 

svn commit: r1802781 - /tomcat/trunk/build.xml

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 10:09:31 2017
New Revision: 1802781

URL: http://svn.apache.org/viewvc?rev=1802781=rev
Log:
Exclude newly added test file from CheckStyle header check

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1802781=1802780=1802781=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 24 10:09:31 2017
@@ -562,6 +562,7 @@
 
 
 
+
 
 
 



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



svn commit: r1802780 - in /tomcat/trunk: conf/ java/org/apache/catalina/servlets/ test/org/apache/catalina/servlets/ test/webapp/bug49nnn/ webapps/docs/

2017-07-24 Thread markt
Author: markt
Date: Mon Jul 24 10:00:23 2017
New Revision: 1802780

URL: http://svn.apache.org/viewvc?rev=1802780=rev
Log:
Correct a further regression in the fix for bug 49464 that could cause an byte 
order mark character to appear at the start of content included by the 
DefaultServlet.

Added:
tomcat/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt   (with props)
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/default-servlet.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1802780=1802779=1802780=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Mon Jul 24 10:00:23 2017
@@ -48,6 +48,11 @@
   
   
   
+  
+  
+  
+  
+  
   
   
   

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1802780=1802779=1802780=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Jul 
24 10:00:23 2017
@@ -236,6 +236,11 @@ public class DefaultServlet extends Http
 private Charset fileEncodingCharset = null;
 
 /**
+ * If a file has a BOM, should that be used in preference to fileEncoding?
+ */
+private boolean useBomIfPresent = true;
+
+/**
  * Minimum size for sendfile usage in bytes.
  */
 protected int sendfileSize = 48 * 1024;
@@ -302,6 +307,10 @@ public class DefaultServlet extends Http
 }
 }
 
+if (getServletConfig().getInitParameter("useBomIfPresent") != null)
+useBomIfPresent = Boolean.parseBoolean(
+getServletConfig().getInitParameter("useBomIfPresent"));
+
 globalXsltFile = getServletConfig().getInitParameter("globalXsltFile");
 contextXsltFile = 
getServletConfig().getInitParameter("contextXsltFile");
 localXsltFile = getServletConfig().getInitParameter("localXsltFile");
@@ -726,11 +735,11 @@ public class DefaultServlet extends Http
 /**
  * Serve the specified resource, optionally including the data content.
  *
- * @param request  The servlet request we are processing
- * @param response The servlet response we are creating
- * @param content  Should the content be included?
- * @param encoding The encoding to use if it is necessary to access the
- * source as characters rather than as bytes
+ * @param request   The servlet request we are processing
+ * @param response  The servlet response we are creating
+ * @param content   Should the content be included?
+ * @param inputEncoding The encoding to use if it is necessary to access 
the
+ *  source as characters rather than as bytes
  *
  * @exception IOException if an input/output error occurs
  * @exception ServletException if a servlet-specified error occurs
@@ -738,7 +747,7 @@ public class DefaultServlet extends Http
 protected void serveResource(HttpServletRequest request,
  HttpServletResponse response,
  boolean content,
- String encoding)
+ String inputEncoding)
 throws IOException, ServletException {
 
 boolean serveContent = content;
@@ -1011,35 +1020,46 @@ public class DefaultServlet extends Http
 // Output via a writer so can't use sendfile or write
 // content directly.
 if (resource.isDirectory()) {
-renderResult = render(getPathPrefix(request), 
resource, encoding);
+renderResult = render(getPathPrefix(request), 
resource, inputEncoding);
 } else {
 renderResult = resource.getInputStream();
+if (included) {
+// Need to make sure any BOM is removed
+if (!renderResult.markSupported()) {
+renderResult = new 
BufferedInputStream(renderResult);
+}
+Charset bomCharset = processBom(renderResult);
+if (bomCharset != null && useBomIfPresent) {
+inputEncoding = bomCharset.name();
+}
+}
 }
-copy(renderResult, writer, encoding);
+

Re: [VOTE] Release Apache Tomcat 8.5.18

2017-07-24 Thread Mark Thomas
The following votes were cast:

Binding:
+1: kkolinko, fschumacher, remm, mgrigorov
-1: markt (changed from +1 due to regression)

And schultz voted a possible +1 but with a query regarding a unit test
failure.

Non-binding

George Stanchev raised a possible regression issue


While there are enough votes to release, I'm going to call this result
as failed, fix the regression and roll a new release.

Thanks to everyone who contributed to this release. Sorry again for the
further regressions in the static file handling.

Mark

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



[VOTE][RESULT] Release Apache Tomcat 9.0.0.M24

2017-07-24 Thread Mark Thomas
The following votes were cast:

Binding:
+1: huxing, fschumacher, remm, mgrigorov
-1: markt (changed from +1)

While there are enough votes to release, I'm going to call this result
as failed, fix the regression and roll a new release.

Thanks to everyone who contributed to this release. Sorry again for the
further regressions in the static file handling.

Mark

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



Re: svn commit: r1802639 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-24 Thread Rémy Maucherat
On Mon, Jul 24, 2017 at 10:38 AM, Mark Thomas  wrote:

> On 21/07/17 20:45, csuth...@apache.org wrote:
> > Author: csutherl
> > Date: Fri Jul 21 19:45:38 2017
> > New Revision: 1802639
> >
> > URL: http://svn.apache.org/viewvc?rev=1802639=rev
> > Log:
> > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253
> >
> > Add warn message when Digester.updateAttributes throws an exception
> instead of ignoring it.
> >
> > Modified:
> > tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> > tomcat/trunk/webapps/docs/changelog.xml
> >
> > Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.
> java
> > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
> tomcat/util/digester/Digester.java?rev=1802639=1802638&
> r2=1802639=diff
> > 
> ==
> > --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> (original)
> > +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri
> Jul 21 19:45:38 2017
> > @@ -1923,7 +1923,7 @@ public class Digester extends DefaultHan
> >  newAttrs.setValue(i, newValue);
> >  }
> >  } catch (Exception e) {
> > -// ignore - let the attribute have its original value
> > +log.warn("Attribute [" + newAttrs.getLocalName(i) + "]
> failed to update and remains [" + value + "].", e);
>
> Convention is that we use a StringManager instance for all new log
> messages to support i18n. There are rare exceptions (e.g. some debug
> messages or when a StringManager implementation isn't available on the
> class path) but this isn't one of them.
>
> Most StringManager (and Log) instances are static but there are a
> handful of exceptions - this is one - that are not. Generally, this is
> because a static instance was found (or suspected) to be the cause of a
> memory leak.
>
> There are a lot of legacy log messages that don't use a StringManager.
> Those are slowly being cleaned up as folks are making changes nearby.
>
> +1, when adding new messages. There is a significant amount of old ones
indeed :(

Rémy


Re: svn commit: r1802639 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-24 Thread Mark Thomas
On 21/07/17 20:45, csuth...@apache.org wrote:
> Author: csutherl
> Date: Fri Jul 21 19:45:38 2017
> New Revision: 1802639
> 
> URL: http://svn.apache.org/viewvc?rev=1802639=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253
> 
> Add warn message when Digester.updateAttributes throws an exception instead 
> of ignoring it.
> 
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> tomcat/trunk/webapps/docs/changelog.xml
> 
> Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802639=1802638=1802639=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri Jul 
> 21 19:45:38 2017
> @@ -1923,7 +1923,7 @@ public class Digester extends DefaultHan
>  newAttrs.setValue(i, newValue);
>  }
>  } catch (Exception e) {
> -// ignore - let the attribute have its original value
> +log.warn("Attribute [" + newAttrs.getLocalName(i) + "] 
> failed to update and remains [" + value + "].", e);

Convention is that we use a StringManager instance for all new log
messages to support i18n. There are rare exceptions (e.g. some debug
messages or when a StringManager implementation isn't available on the
class path) but this isn't one of them.

Most StringManager (and Log) instances are static but there are a
handful of exceptions - this is one - that are not. Generally, this is
because a static instance was found (or suspected) to be the cause of a
memory leak.

There are a lot of legacy log messages that don't use a StringManager.
Those are slowly being cleaned up as folks are making changes nearby.

Mark

>  }
>  }
>  
> 
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1802639=1802638=1802639=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 21 19:45:38 2017
> @@ -58,6 +58,10 @@
>  work directory for improved performance when deploying packed WAR 
> files.
>  (markt)
>
> +  
> +61253: Add warn message when Digester.updateAttributes
> +throws an exception instead of ignoring it. (csutherl)
> +  
>  
>
>
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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



[Bug 61330] Tomcat 8.5.16/Ubuntu ClassNotFoundException in ForkJoinPool

2017-07-24 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61330

--- Comment #1 from Konstantin Kolinko  ---
weiwei,

see mail thread "ForkJoinPool behaviour changed from 9.0.0-M15 to 9.0.0-M17" on
usera@ list,
http://tomcat.markmail.org/thread/ifoxumbw3xswdxz5

and the threads mentioned in bug 60620.

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