Merge branch 'main' into v3

Author: eli-darkly

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.3.2] - 2022-05-02
+### Changed:
+- Improved the panic message that is generated by `httphelpers.BrokenConnectionHandler` to make it clearer that this is an intentional error (if for instance the panic stacktrace is logged by `http.Server`).
+
 ## [2.3.1] - 2022-02-03
 ### Fixed:
 - The `Assert`/`Require` methods in `matchers` now call `t.Helper()` (if that method exists) so the location of the failure will be more accurately reported.

httphelpers/handlers.go

@@ -185,6 +185,7 @@ func BrokenConnectionHandler() http.Handler {
 				return
 			}
 		}
-		panic("connection deliberately closed by httphelpers.BrokenConnectionHandler")
+		panic("connection deliberately closed by httphelpers.BrokenConnectionHandler; a panic stacktrace" +
+			" here from the Go HTTP framework is expected and can be ignored")
 	})
 }