From 1db176151b79ff72072668c0d4a041be222996a6 Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Tue, 14 Jul 2015 16:19:11 -0700
Subject: [PATCH] discovery: remove ResponseHeaderTimeout when discovery

The discovery service doesn't return HTTP header early when watch
starts. This may trigger ResponseHeaderTimeout and cause the watch
request failed.

The fix on discovery service may take some time. Remove the
ResponseHeaderTimeout first so it behaves as before.
---
 discovery/discovery.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/discovery/discovery.go b/discovery/discovery.go
index dbc041c22..72c4f0463 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -127,8 +127,8 @@ func newDiscovery(durl, dproxyurl string, id types.ID) (*discovery, error) {
 				Timeout:   30 * time.Second,
 				KeepAlive: 30 * time.Second,
 			}).Dial,
-			TLSHandshakeTimeout:   10 * time.Second,
-			ResponseHeaderTimeout: 5 * time.Second,
+			TLSHandshakeTimeout: 10 * time.Second,
+			// TODO: add ResponseHeaderTimeout back when watch on discovery service writes header early
 		},
 		Endpoints: []string{u.String()},
 	}