Merge branch 'master' into master

kistlers · Jun 22, 2023 · 47e0cf9 · 47e0cf9
2 parents f09f975 + e4d2bed
commit 47e0cf9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -30,7 +30,7 @@
     <jmh.version>1.36</jmh.version>
     <rx.netty.version>0.5.3</rx.netty.version>
     <rx.java.version>1.3.8</rx.java.version>
-    <netty.version>4.1.93.Final</netty.version>
+    <netty.version>4.1.94.Final</netty.version>
     <main.basedir>${project.basedir}/..</main.basedir>
 
     <moditect.skip>true</moditect.skip>

diff --git a/core/src/main/java/feign/Request.java b/core/src/main/java/feign/Request.java
@@ -276,7 +276,8 @@ public ProtocolVersion protocolVersion() {
   @Override
   public String toString() {
     final StringBuilder builder = new StringBuilder();
-    builder.append(httpMethod).append(' ').append(url).append(" HTTP/1.1\n");
+    builder.append(httpMethod).append(' ').append(url).append(' ').append(protocolVersion)
+        .append('\n');
     for (final String field : headers.keySet()) {
       for (final String value : valuesOrEmpty(headers, field)) {
         builder.append(field).append(": ").append(value).append('\n');

diff --git a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java
@@ -28,6 +28,7 @@
 import java.util.concurrent.CompletableFuture;
 import feign.*;
 import feign.Request.Options;
+import static feign.Util.enumForName;
 
 /**
  * This module directs Feign's http requests to Apache's
@@ -179,6 +180,8 @@ Response toFeignResponse(SimpleHttpResponse httpResponse, Request request) {
     }
 
     return Response.builder()
+        .protocolVersion(
+            enumForName(Request.ProtocolVersion.class, httpResponse.getVersion().format()))
         .status(statusCode)
         .reason(reason)
         .headers(headers)