Merge pull request getlantern#2983 from getlantern/issue2981

Data race in handler.go error variable itself closes #2981
yuzeshan · Aug 19, 2015 · d4c4f99 · d4c4f99
2 parents e988fa7 + 139f3ad
commit d4c4f99
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/github.com/getlantern/flashlight/client/handler.go b/src/github.com/getlantern/flashlight/client/handler.go
@@ -80,9 +80,8 @@ func (client *Client) intercept(resp http.ResponseWriter, req *http.Request) {
 	// established yet, to avoid timeouts on the client application
 	success := make(chan bool, 1)
 	go func() {
-		err = respondOK(clientConn, req)
-		if err != nil {
-			log.Errorf("Unable to respond OK: %s", err)
+		if e := respondOK(clientConn, req); e != nil {
+			log.Errorf("Unable to respond OK: %s", e)
 			success <- false
 			return
 		}