Handle implicit port

Author: sqs

client.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strings"
 	"time"
 )
 
@@ -110,11 +111,12 @@ func (pw *appendWriteCloser) Close() error {
 func newClient(u *url.URL, method string) (*websocket.Conn, *http.Response, error) {
 	var c net.Conn
 	var err error
+	hostport := hostPort(u)
 	switch u.Scheme {
 	case "http":
-		c, err = net.Dial("tcp", u.Host)
+		c, err = net.Dial("tcp", hostport)
 	case "https":
-		c, err = tls.Dial("tcp", u.Host, nil)
+		c, err = tls.Dial("tcp", hostport, nil)
 	default:
 		return nil, nil, errors.New("unrecognized URL scheme")
 	}
@@ -124,6 +126,13 @@ func newClient(u *url.URL, method string) (*websocket.Conn, *http.Response, erro
 	return websocket.NewClient(c, u, http.Header{xVerb: []string{method}}, readBufSize, writeBufSize)
 }
 
+func hostPort(u *url.URL) string {
+	if strings.Contains(u.Host, ":") {
+		return u.Host
+	}
+	return u.Host + ":" + u.Scheme
+}
+
 // errorFromResponse returns err if err != nil, or another non-nil error if resp
 // indicates a non-HTTP 200 response.
 func errorFromResponse(resp *http.Response, err error) error {

client_test.go

@@ -152,3 +152,27 @@ type fixedReader struct {
 func (r *fixedReader) Read(p []byte) (n int, err error) {
 	return io.LimitReader(r.R, int64(r.N)).Read(p)
 }
+
+func TestHostPort(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"http://example.com", "example.com:http"},
+		{"https://example.com", "example.com:https"},
+		{"http://example.com:1234", "example.com:1234"},
+		{"https://example.com:1234", "example.com:1234"},
+	}
+
+	for _, test := range tests {
+		u, err := url.Parse(test.input)
+		if err != nil {
+			t.Errorf("%s: url.Parse: %s", test.input, err)
+			continue
+		}
+		got := hostPort(u)
+		if test.expected != got {
+			t.Errorf("%s: want %q, got %q", test.input, test.expected, got)
+		}
+	}
+}