Merge branch 'master' into javawebsocket-jsr

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

@@ -318,9 +318,9 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
 
                 if (!_response.isCommitted() && !_request.isHandled())
                     _response.sendError(404);
-
-                // Complete generating the response
-                _response.complete();
+                else
+                    // Complete generating the response
+                    _response.closeOutput();
             }
             catch(EofException e)
             {

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

@@ -436,7 +436,7 @@ public class Response implements HttpServletResponse
             _mimeType=null;
         }
 
-        complete();
+        closeOutput();
     }
 
     /**
@@ -516,7 +516,7 @@ public class Response implements HttpServletResponse
         resetBuffer();
         setHeader(HttpHeader.LOCATION, location);
         setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);
-        complete();
+        closeOutput();
     }
 
     @Override
@@ -792,6 +792,7 @@ public class Response implements HttpServletResponse
                 getOutputStream().close();
                 break;
             default:
+                _out.close();
         }
     }
 
@@ -1062,11 +1063,6 @@ public class Response implements HttpServletResponse
         return _reason;
     }
 
-    public void complete()
-    {
-        _out.close();
-    }
-
     public HttpFields getHttpFields()
     {
         return _fields;

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

@@ -459,7 +459,7 @@ public class Server extends HandlerWrapper implements Attributes
         response.setStatus(200);
         response.getHttpFields().put(HttpHeader.ALLOW,"GET,POST,HEAD,OPTIONS");
         response.setContentLength(0);
-        response.complete();
+        response.closeOutput();
     }
 
     /* ------------------------------------------------------------ */