[Bug 55243] Add special search string for nested roles

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=55243

--- Comment #3 from isabelladom  ---
https://app.grammarly.com/ddocs/428003256;>click here

https://www.google.com/

[url=https://www.google.com/]click to go[/url]

www.google.com

-- 
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 55559] UserDatabaseRealm enhacement: may use local JNDI

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=9

--- Comment #4 from isabelladom  ---
https://www.google.com/
 good work

-- 
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 56546] Improve thread trace logging in WebappClassLoader.clearReferencesThreads()

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56546

--- Comment #9 from isabelladom  ---
https://app.grammarly.com/ddocs/428003256;>click here

https://www.google.com/

[url=https://www.google.com/]click to go[/url]

www.google.com

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



[GitHub] [tomcat] nightwatchcyber commented on issue #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
nightwatchcyber commented on issue #138: Expanding SSI documentation (bug # 
63184)
URL: https://github.com/apache/tomcat/pull/138#issuecomment-473127992
 
 
   I updated the pull request - let me if that works


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] nightwatchcyber commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
nightwatchcyber commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265823838
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
+
+flastmod - !--#flastmod 
virtual=filename.shtml --
+Returns the time that a file was lost modified, this is interpreted relative 
to the document being served.
 
 
 fsize - !--#fsize file=filename.shtml 
--
-Returns the size of a file.
+Returns the size of a file, this is interpreted relative to the current 
directory.
+
+
+fsize - !--#fsize 
virtual=filename.shtml --
+Returns the size of a file, this is interpreted relative to the document being 
served.
 
 
 Review comment:
   Meaning its not a virtual path, I change the language to clarify


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] nightwatchcyber commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
nightwatchcyber commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265823823
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
+
+flastmod - !--#flastmod 
virtual=filename.shtml --
+Returns the time that a file was lost modified, this is interpreted relative 
to the document being served.
 
 
 fsize - !--#fsize file=filename.shtml 
--
-Returns the size of a file.
+Returns the size of a file, this is interpreted relative to the current 
directory.
+
 
 Review comment:
   Meaning its not a virtual path, I change the language to clarify


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] nightwatchcyber commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
nightwatchcyber commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265823804
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
 
 Review comment:
   Meaning its not a virtual path, I change the language to clarify


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] nightwatchcyber commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
nightwatchcyber commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265823744
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
+
+flastmod - !--#flastmod 
virtual=filename.shtml --
+Returns the time that a file was lost modified, this is interpreted relative 
to the document being served.
 
 
 Review comment:
   fixed


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



Re: [VOTE] Release Apache Tomcat 8.5.39

2019-03-14 Thread Igal Sapir

On 3/14/2019 6:43 AM, Mark Thomas wrote:

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




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


Tested on Windows 10 and Ubuntu 18.04

Best,

Igal




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



Re: Default Number of Test Threads

2019-03-14 Thread Igal Sapir

On 3/14/2019 12:51 PM, Mark Thomas wrote:

On 14/03/2019 19:26, Igal Sapir wrote:

Does test.threads default to 1 for a reason?

Mostly historical. The tests weren't originally designed to run in parallel.


If there is no objection, I would like to set the default to the number
of available CPU Threads.  It looks like that can be done with a custom
Ant task which should be fairly simple to implement.

I over-ride it locally so I'm not going to be directly affected.

A custom Ant task seems a little over-engineered compared to setting a
property in build.properties.


I override it in build.properties as well, but I find myself doing it 
each time I download the sources for testing a tagged version, or at 
least copy the file from one version to another. If you're doing it in 
your dev directory and simply added "build.properties" to .gitignore 
then you are not affected by this.



I do wonder about CI systems. It is potentially a big change that might
take someone by surprise. We'll need to update some buildbot
configuration for example. I have visions of a CI system with lots of
cores running lots of builds in parallel suddenly grinding to a halt
because a Tomcat build suddenly tries to use every CPU. But I don't know
now likely that is.


I doubt that CI systems are that fragile/vulnerable.  AFAIK they launch 
a new VM to ensure isolation and a clean environment, or else they would 
fall apart any time someone pushes a build without considering the CI 
environment.



I guess I'm -0.

If it's just me then I can add a custom ENV variable to my profile, e.g.

    $ export ANT_OPTS=-Dtest.threads=8

but I thought that others are annoyed by this as well.

Best,

Igal




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



Re: Default Number of Test Threads

2019-03-14 Thread Mark Thomas
On 14/03/2019 19:26, Igal Sapir wrote:
> Does test.threads default to 1 for a reason?

Mostly historical. The tests weren't originally designed to run in parallel.

> If there is no objection, I would like to set the default to the number
> of available CPU Threads.  It looks like that can be done with a custom
> Ant task which should be fairly simple to implement.

I over-ride it locally so I'm not going to be directly affected.

A custom Ant task seems a little over-engineered compared to setting a
property in build.properties.

I do wonder about CI systems. It is potentially a big change that might
take someone by surprise. We'll need to update some buildbot
configuration for example. I have visions of a CI system with lots of
cores running lots of builds in parallel suddenly grinding to a halt
because a Tomcat build suddenly tries to use every CPU. But I don't know
now likely that is.

I guess I'm -0.

Mark

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



[GitHub] [tomcat] markt-asf commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
markt-asf commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265734162
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
+
+flastmod - !--#flastmod 
virtual=filename.shtml --
+Returns the time that a file was lost modified, this is interpreted relative 
to the document being served.
 
 
 Review comment:
   "last modified" not "lost modified"


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] markt-asf commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
markt-asf commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265734995
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
 
 Review comment:
   "last" not "lost"
   "relative to the current directory"? 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] markt-asf commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
markt-asf commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265735188
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
+
+flastmod - !--#flastmod 
virtual=filename.shtml --
+Returns the time that a file was lost modified, this is interpreted relative 
to the document being served.
 
 
 fsize - !--#fsize file=filename.shtml 
--
-Returns the size of a file.
+Returns the size of a file, this is interpreted relative to the current 
directory.
+
 
 Review comment:
   "relative to the current directory"? That looks like a copy/paste error.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] markt-asf commented on a change in pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
markt-asf commented on a change in pull request #138: Expanding SSI 
documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#discussion_r265735282
 
 

 ##
 File path: webapps/docs/ssi-howto.xml
 ##
 @@ -146,27 +146,53 @@ false.
 The directives are:
 
 
-config - !--#config timefmt=%B %Y 
--
-Used to set the format of dates and other items processed by SSI
+config - !--#config errmsg=Error 
occured sizefmt=abbrev timefmt=%B %Y --
+Used to set SSI error message, the format of dates and file sizes processed by 
SSI.
+All are optional but at least one must be used. The available options are as 
follows:
+
+errmsg - error message used for SSI errors
+sizefmt - format used for sizes in the fsize 
directive
+timefmt - format used for timestamps in the 
flastmod directive
 
 
-echo -   !--#echo var=VARIABLE_NAME 
--
+echo -   !--#echo var=VARIABLE_NAME 
encoding=entity --
 will be replaced by the value of the variable.
+
+The optional encoding parameter specifies the type of 
encoding to use.
+Valid values are entity (default), url or 
none.
+NOTE: Using an encoding other than entity can lead to 
security issues.
 
 
-exec -  Used to run commands on the host system.
+exec - !--#exec cmd=file-name 
--
+Used to run commands on the host system.
+
+
+exec - !--#exec cgi=file-name 
--
+This acts the same as the include directive, and doesn't 
actually execute any commands.
+
+
+include -  !--#include file=file-name 
--
+inserts the contents, this is interpreted relative to the current directory.
 
 
 include -  !--#include 
virtual=file-name --
-inserts the contents
+inserts the contents, this is interpreted relative to the document being 
served.
 
 
 flastmod - !--#flastmod 
file=filename.shtml --
-Returns the time that a file was lost modified.
+Returns the time that a file was lost modified, this is interpreted relative 
to the current directory.
+
+
+flastmod - !--#flastmod 
virtual=filename.shtml --
+Returns the time that a file was lost modified, this is interpreted relative 
to the document being served.
 
 
 fsize - !--#fsize file=filename.shtml 
--
-Returns the size of a file.
+Returns the size of a file, this is interpreted relative to the current 
directory.
+
+
+fsize - !--#fsize 
virtual=filename.shtml --
+Returns the size of a file, this is interpreted relative to the document being 
served.
 
 
 Review comment:
   "relative to the document"? 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



Default Number of Test Threads

2019-03-14 Thread Igal Sapir

Does test.threads default to 1 for a reason?

If there is no objection, I would like to set the default to the number 
of available CPU Threads.  It looks like that can be done with a custom 
Ant task which should be fairly simple to implement.


Best,

Igal



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



[tomcat] branch 7.0.x updated: Remove duplicated comments

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 3a97c8c  Remove duplicated comments
3a97c8c is described below

commit 3a97c8c1808cc87719254b8b21f8be1669b6d6ce
Author: samslow 
AuthorDate: Thu Mar 14 15:25:51 2019 +0900

Remove duplicated comments

Signed-off-by: samslow 
---
 webapps/ROOT/index.jsp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 4f7f4aa..d1b6637 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -70,9 +70,6 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Host Manager
 
 
-
 
 
 


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



[tomcat] branch 8.5.x updated: Remove duplicated comments

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 9f04cf0  Remove duplicated comments
9f04cf0 is described below

commit 9f04cf051add540c723f31752e27f60cc2492b2a
Author: samslow 
AuthorDate: Thu Mar 14 15:25:51 2019 +0900

Remove duplicated comments

Signed-off-by: samslow 
---
 webapps/ROOT/index.jsp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index d8eee1e..3c62329 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -71,9 +71,6 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Host Manager
 
 
-
 
 
 


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



[GitHub] [tomcat] markt-asf merged pull request #148: Remove duplicated comments

2019-03-14 Thread GitBox
markt-asf merged pull request #148: Remove duplicated comments
URL: https://github.com/apache/tomcat/pull/148
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[tomcat] branch master updated: Remove duplicated comments

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 5841c03  Remove duplicated comments
 new 3617dbb  Merge pull request #148 from samslow/master
5841c03 is described below

commit 5841c03ec4b2902a5ad16cfce0448a150fd0ea56
Author: samslow 
AuthorDate: Thu Mar 14 15:25:51 2019 +0900

Remove duplicated comments

Signed-off-by: samslow 
---
 webapps/ROOT/index.jsp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 4885e10..6de0008 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -71,9 +71,6 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Host Manager
 
 
-
 
 
 


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



[GitHub] [tomcat] markt-asf commented on issue #148: Remove duplicated comments

2019-03-14 Thread GitBox
markt-asf commented on issue #148: Remove duplicated comments
URL: https://github.com/apache/tomcat/pull/148#issuecomment-473021367
 
 
   No reason. It looks like a leftover from the last major redesign.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] toby1984 commented on issue #140: jdbc-pool: Improve maxAge handling

