Author: markt
Date: Wed Sep 3 14:10:49 2014
New Revision: 1622264
URL: http://svn.apache.org/r1622264
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.bat
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1622263
Modified: tomcat/tc7.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.bat?rev=1622264&r1=1622263&r2=1622264&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.bat Wed Sep 3 14:10:49 2014
@@ -176,12 +176,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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1622264&r1=1622263&r2=1622264&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 3 14:10:49 2014
@@ -200,6 +200,11 @@
variables. Be more strict with executable filename on Windows
(s/java/java.exe/). Based on a patch by Neeme Praks. (markt/kkolinko)
</add>
+ <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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
