diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 765be54592..6dbc6dbc29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,29 +1,21 @@ name: CI on: - workflow_call: - inputs: - branch: - required: true - type: string - jdk: - default: 8 - type: string - os: - default: ubuntu-latest - type: string + push: + branches: + - test jobs: Test: name: Run tests - runs-on: ${{ inputs.os }} + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 with: - ref: ${{ inputs.branch }} + ref: test - name: Install JDK uses: actions/setup-java@v2 with: - java-version: ${{ inputs.jdk }} + java-version: 11 distribution: temurin - name: Run tests run: mvn -s .github/maven-ci-settings.xml clean verify -B 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 index becfd3a3f5..5103408fb8 100644 --- 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 @@ -444,11 +444,6 @@ private void handleCreateRequest() { return; } 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 -> { headers.set(header.getKey(), header.getValue()); });