FELIX-6782 Allow adding custom headers to Jetty error pages

paulrutter · paulrutter · commit d66f7a43b46b · 2025-05-19T21:16:47.000+02:00
- Use put instead of add to allow for replacing headers
diff --git a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java
@@ -35,7 +35,7 @@ public JettyErrorHandler(Map<String, String> customHeaders) {
     public boolean handle(Request request, Response response, Callback callback) throws Exception {
         if (!customHeaders.isEmpty()) {
             Mutable headers = response.getHeaders();
-            customHeaders.forEach(headers::add);
+            customHeaders.forEach(headers::put);
         }
 
         return super.handle(request, response, callback);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public JettyErrorHandler(Map<String, String> customHeaders) {`
`35`	`35`	`public boolean handle(Request request, Response response, Callback callback) throws Exception {`
`36`	`36`	`if (!customHeaders.isEmpty()) {`
`37`	`37`	`Mutable headers = response.getHeaders();`
`38`		`- customHeaders.forEach(headers::add);`
	`38`	`+ customHeaders.forEach(headers::put);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`return super.handle(request, response, callback);`