Escape debug output to aid readability

apache · Apr 9, 2019 · 15fcd16 · 15fcd16
1 parent 9ea280c
commit 15fcd16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/java/org/apache/catalina/ssi/SSIPrintenv.java b/java/org/apache/catalina/ssi/SSIPrintenv.java
@@ -41,8 +41,7 @@ public long process(SSIMediator ssiMediator, String commandName,
         } else {
             Collection<String> variableNames = ssiMediator.getVariableNames();
             for (String variableName : variableNames) {
-                String variableValue = ssiMediator
-                        .getVariableValue(variableName);
+                String variableValue = ssiMediator.getVariableValue(variableName, "entity");
                 //This shouldn't happen, since all the variable names must
                 // have values
                 if (variableValue == null) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -101,6 +101,9 @@
         Tomcat used to resolve standard XML DTDs and schemas when Tomcat is
         configured to validate XML configuration files such as web.xml. (markt)
       </fix>
+      <fix>
+        Encode the output of the SSI <code>printenv</code> command. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">