Merge "Update notes about password security"

[gigi.git] / lib / jetty / org / eclipse / jetty / server / handler / ErrorHandler.java

diff --git a/lib/jetty/org/eclipse/jetty/server/handler/ErrorHandler.java b/lib/jetty/org/eclipse/jetty/server/handler/ErrorHandler.java
index b1af5208a39aad479a13589315de81e6dc3c54f7..f1094317d298e436662a418cf3199bd66818223c 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/server/handler/ErrorHandler.java
+++ b/lib/jetty/org/eclipse/jetty/server/handler/ErrorHandler.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
@@ -39,6 +39,7 @@ import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.ByteArrayISO8859Writer;
+import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
@@ -275,29 +276,7 @@ public class ErrorHandler extends AbstractHandler
         if (string==null)
             return;
 
-        for (int i=0;i<string.length();i++)
-        {
-            char c=string.charAt(i);
-
-            switch(c)
-            {
-                case '&' :
-                    writer.write("&amp;");
-                    break;
-                case '<' :
-                    writer.write("&lt;");
-                    break;
-                case '>' :
-                    writer.write("&gt;");
-                    break;
-
-                default:
-                    if (Character.isISOControl(c) && !Character.isWhitespace(c))
-                        writer.write('?');
-                    else
-                        writer.write(c);
-            }
-        }
+        writer.write(StringUtil.sanitizeXmlString(string));
     }
 
     /* ------------------------------------------------------------ */