code review 6228046: undo CL 6112054 / 2eec2501961c

src/pkg/net/http/server.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // HTTP server.  See RFC 2616.
 
 // TODO(rsc):
 //      logging
 
 package http
@@ skipping 285 matching lines @@
                         log.Printf("http: invalid Content-Length of %q sent", clenStr)
                         w.header.Del("Content-Length")
                 }
         }
 
         if w.req.wantsHttp10KeepAlive() && (w.req.Method == "HEAD" || hasCL) {
                 _, connectionHeaderSet := w.header["Connection"]
                 if !connectionHeaderSet {
                         w.header.Set("Connection", "keep-alive")
                 }
-        } else if !w.req.ProtoAtLeast(1, 1) {
-                // Client did not ask to keep connection alive.
+        } else if !w.req.ProtoAtLeast(1, 1) || w.req.wantsClose() {
                 w.closeAfterReply = true
         }
 
         if w.header.Get("Connection") == "close" {
                 w.closeAfterReply = true
         }
 
         // Per RFC 2616, we should consume the request body before
         // replying, if the handler hasn't already done so.  But we
         // don't want to do an unbounded amount of reading here for
@@ skipping 909 matching lines @@
 func (tw *timeoutWriter) WriteHeader(code int) {
         tw.mu.Lock()
         if tw.timedOut || tw.wroteHeader {
                 tw.mu.Unlock()
                 return
         }
         tw.wroteHeader = true
         tw.mu.Unlock()
         tw.w.WriteHeader(code)
 }