Merge pull request #44 from ipfs/fix/deadlock

fix deadlock on error

Merge pull request #44 from ipfs/fix/deadlock
fix deadlock on error
2b5e4a02 · Steven Allen · GitHub · 651d8d7e · 3494d2b1 · 2b5e4a02
Unverified Commit 2b5e4a02 authored Dec 14, 2017 by Steven Allen Committed by GitHub Dec 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

http/handler.go http/handler.go +2 -0

No files found.
--- a/http/handler.go
+++ b/http/handler.go
@@ -188,11 +188,13 @@ func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}

 	re := NewResponseEmitter(w, r.Method, req)
+	defer re.Close()

 	// call the command
 	err = i.root.Call(req, re)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
 	}

 	d := re.(Doner)