[2678] Send multiple headers for url-encoded and multipart-form bodies

Bug: #2678
vert-x3 · Nov 11, 2024 · 8e985f2 · 8e985f2
1 parent 2a661ad
commit 8e985f2
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 8 deletions.
diff --git a/vertx-web-client/src/main/java/io/vertx/ext/web/client/impl/HttpContext.java b/vertx-web-client/src/main/java/io/vertx/ext/web/client/impl/HttpContext.java
@@ -443,12 +443,16 @@ private void handleCreateRequest() {
           fail(e);
           return;
         }
-        for (String headerName : this.request.headers().names()) {
-          requestOptions.putHeader(headerName, this.request.headers().get(headerName));
+        MultiMap headers = this.request.checkHeaders(requestOptions);
+        MultiMap requestHeaders = this.request.headers();
+        for (String headerName : requestHeaders.names()) {
+          headers.remove(headerName);
         }
+        headers.addAll(requestHeaders);
         multipartForm.headers().forEach(header -> {
-          requestOptions.putHeader(header.getKey(), header.getValue());
+          headers.set(header.getKey(), header.getValue());
         });
+        requestOptions.setHeaders(headers);
       }
       if (body instanceof ReadStream<?>) {
         ReadStream<Buffer> stream = (ReadStream<Buffer>) body;

diff --git a/vertx-web-client/src/main/java/io/vertx/ext/web/client/impl/HttpRequestImpl.java b/vertx-web-client/src/main/java/io/vertx/ext/web/client/impl/HttpRequestImpl.java
@@ -535,13 +535,18 @@ Future<HttpResponse<T>> send(String contentType, Object body) {
     return ctx.future();
   }
 
+  MultiMap checkHeaders(RequestOptions options) {
+    MultiMap tmp = options.getHeaders();
+    if (tmp == null) {
+      tmp = MultiMap.caseInsensitiveMultiMap();
+      options.setHeaders(tmp);
+    }
+    return tmp;
+  }
+
   void mergeHeaders(RequestOptions options) {
     if (headers != null) {
-      MultiMap tmp = options.getHeaders();
-      if (tmp == null) {
-        tmp = MultiMap.caseInsensitiveMultiMap();
-        options.setHeaders(tmp);
-      }
+      MultiMap tmp = checkHeaders(options);
       tmp.addAll(headers);
     }
   }

diff --git a/vertx-web-client/src/test/java/io/vertx/ext/web/client/tests/WebClientTest.java b/vertx-web-client/src/test/java/io/vertx/ext/web/client/tests/WebClientTest.java
@@ -1183,6 +1183,23 @@ public void testFormUrlEncodedUnescaped() throws Exception {
     await();
   }
 
+  @Test
+  public void testFormUrlEncodedMultipleHeaders() throws Exception {
+    server.requestHandler(req -> {
+      req.setExpectMultipart(true);
+      req.endHandler(v -> {
+        assertEquals(Arrays.asList("1", "2"), req.headers().getAll("bla"));
+        req.response().end();
+      });
+    });
+    startServer();
+    MultiMap form = MultiMap.caseInsensitiveMultiMap();
+    HttpRequest<Buffer> builder = webClient.post("/somepath");
+    builder.putHeader("bla", Arrays.asList("1", "2"));
+    builder.sendForm(form).onComplete(onSuccess(resp -> complete()));
+    await();
+  }
+
   @Test
   public void testFormMultipart() throws Exception {
     server.requestHandler(req -> {
@@ -1395,6 +1412,23 @@ static Upload memoryUpload(String name, String filename, Buffer data) {
     }
   }
 
+  @Test
+  public void testMultipartFormMultipleHeaders() throws Exception {
+    server.requestHandler(req -> {
+      req.setExpectMultipart(true);
+      req.endHandler(v -> {
+        assertEquals(Arrays.asList("1", "2"), req.headers().getAll("bla"));
+        req.response().end();
+      });
+    });
+    startServer();
+    HttpRequest<Buffer> builder = webClient.post("somepath");
+    MultipartForm form = MultipartForm.create();
+    builder.putHeader("bla", Arrays.asList("1", "2"));
+    builder.sendMultipartForm(form).onComplete(onSuccess(resp -> complete()));
+    await();
+  }
+
   @Test
   public void testFileUploadWhenFileDoesNotExist() {
     HttpRequest<Buffer> builder = webClient.post("somepath");