lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

multiple fixes for http proxy

Browse Source
This commit is contained in:
Darien Raymond 2017-04-12 00:21:46 +02:00
parent a758e07339
commit 042e5e8033
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxy/http/server.go
View File

@ -68,15 +68,21 @@ func parseHost(rawHost string, defaultPort v2net.Port) (v2net.Destination, error
return v2net.TCPDestination(v2net.DomainAddress(host), port), nil return v2net.TCPDestination(v2net.DomainAddress(host), port), nil
} }
func isTimeout(err error) bool {
nerr, ok := err.(net.Error)
return ok && nerr.Timeout()
}
func (s *Server) Process(ctx context.Context, network v2net.Network, conn internet.Connection, dispatcher dispatcher.Interface) error { func (s *Server) Process(ctx context.Context, network v2net.Network, conn internet.Connection, dispatcher dispatcher.Interface) error {
reader := bufio.NewReaderSize(conn, 8192)
Start: Start:
conn.SetReadDeadline(time.Now().Add(time.Second * 8)) conn.SetReadDeadline(time.Now().Add(time.Second * 16))
reader := bufio.NewReaderSize(conn, 2048)
request, err := http.ReadRequest(reader) request, err := http.ReadRequest(reader)
if err != nil { if err != nil {
trace := newError("failed to read http request").Base(err) trace := newError("failed to read http request").Base(err)
if errors.Cause(err) != io.EOF { if errors.Cause(err) != io.EOF && !isTimeout(errors.Cause(err)) {
trace.AtWarning() trace.AtWarning()
} }
return trace return trace
@ -186,13 +192,13 @@ func StripHopByHopHeaders(header http.Header) {
header.Del("Upgrade") header.Del("Upgrade")
connections := header.Get("Connection") connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 { if len(connections) == 0 {
return return
} }
for _, h := range strings.Split(connections, ",") { for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) header.Del(strings.TrimSpace(h))
} }
header.Del("Connection")
} }
var errWaitAnother = newError("keep alive") var errWaitAnother = newError("keep alive")
@ -246,8 +252,9 @@ func (s *Server) handlePlainHTTP(ctx context.Context, request *http.Request, rea
if err == nil { if err == nil {
StripHopByHopHeaders(response.Header) StripHopByHopHeaders(response.Header)
response.Header.Set("Proxy-Connection", "keep-alive") response.Header.Set("Proxy-Connection", "keep-alive")
response.Header.Set("Connection", "Keep-Alive") response.Header.Set("Connection", "keep-alive")
response.Header.Set("Keep-Alive", "timeout=4") response.Header.Set("Keep-Alive", "timeout=4")
response.Close = false
} else { } else {
log.Trace(newError("failed to read response").Base(err).AtWarning()) log.Trace(newError("failed to read response").Base(err).AtWarning())
response = &http.Response{ response = &http.Response{

8
proxy/http/server_test.go
View File

@ -40,8 +40,8 @@ Accept-Language: de,en;q=0.7,en-us;q=0.3
StripHopByHopHeaders(req.Header) StripHopByHopHeaders(req.Header)
assert.String(req.Header.Get("Connection")).IsEmpty() assert.String(req.Header.Get("Connection")).IsEmpty()
assert.String(req.Header.Get("Foo")).Equals("") assert.String(req.Header.Get("Foo")).IsEmpty()
assert.String(req.Header.Get("Bar")).Equals("") assert.String(req.Header.Get("Bar")).IsEmpty()
assert.String(req.Header.Get("Proxy-Connection")).Equals("") assert.String(req.Header.Get("Proxy-Connection")).IsEmpty()
assert.String(req.Header.Get("Proxy-Authenticate")).Equals("") assert.String(req.Header.Get("Proxy-Authenticate")).IsEmpty()
} }