From 2547f60ad3989a5f47f932374d490e28dd74e23e Mon Sep 17 00:00:00 2001
From: chegar <unknown>
Date: Tue, 23 Feb 2010 17:08:23 +0000
Subject: [PATCH] 6365587: Proxy-Connection header sent through tunnel
 Reviewed-by: michaelm

---
 .../classes/sun/net/www/protocol/http/HttpURLConnection.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 732e9b3dce..ac5eb2d281 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -423,7 +423,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
 
             // Try keep-alive only on first attempt
             if (!failedOnce && http.getHttpKeepAliveSet()) {
-                if (http.usingProxy) {
+                if (http.usingProxy && tunnelState() != TunnelState.TUNNELING) {
                     requests.setIfNotSet("Proxy-Connection", "keep-alive");
                 } else {
                     requests.setIfNotSet("Connection", "keep-alive");
-- 
GitLab