Set response Server header to Server.Name if it is empty. This proper…

…ly handles #118
valyala · Jun 17, 2016 · d42167f · d42167f
1 parent 83a24c3
commit d42167f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/server.go b/server.go
@@ -1533,6 +1533,10 @@ func (s *Server) serveConn(c net.Conn) error {
 			ctx.Response.Header.SetCanonical(strConnection, strKeepAlive)
 		}
 
+		if len(ctx.Response.Header.Server()) == 0 {
+			ctx.Response.Header.SetServerBytes(serverName)
+		}
+
 		if bw == nil {
 			bw = acquireWriter(ctx)
 		}

diff --git a/server_test.go b/server_test.go
@@ -60,6 +60,9 @@ func TestServerResponseServerHeader(t *testing.T) {
 			} else {
 				ctx.WriteString("OK")
 			}
+
+			// make sure the server name is sent to the client after ctx.Response.Reset()
+			ctx.NotFound()
 		},
 		Name: serverName,
 	}
@@ -89,11 +92,14 @@ func TestServerResponseServerHeader(t *testing.T) {
 			t.Fatalf("unexpected error: %s", err)
 		}
 
-		if resp.StatusCode() != StatusOK {
-			t.Fatalf("unexpected status code: %d. Expecting %d", resp.StatusCode(), StatusOK)
+		if resp.StatusCode() != StatusNotFound {
+			t.Fatalf("unexpected status code: %d. Expecting %d", resp.StatusCode(), StatusNotFound)
 		}
-		if string(resp.Body()) != "OK" {
-			t.Fatalf("unexpected body: %q. Expecting %q", resp.Body(), "OK")
+		if string(resp.Body()) != "404 Page not found" {
+			t.Fatalf("unexpected body: %q. Expecting %q", resp.Body(), "404 Page not found")
+		}
+		if string(resp.Header.Server()) != serverName {
+			t.Fatalf("unexpected server header: %q. Expecting %q", resp.Header.Server(), serverName)
 		}
 		if err = c.Close(); err != nil {
 			t.Fatalf("unexpected error: %s", err)