From 84328e733d62e21cd2573cfda5d2126f568b59ac Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Mon, 11 Jun 2018 14:12:48 -0700
Subject: [PATCH] No need to fallback on https_proxy for insecure connections

---
 .../ext/filters/client_channel/http_proxy.cc  |  1 -
 tools/run_tests/generated/tests.json          | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc
index 45b791a78d5..652cf438ef7 100644
--- a/src/core/ext/filters/client_channel/http_proxy.cc
+++ b/src/core/ext/filters/client_channel/http_proxy.cc
@@ -58,7 +58,6 @@ static char* get_http_proxy_server(char** user_cred,
     if (uri_str == nullptr) gpr_getenv("http_proxy");
   } else {
     uri_str = gpr_getenv("http_proxy");
-    if (uri_str == nullptr) gpr_getenv("https_proxy");
   }
   char* proxy_name = nullptr;
   char** authority_strs = nullptr;
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 5f2bd35cdfe..26bd6275a88 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -22908,6 +22908,30 @@
       "posix"
     ]
   }, 
+  {
+    "args": [
+      "no_error_on_hotpath"
+    ], 
+    "ci_platforms": [
+      "windows", 
+      "linux", 
+      "posix"
+    ], 
+    "cpu_cost": 1.0, 
+    "exclude_configs": [], 
+    "exclude_iomgrs": [
+      "uv"
+    ], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_https_proxy_test", 
+    "platforms": [
+      "windows", 
+      "linux", 
+      "mac", 
+      "posix"
+    ]
+  }, 
   {
     "args": [
       "no_logging"