Commit818579b

committed

TestDialViaProxy: Fix bug in forward proxy

Closes#395Confirmed library works correctly with a working forward proxy.

1 parent249edb2 commit818579bCopy full SHA for 818579b

File tree

+22

-13

lines changed

+22

-13

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -535,6 +535,7 @@ func assertEcho(tb testing.TB, ctx context.Context, c *websocket.Conn) {`
`535`	`535`	`})`
`536`	`536`
`537`	`537`	`varactinterface{}`
	`538`	`+c.SetReadLimit(1<<30)`
`538`	`539`	`err:=wsjson.Read(ctx,c,&act)`
`539`	`540`	`assert.Success(tb,err)`
`540`	`541`	`assert.Equal(tb,"read msg",exp,act)`

Lines changed: 21 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,21 +361,29 @@ func (fc forwardProxy) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`361`	`361`	`}`
`362`	`362`	`w.Header().Set("PROXIED","true")`
`363`	`363`	`w.WriteHeader(resp.StatusCode)`
`364`		`-errc1:=xsync.Go(func()error {`
`365`		`-_,err:=io.Copy(w,resp.Body)`
`366`		`-returnerr`
`367`		`-})`
`368`		`-varerrc2<-chanerror`
`369`		`-ifbodyw,ok:=resp.Body.(io.Writer);ok {`
`370`		`-errc2=xsync.Go(func()error {`
`371`		`-_,err:=io.Copy(bodyw,r.Body)`
	`364`	`+ifresprw,ok:=resp.Body.(io.ReadWriter);ok {`
	`365`	`+c,brw,err:=w.(http.Hijacker).Hijack()`
	`366`	`+iferr!=nil {`
	`367`	`+http.Error(w,http.StatusText(http.StatusInternalServerError),http.StatusInternalServerError)`
	`368`	`+return`
	`369`	`+}`
	`370`	`+brw.Flush()`
	`371`	`+`
	`372`	`+errc1:=xsync.Go(func()error {`
	`373`	`+_,err:=io.Copy(c,resprw)`
`372`	`374`	`returnerr`
`373`	`375`	`})`
`374`		`-}`
`375`		`-select {`
`376`		`-case<-errc1:`
`377`		`-case<-errc2:`
`378`		`-case<-r.Context().Done():`
	`376`	`+errc2:=xsync.Go(func()error {`
	`377`	`+_,err:=io.Copy(resprw,c)`
	`378`	`+returnerr`
	`379`	`+})`
	`380`	`+select {`
	`381`	`+case<-errc1:`
	`382`	`+case<-errc2:`
	`383`	`+case<-r.Context().Done():`
	`384`	`+}`
	`385`	`+}else {`
	`386`	`+io.Copy(w,resp.Body)`
`379`	`387`	`}`
`380`	`388`	`}`
`381`	`389`

Comments

(0)