2019-03-14 Thread GitBox
toby1984 commented on issue #140: jdbc-pool: Improve maxAge handling
URL: https://github.com/apache/tomcat/pull/140#issuecomment-473018240
 
 
   I fixed the missing calls to PooledConnection#validate(int). 
   
   While reading the code I was kind of unsure whether I should call 
PooledConnection#setTimestamp(long) when reconnecting an idle connection. 
Looking at the code it seems that the timestamp should only be updated when 
user-initiated (like borrow or return) operations are executed on the 
PooledConnection, not when (possibly internal) operations are executed on the 
underlying JDBC Connection - right ? The JavaDoc on setTimestamp() is kind of 
fuzzy and does not explain what kind of 'operations' are meant.  


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



Re: [VOTE] Release Apache Tomcat 9.0.17

2019-03-14 Thread Igal Sapir

On 3/13/2019 11:23 AM, Mark Thomas wrote:

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



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


Tested on Ubuntu 18.04 and Windows 10



-
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

2019-03-14 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4136

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 master] 21ddc57542351c6e19a6633aac558300313e6974
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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



[tomcat] branch 7.0.x updated: Add missing alias names to CharsetCache list of known charsets

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new f0fc43c  Add missing alias names to CharsetCache list of known charsets
f0fc43c is described below

commit f0fc43ca22383898ea70c6d3d22ec8673cad7914
Author: Mark Thomas 
AuthorDate: Thu Mar 14 18:10:35 2019 +

Add missing alias names to CharsetCache list of known charsets

Re-work the unit test so it better captures missing alias names
---
 java/org/apache/tomcat/util/buf/CharsetCache.java  | 142 +
 .../apache/tomcat/util/buf/TestCharsetCache.java   |  31 +++--
 2 files changed, 139 insertions(+), 34 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
