Author: markt
Date: Tue Oct 4 19:01:55 2016
New Revision: 1763319
URL: http://svn.apache.org/viewvc?rev=1763319&view=rev
Log:
Make the custom war URL handler available when processing the security
manager's policy file.
Part of the fix for BZ 60087
Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
tomcat/trunk/build.xml
Modified: tomcat/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1763319&r1=1763318&r2=1763319&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Tue Oct 4 19:01:55 2016
@@ -201,6 +201,10 @@ set JSSE_OPTS="-Djdk.tls.ephemeralDHKeyS
:gotJsseOpts
set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
+rem Register custom URL handlers
+rem Do this here so they 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
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1763319&r1=1763318&r2=1763319&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Tue Oct 4 19:01:55 2016
@@ -240,6 +240,10 @@ if [ -z "$JSSE_OPTS" ] ; then
fi
JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
+# Register custom URL handlers
+# Do this here so they can be used in the security policy
+JAVA_OPTS="%JAVA_OPTS%
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
+
# Set juli LogManager config file if it is present and an override has not
been issued
if [ -z "$LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763319&r1=1763318&r2=1763319&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct 4 19:01:55 2016
@@ -333,6 +333,7 @@
<include name="org/apache/catalina/startup/ClassLoaderFactory$*.*" />
<include name="org/apache/catalina/startup/Tool.*" />
<include name="org/apache/catalina/security/SecurityClassLoad.*" />
+ <include name="org/apache/catalina/webresources/war/**" />
</patternset>
<patternset id="files.tomcat-juli">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
