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

use WebSocket instead of Websocket in the headers

Browse Source
This commit is contained in:
WeidiDeng 2024-11-26 09:05:30 +08:00
parent ebd589ce9c
commit 0097468a34
No known key found for this signature in database
GPG Key ID: 25F87CE1741EC7CD
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/caddyhttp/reverseproxy/reverseproxy.go
View File

@ -400,7 +400,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
return caddyhttp.Error(http.StatusInternalServerError,
fmt.Errorf("preparing request for upstream round-trip: %v", err))
}
// websocket over http2, assuming backend doesn't support this, the request will be modifided to http1.1 upgrade
// websocket over http2, assuming backend doesn't support this, the request will be modified to http1.1 upgrade
// TODO: once we can reliably detect backend support this, it can be removed for those backends
if r.ProtoMajor == 2 && r.Method == http.MethodConnect && r.Header.Get(":protocol") != "" {
clonedReq.Header.Del(":protocol")
@ -415,7 +415,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
if randErr != nil {
return randErr
}
clonedReq.Header.Set("Sec-Websocket-Key", base64.StdEncoding.EncodeToString(key))
clonedReq.Header["Sec-WebSocket-Key"] = []string{base64.StdEncoding.EncodeToString(key)}
}
// we will need the original headers and Host value if

7
modules/caddyhttp/reverseproxy/streaming.go
View File

@ -23,7 +23,6 @@ import (
"context"
"errors"
"fmt"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"io"
weakrand "math/rand"
"mime"
@ -34,6 +33,8 @@ import (
"go.uber.org/zap"
"golang.org/x/net/http/httpguts"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
type h2ReadWriteCloser struct {
@ -86,13 +87,13 @@ func (h *Handler) handleUpgradeResponse(logger *zap.Logger, wg *sync.WaitGroup,
conn io.ReadWriteCloser
brw *bufio.ReadWriter
)
// websocket over http2, assuming backend doesn't support this, the request will be modifided to http1.1 upgrade
// websocket over http2, assuming backend doesn't support this, the request will be modified to http1.1 upgrade
// TODO: once we can reliably detect backend support this, it can be removed for those backends
if body, ok := caddyhttp.GetVar(req.Context(), "h2_websocket_body").(io.ReadCloser); ok {
req.Body = body
rw.Header().Del("Upgrade")
rw.Header().Del("Connection")
rw.Header().Del("Sec-Websocket-Accept")
delete(rw.Header(), "Sec-WebSocket-Accept")
rw.WriteHeader(http.StatusOK)
flushErr := http.NewResponseController(rw).Flush()