languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-14 11:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add rw headers to upgrade response

Browse source
This commit is contained in:
Julien Salleyron 2018-12-24 09:07:07 +01:00
parent 97d5cb24b1
commit 79bb493dcb
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/net/http/httputil/reverseproxy.go
View file

@ -497,6 +497,9 @@ func (p *ReverseProxy) handleUpgradeResponse(rw http.ResponseWriter, req *http.R
p.getErrorHandler()(rw, req, fmt.Errorf("backend tried to switch protocol %q when %q was requested", resUpType, reqUpType))
return
}
copyHeader(res.Header, rw.Header())
hj, ok := rw.(http.Hijacker)
if !ok {
p.getErrorHandler()(rw, req, fmt.Errorf("can't switch protocols using non-Hijacker ResponseWriter type %T", rw))

18
src/net/http/httputil/reverseproxy_test.go
View file

@ -1013,7 +1013,12 @@ func TestReverseProxyWebSocket(t *testing.T) {
rproxy := NewSingleHostReverseProxy(backURL)
rproxy.ErrorLog = log.New(ioutil.Discard, "", 0) // quiet for tests
frontendProxy := httptest.NewServer(rproxy)
handler := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
rw.Header().Set("X-Header", "X-Value")
rproxy.ServeHTTP(rw, req)
})
frontendProxy := httptest.NewServer(handler)
defer frontendProxy.Close()
req, _ := http.NewRequest("GET", frontendProxy.URL, nil)
@ -1028,6 +1033,13 @@ func TestReverseProxyWebSocket(t *testing.T) {
if res.StatusCode != 101 {
t.Fatalf("status = %v; want 101", res.Status)
}
got := res.Header.Get("X-Header")
want := "X-Value"
if got != want {
t.Errorf("Header(XHeader) = %q; want %q", got, want)
}
if upgradeType(res.Header) != "websocket" {
t.Fatalf("not websocket upgrade; got %#v", res.Header)
}
@ -1042,8 +1054,8 @@ func TestReverseProxyWebSocket(t *testing.T) {
if !bs.Scan() {
t.Fatalf("Scan: %v", bs.Err())
}
got := bs.Text()
want := `backend got "Hello"`
got = bs.Text()
want = `backend got "Hello"`
if got != want {
t.Errorf("got %#q, want %#q", got, want)
}