Escape debug output to aid readability

# Conflicts: # java/org/apache/catalina/ssi/SSIPrintenv.java
apache · Apr 10, 2019 · 44ec74c · 44ec74c
1 parent 806195b
commit 44ec74c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/java/org/apache/catalina/ssi/SSIPrintenv.java b/java/org/apache/catalina/ssi/SSIPrintenv.java
@@ -22,7 +22,7 @@
 import java.util.Iterator;
 /**
  * Implements the Server-side #printenv command
- * 
+ *
  * @author Dan Sandberg
  * @author David Becker
  */
@@ -43,8 +43,7 @@ public long process(SSIMediator ssiMediator, String commandName,
             Iterator<String> iter = variableNames.iterator();
             while (iter.hasNext()) {
                 String variableName = iter.next();
-                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
@@ -131,6 +131,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">