Merge ae7b78e into 31da8b7

amahi · Apr 12, 2017 · b087984 · b087984
2 parents 31da8b7 + ae7b78e
commit b087984
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: go
 
 go:
-  - 1.2
-  - 1.3
   - 1.4
   - 1.5
+  - 1.6
+  - 1.7
 
 before_install:
   - go get code.google.com/p/go.tools/cmd/cover || go get golang.org/x/tools/cmd/cover

diff --git a/stream.go b/stream.go
@@ -554,6 +554,11 @@ func (s *Stream) WriteHeader(code int) {
 	}
 	// Write the frame
 	sr := frameSynReply{session: s.session, stream: s.id, headers: s.headers}
+	if s.closed {
+		// FIXME-cpg: how should this error be propagated upstream?
+		log.Println("ERROR: Attempting to send on a closed stream in ResponseWriter.WriteHeader.")
+		return
+	}
 	debug.Println("Sending SYN_REPLY", sr)
 	s.session.out <- sr
 	s.wroteHeader = true