marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-09-16 09:09:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #772 from AnthonyMichaelTDM/issue-771

Browse Source 
fix(issue 771): panics when rewriting headers for websockets, and strange issue with logging across a month boundary
This commit is contained in:
Toby Chui
2025-08-16 21:34:09 +08:00
committed by GitHub
parent 4e32f31f0a bd5d225a94
commit 51145edae7
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/dynamicproxy/rewrite/rewrite.go
View File

@@ -75,5 +75,9 @@ func SplitUpDownStreamHeaders(rewriteOptions *HeaderRewriteOptions) ([][]string,
downstreamHeaderCounter++ downstreamHeaderCounter++
} }
// Slice the arrays to only include the filled portions to prevent nil slice access
upstreamHeaders = upstreamHeaders[:upstreamHeaderCounter]
downstreamHeaders = downstreamHeaders[:downstreamHeaderCounter]
return upstreamHeaders, downstreamHeaders return upstreamHeaders, downstreamHeaders
} }

4
src/mod/websocketproxy/websocketproxy.go
View File

@@ -211,6 +211,10 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
UserDefinedHeaders: rewrittenUserDefinedHeaders, UserDefinedHeaders: rewrittenUserDefinedHeaders,
}) })
for _, headerValuePair := range upstreamHeaders { for _, headerValuePair := range upstreamHeaders {
//Skip empty header pairs
if len(headerValuePair) < 2 {
continue
}
//Do not copy Upgrade and Connection headers, it will be handled by the upgrader //Do not copy Upgrade and Connection headers, it will be handled by the upgrader
if strings.EqualFold(headerValuePair[0], "Upgrade") || strings.EqualFold(headerValuePair[0], "Connection") { if strings.EqualFold(headerValuePair[0], "Upgrade") || strings.EqualFold(headerValuePair[0], "Connection") {
continue continue