8276798: HttpURLConnection sends invalid HTTP request

Reviewed-by: dfuchs, michaelm
openjdk · Jun 22, 2022 · 50c37f5 · 50c37f5 · openjdk-notifier · Jun 22, 2022
1 parent 270cf67
commit 50c37f5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -626,10 +626,13 @@ private void writeRequests() throws IOException {
              * to last and last, respectively, in the case of a POST
              * request.
              */
-            if (!failedOnce) {
+            final String requestLine = method + " " + getRequestURI()+ " " + httpVersion;
+            final int requestLineIndex = requests.getKey(requestLine);
+            if (requestLineIndex != 0) {
+                // we expect the request line to be at index 0. we set it here
+                // if we don't find the request line at that index.
                 checkURLFile();
-                requests.prepend(method + " " + getRequestURI()+" "  +
-                                 httpVersion, null);
+                requests.prepend(requestLine, null);
             }
             if (!getUseCaches()) {
                 requests.setIfNotSet ("Cache-Control", "no-cache");
@@ -656,8 +659,7 @@ private void writeRequests() throws IOException {
              * or if keep alive is disabled via a system property
              */
 
-            // Try keep-alive only on first attempt
-            if (!failedOnce && http.getHttpKeepAliveSet()) {
+            if (http.getHttpKeepAliveSet()) {
                 if (http.usingProxy && tunnelState() != TunnelState.TUNNELING) {
                     requests.setIfNotSet("Proxy-Connection", "keep-alive");
                 } else {