Add a http.Request parameter to NewClient()

Use the request to determine whether to send Connection: keep-alive —
it's not necessary for HTTP/2 connections.

Signed-off-by: Tim Ekl <[email protected]>

Author: timothyekl

client.go

@@ -20,8 +20,11 @@ type Client struct {
 // NewClient creates a client wrapping a response writer.
 // The response writer must support http.Flusher and http.CloseNotifier
 // interfaces.
+// When writing, the client will automatically send some headers. Passing the
+// original http.Request helps determine which headers, but the request it is
+// optional.
 // Returns nil on error.
-func NewClient(w http.ResponseWriter) *Client {
+func NewClient(w http.ResponseWriter, req *http.Request) *Client {
 	c := &Client{
 		events: make(chan *Event, 1),
 		write:  w,
@@ -44,7 +47,9 @@ func NewClient(w http.ResponseWriter) *Client {
 	// Send the initial headers
 	w.Header().Set("Content-Type", "text/event-stream")
 	w.Header().Set("Cache-Control", "no-cache")
-	w.Header().Set("Connection", "keep-alive")
+	if req == nil || req.ProtoMajor < 2 {
+		w.Header().Set("Connection", "keep-alive")
+	}
 	flush.Flush()
 
 	// start the sending thread

stream.go

@@ -161,7 +161,7 @@ func (s *Stream) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// create the client
-	c := NewClient(w)
+	c := NewClient(w, r)
 	if c == nil {
 		http.Error(w, "EventStream not supported for this connection", http.StatusInternalServerError)
 		return
@@ -188,7 +188,7 @@ func (s *Stream) TopicHandler(topics []string) http.HandlerFunc {
 		}
 
 		// create the client
-		c := NewClient(w)
+		c := NewClient(w, r)
 		if c == nil {
 			http.Error(w, "EventStream not supported for this connection", http.StatusInternalServerError)
 			return