Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java

jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java

@@ -57,8 +57,8 @@ public class ResourceCache
     private final ResourceCache _parent;
     private final MimeTypes _mimeTypes;
     private final boolean _etagSupported;
-
-    private boolean  _useFileMappedBuffer=true;
+    private final boolean  _useFileMappedBuffer;
+    
     private int _maxCachedFileSize =4*1024*1024;
     private int _maxCachedFiles=2048;
     private int _maxCacheSize =32*1024*1024;
@@ -142,12 +142,6 @@ public class ResourceCache
         return _useFileMappedBuffer;
     }
 
-    /* ------------------------------------------------------------ */
-    public void setUseFileMappedBuffer(boolean useFileMappedBuffer)
-    {
-        _useFileMappedBuffer = useFileMappedBuffer;
-    }
-
     /* ------------------------------------------------------------ */
     public void flushCache()
     {

jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java

@@ -160,7 +160,6 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory
     private ServletHandler _servletHandler;
     private ServletHolder _defaultHolder;
 
-
     /* ------------------------------------------------------------ */
     @Override
     public void init()

tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java

@@ -497,6 +497,10 @@ public class Dump extends HttpServlet
             pout.write("<th align=\"right\">isSecure():&nbsp;</th>");
             pout.write("<td>"+request.isSecure()+"</td>");
 
+            pout.write("</tr><tr>\n");
+            pout.write("<th align=\"right\">encodeRedirectURL(/foo?bar):&nbsp;</th>");
+            pout.write("<td>"+response.encodeRedirectURL("/foo?bar")+"</td>");
+
             pout.write("</tr><tr>\n");
             pout.write("<th align=\"right\">isUserInRole(admin):&nbsp;</th>");
             pout.write("<td>"+request.isUserInRole("admin")+"</td>");