summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYawning Angel <yawning@schwanenlied.me>2014-05-25 12:42:07 +0000
committerYawning Angel <yawning@schwanenlied.me>2014-05-25 12:42:07 +0000
commit49d3f6e8bbbdd72cb7445b0ff4807c43afac4ce4 (patch)
tree8cde8a996f4c0c932b5a692cc07ddc331db8b050
parentc05a7a2e34dc832f192beaeee43931d13778dbe2 (diff)
Run go fmt on proxy_http.go (No functional changes).
-rw-r--r--obfs4proxy/proxy_http.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go
index 0c518ff..0870e5d 100644
--- a/obfs4proxy/proxy_http.go
+++ b/obfs4proxy/proxy_http.go
@@ -45,7 +45,7 @@ type httpProxy struct {
haveAuth bool
username string
password string
- forward proxy.Dialer
+ forward proxy.Dialer
}
func newHTTP(uri *url.URL, forward proxy.Dialer) (proxy.Dialer, error) {
@@ -55,7 +55,7 @@ func newHTTP(uri *url.URL, forward proxy.Dialer) (proxy.Dialer, error) {
if uri.User != nil {
s.haveAuth = true
s.username = uri.User.Username()
- s.password,_ = uri.User.Password()
+ s.password, _ = uri.User.Password()
}
return s, nil
@@ -110,10 +110,10 @@ func (s *httpProxy) Dial(network, addr string) (net.Conn, error) {
// httpConn is the mountain of bullshit we need to do just for staleReader.
type httpConn struct {
- remoteAddr *net.TCPAddr
- httpConn *httputil.ClientConn
+ remoteAddr *net.TCPAddr
+ httpConn *httputil.ClientConn
hijackedConn net.Conn
- staleReader *bufio.Reader
+ staleReader *bufio.Reader
}
func (c *httpConn) Read(b []byte) (int, error) {