Merge pull request kubernetes#638 from kelseyhightower/fix_multiple_response_write_headers

lavalamp · lavalamp · commit 8a5cc87df8f7 · 2014-07-26T16:50:47.000-07:00
integration: Fix multiple response.WriteHeader calls
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
@@ -74,6 +74,7 @@ type delegateHandler struct {
 func (h *delegateHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	if h.delegate != nil {
 		h.delegate.ServeHTTP(w, req)
+		return
 	}
 	w.WriteHeader(http.StatusNotFound)
 }

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ type delegateHandler struct {`
`74`	`74`	`func (h delegateHandler) ServeHTTP(w http.ResponseWriter, req http.Request) {`
`75`	`75`	`if h.delegate != nil {`
`76`	`76`	`h.delegate.ServeHTTP(w, req)`
	`77`	`+ return`
`77`	`78`	`}`
`78`	`79`	`w.WriteHeader(http.StatusNotFound)`
`79`	`80`	`}`