Merge 7b26a5211d31dc1a3682aeee1d193922d113c472 into 5fad976b372e381312f8de69f0969f1284d229d3

recovery.go

@@ -68,9 +68,12 @@ func CustomRecoveryWithWriter(out io.Writer, handle RecoveryFunc) HandlerFunc {
 						}
 					}
 				}
-				if e, ok := err.(error); ok && errors.Is(e, http.ErrAbortHandler) {  
-					brokenPipe = true  
-				}  
+				if e, ok := err.(error); ok {
+					// ErrAbortHandler should be treated as broken pipe too.
+					if errors.Is(e, http.ErrAbortHandler) {
+						brokenPipe = true
+					}
+				}
 				if logger != nil {
 					const stackSkip = 3
 					if brokenPipe {

recovery_test.go

@@ -161,9 +161,7 @@ func TestPanicWithAbortHandler(t *testing.T) {
 	w := PerformRequest(router, http.MethodGet, "/recovery")
 	// TEST
 	assert.Equal(t, expectCode, w.Code)
-	out := buf.String()
-	assert.Contains(t, out, "net/http: abort Handler")
-	assert.NotContains(t, out, "panic recovered")
+	assert.Contains(t, buf.String(), "net/http: abort Handler")
 }
 
 func TestCustomRecoveryWithWriter(t *testing.T) {