[tomcat] branch master updated: Update the security how-to to reflect the reduction in system properties
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 13e4ed3 Update the security how-to to reflect the reduction in system properties 13e4ed3 is described below commit 13e4ed380dec4a1b276fe23e8c1a7e80e0a271ec Author: Mark Thomas AuthorDate: Wed Apr 1 11:53:28 2020 +0100 Update the security how-to to reflect the reduction in system properties --- webapps/docs/security-howto.xml | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml index fbdb9d7..0eddda6 100644 --- a/webapps/docs/security-howto.xml +++ b/webapps/docs/security-howto.xml @@ -261,6 +261,11 @@ address a connector listens on for connections. By default, a connector listens on all configured IP addresses. + The allowBackslash attribute allows non-standard + parsing of the request URI. Setting this attribute to a non-default value + when behind a reverse proxy may enable an attacker to bypass any security + constraints enforced by the proxy. + The allowTrace attribute may be used to enable TRACE requests which can be useful for debugging. Due to the way some browsers handle the response from a TRACE request (which exposes the browser to an @@ -271,6 +276,18 @@ the default value, and this reduces the chances of a bug in an application exposing data from one request to another. + The encodedSolidusHandling attribute allows + non-standard parsing of the request URI. Setting this attribute to a + non-default value when behind a reverse proxy may enable an attacker to + bypass any security constraints enforced by the proxy. + + The enforceEncodingInGetWriter attribute has security + implications if set to false. Many user agents, in breach of + RFC 7230, try to guess the character encoding of text media types when the + specification-mandated default of ISO-8859-1 should be used. Some browsers + will interpret as UTF-7 a response containing characters that are safe for + ISO-8859-1 but trigger an XSS vulnerability if interpreted as UTF-7. + The maxPostSize attribute controls the maximum size of a POST request that will be parsed for parameters. The parameters are cached for the duration of the request so this is limited to 2MB by @@ -465,24 +482,6 @@ - -The -org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH and -org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH -system properties allow non-standard parsing of the request URI. Using -these options when behind a reverse proxy may enable an attacker to bypass -any security constraints enforced by the proxy. - -The -org.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER - system property has security implications if disabled. Many user -agents, in breach of RFC2616, try to guess the character encoding of text -media types when the specification-mandated default of ISO-8859-1 should be -used. Some browsers will interpret as UTF-7 a response containing characters -that are safe for ISO-8859-1 but trigger an XSS vulnerability if interpreted -as UTF-7. - - This applies to the default conf/web.xml file, the /WEB-INF/tomcat-web.xml and the /WEB-INF/web.xml - 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: Update security docs after addition of encodedSolidusHandling attribute
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 9fa7de6 Update security docs after addition of encodedSolidusHandling attribute 9fa7de6 is described below commit 9fa7de6be46c656472fefb84efe7557425753281 Author: Mark Thomas AuthorDate: Wed Apr 1 11:56:06 2020 +0100 Update security docs after addition of encodedSolidusHandling attribute --- webapps/docs/security-howto.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml index d0c53ed..4a2de46 100644 --- a/webapps/docs/security-howto.xml +++ b/webapps/docs/security-howto.xml @@ -271,6 +271,11 @@ reduces the chances of a bug in an application exposing data from one request to another. + The encodedSolidusHandling attribute allows + non-standard parsing of the request URI. Setting this attribute to a + non-default value when behind a reverse proxy may enable an attacker to + bypass any security constraints enforced by the proxy. + The maxPostSize attribute controls the maximum size of a POST request that will be parsed for parameters. The parameters are cached for the duration of the request so this is limited to 2MB by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update security docs after addition of encodedSolidusHandling attribute
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new add00a5 Update security docs after addition of encodedSolidusHandling attribute add00a5 is described below commit add00a55c334f0ebc8a2d952f0f4cdff7517e3f5 Author: Mark Thomas AuthorDate: Wed Apr 1 11:56:06 2020 +0100 Update security docs after addition of encodedSolidusHandling attribute --- webapps/docs/security-howto.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml index e929a8e..551b118 100644 --- a/webapps/docs/security-howto.xml +++ b/webapps/docs/security-howto.xml @@ -271,6 +271,11 @@ reduces the chances of a bug in an application exposing data from one request to another. + The encodedSolidusHandling attribute allows + non-standard parsing of the request URI. Setting this attribute to a + non-default value when behind a reverse proxy may enable an attacker to + bypass any security constraints enforced by the proxy. + The maxPostSize attribute controls the maximum size of a POST request that will be parsed for parameters. The parameters are cached for the duration of the request so this is limited to 2MB by - 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: Update security docs after addition of encodedSolidusHandling attribute
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 22ce59d Update security docs after addition of encodedSolidusHandling attribute 22ce59d is described below commit 22ce59d4767fcc2a6895c7d556857b45fba93a79 Author: Mark Thomas AuthorDate: Wed Apr 1 11:56:06 2020 +0100 Update security docs after addition of encodedSolidusHandling attribute --- webapps/docs/security-howto.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml index d52fc01..694a7a7 100644 --- a/webapps/docs/security-howto.xml +++ b/webapps/docs/security-howto.xml @@ -262,6 +262,11 @@ reduces the chances of a bug in an application exposing data from one request to another. + The encodedSolidusHandling attribute allows + non-standard parsing of the request URI. Setting this attribute to a + non-default value when behind a reverse proxy may enable an attacker to + bypass any security constraints enforced by the proxy. + The maxPostSize attribute controls the maximum size of a POST request that will be parsed for parameters. The parameters are cached for the duration of the request so this is limited to 2MB by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add SSO cookieName configuration attribute
This is an automated email from the ASF dual-hosted git repository.
remm 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 a41c2a4 Add SSO cookieName configuration attribute
a41c2a4 is described below
commit a41c2a4710200d7fc99078ab17232f1fcaa16788
Author: remm
AuthorDate: Wed Apr 1 14:46:04 2020 +0200
Add SSO cookieName configuration attribute
---
.../catalina/authenticator/AuthenticatorBase.java | 2 +-
.../apache/catalina/authenticator/Constants.java | 1 +
.../catalina/authenticator/SingleSignOn.java | 23 +-
webapps/docs/changelog.xml | 4
webapps/docs/config/valve.xml | 5 +
5 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 00a02a8..183b575 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1179,7 +1179,7 @@ public abstract class AuthenticatorBase extends ValveBase
if (ssoId == null) {
// Construct a cookie to be returned to the client
ssoId = sessionIdGenerator.generateSessionId();
-Cookie cookie = new Cookie(Constants.SINGLE_SIGN_ON_COOKIE, ssoId);
+Cookie cookie = new Cookie(sso.getCookieName(), ssoId);
cookie.setMaxAge(-1);
cookie.setPath("/");
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index 7977d55..f7c1b71 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -17,6 +17,7 @@
package org.apache.catalina.authenticator;
public class Constants {
+
// Authentication methods for login configuration
// Servlet spec schemes are defined in HttpServletRequest
// Vendor specific schemes
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 0233dd8..18f8791 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -94,6 +94,10 @@ public class SingleSignOn extends ValveBase {
*/
private String cookieDomain;
+/**
+ * SSO cookie name, the default value is JSESSIONIDSSO.
+ */
+private String cookieName = Constants.SINGLE_SIGN_ON_COOKIE;
// - Properties
@@ -123,6 +127,23 @@ public class SingleSignOn extends ValveBase {
/**
+ * @return the cookie name
+ */
+public String getCookieName() {
+return cookieName;
+}
+
+
+/**
+ * Set the cookie name that will be used for the SSO cookie.
+ * @param cookieName the cookieName to set
+ */
+public void setCookieName(String cookieName) {
+this.cookieName = cookieName;
+}
+
+
+/**
* Gets whether each request needs to be reauthenticated (by an
* Authenticator downstream in the pipeline) to the security
* Realm, or if this Valve can itself bind security info
@@ -227,7 +248,7 @@ public class SingleSignOn extends ValveBase {
Cookie cookies[] = request.getCookies();
if (cookies != null) {
for (int i = 0; i < cookies.length; i++) {
-if
(Constants.SINGLE_SIGN_ON_COOKIE.equals(cookies[i].getName())) {
+if (cookieName.equals(cookies[i].getName())) {
cookie = cookies[i];
break;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c6ebff4..05fe60e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,10 @@
64265: Fix ETag comparison performed by the default servlet.
The default servley always uses weak comparison. (markt)
+
+Add cookieName attribute to the SSO valve to configure the
+SSO cookie name. (remm)
+
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 4afdbc0..fe97f8e 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1166,6 +1166,11 @@
Sets the host domain to be used for sso cookies.
+
+Sets the cookie name to be used for sso cookies. The default value
+is JSESSIONIDSSO
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove system property
This is an automated email from the ASF dual-hosted git repository.
remm 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 fc54e68 Remove system property
fc54e68 is described below
commit fc54e683d1517f3b303a16b3826098592a9bfafe
Author: remm
AuthorDate: Wed Apr 1 14:53:45 2020 +0200
Remove system property
The system property for SSO cookie name configuration is now replaced by
an attribute on the SSO valve. The SINGLE_SIGN_ON_COOKIE in Constants
remains with the same "JSESSIONIDSSO" default value.
---
java/org/apache/catalina/authenticator/Constants.java | 3 +--
webapps/docs/changelog.xml| 6 --
webapps/docs/config/systemprops.xml | 14 --
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index f7c1b71..1bf3689 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -36,8 +36,7 @@ public class Constants {
public static final String DEFAULT_LOGIN_MODULE_NAME =
"com.sun.security.jgss.krb5.accept";
// Cookie name for single sign on support
-public static final String SINGLE_SIGN_ON_COOKIE = System.getProperty(
-
"org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
"JSESSIONIDSSO");
+public static final String SINGLE_SIGN_ON_COOKIE = "JSESSIONIDSSO";
// - Request Notes
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 05fe60e..aadacaa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,8 +122,10 @@
The default servley always uses weak comparison. (markt)
-Add cookieName attribute to the SSO valve to configure the
-SSO cookie name. (remm)
+Remove
+
org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME
+system property, replaced by the
+cookieName attribute on the SSO valve. (remm)
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index 8ce3793..fb3c6ea 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -171,20 +171,6 @@
-
-
-
-
-
- An alternative name for the single sign on session cookie. Defaults to
- JSESSIONIDSSO.
-
-
-
-
-
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] ChristopherSchultz commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG
ChristopherSchultz commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG URL: https://github.com/apache/tomcat/pull/265#issuecomment-607239322 Spring Boot is only configured via environment variables? Seems fragile and non-portable to me. 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] martin-g commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG
martin-g commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG URL: https://github.com/apache/tomcat/pull/265#issuecomment-607242897 Spring Boot could be configured via config file(s), system properties and/or env variables. It is pretty flexible! Using env variables is the preferred way in Docker/Kubernetes setups. 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 #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG
markt-asf commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG URL: https://github.com/apache/tomcat/pull/265#issuecomment-607303421 Given containers seem to like environment variables, I don't see a way around this. I'm working on a backwards compatible solution. 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: Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG
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 3bb02ea Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG 3bb02ea is described below commit 3bb02eae433f5eb610a6454702a254763bb4514e Author: Mark Thomas AuthorDate: Wed Apr 1 17:19:25 2020 +0100 Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG Backwards compatibility is retained --- bin/catalina.bat | 30 +- bin/catalina.sh| 35 --- bin/daemon.sh | 19 ++- webapps/docs/changelog.xml | 6 ++ 4 files changed, 65 insertions(+), 25 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index eaced8d..bf0f7e0 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -94,9 +94,14 @@ rem JSSE_OPTS (Optional) Java runtime options used to control the TLS rem implementation when JSSE is used. Default is: rem "-Djdk.tls.ephemeralDHKeySize=2048" rem -rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file +rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file rem Example (all one line) -rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem set CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem +rem LOGGING_CONFIG Deprecated +rem Use CATALINA_LOGGING_CONFIG +rem This is only used if CATALINA_LOGGING_CONFIG is not set +rem and LOGGING_CONFIG starts with "-D..." rem rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager rem Example (all one line) @@ -214,10 +219,17 @@ rem Register custom URL handlers rem Do this here so custom URL handles (specifically 'war:...') can be used in the security policy set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" -if not "%LOGGING_CONFIG%" == "" goto noJuliConfig -set LOGGING_CONFIG=-Dnop +rem Check for the deprecated LOGGING_CONFIG +rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation +set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%" +:noLoggingDeprecation + +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig +set CATALINA_LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig -set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" +set CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" :noJuliConfig if not "%LOGGING_MANAGER%" == "" goto noJuliManager @@ -358,17 +370,17 @@ goto setArgs rem Execute Java with the applicable properties if not "%JPDA%" == "" goto doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME
[tomcat] branch 9.0.x updated: Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 8555df3 Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG 8555df3 is described below commit 8555df3ce116d4f61d9642a9dfabde82075e626f Author: Mark Thomas AuthorDate: Wed Apr 1 17:19:25 2020 +0100 Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG Backwards compatibility is retained --- bin/catalina.bat | 30 +- bin/catalina.sh| 35 --- bin/daemon.sh | 19 ++- webapps/docs/changelog.xml | 6 ++ 4 files changed, 65 insertions(+), 25 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index eaced8d..bf0f7e0 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -94,9 +94,14 @@ rem JSSE_OPTS (Optional) Java runtime options used to control the TLS rem implementation when JSSE is used. Default is: rem "-Djdk.tls.ephemeralDHKeySize=2048" rem -rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file +rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file rem Example (all one line) -rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem set CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem +rem LOGGING_CONFIG Deprecated +rem Use CATALINA_LOGGING_CONFIG +rem This is only used if CATALINA_LOGGING_CONFIG is not set +rem and LOGGING_CONFIG starts with "-D..." rem rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager rem Example (all one line) @@ -214,10 +219,17 @@ rem Register custom URL handlers rem Do this here so custom URL handles (specifically 'war:...') can be used in the security policy set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" -if not "%LOGGING_CONFIG%" == "" goto noJuliConfig -set LOGGING_CONFIG=-Dnop +rem Check for the deprecated LOGGING_CONFIG +rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation +set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%" +:noLoggingDeprecation + +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig +set CATALINA_LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig -set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" +set CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" :noJuliConfig if not "%LOGGING_MANAGER%" == "" goto noJuliManager @@ -358,17 +370,17 @@ goto setArgs rem Execute Java with the applicable properties if not "%JPDA%" == "" goto doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%"
[tomcat] branch 8.5.x updated: Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG
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 210cf32 Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG 210cf32 is described below commit 210cf32c5789eff6ad99b84c6976bc200422de05 Author: Mark Thomas AuthorDate: Wed Apr 1 17:19:25 2020 +0100 Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG Backwards compatibility is retained --- bin/catalina.bat | 30 +- bin/catalina.sh| 35 --- bin/daemon.sh | 19 ++- webapps/docs/changelog.xml | 6 ++ 4 files changed, 65 insertions(+), 25 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index eaced8d..bf0f7e0 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -94,9 +94,14 @@ rem JSSE_OPTS (Optional) Java runtime options used to control the TLS rem implementation when JSSE is used. Default is: rem "-Djdk.tls.ephemeralDHKeySize=2048" rem -rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file +rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file rem Example (all one line) -rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem set CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem +rem LOGGING_CONFIG Deprecated +rem Use CATALINA_LOGGING_CONFIG +rem This is only used if CATALINA_LOGGING_CONFIG is not set +rem and LOGGING_CONFIG starts with "-D..." rem rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager rem Example (all one line) @@ -214,10 +219,17 @@ rem Register custom URL handlers rem Do this here so custom URL handles (specifically 'war:...') can be used in the security policy set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" -if not "%LOGGING_CONFIG%" == "" goto noJuliConfig -set LOGGING_CONFIG=-Dnop +rem Check for the deprecated LOGGING_CONFIG +rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation +set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%" +:noLoggingDeprecation + +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig +set CATALINA_LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig -set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" +set CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" :noJuliConfig if not "%LOGGING_MANAGER%" == "" goto noJuliManager @@ -358,17 +370,17 @@ goto setArgs rem Execute Java with the applicable properties if not "%JPDA%" == "" goto doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%"
[tomcat] branch 7.0.x updated: Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG
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 18dc9ae Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG 18dc9ae is described below commit 18dc9ae70934129d6d03f4da9b846a99c91a9351 Author: Mark Thomas AuthorDate: Wed Apr 1 17:19:25 2020 +0100 Deprecate LOGGING_CONFIG and replace with CATALINA_LOGGING_CONFIG Backwards compatibility is retained --- bin/catalina.bat | 30 +- bin/catalina.sh| 35 --- bin/daemon.sh | 19 ++- webapps/docs/changelog.xml | 6 ++ 4 files changed, 65 insertions(+), 25 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index 239e81c..6443620 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -94,9 +94,14 @@ rem JSSE_OPTS (Optional) Java runtime options used to control the TLS rem implementation when JSSE is used. Default is: rem "-Djdk.tls.ephemeralDHKeySize=2048" rem -rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file +rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file rem Example (all one line) -rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem set CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" +rem +rem LOGGING_CONFIG Deprecated +rem Use CATALINA_LOGGING_CONFIG +rem This is only used if CATALINA_LOGGING_CONFIG is not set +rem and LOGGING_CONFIG starts with "-D..." rem rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager rem Example (all one line) @@ -210,10 +215,17 @@ set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048" :gotJsseOpts set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%" -if not "%LOGGING_CONFIG%" == "" goto noJuliConfig -set LOGGING_CONFIG=-Dnop +rem Check for the deprecated LOGGING_CONFIG +rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation +set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%" +:noLoggingDeprecation + +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig +set CATALINA_LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig -set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" +set CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" :noJuliConfig if not "%LOGGING_MANAGER%" == "" goto noJuliManager @@ -354,17 +366,17 @@ goto setArgs rem Execute Java with the applicable properties if not "%JPDA%" == "" goto doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doSecurity -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% goto end :doJpda if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda -%_EXECJAVA% %LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGI
[GitHub] [tomcat] markt-asf commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG
markt-asf commented on issue #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG URL: https://github.com/apache/tomcat/pull/265#issuecomment-607363278 Fixed in a backwards compatible manner for all currently supported versions. 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 closed pull request #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG
markt-asf closed pull request #265: Replace LOGGING_CONFIG BY CATALINA_LOGGING_CONFIG URL: https://github.com/apache/tomcat/pull/265 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 support for the deprecated LOGGING_CONFIG environment variable
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 a9359e0 Remove support for the deprecated LOGGING_CONFIG environment
variable
a9359e0 is described below
commit a9359e0f1f8455bf5932afa402c41c08813bbdd7
Author: Mark Thomas
AuthorDate: Wed Apr 1 17:48:32 2020 +0100
Remove support for the deprecated LOGGING_CONFIG environment variable
---
bin/catalina.bat | 12
bin/catalina.sh| 13 -
bin/daemon.sh | 8
webapps/docs/changelog.xml | 2 +-
4 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index bf0f7e0..ada989b 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -98,11 +98,6 @@ rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's
logging config file
rem Example (all one line)
rem set
CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
rem
-rem LOGGING_CONFIG Deprecated
-rem Use CATALINA_LOGGING_CONFIG
-rem This is only used if CATALINA_LOGGING_CONFIG is not set
-rem and LOGGING_CONFIG starts with "-D..."
-rem
rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
rem Example (all one line)
rem set
LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
@@ -219,13 +214,6 @@ rem Register custom URL handlers
rem Do this here so custom URL handles (specifically 'war:...') can be used in
the security policy
set "JAVA_OPTS=%JAVA_OPTS%
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
-rem Check for the deprecated LOGGING_CONFIG
-rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG
starts with "-D..."
-if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation
-if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation
-set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%"
-:noLoggingDeprecation
-
if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig
set CATALINA_LOGGING_CONFIG=-Dnop
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 4e0b8bf..0ee6595 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -98,11 +98,6 @@
# Example (all one line)
#
CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
#
-# LOGGING_CONFIG Deprecated
-# Use CATALINA_LOGGING_CONFIG
-# This is only used if CATALINA_LOGGING_CONFIG is not set
-# and LOGGING_CONFIG starts with "-D..."
-#
# LOGGING_MANAGER (Optional) Override Tomcat's logging manager
# Example (all one line)
#
LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
@@ -260,14 +255,6 @@ JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
# Do this here so custom URL handles (specifically 'war:...') can be used in
the security policy
JAVA_OPTS="$JAVA_OPTS
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
-# Check for the deprecated LOGGING_CONFIG
-# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts
with "-D..."
-if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
- if [ "${LOGGING_CONFIG#*-D}" != "$LOGGING_CONFIG" ]; then
-CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
- fi
-fi
-
# Set juli LogManager config file if it is present and an override has not
been issued
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 6038e1d..946bbe7 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -149,14 +149,6 @@ else
CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar"
fi
-# Check for the deprecated LOGGING_CONFIG
-# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts
with "-D..."
-if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
- if [ "${LOGGING_CONFIG#*-D}" != "$LOGGING_CONFIG" ]; then
-CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
- fi
-fi
-
# Set juli LogManager config file if it is present and an override has not
been issued
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0fb18cf..01ee242 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,7 +223,7 @@
Update the CXF module to Apache CXF 3.3.6. (remm)
-Depreacted the LOGGING_CONFIG environment variable and
+Remove the LOGGING_CONFIG environment variable and
replace it with the CATALINA_LOGGING_
[tomcat] branch master updated: Set 'release' parameter for main compile target
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 162a5b1 Set 'release' parameter for main compile target
162a5b1 is described below
commit 162a5b1935688bb796b09b62dffb7ebc8de130e7
Author: Richard Hernandez
AuthorDate: Wed Mar 11 12:22:45 2020 -0700
Set 'release' parameter for main compile target
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index ec5464b..8bd2ac7 100644
--- a/build.xml
+++ b/build.xml
@@ -713,6 +713,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeAntRuntime="true" >
[GitHub] [tomcat] markt-asf merged pull request #259: Set 'release' parameter for main compile target
markt-asf merged pull request #259: Set 'release' parameter for main compile target URL: https://github.com/apache/tomcat/pull/259 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 unnecessary setting - JreRemoteLifecycleListener has been removed
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 17fb15e Remove unnecessary setting - JreRemoteLifecycleListener has been removed 17fb15e is described below commit 17fb15e522842e9aa46a12997980145cec57de35 Author: Mark Thomas AuthorDate: Wed Apr 1 18:01:30 2020 +0100 Remove unnecessary setting - JreRemoteLifecycleListener has been removed --- build.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/build.xml b/build.xml index 8bd2ac7..43f9dff 100644 --- a/build.xml +++ b/build.xml @@ -719,7 +719,6 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
