Merge pull request #2615 from getlantern/issue2614

Add tls handshake timeout and don't keep connections alive closes #2614
getlantern · Jun 8, 2015 · 421967c · 421967c
2 parents 95eff89 + 40705a1
commit 421967c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/github.com/getlantern/fronted/dialer.go b/src/github.com/getlantern/fronted/dialer.go
@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"encoding/asn1"
+
 	"github.com/getlantern/connpool"
 	"github.com/getlantern/enproxy"
 	"github.com/getlantern/golog"
@@ -229,6 +230,8 @@ func (d *dialer) NewDirectDomainFronter() *http.Client {
 					log.Debugf("Dialing %s with direct domain fronter", addr)
 					return d.dialServer()
 				},
+				TLSHandshakeTimeout: 40 * time.Second,
+				DisableKeepAlives:   true,
 			},
 		},
 	}