go: drop dependency on go-httpclient

Believe that Go standard net.Transport now covers what we need.

Author: daviddrysdale

go/client/ctclient/ctclient.go

@@ -15,7 +15,6 @@ import (
 	"github.com/google/certificate-transparency/go/jsonclient"
 	"github.com/google/certificate-transparency/go/x509"
 	"github.com/google/certificate-transparency/go/x509util"
-	httpclient "github.com/mreiferson/go-httpclient"
 	"golang.org/x/net/context"
 )
 
@@ -176,13 +175,17 @@ func dieWithUsage(msg string) {
 func main() {
 	flag.Parse()
 	httpClient := &http.Client{
-		Transport: &httpclient.Transport{
-			ConnectTimeout:        10 * time.Second,
-			RequestTimeout:        30 * time.Second,
+		Timeout: 10 * time.Second,
+		Transport: &http.Transport{
+			TLSHandshakeTimeout:   30 * time.Second,
 			ResponseHeaderTimeout: 30 * time.Second,
 			MaxIdleConnsPerHost:   10,
 			DisableKeepAlives:     false,
-		}}
+			MaxIdleConns:          100,
+			IdleConnTimeout:       90 * time.Second,
+			ExpectContinueTimeout: 1 * time.Second,
+		},
+	}
 	var opts jsonclient.Options
 	if *pubKey != "" {
 		pubkey, err := ioutil.ReadFile(*pubKey)

go/preload/main/preload.go

@@ -18,7 +18,6 @@ import (
 	"github.com/google/certificate-transparency/go/jsonclient"
 	"github.com/google/certificate-transparency/go/preload"
 	"github.com/google/certificate-transparency/go/scanner"
-	httpclient "github.com/mreiferson/go-httpclient"
 	"golang.org/x/net/context"
 )
 
@@ -152,15 +151,18 @@ func main() {
 		}
 	}()
 
-	transport := &httpclient.Transport{
-		ConnectTimeout:        10 * time.Second,
-		RequestTimeout:        30 * time.Second,
+	transport := &http.Transport{
+		TLSHandshakeTimeout:   30 * time.Second,
 		ResponseHeaderTimeout: 30 * time.Second,
 		MaxIdleConnsPerHost:   10,
 		DisableKeepAlives:     false,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
 	}
 
 	fetchLogClient, err := client.New(*sourceLogURI, &http.Client{
+		Timeout:   10 * time.Second,
 		Transport: transport,
 	}, jsonclient.Options{})
 	if err != nil {

go/scanner/main/scanner.go

@@ -14,7 +14,6 @@ import (
 	"github.com/google/certificate-transparency/go/client"
 	"github.com/google/certificate-transparency/go/jsonclient"
 	"github.com/google/certificate-transparency/go/scanner"
-	httpclient "github.com/mreiferson/go-httpclient"
 )
 
 const (
@@ -100,12 +99,15 @@ func createMatcherFromFlags() (scanner.Matcher, error) {
 func main() {
 	flag.Parse()
 	logClient, err := client.New(*logURI, &http.Client{
-		Transport: &httpclient.Transport{
-			ConnectTimeout:        10 * time.Second,
-			RequestTimeout:        30 * time.Second,
+		Timeout: 10 * time.Second,
+		Transport: &http.Transport{
+			TLSHandshakeTimeout:   30 * time.Second,
 			ResponseHeaderTimeout: 30 * time.Second,
 			MaxIdleConnsPerHost:   10,
 			DisableKeepAlives:     false,
+			MaxIdleConns:          100,
+			IdleConnTimeout:       90 * time.Second,
+			ExpectContinueTimeout: 1 * time.Second,
 		},
 	}, jsonclient.Options{})
 	if err != nil {