add closenotify and large timeout to gateway

whyrusleeping · whyrusleeping · commit cb56ec19295a · 2015-11-19T15:28:33.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go
@@ -86,9 +86,20 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func (i *gatewayHandler) getOrHeadHandler(w http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithCancel(i.node.Context())
+	ctx, cancel := context.WithTimeout(i.node.Context(), time.Hour)
+	// the hour is a hard fallback, we don't expect it to happen, but just in case
 	defer cancel()
 
+	if cn, ok := w.(http.CloseNotifier); ok {
+		go func() {
+			select {
+			case <-cn.CloseNotify():
+			case <-ctx.Done():
+			}
+			cancel()
+		}()
+	}
+
 	urlPath := r.URL.Path
 
 	// IPNSHostnameOption might have constructed an IPNS path using the Host header.
