Index: examples/test-webapp/src/main/java/com/acme/Dump.java
===================================================================
--- examples/test-webapp/src/main/java/com/acme/Dump.java	(revision 2168)
+++ examples/test-webapp/src/main/java/com/acme/Dump.java	(working copy)
@@ -63,6 +63,12 @@
     /* ------------------------------------------------------------ */
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
     {
+        if(request.getPathInfo().toLowerCase().indexOf("script")!=-1)
+        {
+            response.sendRedirect(getServletContext().getContextPath() + "/dump/info");
+            return;
+        }
+            
         request.setCharacterEncoding("UTF-8");
         
         if (request.getParameter("empty")!=null)
@@ -399,8 +405,8 @@
                 {
                     String hv= (String)h2.nextElement();
                     pout.write("</tr><tr>\n");
-                    pout.write("<th align=\"right\">"+name+":&nbsp;</th>");
-                    pout.write("<td>"+hv+"</td>");
+                    pout.write("<th align=\"right\">"+name.replaceAll("<", "&lt;").replaceAll(">","&gt;")+":&nbsp;</th>");
+                    pout.write("<td>"+hv.replaceAll("<", "&lt;").replaceAll(">","&gt;")+"</td>");
                 }
             }
 
@@ -411,13 +417,13 @@
             {
                 name= (String)h.nextElement();
                 pout.write("</tr><tr>\n");
-                pout.write("<th align=\"right\">"+name+":&nbsp;</th>");
-                pout.write("<td>"+request.getParameter(name)+"</td>");
+                pout.write("<th align=\"right\">"+name.replaceAll("<", "&lt;").replaceAll(">","&gt;")+":&nbsp;</th>");
+                pout.write("<td>"+request.getParameter(name).replaceAll("<", "&lt;").replaceAll(">","&gt;")+"</td>");
                 String[] values= request.getParameterValues(name);
                 if (values == null)
                 {
                     pout.write("</tr><tr>\n");
-                    pout.write("<th align=\"right\">"+name+" Values:&nbsp;</th>");
+                    pout.write("<th align=\"right\">"+name.replaceAll("<", "&lt;").replaceAll(">","&gt;")+" Values:&nbsp;</th>");
                     pout.write("<td>"+"NULL!"+"</td>");
                 }
                 else if (values.length > 1)
@@ -425,8 +431,8 @@
                     for (int i= 0; i < values.length; i++)
                     {
                         pout.write("</tr><tr>\n");
-                        pout.write("<th align=\"right\">"+name+"["+i+"]:&nbsp;</th>");
-                        pout.write("<td>"+values[i]+"</td>");
+                        pout.write("<th align=\"right\">"+name.replaceAll("<", "&lt;").replaceAll(">","&gt;")+"["+i+"]:&nbsp;</th>");
+                        pout.write("<td>"+values[i].replaceAll("<", "&lt;").replaceAll(">","&gt;")+"</td>");
                     }
                 }
             }
@@ -439,8 +445,8 @@
                 Cookie cookie = cookies[i];
 
                 pout.write("</tr><tr>\n");
-                pout.write("<th align=\"right\">"+cookie.getName()+":&nbsp;</th>");
-                pout.write("<td>"+cookie.getValue()+"</td>");
+                pout.write("<th align=\"right\">"+cookie.getName().replaceAll("<", "&lt;").replaceAll(">","&gt;")+":&nbsp;</th>");
+                pout.write("<td>"+cookie.getValue().replaceAll("<", "&lt;").replaceAll(">","&gt;")+"</td>");
             }
             
             String content_type=request.getContentType();
Index: examples/test-webapp/src/main/webapp/snoop.jsp
===================================================================
--- examples/test-webapp/src/main/webapp/snoop.jsp	(revision 2168)
+++ examples/test-webapp/src/main/webapp/snoop.jsp	(working copy)
@@ -40,7 +40,7 @@
 </TR>
 <TR>
 	<TH align=right>Query string:</TH>
-	<TD><%= request.getQueryString() %></TD>
+	<TD><% if(request.getQueryString()!=null) out.write(request.getQueryString().replaceAll("<", "&lt;").replaceAll(">","&gt;")); %></TD>
 </TR>
 <TR>
 	<TH align=right>Content length:</TH>
@@ -122,13 +122,13 @@
 			String vals[] = request.getParameterValues(k);
 %>
 <TR valign=top>
-	<TD><%= k %></TD>
-	<TD><%= val %></TD>
+	<TD><%= k.replaceAll("<", "&lt;").replaceAll(">","&gt;") %></TD>
+	<TD><%= val.replaceAll("<", "&lt;").replaceAll(">","&gt;") %></TD>
 	<TD><%
 			for(int i = 0; i < vals.length; i++) {
 				if(i > 0)
 					out.print("<BR>");
-				out.print(vals[i]);
+				out.print(vals[i].replaceAll("<", "&lt;").replaceAll(">","&gt;"));
 			}
 		%></TD>
 </TR>
@@ -157,8 +157,8 @@
 			Object val = request.getAttribute(k);
 %>
 <TR valign=top>
-	<TD><%= k %></TD>
-	<TD><%= val %></TD>
+	<TD><%= k.replaceAll("<", "&lt;").replaceAll(">","&gt;") %></TD>
+	<TD><%= val.toString().replaceAll("<", "&lt;").replaceAll(">","&gt;") %></TD>
 </TR>
 <%
 		}
Index: VERSION.txt
===================================================================
--- VERSION.txt	(revision 2168)
+++ VERSION.txt	(working copy)
@@ -1,6 +1,7 @@
 
 
 jetty-SNAPSHOT
+ + CERT VU#237888 Dump Servlet - prevent cross site scripting
  + CERT VU#38616 handle single quotes in cookie names.
  + Improved JSON parsing from Readers
  + Moved some impl classes from jsp-api-2.1 to jsp-2.1