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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1622263 13f79535-47bb-0310-9956-ffa450edef68

bin/catalina.bat

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

webapps/docs/changelog.xml

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