martian: fix Connect() after extraction

Remove defer as it has wrong scope, add deferred close to callers.
saucelabs · Sep 12, 2024 · 73a96c2 · 73a96c2
1 parent ffa6e82
commit 73a96c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/internal/martian/proxy_conn.go b/internal/martian/proxy_conn.go
@@ -208,6 +208,9 @@ func (p *proxyConn) handleConnectRequest(req *http.Request) error {
 	if res != nil {
 		defer res.Body.Close()
 	}
+	if crw != nil {
+		defer crw.Close()
+	}
 	if cerr != nil {
 		log.Errorf(ctx, "failed to CONNECT: %v", cerr)
 		return p.writeErrorResponse(req, cerr)

diff --git a/internal/martian/proxy_connect.go b/internal/martian/proxy_connect.go
@@ -60,7 +60,6 @@ func (p *Proxy) Connect(ctx context.Context, req *http.Request, terminateTLS boo
 		res, cconn, cerr = p.connect(req)
 
 		if cconn != nil {
-			defer cconn.Close()
 			crw = cconn
 
 			if terminateTLS {

diff --git a/internal/martian/proxy_handler.go b/internal/martian/proxy_handler.go
@@ -114,6 +114,9 @@ func (p proxyHandler) handleConnectRequest(rw http.ResponseWriter, req *http.Req
 	if res != nil {
 		defer res.Body.Close()
 	}
+	if crw != nil {
+		defer crw.Close()
+	}
 	if cerr != nil {
 		log.Errorf(ctx, "failed to CONNECT: %v", cerr)
 		p.writeErrorResponse(rw, req, cerr)