Archives/obfs4
2
0
Fork 0
mirror of https://gitlab.com/yawning/obfs4.git synced 2024-11-17 09:25:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix minor style issues pointed out by golint.

Browse Source
This commit is contained in:
Yawning Angel 2014-05-28 04:25:47 +00:00
parent 9fe9959c76
commit 697b51b4bd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
obfs4proxy/proxy_http.go
View File

@ -76,14 +76,14 @@ func (s *httpProxy) Dial(network, addr string) (net.Conn, error) {
}
// HACK HACK HACK HACK. http.ReadRequest also does this.
reqUrl, err := url.Parse("http://" + addr)
reqURL, err := url.Parse("http://" + addr)
if err != nil {
conn.httpConn.Close()
return nil, err
}
reqUrl.Scheme = ""
reqURL.Scheme = ""
req, err := http.NewRequest("CONNECT", reqUrl.String(), nil)
req, err := http.NewRequest("CONNECT", reqURL.String(), nil)
if err != nil {
conn.httpConn.Close()
return nil, err
@ -120,9 +120,8 @@ func (c *httpConn) Read(b []byte) (int, error) {
if c.staleReader != nil {
if c.staleReader.Buffered() > 0 {
return c.staleReader.Read(b)
} else {
c.staleReader = nil
}
c.staleReader = nil
}
return c.hijackedConn.Read(b)
}