From cd3f047ccd3368003fe09592307fb662edc0c688 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blake.mizerany@gmail.com>
Date: Wed, 27 Aug 2014 15:21:45 -0700
Subject: [PATCH] etcdserver/etcdhttp: remove closenotify watch

---
 etcdserver2/etcdhttp/http.go | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/etcdserver2/etcdhttp/http.go b/etcdserver2/etcdhttp/http.go
index d6dab2d4b..23491bf7d 100644
--- a/etcdserver2/etcdhttp/http.go
+++ b/etcdserver2/etcdhttp/http.go
@@ -35,21 +35,6 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// avoid spawing goroutines for requests that are short lived.
-	if canBlock(rr) {
-		// cancel the request and release resources associated with it if the
-		// client closes their connection before we get a response.
-		if nf, ok := w.(http.CloseNotifier); ok {
-			go func() {
-				select {
-				case <-nf.CloseNotify():
-					cancel()
-				case <-ctx.Done():
-				}
-			}()
-		}
-	}
-
 	resp, err := h.Server.Do(ctx, rr)
 	if err != nil {
 		// TODO(bmizerany): switch on store errors and etcdserver.ErrUnknownMethod
@@ -96,7 +81,3 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, resp etcdserver.
 	}
 	return nil
 }
-
-func canBlock(r etcdserver.Request) bool {
-	return r.Method != "GET" || (r.Method == "GET" && r.Wait)
-}