@@ -52,6 +52,12 @@ } 
 func serverHeaderHandler(wrappedHandler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.ProtoMajor >= 2 && r.Header.Get("Host") != "" {
+			// net/http does this for HTTP/1.1, but not h2c
+			// TODO: check with HTTP/2.0 (i.e. with TLS)
+			r.Host = r.Header.Get("Host")
+			r.Header.Del("Host")
+		}
 		w.Header().Set("Server", serverHeader)
 		wrappedHandler.ServeHTTP(w, r)
 	})