svn commit: r919668 - in /hadoop/hdfs/trunk: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java

[cd...@apache.org]

Author: cdouglas
Date: Fri Mar  5 23:27:30 2010
New Revision: 919668

URL: http://svn.apache.org/viewvc?rev=919668&view=rev
Log:
HDFS-998. Quote blocks streamed through jsps.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=919668&r1=919667&r2=919668&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Mar  5 23:27:30 2010
@@ -83,6 +83,8 @@
     HDFS-994. Allow fetching of delegation token from NameNode for hftp.
     (Jakob Homan via acmurthy) 
 
+    HDFS-998. Quote blocks streamed through jsps. (cdouglas)
+
   OPTIMIZATIONS
 
     HDFS-946. NameNode should not return full path name when lisitng a

Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java?rev=919668&r1=919667&r2=919668&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java Fri Mar  5 23:27:30 2010
@@ -45,6 +45,7 @@
 import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
 import org.apache.hadoop.hdfs.server.datanode.DatanodeJspHelper;
 import org.apache.hadoop.hdfs.server.namenode.DatanodeDescriptor;
+import org.apache.hadoop.http.HtmlQuoting;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.AccessControlException;
@@ -146,7 +147,7 @@
     }
     blockReader = null;
     s.close();
-    out.print(new String(buf));
+    out.print(HtmlQuoting.quoteHtmlChars(new String(buf)));
   }
 
   public static void addTableHeader(JspWriter out) throws IOException {
@@ -431,4 +432,4 @@
   }
 
 
-}
\ No newline at end of file
+}