Author: markt
Date: Wed Sep 3 14:09:00 2014
New Revision: 1622263
URL: http://svn.apache.org/r1622263
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56895
Correctly compose JAVA_OPTS in catalina.bat so that escape sequences are
preserved.
Patch by Lucas Theisen.
Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1622263&r1=1622262&r2=1622263&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Wed Sep 3 14:09:00 2014
@@ -193,12 +193,12 @@ set 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"
:noJuliConfig
-set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%
+set "JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%"
if not "%LOGGING_MANAGER%" == "" goto noJuliManager
set
LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
:noJuliManager
-set JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%
+set "JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%"
rem ----- Execute The Requested Command ---------------------------------------
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1622263&r1=1622262&r2=1622263&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 3 14:09:00 2014
@@ -124,6 +124,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>56895</bug>: Correctly compose <code>JAVA_OPTS</code> in
+ <code>catalina.bat</code> so that escape sequences are preserved. Patch
+ by Lucas Theisen. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.12 (markt)" rtext="2014-09-03">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
