diff --git a/CHANGELOG.md b/CHANGELOG.md index f2f5c69..3850ac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Golang Module Release Notes +## 1.14.1 2025-03-17 +* Run `scripts/build.sh` in a Docker image (in `make build`) so that it works on MacOS. + ## 1.14.0 2024-11-18 * Allow the agent to edit application response headers diff --git a/Makefile b/Makefile index c966a87..f8b170c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build: ## build and lint locally - ./scripts/build.sh + docker run --rm -v "$(CURDIR):/temp" -w /temp golang:1.23 ./scripts/build.sh # clean up each time to make sure nothing is cached between runs # diff --git a/responsewriter.go b/responsewriter.go index 761a7c4..eb1ab25 100644 --- a/responsewriter.go +++ b/responsewriter.go @@ -81,6 +81,8 @@ func (w *responseRecorder) WriteHeader(status int) { w.base.WriteHeader(status) } +// Merge in our header modifications using the appropriate functions in +// the Header type in net/http func (w *responseRecorder) mergeHeader() { hdr := w.base.Header() for _, a := range w.actions {