http: respect Handlers setting Connection: close in their response

Fixes #2011

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4667043

diff --git a/src/pkg/http/serve_test.go b/src/pkg/http/serve_test.go
index a6a566a9c3e78448db83d8153dce653a7318163a..55a9cbf70d55ca1195841bc6f340e0aa7959c9a5 100644 (file)
--- a/src/pkg/http/serve_test.go
+++ b/src/pkg/http/serve_test.go
@@ -373,11 +373,8 @@ func TestIdentityResponse(t *testing.T) {
        }
 }
 
-// TestServeHTTP10Close verifies that HTTP/1.0 requests won't be kept alive.
-func TestServeHTTP10Close(t *testing.T) {
-       s := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
-               ServeFile(w, r, "testdata/file")
-       }))
+func testTcpConnectionCloses(t *testing.T, req string, h Handler) {
+       s := httptest.NewServer(h)
        defer s.Close()
 
        conn, err := net.Dial("tcp", s.Listener.Addr().String())
@@ -386,7 +383,7 @@ func TestServeHTTP10Close(t *testing.T) {
        }
        defer conn.Close()
 
-       _, err = fmt.Fprint(conn, "GET / HTTP/1.0\r\n\r\n")
+       _, err = fmt.Fprint(conn, req)
        if err != nil {
                t.Fatal("print error:", err)
        }
@@ -414,6 +411,27 @@ func TestServeHTTP10Close(t *testing.T) {
        success <- true
 }
 
+// TestServeHTTP10Close verifies that HTTP/1.0 requests won't be kept alive.
+func TestServeHTTP10Close(t *testing.T) {
+       testTcpConnectionCloses(t, "GET / HTTP/1.0\r\n\r\n", HandlerFunc(func(w ResponseWriter, r *Request) {
+               ServeFile(w, r, "testdata/file")
+       }))
+}
+
+// TestHandlersCanSetConnectionClose verifies that handlers can force a connection to close,
+// even for HTTP/1.1 requests.
+func TestHandlersCanSetConnectionClose11(t *testing.T) {
+       testTcpConnectionCloses(t, "GET / HTTP/1.1\r\n\r\n", HandlerFunc(func(w ResponseWriter, r *Request) {
+               w.Header().Set("Connection", "close")
+       }))
+}
+
+func TestHandlersCanSetConnectionClose10(t *testing.T) {
+       testTcpConnectionCloses(t, "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n", HandlerFunc(func(w ResponseWriter, r *Request) {
+               w.Header().Set("Connection", "close")
+       }))
+}
+
 func TestSetsRemoteAddr(t *testing.T) {
        ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
                fmt.Fprintf(w, "%s", r.RemoteAddr)

diff --git a/src/pkg/http/server.go b/src/pkg/http/server.go
index 1e06c24af356ed3e6369d78f2ca625db3fde508a..08cbed7ad87b02ad6a860cac25b283af841fb615 100644 (file)
--- a/src/pkg/http/server.go
+++ b/src/pkg/http/server.go
@@ -315,6 +315,10 @@ func (w *response) WriteHeader(code int) {
                w.closeAfterReply = true
        }
 
+       if w.header.Get("Connection") == "close" {
+               w.closeAfterReply = true
+       }
+
        // Cannot use Content-Length with non-identity Transfer-Encoding.
        if w.chunking {
                w.header.Del("Content-Length")