index 1558c88..84a4fb4 100644
--- a/java/org/apache/tomcat/util/buf/CharsetCache.java
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -25,37 +25,127 @@ import java.util.concurrent.ConcurrentMap;
 
 public class CharsetCache {
 
-private static final String[] INITIAL_CHARSETS = new String[] { 
"iso-8859-1", "utf-8" };
+/* Note: Package private to enable testing without reflection */
+static final String[] INITIAL_CHARSETS = new String[] { "iso-8859-1", 
"utf-8" };
 
 /*
- * Tested with:
- *  - Oracle JDK 8 u192
- *  - OpenJDK 13 EA 4
+ *  Note: Package private to enable testing without reflection
  */
-private static final String[] LAZY_CHARSETS = new String[] {
-"big5", "big5-hkscs", "cesu-8", "euc-jp", "euc-kr", "gb18030", 
"gb2312", "gbk", "ibm-thai", "ibm00858",
-"ibm01140", "ibm01141", "ibm01142", "ibm01143", "ibm01144", 
"ibm01145", "ibm01146", "ibm01147", "ibm01148",
-"ibm01149", "ibm037", "ibm1026", "ibm1047", "ibm273", "ibm277", 
"ibm278", "ibm280", "ibm284", "ibm285",
-"ibm290", "ibm297", "ibm420", "ibm424", "ibm437", "ibm500", 
"ibm775", "ibm850", "ibm852", "ibm855",
-"ibm857", "ibm860", "ibm861", "ibm862", "ibm863", "ibm864", 
"ibm865", "ibm866", "ibm868", "ibm869",
-"ibm870", "ibm871", "ibm918", "iso-2022-cn", "iso-2022-jp", 
"iso-2022-jp-2", "iso-2022-kr", "iso-8859-13",
-"iso-8859-15", "iso-8859-2", "iso-8859-3", "iso-8859-4", 
"iso-8859-5", "iso-8859-6", "iso-8859-7",
-"iso-8859-8", "iso-8859-9", "iso-8859-16", "jis_x0201", 
"jis_x0212-1990", "koi8-r", "koi8-u", "shift_jis",
-"tis-620", "us-ascii", "utf-16", "utf-16be", "utf-16le", "utf-32", 
"utf-32be", "utf-32le", "x-utf-32be-bom",
-"x-utf-32le-bom", "windows-1250", "windows-1251", "windows-1252", 
"windows-1253", "windows-1254",
-"windows-1255", "windows-1256", "windows-1257", "windows-1258", 
"windows-31j", "x-big5-hkscs-2001",
-"x-big5-solaris", "x-compound_text", "x-euc-tw", "x-ibm1006", 
"x-ibm1025", "x-ibm1046", "x-ibm1097",
-"x-ibm1098", "x-ibm1112", "x-ibm1122", "x-ibm1123", "x-ibm1124", 
"x-ibm1129", "x-ibm1166", "x-ibm1364",
-"x-ibm1381", "x-ibm1383", "x-ibm300", "x-ibm33722", "x-ibm737", 
"x-ibm833", "x-ibm834", "x-ibm856",
-"x-ibm874", "x-ibm875", "x-ibm921", "x-ibm922", "x-ibm930", 
"x-ibm933", "x-ibm935", "x-ibm937", "x-ibm939",
-"x-ibm942", "x-ibm942c", "x-ibm943", "x-ibm943c", "x-ibm948", 
"x-ibm949", "x-ibm949c", "x-ibm950",
-"x-ibm964", "x-ibm970", "x-iscii91", "x-iso-2022-cn-cns", 
"x-iso-2022-cn-gb", "x-jis0208",
-"x-jisautodetect", "x-johab", "x-ms932_0213", "x-ms950-hkscs", 
"x-ms950-hkscs-xp", "x-macarabic",
+static final String[] LAZY_CHARSETS = new String[] {
+// Initial set from Oracle JDK 8 u192
+"037", "1006", "1025", "1026", "1046", "1047", "1089", "1097", 
"1098", "1112", "1122", "1123", "1124",
+"1140", "1141", "1142", "1143", "1144", "1145", "1146", "1147", 
"1148", "1149", "1166", "1364", "1381",
+"1383", "273", "277", "278", "280", "284", "285", "290", "297", 
"300", "33722", "420", "424", "437", "500",
+"5601", "646", "737", "775", "813", "834", "838", "850", "852", 
"855", "856", "857", "858", "860", "861",
+"862", "863", "864", "865", "866", "868", "869", "870", "871", 
"874", "875", "8859_13", "8859_15", "8859_2",
+"8859_3", "8859_4", "8859_5", "8859_6", "8859_7", "8859_8", 
"8859_9", "912", "913", "914", "915", "916",
+"918", "920", "921", "922", "923", "930", "933", "935", "937", 
"939", "942", "942c", "943", "943c", "948",
+"949", "949c", "950", "964", "970", "ansi-1251", "ansi_x3.4-1968", 
"ansi_x3.4-1986", "arabic", "ascii",
+"ascii7", "asmo-708", "big5", "big5-hkscs", "big5-hkscs", 
"big5-hkscs-2001", "big5-hkscs:unicode3.0",
+"big5_hkscs", "big5_hkscs_2001", "big5_solaris", "big5hk", 

[tomcat] branch 8.5.x updated: Add missing alias names to CharsetCache list of known charsets

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 86e453f  Add missing alias names to CharsetCache list of known charsets
86e453f is described below

commit 86e453f7ce5797cd076bbe8ba3bf8f4c1bd45355
Author: Mark Thomas 
AuthorDate: Thu Mar 14 18:10:35 2019 +

Add missing alias names to CharsetCache list of known charsets

Re-work the unit test so it better captures missing alias names
---
 java/org/apache/tomcat/util/buf/CharsetCache.java  | 142 +
 .../apache/tomcat/util/buf/TestCharsetCache.java   |  31 +++--
 2 files changed, 139 insertions(+), 34 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
index bde4583..ff42b87 100644
--- a/java/org/apache/tomcat/util/buf/CharsetCache.java
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -25,37 +25,127 @@ import java.util.concurrent.ConcurrentMap;
 
 public class CharsetCache {
 
-private static final String[] INITIAL_CHARSETS = new String[] { 
"iso-8859-1", "utf-8" };
+/* Note: Package private to enable testing without reflection */
+static final String[] INITIAL_CHARSETS = new String[] { "iso-8859-1", 
"utf-8" };
 
 /*
- * Tested with:
- *  - Oracle JDK 8 u192
- *  - OpenJDK 13 EA 4
+ *  Note: Package private to enable testing without reflection
  */
-private static final String[] LAZY_CHARSETS = new String[] {
-"big5", "big5-hkscs", "cesu-8", "euc-jp", "euc-kr", "gb18030", 
"gb2312", "gbk", "ibm-thai", "ibm00858",
-"ibm01140", "ibm01141", "ibm01142", "ibm01143", "ibm01144", 
"ibm01145", "ibm01146", "ibm01147", "ibm01148",
-"ibm01149", "ibm037", "ibm1026", "ibm1047", "ibm273", "ibm277", 
"ibm278", "ibm280", "ibm284", "ibm285",
-"ibm290", "ibm297", "ibm420", "ibm424", "ibm437", "ibm500", 
"ibm775", "ibm850", "ibm852", "ibm855",
-"ibm857", "ibm860", "ibm861", "ibm862", "ibm863", "ibm864", 
"ibm865", "ibm866", "ibm868", "ibm869",
-"ibm870", "ibm871", "ibm918", "iso-2022-cn", "iso-2022-jp", 
"iso-2022-jp-2", "iso-2022-kr", "iso-8859-13",
-"iso-8859-15", "iso-8859-2", "iso-8859-3", "iso-8859-4", 
"iso-8859-5", "iso-8859-6", "iso-8859-7",
-"iso-8859-8", "iso-8859-9", "iso-8859-16", "jis_x0201", 
"jis_x0212-1990", "koi8-r", "koi8-u", "shift_jis",
-"tis-620", "us-ascii", "utf-16", "utf-16be", "utf-16le", "utf-32", 
"utf-32be", "utf-32le", "x-utf-32be-bom",
-"x-utf-32le-bom", "windows-1250", "windows-1251", "windows-1252", 
"windows-1253", "windows-1254",
-"windows-1255", "windows-1256", "windows-1257", "windows-1258", 
"windows-31j", "x-big5-hkscs-2001",
-"x-big5-solaris", "x-compound_text", "x-euc-tw", "x-ibm1006", 
"x-ibm1025", "x-ibm1046", "x-ibm1097",
-"x-ibm1098", "x-ibm1112", "x-ibm1122", "x-ibm1123", "x-ibm1124", 
"x-ibm1129", "x-ibm1166", "x-ibm1364",
-"x-ibm1381", "x-ibm1383", "x-ibm300", "x-ibm33722", "x-ibm737", 
"x-ibm833", "x-ibm834", "x-ibm856",
-"x-ibm874", "x-ibm875", "x-ibm921", "x-ibm922", "x-ibm930", 
"x-ibm933", "x-ibm935", "x-ibm937", "x-ibm939",
-"x-ibm942", "x-ibm942c", "x-ibm943", "x-ibm943c", "x-ibm948", 
"x-ibm949", "x-ibm949c", "x-ibm950",
-"x-ibm964", "x-ibm970", "x-iscii91", "x-iso-2022-cn-cns", 
"x-iso-2022-cn-gb", "x-jis0208",
-"x-jisautodetect", "x-johab", "x-ms932_0213", "x-ms950-hkscs", 
"x-ms950-hkscs-xp", "x-macarabic",
+static final String[] LAZY_CHARSETS = new String[] {
+// Initial set from Oracle JDK 8 u192
+"037", "1006", "1025", "1026", "1046", "1047", "1089", "1097", 
"1098", "1112", "1122", "1123", "1124",
+"1140", "1141", "1142", "1143", "1144", "1145", "1146", "1147", 
"1148", "1149", "1166", "1364", "1381",
+"1383", "273", "277", "278", "280", "284", "285", "290", "297", 
"300", "33722", "420", "424", "437", "500",
+"5601", "646", "737", "775", "813", "834", "838", "850", "852", 
"855", "856", "857", "858", "860", "861",
+"862", "863", "864", "865", "866", "868", "869", "870", "871", 
"874", "875", "8859_13", "8859_15", "8859_2",
+"8859_3", "8859_4", "8859_5", "8859_6", "8859_7", "8859_8", 
"8859_9", "912", "913", "914", "915", "916",
+"918", "920", "921", "922", "923", "930", "933", "935", "937", 
"939", "942", "942c", "943", "943c", "948",
+"949", "949c", "950", "964", "970", "ansi-1251", "ansi_x3.4-1968", 
"ansi_x3.4-1986", "arabic", "ascii",
+"ascii7", "asmo-708", "big5", "big5-hkscs", "big5-hkscs", 
"big5-hkscs-2001", "big5-hkscs:unicode3.0",
+"big5_hkscs", "big5_hkscs_2001", "big5_solaris", "big5hk", 

[tomcat] branch master updated: Add missing alias names to CharsetCache list of known charsets

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 21ddc57  Add missing alias names to CharsetCache list of known charsets
21ddc57 is described below

commit 21ddc57542351c6e19a6633aac558300313e6974
Author: Mark Thomas 
AuthorDate: Thu Mar 14 18:10:35 2019 +

Add missing alias names to CharsetCache list of known charsets

Re-work the unit test so it better captures missing alias names
---
 java/org/apache/tomcat/util/buf/CharsetCache.java  | 142 +
 .../apache/tomcat/util/buf/TestCharsetCache.java   |  31 +++--
 2 files changed, 139 insertions(+), 34 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
index bde4583..ff42b87 100644
--- a/java/org/apache/tomcat/util/buf/CharsetCache.java
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -25,37 +25,127 @@ import java.util.concurrent.ConcurrentMap;
 
 public class CharsetCache {
 
-private static final String[] INITIAL_CHARSETS = new String[] { 
"iso-8859-1", "utf-8" };
+/* Note: Package private to enable testing without reflection */
+static final String[] INITIAL_CHARSETS = new String[] { "iso-8859-1", 
"utf-8" };
 
 /*
- * Tested with:
- *  - Oracle JDK 8 u192
- *  - OpenJDK 13 EA 4
+ *  Note: Package private to enable testing without reflection
  */
-private static final String[] LAZY_CHARSETS = new String[] {
-"big5", "big5-hkscs", "cesu-8", "euc-jp", "euc-kr", "gb18030", 
"gb2312", "gbk", "ibm-thai", "ibm00858",
-"ibm01140", "ibm01141", "ibm01142", "ibm01143", "ibm01144", 
"ibm01145", "ibm01146", "ibm01147", "ibm01148",
-"ibm01149", "ibm037", "ibm1026", "ibm1047", "ibm273", "ibm277", 
"ibm278", "ibm280", "ibm284", "ibm285",
-"ibm290", "ibm297", "ibm420", "ibm424", "ibm437", "ibm500", 
"ibm775", "ibm850", "ibm852", "ibm855",
-"ibm857", "ibm860", "ibm861", "ibm862", "ibm863", "ibm864", 
"ibm865", "ibm866", "ibm868", "ibm869",
-"ibm870", "ibm871", "ibm918", "iso-2022-cn", "iso-2022-jp", 
"iso-2022-jp-2", "iso-2022-kr", "iso-8859-13",
-"iso-8859-15", "iso-8859-2", "iso-8859-3", "iso-8859-4", 
"iso-8859-5", "iso-8859-6", "iso-8859-7",
-"iso-8859-8", "iso-8859-9", "iso-8859-16", "jis_x0201", 
"jis_x0212-1990", "koi8-r", "koi8-u", "shift_jis",
-"tis-620", "us-ascii", "utf-16", "utf-16be", "utf-16le", "utf-32", 
"utf-32be", "utf-32le", "x-utf-32be-bom",
-"x-utf-32le-bom", "windows-1250", "windows-1251", "windows-1252", 
"windows-1253", "windows-1254",
-"windows-1255", "windows-1256", "windows-1257", "windows-1258", 
"windows-31j", "x-big5-hkscs-2001",
-"x-big5-solaris", "x-compound_text", "x-euc-tw", "x-ibm1006", 
"x-ibm1025", "x-ibm1046", "x-ibm1097",
-"x-ibm1098", "x-ibm1112", "x-ibm1122", "x-ibm1123", "x-ibm1124", 
"x-ibm1129", "x-ibm1166", "x-ibm1364",
-"x-ibm1381", "x-ibm1383", "x-ibm300", "x-ibm33722", "x-ibm737", 
"x-ibm833", "x-ibm834", "x-ibm856",
-"x-ibm874", "x-ibm875", "x-ibm921", "x-ibm922", "x-ibm930", 
"x-ibm933", "x-ibm935", "x-ibm937", "x-ibm939",
-"x-ibm942", "x-ibm942c", "x-ibm943", "x-ibm943c", "x-ibm948", 
"x-ibm949", "x-ibm949c", "x-ibm950",
-"x-ibm964", "x-ibm970", "x-iscii91", "x-iso-2022-cn-cns", 
"x-iso-2022-cn-gb", "x-jis0208",
-"x-jisautodetect", "x-johab", "x-ms932_0213", "x-ms950-hkscs", 
"x-ms950-hkscs-xp", "x-macarabic",
+static final String[] LAZY_CHARSETS = new String[] {
+// Initial set from Oracle JDK 8 u192
+"037", "1006", "1025", "1026", "1046", "1047", "1089", "1097", 
"1098", "1112", "1122", "1123", "1124",
+"1140", "1141", "1142", "1143", "1144", "1145", "1146", "1147", 
"1148", "1149", "1166", "1364", "1381",
+"1383", "273", "277", "278", "280", "284", "285", "290", "297", 
"300", "33722", "420", "424", "437", "500",
+"5601", "646", "737", "775", "813", "834", "838", "850", "852", 
"855", "856", "857", "858", "860", "861",
+"862", "863", "864", "865", "866", "868", "869", "870", "871", 
"874", "875", "8859_13", "8859_15", "8859_2",
+"8859_3", "8859_4", "8859_5", "8859_6", "8859_7", "8859_8", 
"8859_9", "912", "913", "914", "915", "916",
+"918", "920", "921", "922", "923", "930", "933", "935", "937", 
"939", "942", "942c", "943", "943c", "948",
+"949", "949c", "950", "964", "970", "ansi-1251", "ansi_x3.4-1968", 
"ansi_x3.4-1986", "arabic", "ascii",
+"ascii7", "asmo-708", "big5", "big5-hkscs", "big5-hkscs", 
"big5-hkscs-2001", "big5-hkscs:unicode3.0",
+"big5_hkscs", "big5_hkscs_2001", "big5_solaris", "big5hk", 

Re: buildbot failure in on tomcat-trunk

2019-03-14 Thread Mark Thomas
On 14/03/2019 14:06, build...@apache.org wrote:
> The Buildbot has detected a new failure on builder tomcat-trunk while 
> building tomcat. Full details are available at:
> https://ci.apache.org/builders/tomcat-trunk/builds/4135
> 
> 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 master] 8a1d9a05327c498d498716d205f0b63f64c3d64a
> Blamelist: Mark Thomas 
> 
> BUILD FAILED: failed compile_1

The new charset cache code is missing a number of aliases. I need to
re-work the unit tests.

Mark

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



Re: GitHub Issues / GitHub PRs / Bugzilla

2019-03-14 Thread Mark Thomas
On 14/03/2019 15:21, Coty Sutherland wrote:
> On Thu, Mar 14, 2019 at 11:14 AM Coty Sutherland 
> wrote:
> 
>> On Thu, Mar 14, 2019 at 8:39 AM Mark Thomas  wrote:
>>
>>> It is early days but my impression is that the move to git has triggered
>>> an increase in conversations that end up split between a GitHub PR and
>>> Bugzilla.
>>>
>>> Personally, I'm not finding it unmanageable at this point but it does
>>> feel a little disorganized.
>>>
>>
>> +1, I was just thinking about this earlier while trying to follow some
>> conversations.
>>
>>
>>>
>>> I'm wondering if we need clearer guidelines about what to discuss where
>>> or do we need something else? What about a bigger change such as moving
>>> issue tracking to GitHub? Would that be beneficial?
>>>
>>
>> I agree that we should probably outline the best way to carry on
>> conversations now that we have the possibility of dev/user list, BZ, and
>> PRs; I'm not sure what exactly that would look like though. Is there a way
>> to push links from PR comments into BZ (that's how GitHub does it with PRs
>> and issues IIRC) to retain the conversation flow?

I'm not aware of any infra tooling for this.

>> Moving to GitHub's issue
>> tracker is an interesting solution. I think that the issue tracker is
>> robust enough that we wouldn't have any issues moving over, but is that OK
>> in the eyes of the ASF Infra team?

(Aside: Infra polices policy. It doesn't set it.)

Yes, using GitHub as an issue tracker is allowed.

>> How would we be archiving those
>> conversations (assuming that we need to)?

Comments get echoed back to dev@ (or any other list we specify).

> Apache CloudStack instructs people to use Jira (which mostly has GSoC
> issues), but also has several issues reported on the GitHub issue tracker;
> there doesn't seem to be any integration between the two. They use a nice
> template for issues on GitHub too.

Mark

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



Re: ApacheCon Berlin 2019 track?

2019-03-14 Thread Myrle Krantz
Thank you so much Mark!!  Tomcat devs, I look forward to seeing you in
Berlin!

Best,
Myrle

On Thu, Mar 14, 2019 at 5:28 PM Mark Thomas  wrote:

> On 10/03/2019 19:59, Myrle Krantz wrote:
> > Hey Tomcat!
> >
> > ApacheCon EU this year is going to be from October 22-24 in Berlin, I'm
> > looking for some great tracks for this year.  Tomcat is doing a track in
> > Las Vegas this year (Thank you for chairing in Vegas Jean-Frederic!).  Is
> > anyone interested in chairing a Tomcat track for Berlin as well this
> year?
>
> I'd be happy to do this. I'm equally happy to step aside if someone else
> would like to pick this up.
>
> I think we can easily fill a 2-day track.
>
> Mark
>
>
> > Chairing a track involves being responsible for two things:
> >
> > 1.) A schedule of talks that will fill your track
> > 2.) Promoting this track to your community, both inside, and outside of
> > Tomcat.
> >
> > If Tomcat wants a track in Berlin, I need two things from you:
> >
> > 1.) A volunteer who wants to be track chair.
> > 2.) A rough first estimate about what size you'd like your track to be
> (0.5
> > days, 1 day, or 2 days).
> >
> > Best Regards,
> > Myrle
> > Event Lead, ApacheCon Berlin
> >
>
>


Re: ApacheCon Berlin 2019 track?

2019-03-14 Thread Rémy Maucherat
On Thu, Mar 14, 2019 at 5:28 PM Mark Thomas  wrote:

> On 10/03/2019 19:59, Myrle Krantz wrote:
> > Hey Tomcat!
> >
> > ApacheCon EU this year is going to be from October 22-24 in Berlin, I'm
> > looking for some great tracks for this year.  Tomcat is doing a track in
> > Las Vegas this year (Thank you for chairing in Vegas Jean-Frederic!).  Is
> > anyone interested in chairing a Tomcat track for Berlin as well this
> year?
>
> I'd be happy to do this. I'm equally happy to step aside if someone else
> would like to pick this up.
>
> I think we can easily fill a 2-day track.
>

+1 since you're not doing it in LV.

Rémy


Re: ApacheCon Berlin 2019 track?

2019-03-14 Thread Mark Thomas
On 10/03/2019 19:59, Myrle Krantz wrote:
> Hey Tomcat!
> 
> ApacheCon EU this year is going to be from October 22-24 in Berlin, I'm
> looking for some great tracks for this year.  Tomcat is doing a track in
> Las Vegas this year (Thank you for chairing in Vegas Jean-Frederic!).  Is
> anyone interested in chairing a Tomcat track for Berlin as well this year?

I'd be happy to do this. I'm equally happy to step aside if someone else
would like to pick this up.

I think we can easily fill a 2-day track.

Mark


> Chairing a track involves being responsible for two things:
> 
> 1.) A schedule of talks that will fill your track
> 2.) Promoting this track to your community, both inside, and outside of
> Tomcat.
> 
> If Tomcat wants a track in Berlin, I need two things from you:
> 
> 1.) A volunteer who wants to be track chair.
> 2.) A rough first estimate about what size you'd like your track to be (0.5
> days, 1 day, or 2 days).
> 
> Best Regards,
> Myrle
> Event Lead, ApacheCon Berlin
> 


