combine headers before adding to connection

unimined · Sep 23, 2024 · 8a0d2a6 · 8a0d2a6
1 parent 7bf35c7
commit 8a0d2a6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/impl/http/HttpClientImpl.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/impl/http/HttpClientImpl.java
@@ -139,8 +139,16 @@ protected <T> J_N_H_HttpResponse<T> sendImpl(J_N_H_HttpRequest var1, J_N_H_HttpR
 
         HttpRequestImpl request = (HttpRequestImpl) var1;
 
-        request.headers.forEach((k, v) -> putHeaders(connection, k, v));
-        cookieHandler.get(var1.uri(), request.headers).forEach((k, v) -> putHeaders(connection, k, v));
+        Map<String, List<String>> headers = new HashMap<>();
+        for (Map.Entry<String, List<String>> header : request.headers.entrySet()) {
+            headers.computeIfAbsent(header.getKey(), k -> new ArrayList<>()).addAll(header.getValue());
+        }
+        for (Map.Entry<String, List<String>> header : cookieHandler.get(var1.uri(), request.headers).entrySet()) {
+            headers.computeIfAbsent(header.getKey(), k -> new ArrayList<>()).addAll(header.getValue());
+        }
+        for (Map.Entry<String, List<String>> header : headers.entrySet()) {
+            putHeaders(connection, header.getKey(), header.getValue());
+        }
 
         J_N_H_HttpRequest.BodyPublisher publisher = request.publisher;