github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-24 03:19:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

changes as noted in PR

Browse Source
This commit is contained in:
Austin
2015-06-01 10:23:57 -07:00
parent 56ec7b9887
commit ccd3e55b32
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
middleware/proxy/reverseproxy.go
View File

@ -16,8 +16,6 @@ import (
"time"
)
const HTTPSwitchingProtocols = 101
// onExitFlushLoop is a callback set by tests to detect the state of the
// flushLoop() goroutine.
var onExitFlushLoop func()
@ -149,13 +147,7 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request, extr
}
defer res.Body.Close()
for _, h := range hopHeaders {
res.Header.Del(h)
}
copyHeader(rw.Header(), res.Header)
if res.StatusCode == HTTPSwitchingProtocols && outreq.Header.Get("Upgrade") == "websocket" {
if res.StatusCode == http.StatusSwitchingProtocols && outreq.Header.Get("Upgrade") == "websocket" {
hj, ok := rw.(http.Hijacker)
if !ok {
return nil
@ -182,6 +174,12 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request, extr
io.Copy(conn, backendConn) // read tcp stream from backend.
conn.Close()
} else {
for _, h := range hopHeaders {
res.Header.Del(h)
}
copyHeader(rw.Header(), res.Header)
rw.WriteHeader(res.StatusCode)
p.copyResponse(rw, res.Body)
}