-
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

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

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 7.0.x] b277f1fd4b4ea8fb78e722d42bd0d171829908d5
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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



Re: GitHub Issues / GitHub PRs / Bugzilla

2019-03-14 Thread Coty Sutherland
On Thu, Mar 14, 2019 at 11:14 AM Coty Sutherland 
wrote:

> On Thu, Mar 14, 2019 at 8:39 AM Mark Thomas  wrote:
>
>> It is early days but my impression is that the move to git has triggered
>> an increase in conversations that end up split between a GitHub PR and
>> Bugzilla.
>>
>> Personally, I'm not finding it unmanageable at this point but it does
>> feel a little disorganized.
>>
>
> +1, I was just thinking about this earlier while trying to follow some
> conversations.
>
>
>>
>> I'm wondering if we need clearer guidelines about what to discuss where
>> or do we need something else? What about a bigger change such as moving
>> issue tracking to GitHub? Would that be beneficial?
>>
>
> I agree that we should probably outline the best way to carry on
> conversations now that we have the possibility of dev/user list, BZ, and
> PRs; I'm not sure what exactly that would look like though. Is there a way
> to push links from PR comments into BZ (that's how GitHub does it with PRs
> and issues IIRC) to retain the conversation flow? Moving to GitHub's issue
> tracker is an interesting solution. I think that the issue tracker is
> robust enough that we wouldn't have any issues moving over, but is that OK
> in the eyes of the ASF Infra team? How would we be archiving those
> conversations (assuming that we need to)?
>

Apache CloudStack instructs people to use Jira (which mostly has GSoC
issues), but also has several issues reported on the GitHub issue tracker;
there doesn't seem to be any integration between the two. They use a nice
template for issues on GitHub too.


>
>
>>
>> What do others think?
>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>


Re: GitHub Issues / GitHub PRs / Bugzilla

2019-03-14 Thread Coty Sutherland
On Thu, Mar 14, 2019 at 8:39 AM Mark Thomas  wrote:

> It is early days but my impression is that the move to git has triggered
> an increase in conversations that end up split between a GitHub PR and
> Bugzilla.
>
> Personally, I'm not finding it unmanageable at this point but it does
> feel a little disorganized.
>

+1, I was just thinking about this earlier while trying to follow some
conversations.


>
> I'm wondering if we need clearer guidelines about what to discuss where
> or do we need something else? What about a bigger change such as moving
> issue tracking to GitHub? Would that be beneficial?
>

I agree that we should probably outline the best way to carry on
conversations now that we have the possibility of dev/user list, BZ, and
PRs; I'm not sure what exactly that would look like though. Is there a way
to push links from PR comments into BZ (that's how GitHub does it with PRs
and issues IIRC) to retain the conversation flow? Moving to GitHub's issue
tracker is an interesting solution. I think that the issue tracker is
robust enough that we wouldn't have any issues moving over, but is that OK
in the eyes of the ASF Infra team? How would we be archiving those
conversations (assuming that we need to)?


>
> What do others think?
>
> Mark
>
> -
> 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

2019-03-14 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4135

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 master] 8a1d9a05327c498d498716d205f0b63f64c3d64a
Blamelist: Mark Thomas 

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



[tomcat] branch 7.0.x updated: Fix backport of <> which is not supported in Java 6

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new b277f1f  Fix backport of <> which is not supported in Java 6
b277f1f is described below

commit b277f1fd4b4ea8fb78e722d42bd0d171829908d5
Author: Mark Thomas 
AuthorDate: Thu Mar 14 13:44:27 2019 +

Fix backport of <> which is not supported in Java 6
---
 java/org/apache/tomcat/util/buf/CharsetCache.java| 2 +-
 test/org/apache/tomcat/util/buf/TestCharsetCache.java| 2 +-
 test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
