From b3f0cea2c31f6137cd1604ba31afffdbfc8b70ee Mon Sep 17 00:00:00 2001
From: WeidiDeng <weidi_deng@icloud.com>
Date: Tue, 7 Mar 2023 00:13:48 +0800
Subject: [PATCH] encode: flush status code when hijacked. (#5419)
---
modules/caddyhttp/encode/encode.go | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go
index e3a6267de..8a6fc1060 100644
--- a/modules/caddyhttp/encode/encode.go
+++ b/modules/caddyhttp/encode/encode.go
@@ -20,9 +20,11 @@
package encode
import (
+ "bufio"
"fmt"
"io"
"math"
+ "net"
"net/http"
"sort"
"strconv"
@@ -212,6 +214,18 @@ func (rw *responseWriter) Flush() {
rw.HTTPInterfaces.Flush()
}
+// Hijack implements http.Hijacker. It will flush status code if set. We don't track actual hijacked
+// status assuming http middlewares will track its status.
+func (rw *responseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+ if !rw.wroteHeader {
+ if rw.statusCode != 0 {
+ rw.HTTPInterfaces.WriteHeader(rw.statusCode)
+ }
+ rw.wroteHeader = true
+ }
+ return rw.HTTPInterfaces.Hijack()
+}
+
// Write writes to the response. If the response qualifies,
// it is encoded using the encoder, which is initialized
// if not done so already.