index bde4583..1558c88 100644
--- a/java/org/apache/tomcat/util/buf/CharsetCache.java
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -60,7 +60,7 @@ public class CharsetCache {
 
 private static final Charset DUMMY_CHARSET = new DummyCharset("Dummy",  
null);
 
-private ConcurrentMap cache = new ConcurrentHashMap<>();
+private ConcurrentMap cache = new 
ConcurrentHashMap();
 
 public CharsetCache() {
 // Pre-populate the cache
diff --git a/test/org/apache/tomcat/util/buf/TestCharsetCache.java 
b/test/org/apache/tomcat/util/buf/TestCharsetCache.java
index 011b08c..d8916e8 100644
--- a/test/org/apache/tomcat/util/buf/TestCharsetCache.java
+++ b/test/org/apache/tomcat/util/buf/TestCharsetCache.java
@@ -31,7 +31,7 @@ public class TestCharsetCache {
 public void testAllKnownCharsets() {
 CharsetCache cache = new CharsetCache();
 
-List cacheMisses = new ArrayList<>();
+List cacheMisses = new ArrayList();
 
 for (Charset charset: Charset.availableCharsets().values()) {
 if (cache.getCharset(charset.name()) == null) {
diff --git a/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java 
b/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
index 6823890..574a7a8 100644
--- a/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
+++ b/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
@@ -87,7 +87,7 @@ public class TestCharsetCachePerformance {
 
 private static class FullCsCache implements CsCache {
 
-private static final Map cache = new HashMap<>();
+private static final Map cache = new HashMap();
 
 static {
 for (Charset charset: Charset.availableCharsets().values()) {


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

2019-03-14 Thread Mark Thomas
The proposed Apache Tomcat 8.5.39 release is now available for voting.

The major changes compared to the 8.5.38 release are:

- The APR/Native connector now supports both OpenSSL and JSSE TLS
  configuration syntax (NIO and NIO2 already support this)

- Various improvements to NIO2

- Various fixes for HTTP/2 push requests

- Refactor error handling so that errors that occur early in request
  processing are handled by the application's error handling where the
  application can be identified


Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.39/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1206/

The tag is:
https://github.com/apache/tomcat/tree/8.5.39
f481565d959dc5a5eae1576cc294774c8683b4dc


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

-
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

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

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 7.0.x] 89cbf0252def59b19b77af1211f44b41c98e
Blamelist: Mark Thomas 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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



[GitHub] [tomcat] nightwatchcyber opened a new pull request #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
nightwatchcyber opened a new pull request #138: Expanding SSI documentation 
(bug # 63184)
URL: https://github.com/apache/tomcat/pull/138
 
 
   Fixing:
   https://bz.apache.org/bugzilla/show_bug.cgi?id=63184


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] markt-asf commented on issue #138: Expanding SSI documentation (bug # 63184)

2019-03-14 Thread GitBox
markt-asf commented on issue #138: Expanding SSI documentation (bug # 63184)
URL: https://github.com/apache/tomcat/pull/138#issuecomment-472856732
 
 
   Close unintentionally during svn->git migration.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[Bug 63235] Defer potentially expensive Charset.availableCharsets() call

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #12 from Mark Thomas  ---
Fixed in:
- master for 9.0.18 onwards
- 8.5.x for 8.5.40 onwards
- 7.0.x for 7.0.94 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



[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 89cbf02  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235
89cbf02 is described below

commit 89cbf0252def59b19b77af1211f44b41c98e
Author: Mark Thomas 
AuthorDate: Fri Mar 8 20:45:38 2019 +

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

Implement an alternative Charset caching strategy that does not load all
Charsets at Tomcat start. This reduces start time by ~30ms and does not,
based on the performance tests included in this commit, have a negative
impact on runtime look-ups.
It does require that the names of all supported Charsets are known to
Tomcat at compile time. The code has been tested with a range of JVMs
and a unit test is provided for testing new JVMs.
---
 java/org/apache/tomcat/util/buf/B2CConverter.java  |  23 +---
 java/org/apache/tomcat/util/buf/CharsetCache.java  | 134 
 .../apache/tomcat/util/buf/TestCharsetCache.java   |  65 ++
 .../util/buf/TestCharsetCachePerformance.java  | 141 +
 webapps/docs/changelog.xml |   3 +
 5 files changed, 350 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java 
b/java/org/apache/tomcat/util/buf/B2CConverter.java
index 4492fbd..31ad092 100644
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -24,9 +24,7 @@ import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 import org.apache.tomcat.util.res.StringManager;
 
@@ -38,8 +36,7 @@ public class B2CConverter {
 private static final StringManager sm =
 StringManager.getManager(Constants.Package);
 
-private static final Map encodingToCharsetCache =
-new HashMap();
+private static final CharsetCache charsetCache;
 
 public static final Charset ISO_8859_1;
 public static final Charset UTF_8;
@@ -48,14 +45,8 @@ public class B2CConverter {
 protected static final int LEFTOVER_SIZE = 9;
 
 static {
-for (Charset charset: Charset.availableCharsets().values()) {
-encodingToCharsetCache.put(
-charset.name().toLowerCase(Locale.ENGLISH), charset);
-for (String alias : charset.aliases()) {
-encodingToCharsetCache.put(
-alias.toLowerCase(Locale.ENGLISH), charset);
-}
-}
+charsetCache = new CharsetCache();
+
 Charset iso88591 = null;
 Charset utf8 = null;
 try {
@@ -84,7 +75,7 @@ public class B2CConverter {
 public static Charset getCharsetLower(String lowerCaseEnc)
 throws UnsupportedEncodingException {
 
-Charset charset = encodingToCharsetCache.get(lowerCaseEnc);
+Charset charset = charsetCache.getCharset(lowerCaseEnc);
 
 if (charset == null) {
 // Pre-population of the cache means this must be invalid
@@ -130,7 +121,7 @@ public class B2CConverter {
 decoder.onUnmappableCharacter(action);
 }
 
-/** 
+/**
  * Reset the decoder state.
  */
 public void recycle() {
@@ -140,7 +131,7 @@ public class B2CConverter {
 
 /**
  * Convert the given bytes to characters.
- * 
+ *
  * @param bc byte input
  * @param cc char output
  * @param endOfInputIs this all of the available data
@@ -157,7 +148,7 @@ public class B2CConverter {
 }
 if ((cb == null) || (cb.array() != cc.getBuffer())) {
 // Create a new char buffer if anything changed
-cb = CharBuffer.wrap(cc.getBuffer(), cc.getEnd(), 
+cb = CharBuffer.wrap(cc.getBuffer(), cc.getEnd(),
 cc.getBuffer().length - cc.getEnd());
 } else {
 // Initialize the char buffer
diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
new file mode 100644
index 000..bde4583
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -0,0 +1,134 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or 

[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new b10ceba  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235
b10ceba is described below

commit b10ceba2f88f8ebec7e5479a66fb5b689ff46dfa
Author: Mark Thomas 
AuthorDate: Fri Mar 8 20:45:38 2019 +

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

Implement an alternative Charset caching strategy that does not load all
Charsets at Tomcat start. This reduces start time by ~30ms and does not,
based on the performance tests included in this commit, have a negative
impact on runtime look-ups.
It does require that the names of all supported Charsets are known to
Tomcat at compile time. The code has been tested with a range of JVMs
and a unit test is provided for testing new JVMs.
---
 java/org/apache/tomcat/util/buf/B2CConverter.java  |  21 +--
 java/org/apache/tomcat/util/buf/CharsetCache.java  | 134 
 .../apache/tomcat/util/buf/TestCharsetCache.java   |  65 ++
 .../util/buf/TestCharsetCachePerformance.java  | 141 +
 webapps/docs/changelog.xml |   3 +
 5 files changed, 348 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java 
b/java/org/apache/tomcat/util/buf/B2CConverter.java
index ef8e706..2dd63c0 100644
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -25,9 +25,7 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 import org.apache.tomcat.util.res.StringManager;
 
@@ -39,23 +37,14 @@ public class B2CConverter {
 private static final StringManager sm =
 StringManager.getManager(Constants.Package);
 
-private static final Map encodingToCharsetCache =
-new HashMap<>();
-
-// Protected so unit tests can use it
-protected static final int LEFTOVER_SIZE = 9;
+private static final CharsetCache charsetCache;
 
 static {
-for (Charset charset: Charset.availableCharsets().values()) {
-encodingToCharsetCache.put(
-charset.name().toLowerCase(Locale.ENGLISH), charset);
-for (String alias : charset.aliases()) {
-encodingToCharsetCache.put(
-alias.toLowerCase(Locale.ENGLISH), charset);
-}
-}
+charsetCache = new CharsetCache();
 }
 
+// Protected so unit tests can use it
+protected static final int LEFTOVER_SIZE = 9;
 
 /**
  * Obtain the Charset for the given encoding
@@ -93,7 +82,7 @@ public class B2CConverter {
 public static Charset getCharsetLower(String lowerCaseEnc)
 throws UnsupportedEncodingException {
 
-Charset charset = encodingToCharsetCache.get(lowerCaseEnc);
+Charset charset = charsetCache.getCharset(lowerCaseEnc);
 
 if (charset == null) {
 // Pre-population of the cache means this must be invalid
diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
new file mode 100644
index 000..bde4583
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -0,0 +1,134 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.buf;
+
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.util.Locale;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class CharsetCache {
+
+private static final String[] INITIAL_CHARSETS = new String[] { 
"iso-8859-1", "utf-8" };
+
+/*
+ * Tested with:
+ *  - Oracle JDK 8 u192
+ *  - OpenJDK 13 EA 4
+ */
+private static final String[] LAZY_CHARSETS = new String[] {
+  

[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 4debebe  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235
 new 8a1d9a0  Merge pull request #146 from markt-asf/bz-63235
4debebe is described below

commit 4debebee08769be76d0909774357b8d544cbadac
Author: Mark Thomas 
AuthorDate: Fri Mar 8 20:45:38 2019 +

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

Implement an alternative Charset caching strategy that does not load all
Charsets at Tomcat start. This reduces start time by ~30ms and does not,
based on the performance tests included in this commit, have a negative
impact on runtime look-ups.
It does require that the names of all supported Charsets are known to
Tomcat at compile time. The code has been tested with a range of JVMs
and a unit test is provided for testing new JVMs.
---
 java/org/apache/tomcat/util/buf/B2CConverter.java  |  21 +--
 java/org/apache/tomcat/util/buf/CharsetCache.java  | 134 
 .../apache/tomcat/util/buf/TestCharsetCache.java   |  65 ++
 .../util/buf/TestCharsetCachePerformance.java  | 141 +
 webapps/docs/changelog.xml |   3 +
 5 files changed, 348 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java 
b/java/org/apache/tomcat/util/buf/B2CConverter.java
index b2e2a7a..0d3afd7 100644
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -25,9 +25,7 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 import org.apache.tomcat.util.res.StringManager;
 
@@ -38,23 +36,14 @@ public class B2CConverter {
 
 private static final StringManager sm = 
StringManager.getManager(B2CConverter.class);
 
-private static final Map encodingToCharsetCache =
-new HashMap<>();
-
-// Protected so unit tests can use it
-protected static final int LEFTOVER_SIZE = 9;
+private static final CharsetCache charsetCache;
 
 static {
-for (Charset charset: Charset.availableCharsets().values()) {
-encodingToCharsetCache.put(
-charset.name().toLowerCase(Locale.ENGLISH), charset);
-for (String alias : charset.aliases()) {
-encodingToCharsetCache.put(
-alias.toLowerCase(Locale.ENGLISH), charset);
-}
-}
+charsetCache = new CharsetCache();
 }
 
+// Protected so unit tests can use it
+protected static final int LEFTOVER_SIZE = 9;
 
 /**
  * Obtain the Charset for the given encoding
@@ -71,7 +60,7 @@ public class B2CConverter {
 // Encoding names should all be ASCII
 String lowerCaseEnc = enc.toLowerCase(Locale.ENGLISH);
 
-Charset charset = encodingToCharsetCache.get(lowerCaseEnc);
+Charset charset = charsetCache.getCharset(lowerCaseEnc);
 
 if (charset == null) {
 // Pre-population of the cache means this must be invalid
diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java 
b/java/org/apache/tomcat/util/buf/CharsetCache.java
new file mode 100644
index 000..bde4583
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -0,0 +1,134 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.buf;
+
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.util.Locale;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class CharsetCache {
+
+private static final String[] INITIAL_CHARSETS = new String[] { 
"iso-8859-1", "utf-8" };
+
+/*
+ * Tested with:
+ *  - Oracle JDK 8 u192
+ *  - OpenJDK 13 EA 4
+ */
+

[GitHub] [tomcat] markt-asf merged pull request #146: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

2019-03-14 Thread GitBox
markt-asf merged pull request #146: Fix 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63235
URL: https://github.com/apache/tomcat/pull/146
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



GitHub Issues / GitHub PRs / Bugzilla

2019-03-14 Thread Mark Thomas
It is early days but my impression is that the move to git has triggered
an increase in conversations that end up split between a GitHub PR and
Bugzilla.

Personally, I'm not finding it unmanageable at this point but it does
feel a little disorganized.

I'm wondering if we need clearer guidelines about what to discuss where
or do we need something else? What about a bigger change such as moving
issue tracking to GitHub? Would that be beneficial?

What do others think?

Mark

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



[Bug 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #9 from Mark Thomas  ---
Fixed in:
- master for 9.0.18 onwards
- 8.5.x for 8.5.40 onwards
- 7.0.x for 7.0.94 onwards

The GH Issues / GH PR/ BZ discussion is probably one for the dev@ list

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



[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 1d3931d  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 
Lifecycle
1d3931d is described below

commit 1d3931d7ebb0ae278d7bbb09efdcada71ea7a935
Author: Mark Thomas 
AuthorDate: Thu Mar 14 12:12:47 2019 +

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle

Use a consistent log level (ERROR) when logging the LifecycleException
associated with the failure to start or stop a component.
---
 java/org/apache/catalina/core/StandardContext.java | 4 ++--
 java/org/apache/catalina/startup/HostConfig.java   | 3 +--
 java/org/apache/catalina/util/LifecycleBase.java   | 3 +--
 webapps/docs/changelog.xml | 5 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 0de8aad..d158e76 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2280,7 +2280,7 @@ public class StandardContext extends ContainerBase
 oldNamingResources.stop();
 oldNamingResources.destroy();
 } catch (LifecycleException e) {
-log.warn("standardContext.namingResource.destroy.fail", e);
+
log.error(sm.getString("standardContext.namingResource.destroy.fail"), e);
 }
 }
 if (namingResources != null) {
@@ -2288,7 +2288,7 @@ public class StandardContext extends ContainerBase
 namingResources.init();
 namingResources.start();
 } catch (LifecycleException e) {
-log.warn("standardContext.namingResource.init.fail", e);
+
log.error(sm.getString("standardContext.namingResource.init.fail"), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index e977e8f..0c66896 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1583,8 +1583,7 @@ public class HostConfig
 try {
 context.start();
 } catch (Exception e) {
-log.warn(sm.getString
- ("hostConfig.context.restart", app.name), e);
+log.error(sm.getString("hostConfig.context.restart", 
app.name), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/util/LifecycleBase.java 
b/java/org/apache/catalina/util/LifecycleBase.java
index a4cd46b..faba205 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -259,8 +259,7 @@ public abstract class LifecycleBase implements Lifecycle {
 stop();
 } catch (LifecycleException e) {
 // Just log. Still want to destroy.
-log.warn(sm.getString(
-"lifecycleBase.destroyStopFail", toString()), e);
+log.error(sm.getString("lifecycleBase.destroyStopFail", 
toString()), e);
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b7808c1..3256fba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -93,6 +93,11 @@
 63249: Use a consistent log level (WARN) when
 logging the failure to register or deregister a JMX Bean. (markt)
   
+  
+63249: Use a consistent log level (ERROR) when
+logging the LifecycleException associated with the failure
+to start or stop a component. (markt)
+  
 
   
   


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



[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e992e52  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 
Lifecycle
e992e52 is described below

commit e992e52f8d6e820fb905d806893a1d4868133a69
Author: Mark Thomas 
AuthorDate: Thu Mar 14 12:12:47 2019 +

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle

Use a consistent log level (ERROR) when logging the LifecycleException
associated with the failure to start or stop a component.
---
 java/org/apache/catalina/core/StandardContext.java | 4 ++--
 java/org/apache/catalina/core/StandardService.java | 8 
 java/org/apache/catalina/startup/HostConfig.java   | 3 +--
 java/org/apache/catalina/util/LifecycleBase.java   | 3 +--
 webapps/docs/changelog.xml | 5 +
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 7533d77..e425076 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2057,7 +2057,7 @@ public class StandardContext extends ContainerBase
 oldNamingResources.stop();
 oldNamingResources.destroy();
 } catch (LifecycleException e) {
-log.warn("standardContext.namingResource.destroy.fail", e);
+
log.error(sm.getString("standardContext.namingResource.destroy.fail"), e);
 }
 }
 if (namingResources != null) {
@@ -2065,7 +2065,7 @@ public class StandardContext extends ContainerBase
 namingResources.init();
 namingResources.start();
 } catch (LifecycleException e) {
-log.warn("standardContext.namingResource.init.fail", e);
+
log.error(sm.getString("standardContext.namingResource.init.fail"), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/core/StandardService.java 
b/java/org/apache/catalina/core/StandardService.java
index fd715e2..5de00bd 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -134,25 +134,25 @@ public class StandardService extends LifecycleMBeanBase 
implements Service {
 try {
 this.engine.start();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.engine.startFailed"), e);
+
log.error(sm.getString("standardService.engine.startFailed"), e);
 }
 }
 // Restart MapperListener to pick up new engine.
 try {
 mapperListener.stop();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.mapperListener.stopFailed"), e);
+
log.error(sm.getString("standardService.mapperListener.stopFailed"), e);
 }
 try {
 mapperListener.start();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.mapperListener.startFailed"), e);
+
log.error(sm.getString("standardService.mapperListener.startFailed"), e);
 }
 if (oldEngine != null) {
 try {
 oldEngine.stop();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.engine.stopFailed"), e);
+
log.error(sm.getString("standardService.engine.stopFailed"), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index b00c3ae..48154f3 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1413,8 +1413,7 @@ public class HostConfig implements LifecycleListener {
 try {
 context.start();
 } catch (Exception e) {
-log.warn(sm.getString
- ("hostConfig.context.restart", app.name), e);
+log.error(sm.getString("hostConfig.context.restart", 
app.name), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/util/LifecycleBase.java 
b/java/org/apache/catalina/util/LifecycleBase.java
index 0b6e77e..6ccbdb4 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -264,8 +264,7 @@ public abstract class LifecycleBase implements Lifecycle {
 stop();
 } catch (LifecycleException e) {
 // Just log. Still want to destroy.
-

[GitHub] [tomcat] wilkinsona commented on issue #146: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

2019-03-14 Thread GitBox
wilkinsona commented on issue #146: Fix 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63235
URL: https://github.com/apache/tomcat/pull/146#issuecomment-472829112
 
 
   In addition to the improved startup time, this change has an even bigger 
positive impact on Tomcat's memory footprint. With the latest 9.0 snapshot, I 
have an app using embedded Tomcat that will start with `-Xmx13M` but not with 
`-Xmx12M`. The addition of the change proposed here, allows the same app to 
start with `-Xmx9M`. That ~4MB saving in heap footprint is very welcome indeed.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] wilkinsona edited a comment on issue #146: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63235

2019-03-14 Thread GitBox
wilkinsona edited a comment on issue #146: Fix 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63235
URL: https://github.com/apache/tomcat/pull/146#issuecomment-472829112
 
 
   In addition to the improved startup time, this change has an even bigger 
positive impact on Tomcat's memory footprint. With the latest 9.0 snapshot, I 
have an app using embedded Tomcat that will start with `-Xmx13M` but not with 
`-Xmx12M`. The addition of the change proposed here allows the same app to 
start with `-Xmx9M`. That ~4MB saving in heap footprint is very welcome indeed.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new c3fccde  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 
Lifecycle
c3fccde is described below

commit c3fccdec0f5927d7cad4c9a81e0c1c1aed21b9d3
Author: Mark Thomas 
AuthorDate: Thu Mar 14 12:12:47 2019 +

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle

Use a consistent log level (ERROR) when logging the LifecycleException
associated with the failure to start or stop a component.
---
 java/org/apache/catalina/core/StandardContext.java | 4 ++--
 java/org/apache/catalina/core/StandardService.java | 8 
 java/org/apache/catalina/startup/HostConfig.java   | 3 +--
 java/org/apache/catalina/util/LifecycleBase.java   | 3 +--
 webapps/docs/changelog.xml | 5 +
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 5885b02..2753ff8 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2051,7 +2051,7 @@ public class StandardContext extends ContainerBase
 oldNamingResources.stop();
 oldNamingResources.destroy();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardContext.namingResource.destroy.fail"), e);
+
log.error(sm.getString("standardContext.namingResource.destroy.fail"), e);
 }
 }
 if (namingResources != null) {
@@ -2059,7 +2059,7 @@ public class StandardContext extends ContainerBase
 namingResources.init();
 namingResources.start();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardContext.namingResource.init.fail"), e);
+
log.error(sm.getString("standardContext.namingResource.init.fail"), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/core/StandardService.java 
b/java/org/apache/catalina/core/StandardService.java
index 4ed923d..0a57a17 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -134,25 +134,25 @@ public class StandardService extends LifecycleMBeanBase 
implements Service {
 try {
 this.engine.start();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.engine.startFailed"), e);
+
log.error(sm.getString("standardService.engine.startFailed"), e);
 }
 }
 // Restart MapperListener to pick up new engine.
 try {
 mapperListener.stop();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.mapperListener.stopFailed"), e);
+
log.error(sm.getString("standardService.mapperListener.stopFailed"), e);
 }
 try {
 mapperListener.start();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.mapperListener.startFailed"), e);
+
log.error(sm.getString("standardService.mapperListener.startFailed"), e);
 }
 if (oldEngine != null) {
 try {
 oldEngine.stop();
 } catch (LifecycleException e) {
-
log.warn(sm.getString("standardService.engine.stopFailed"), e);
+
log.error(sm.getString("standardService.engine.stopFailed"), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index bed8200..28a3231 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1411,8 +1411,7 @@ public class HostConfig implements LifecycleListener {
 try {
 context.start();
 } catch (Exception e) {
-log.warn(sm.getString
- ("hostConfig.context.restart", app.name), e);
+log.error(sm.getString("hostConfig.context.restart", 
app.name), e);
 }
 }
 }
diff --git a/java/org/apache/catalina/util/LifecycleBase.java 
b/java/org/apache/catalina/util/LifecycleBase.java
index 65f454a..8ea4d65 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -293,8 +293,7 @@ public abstract class LifecycleBase implements Lifecycle {
 stop();
 } catch (LifecycleException e) {
 // Just log. Still 

[Bug 63196] Add sane default value for RemoteIpValue#protocolHeader

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63196

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- master for 9.0.18 onwards
- 8.5.x for 8.5.40 onwards
- 7.0.x for 7.0.94 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



[Bug 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

--- Comment #8 from Remy Maucherat  ---
We should probably recommend using PRs for multiple simple changes like this
one.

-- 
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: r32919 - in /dev/tomcat/tomcat-8/v8.5.39: ./ bin/ bin/embed/ bin/extras/ src/

2019-03-14 Thread markt
Author: markt
Date: Thu Mar 14 11:53:34 2019
New Revision: 32919

Log:
Upload 8.5.39 for voting

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

dev/tomcat/tomcat-8/v8.5.39/bin/embed/apache-tomcat-8.5.39-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.39/bin/embed/apache-tomcat-8.5.39-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.39/bin/embed/apache-tomcat-8.5.39-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.39/bin/embed/apache-tomcat-8.5.39-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.39/bin/extras/
dev/tomcat/tomcat-8/v8.5.39/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.39/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.39/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.39/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.39/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.39/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.39/src/
dev/tomcat/tomcat-8/v8.5.39/src/apache-tomcat-8.5.39-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.39/src/apache-tomcat-8.5.39-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.39/src/apache-tomcat-8.5.39-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.39/src/apache-tomcat-8.5.39-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.39/src/apache-tomcat-8.5.39-src.zip.asc
dev/tomcat/tomcat-8/v8.5.39/src/apache-tomcat-8.5.39-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.39/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.39/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.39/KEYS Thu Mar 14 11:53:34 2019
@@ -0,0 +1,616 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz

[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63196

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 8564f1d  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63196
8564f1d is described below

commit 8564f1d530e495e57cf550db49140d0cff416b31
Author: Mark Thomas 
AuthorDate: Wed Mar 13 19:14:12 2019 +

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

Provide a default (X-Forwarded-Proto) for the protocolHeader attribute
of the RemoteIpFilter and RemoteIpValve.
---
 java/org/apache/catalina/filters/RemoteIpFilter.java | 2 +-
 java/org/apache/catalina/valves/RemoteIpValve.java   | 2 +-
 webapps/docs/changelog.xml   | 5 +
 webapps/docs/config/filter.xml   | 2 +-
 webapps/docs/config/valve.xml| 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java 
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index e20f53b..d52bba9 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -727,7 +727,7 @@ public class RemoteIpFilter implements Filter {
 /**
  * @see #setProtocolHeader(String)
  */
-private String protocolHeader = null;
+private String protocolHeader = "X-Forwarded-Proto";
 
 private String protocolHeaderHttpsValue = "https";
 
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java 
b/java/org/apache/catalina/valves/RemoteIpValve.java
index f2b1a23..5b9e921 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -422,7 +422,7 @@ public class RemoteIpValve extends ValveBase {
 /**
  * @see #setProtocolHeader(String)
  */
-private String protocolHeader = null;
+private String protocolHeader = "X-Forwarded-Proto";
 
 /**
  * @see #setProtocolHeaderHttpsValue(String)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cc0c15..b7808c1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,11 @@
 calling AsyncContext.dispatch(). (markt)
   
   
+63196: Provide a default (X-Forwarded-Proto) 
for
+the protocolHeader attribute of the
+RemoteIpFilter and RemoteIpValve. (markt)
+  
+  
 63249: Use a consistent log level (WARN) when
 logging the failure to register or deregister a JMX Bean. (markt)
   
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index 8a52706..598e7a8 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1594,7 +1594,7 @@ FINE: Request "/docs/config/manager.html" with response 
status "200"
   
 Name of the HTTP Header read by this valve that holds the protocol
 used by the client to connect to the proxy. If not specified, the
-default of null is used.
+default of X-Forwarded-Proto is used.
   
 
   
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index b93cfd6..9c16436 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -896,7 +896,7 @@
   
 Name of the HTTP Header read by this valve that holds the protocol
 used by the client to connect to the proxy. If not specified, the
-default of null is used.
+default of X-Forwarded-Proto is used.
   
 
   


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



[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63196

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 16ca5f1  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63196
16ca5f1 is described below

commit 16ca5f1371c85f37a2ea74bf90bf37486a810fe9
Author: Mark Thomas 
AuthorDate: Wed Mar 13 19:14:12 2019 +

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

Provide a default (X-Forwarded-Proto) for the protocolHeader attribute
of the RemoteIpFilter and RemoteIpValve.
---
 java/org/apache/catalina/filters/RemoteIpFilter.java | 2 +-
 java/org/apache/catalina/valves/RemoteIpValve.java   | 2 +-
 webapps/docs/changelog.xml   | 5 +
 webapps/docs/config/filter.xml   | 2 +-
 webapps/docs/config/valve.xml| 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java 
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 886ef18..20b4abd 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -745,7 +745,7 @@ public class RemoteIpFilter implements Filter {
 /**
  * @see #setProtocolHeader(String)
  */
-private String protocolHeader = null;
+private String protocolHeader = "X-Forwarded-Proto";
 
 private String protocolHeaderHttpsValue = "https";
 
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java 
b/java/org/apache/catalina/valves/RemoteIpValve.java
index f82af32..145b095 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -420,7 +420,7 @@ public class RemoteIpValve extends ValveBase {
 /**
  * @see #setProtocolHeader(String)
  */
-private String protocolHeader = null;
+private String protocolHeader = "X-Forwarded-Proto";
 
 /**
  * @see #setProtocolHeaderHttpsValue(String)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8013973..d0c9396 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -48,6 +48,11 @@
   
 
   
+63196: Provide a default (X-Forwarded-Proto) 
for
+the protocolHeader attribute of the
+RemoteIpFilter and RemoteIpValve. (markt)
+  
+  
 63249: Use a consistent log level (WARN) when
 logging the failure to register or deregister a JMX Bean. (markt)
   
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index d486735..9e5b5fb 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1594,7 +1594,7 @@ FINE: Request "/docs/config/manager.html" with response 
status "200"
   
 Name of the HTTP Header read by this valve that holds the protocol
 used by the client to connect to the proxy. If not specified, the
-default of null is used.
+default of X-Forwarded-Proto is used.
   
 
   
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index cc16a4e..43e4aad 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -985,7 +985,7 @@
   
 Name of the HTTP Header read by this valve that holds the protocol
 used by the client to connect to the proxy. If not specified, the
-default of null is used.
+default of X-Forwarded-Proto is used.
   
 
   


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



[Bug 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

--- Comment #7 from AnhT  ---
(In reply to Mark Thomas from comment #6)
> The log levels for the JMX (de-)registration messages have been addressed in:
> - master for 9.0.18 onwards
> - 8.5.x for 8.5.40 onwards
> - 7.0.x for 7.0.94 onwards
> 
> I'll look at the Lifecycle issues next but please can I ask that you open a
> new bug report if you find any further issues. Separate bug reports makes it
> easier to track what has been fixed and what hasn't.

OK, I will report the bugs in new page, thanks for your response.

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



buildbot success in on tomcat-85-trunk

2019-03-14 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1697

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 3f5625f487dcd14cd5ac788cf399e594cee25e63
Blamelist: Mark Thomas 

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 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

--- Comment #6 from Mark Thomas  ---
The log levels for the JMX (de-)registration messages have been addressed in:
- master for 9.0.18 onwards
- 8.5.x for 8.5.40 onwards
- 7.0.x for 7.0.94 onwards

I'll look at the Lifecycle issues next but please can I ask that you open a new
bug report if you find any further issues. Separate bug reports makes it easier
to track what has been fixed and what hasn't.

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



[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new d01c6a1  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
d01c6a1 is described below

commit d01c6a1c94b48bff6a437a42d7bfdaa2dccfea72
Author: Mark Thomas 
AuthorDate: Wed Mar 13 19:05:02 2019 +

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

Use a consistent log level (WARN) when logging the failure to register
or deregister a JMX Bean.
---
 .../catalina/core/ApplicationFilterConfig.java | 31 ++
 java/org/apache/catalina/core/StandardWrapper.java |  8 +++---
 java/org/apache/catalina/loader/WebappLoader.java  |  2 +-
 java/org/apache/catalina/startup/HostConfig.java   |  4 +--
 webapps/docs/changelog.xml |  4 +++
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index c7af036..39c85ae 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -189,7 +189,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 @Override
 public Enumeration getInitParameterNames() {
 Map map = filterDef.getParameterMap();
-
+
 if (map == null) {
 return Collections.enumeration(emptyString);
 }
@@ -262,9 +262,9 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 // Identify the class loader we will be using
 String filterClass = filterDef.getFilterClass();
 this.filter = (Filter) getInstanceManager().newInstance(filterClass);
-
+
 initFilter();
-
+
 return (this.filter);
 
 }
@@ -284,7 +284,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 } else {
 filter.init(this);
 }
-
+
 // Expose filter via JMX
 registerJMX();
 }
@@ -305,7 +305,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 void release() {
 
 unregisterJMX();
-
+
 if (this.filter != null) {
 try {
 if (Globals.IS_SECURITY_ENABLED) {
@@ -352,7 +352,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 instanceManager = new DefaultInstanceManager(null,
 new HashMap>(),
 context,
-getClass().getClassLoader()); 
+getClass().getClassLoader());
 }
 }
 return instanceManager;
@@ -388,29 +388,26 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 }
 try {
 oname = new ObjectName(onameStr);
-Registry.getRegistry(null, null).registerComponent(this, oname,
-null);
+Registry.getRegistry(null, null).registerComponent(this, oname, 
null);
 } catch (Exception ex) {
-log.info(sm.getString("applicationFilterConfig.jmxRegisterFail",
+log.warn(sm.getString("applicationFilterConfig.jmxRegisterFail",
 getFilterClass(), getFilterName()), ex);
 }
 }
-
+
+
 private void unregisterJMX() {
 // unregister this component
 if (oname != null) {
 try {
 Registry.getRegistry(null, null).unregisterComponent(oname);
 if (log.isDebugEnabled())
-log.debug(sm.getString(
-"applicationFilterConfig.jmxUnregister",
+
log.debug(sm.getString("applicationFilterConfig.jmxUnregister",
 getFilterClass(), getFilterName()));
 } catch(Exception ex) {
-log.error(sm.getString(
-"applicationFilterConfig.jmxUnregisterFail",
+
log.warn(sm.getString("applicationFilterConfig.jmxUnregisterFail",
 getFilterClass(), getFilterName()), ex);
 }
 }
-
 }
 }
diff --git 

[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 18b16d5  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
18b16d5 is described below

commit 18b16d5cdb1667132c5035aca2f08dced25a911c
Author: Mark Thomas 
AuthorDate: Wed Mar 13 19:05:02 2019 +

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

Use a consistent log level (WARN) when logging the failure to register
or deregister a JMX Bean.
---
 java/org/apache/catalina/core/ApplicationFilterConfig.java | 13 +
 java/org/apache/catalina/core/StandardWrapper.java |  8 +++-
 java/org/apache/catalina/loader/WebappLoader.java  |  2 +-
 java/org/apache/catalina/startup/HostConfig.java   |  4 ++--
 webapps/docs/changelog.xml |  8 
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index ce53f30..6c29234 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -388,29 +388,26 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 }
 try {
 oname = new ObjectName(onameStr);
-Registry.getRegistry(null, null).registerComponent(this, oname,
-null);
+Registry.getRegistry(null, null).registerComponent(this, oname, 
null);
 } catch (Exception ex) {
-log.info(sm.getString("applicationFilterConfig.jmxRegisterFail",
+log.warn(sm.getString("applicationFilterConfig.jmxRegisterFail",
 getFilterClass(), getFilterName()), ex);
 }
 }
 
+
 private void unregisterJMX() {
 // unregister this component
 if (oname != null) {
 try {
 Registry.getRegistry(null, null).unregisterComponent(oname);
 if (log.isDebugEnabled())
-log.debug(sm.getString(
-"applicationFilterConfig.jmxUnregister",
+
log.debug(sm.getString("applicationFilterConfig.jmxUnregister",
 getFilterClass(), getFilterName()));
 } catch(Exception ex) {
-log.error(sm.getString(
-"applicationFilterConfig.jmxUnregisterFail",
+
log.warn(sm.getString("applicationFilterConfig.jmxUnregisterFail",
 getFilterClass(), getFilterName()), ex);
 }
 }
-
 }
 }
diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index 5e31581..806a90d 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1000,11 +1000,9 @@ public class StandardWrapper extends ContainerBase
 
 try {
 jspMonitorON = new ObjectName(oname.toString());
-Registry.getRegistry(null, null)
-.registerComponent(instance, jspMonitorON, null);
-} catch( Exception ex ) {
-log.info("Error registering JSP monitoring with jmx " +
- instance);
+Registry.getRegistry(null, null).registerComponent(instance, 
jspMonitorON, null);
+} catch (Exception ex) {
+log.warn("Error registering JSP monitoring with jmx " + 
instance);
 }
 }
 }
diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 7de7822..c55229a 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -459,7 +459,7 @@ public class WebappLoader extends LifecycleMBeanBase
 context.getParent().getName() + ",context=" + 
contextName);
 Registry.getRegistry(null, null).unregisterComponent(cloname);
 } catch (Exception e) {
-log.error("LifecycleException ", e);
+log.warn("LifecycleException ", e);
 }
 }
 
diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 9b1c693..b00c3ae 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1565,7 +1565,7 @@ public class HostConfig implements LifecycleListener {
 Registry.getRegistry(null, null).registerComponent
 (this, oname, this.getClass().getName());
 } catch (Exception e) {
-log.error(sm.getString("hostConfig.jmx.register", 

[tomcat] branch 8.5.x updated: Increment version number for next development cycle

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 3f5625f  Increment version number for next development cycle
3f5625f is described below

commit 3f5625f487dcd14cd5ac788cf399e594cee25e63
Author: Mark Thomas 
AuthorDate: Thu Mar 14 10:57:27 2019 +

Increment version number for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ea57725..102981f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=39
+version.build=40
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index ef84c43..e858e8b 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.39
+maven.asf.release.deploy.version=8.5.40
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e333bc1..a7be939 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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



[tomcat] tag 8.5.39 created (now f481565)

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 8.5.39
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at f481565  (commit)
This tag includes the following new commits:

 new f481565  Tag 8.5.39

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



[tomcat] 01/01: Tag 8.5.39

2019-03-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 8.5.39
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f481565d959dc5a5eae1576cc294774c8683b4dc
Author: Mark Thomas 
AuthorDate: Thu Mar 14 10:50:05 2019 +

Tag 8.5.39
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ea57725..3a3f839 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=39
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e333bc1..68433e5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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



Re: [VOTE] Release Apache Tomcat 9.0.17

2019-03-14 Thread Mark Thomas
On 13/03/2019 18:23, Mark Thomas wrote:



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

Mark

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



[GitHub] [tomcat] toby1984 commented on issue #140: jdbc-pool: Improve maxAge handling

2019-03-14 Thread GitBox
toby1984 commented on issue #140: jdbc-pool: Improve maxAge handling
URL: https://github.com/apache/tomcat/pull/140#issuecomment-472791041
 
 
   Good catch, I will fix this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] KeiichiFujino commented on issue #140: jdbc-pool: Improve maxAge handling

2019-03-14 Thread GitBox
KeiichiFujino commented on issue #140: jdbc-pool: Improve maxAge handling
URL: https://github.com/apache/tomcat/pull/140#issuecomment-472779046
 
 
   If testOnConnect is true or initSQL is set, we need validate the connection( 
with VALIDATE_INIT) when reconnecting.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



Re: [VOTE] Release Apache Tomcat 9.0.17

2019-03-14 Thread Rémy Maucherat
On Wed, Mar 13, 2019 at 7:23 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.17 release is now available for voting.
>
> The major changes compared to the 9.0.16 release are:
>
> - The APR/Native connector now supports both OpenSSL and JSSE TLS
>   configuration syntax (NIO and NIO2 already support this)
>
> - Various improvements to NIO2
>
> - Various fixes for HTTP/2 push requests
>
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.17/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1205/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.17
> 25d7c99e8c44a41a08ba85ccaba3cfec6af9c801
>
> The proposed 9.0.17 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.17
>
> Rémy


[Bug 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

--- Comment #5 from AnhT  ---
(In reply to AnhT from comment #3)
> Hi, Mark Thomas. Thank you very much for your prompt response. 
> There are other 6 inconsistent logging practices shown below, and I think
> the ERROR level is more appropriate to them.
> StandardService.java===
> full path: tomcat\java\org\apache\catalina\core\StandardService.java
> log line num: 137; 144; 149; 155
> 
> 132 if (getState().isAvailable()) {
> 133 if (this.engine != null) {
> 134 try {
> 135 this.engine.start();
> 136 } catch (LifecycleException e) {
> 137
> log.warn(sm.getString("standardService.engine.startFailed"), e);
> 138 }
> 139 }
> 140 // Restart MapperListener to pick up new engine.
> 141 try {
> 142 mapperListener.stop();
> 143 } catch (LifecycleException e) {
> 144 
> log.warn(sm.getString("standardService.mapperListener.stopFailed"), e);
> 145 }
> 146 try {
> 147 mapperListener.start();
> 148 } catch (LifecycleException e) {
> 149
> log.warn(sm.getString("standardService.mapperListener.startFailed"), e);
> 150 }
> 151 if (oldEngine != null) {
> 152 try {
> 153 oldEngine.stop();
> 154 } catch (LifecycleException e) {
> 155
> log.warn(sm.getString("standardService.engine.stopFailed"), e);
> 156 }
> 157 }
> 158 }
> 
> HostConfig.java===
> full path: tomcat\java\org\apache\catalina\startup\HostConfig.java
> log line num: 1414
> 
> 1396 Context context = (Context) host.findChild(app.name);
> 1397 if (context.getState().isAvailable()) {
> 1398 if (fileToRemove != null && newDocBase != null) {
> 1399 context.addLifecycleListener(
> 1400 new
> ExpandedDirectoryRemovalListener(fileToRemove, newDocBase));
> 1401 }
> 1402 // Reload catches and logs exceptions
> 1403 context.reload();
> 1404 } else {
> 1405 // If the context was not started (for example an error
> 1406 // in web.xml) we'll still get to try to start
> 1407 if (fileToRemove != null && newDocBase != null) {
> 1408 ExpandWar.delete(fileToRemove);
> 1409 context.setDocBase(newDocBase);
> 1410 }
> 1411 try {
> 1412 context.start();
> 1413 } catch (Exception e) {
> 1414 log.warn(sm.getString
> 1415  ("hostConfig.context.restart", app.name), e);
> 1416 }
> 1417 }
> 
> =LifecycleBase.java===
> full path: tomcat\java\org\apache\catalina\util\LifecycleBase.java
> log line num: 296
> 
> 290 if (LifecycleState.FAILED.equals(state)) {
> 291 try {
> 292 // Triggers clean-up
> 293 stop();
> 294 } catch (LifecycleException e) {
> 295 // Just log. Still want to destroy.
> 296 log.warn(sm.getString(
> 297 "lifecycleBase.destroyStopFail", toString()), e);
> 298 }
> 299 }

I present the details in Comment 4. Please ignore this comment.

-- 
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 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

--- Comment #4 from AnhT  ---
Hi, Mark Thomas. Thank you very much for your prompt response. 
There are other inconsistent logging practices shown below, and I think the
ERROR level is more appropriate to following 6 log statements.
StandardService.java===
file path:
apache-tomcat-9.0.16-src\java\org\apache\catalina\core\StandardService.java
log line num: 137; 144; 149; 155

132 if (getState().isAvailable()) {
133 if (this.engine != null) {
134 try {
135 this.engine.start();
136 } catch (LifecycleException e) {
137
log.warn(sm.getString("standardService.engine.startFailed"), e);
138 }
139 }
140 // Restart MapperListener to pick up new engine.
141 try {
142 mapperListener.stop();
143 } catch (LifecycleException e) {
144 
log.warn(sm.getString("standardService.mapperListener.stopFailed"), e);
145 }
146 try {
147 mapperListener.start();
148 } catch (LifecycleException e) {
149
log.warn(sm.getString("standardService.mapperListener.startFailed"), e);
150 }
151 if (oldEngine != null) {
152 try {
153 oldEngine.stop();
154 } catch (LifecycleException e) {
155
log.warn(sm.getString("standardService.engine.stopFailed"), e);
156 }
157 }
158 }

HostConfig.java===
file path:
apache-tomcat-9.0.16-src\java\org\apache\catalina\startup\HostConfig.java
log line num: 1414

1411 try {
1412 context.start();
1413 } catch (Exception e) {
1414 log.warn(sm.getString
1415  ("hostConfig.context.restart", app.name), e);
1416 }

=LifecycleBase.java===
file path:
apache-tomcat-9.0.16-src\java\org\apache\catalina\util\LifecycleBase.java
log line num: 296

290 if (LifecycleState.FAILED.equals(state)) {
291 try {
292 // Triggers clean-up
293 stop();
294 } catch (LifecycleException e) {
295 // Just log. Still want to destroy.
296 log.warn(sm.getString(
297 "lifecycleBase.destroyStopFail", toString()), e);
298 }
299 }


***Following 10 logging statements are assigned to ERROR level in code*
=StandardService.java===
file path:
apache-tomcat-9.0.16-srct\java\org\apache\catalina\core\StandardService.java
log line num: 293; 348
290 try {
291 connectors[j].stop();
292 } catch (LifecycleException e) {
293 log.error(sm.getString(
294 "standardService.connector.stopFailed",
295 connectors[j]), e);
296 }

345 try {
346 ex.start();
347 } catch (LifecycleException x) {
348
log.error(sm.getString("standardService.executor.start"), x);
349 }

=StandardPipeline.java
file path:
apache-tomcat-9.0.16-src\java\org\apache\catalina\core\StandardPipeline.java
log line num: 293; 345
290 try {
291 ((Lifecycle) valve).start();
292 } catch (LifecycleException e) {
293 log.error(sm.getString("standardPipeline.basic.start"), e);
294 return;
295 }

342 try {
343 ((Lifecycle) valve).start();
344 } catch (LifecycleException e) {
345 log.error(sm.getString("standardPipeline.valve.start"),
e);
346 }
=CombinedRealm.java==
file
path:apache-tomcat-9.0.16-src\java\org\apache\catalina\realm\CombinedRealm.java
log line num:249
244 try {
245 ((Lifecycle) realm).start();
246 } catch (LifecycleException e) {
247 // If realm doesn't start can't authenticate against it
248 iter.remove();
249 log.error(sm.getString("combinedRealm.realmStartFail",
250 realm.getClass().getName()), e);
251 }


=StandardContext.java==
file path:
apache-tomcat-9.0.16-src\java\org\apache\catalina\core\StandardContext.java
log line num: 1844; 1899; 3750
1841 try {
1842 ((Lifecycle) oldLoader).stop();
1843 } catch (LifecycleException e) {
1844

[Bug 63249] Inconsistent log level practices

2019-03-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63249

--- Comment #3 from AnhT  ---
Hi, Mark Thomas. Thank you very much for your prompt response. 
There are other 6 inconsistent logging practices shown below, and I think the
ERROR level is more appropriate to them.
StandardService.java===
full path: tomcat\java\org\apache\catalina\core\StandardService.java
log line num: 137; 144; 149; 155

132 if (getState().isAvailable()) {
133 if (this.engine != null) {
134 try {
135 this.engine.start();
136 } catch (LifecycleException e) {
137
log.warn(sm.getString("standardService.engine.startFailed"), e);
138 }
139 }
140 // Restart MapperListener to pick up new engine.
141 try {
142 mapperListener.stop();
143 } catch (LifecycleException e) {
144 
log.warn(sm.getString("standardService.mapperListener.stopFailed"), e);
145 }
146 try {
147 mapperListener.start();
148 } catch (LifecycleException e) {
149
log.warn(sm.getString("standardService.mapperListener.startFailed"), e);
150 }
151 if (oldEngine != null) {
152 try {
153 oldEngine.stop();
154 } catch (LifecycleException e) {
155
log.warn(sm.getString("standardService.engine.stopFailed"), e);
156 }
157 }
158 }

HostConfig.java===
full path: tomcat\java\org\apache\catalina\startup\HostConfig.java
log line num: 1414

1396 Context context = (Context) host.findChild(app.name);
1397 if (context.getState().isAvailable()) {
1398 if (fileToRemove != null && newDocBase != null) {
1399 context.addLifecycleListener(
1400 new ExpandedDirectoryRemovalListener(fileToRemove,
newDocBase));
1401 }
1402 // Reload catches and logs exceptions
1403 context.reload();
1404 } else {
1405 // If the context was not started (for example an error
1406 // in web.xml) we'll still get to try to start
1407 if (fileToRemove != null && newDocBase != null) {
1408 ExpandWar.delete(fileToRemove);
1409 context.setDocBase(newDocBase);
1410 }
1411 try {
1412 context.start();
1413 } catch (Exception e) {
1414 log.warn(sm.getString
1415  ("hostConfig.context.restart", app.name), e);
1416 }
1417 }

=LifecycleBase.java===
full path: tomcat\java\org\apache\catalina\util\LifecycleBase.java
log line num: 296

290 if (LifecycleState.FAILED.equals(state)) {
291 try {
292 // Triggers clean-up
293 stop();
294 } catch (LifecycleException e) {
295 // Just log. Still want to destroy.
296 log.warn(sm.getString(
297 "lifecycleBase.destroyStopFail", toString()), e);
298 }
299 }

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



[GitHub] [tomcat] samslow opened a new pull request #148: Remove duplicated comments

2019-03-14 Thread GitBox
samslow opened a new pull request #148: Remove duplicated comments
URL: https://github.com/apache/tomcat/pull/148
 
 
   Signed-off-by: samslow 
   
   I don't know why this comments is here.
   
   If there is a reason why the comment is here and I do not know, Abort this 
PR and Teach me if you can


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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