http_proxy: fix user-agent and custom headers for CONNECT with hyper

Enable test 287

Closes #7598

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index a0168cbf5aed2f2397507f75599af53629ec48c1..9ce5ee8480506bd9a77bae656ccefdb502172272 100644 (file)
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -840,9 +840,8 @@ static CURLcode CONNECT(struct Curl_easy *data,
          Curl_hyper_header(data, headers, data->state.aptr.proxyuserpwd))
         goto error;
 
-      if(data->set.str[STRING_USERAGENT] &&
-         *data->set.str[STRING_USERAGENT] &&
-         data->state.aptr.uagent &&
+      if(!Curl_checkProxyheaders(data, conn, "User-Agent") &&
+         data->set.str[STRING_USERAGENT] &&
          Curl_hyper_header(data, headers, data->state.aptr.uagent))
         goto error;
 
@@ -850,6 +849,9 @@ static CURLcode CONNECT(struct Curl_easy *data,
          Curl_hyper_header(data, headers, "Proxy-Connection: Keep-Alive"))
         goto error;
 
+      if(Curl_add_custom_headers(data, TRUE, headers))
+        goto error;
+
       sendtask = hyper_clientconn_send(client, req);
       if(!sendtask) {
         failf(data, "hyper_clientconn_send");

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 01ee25772182472f6cda8d5410fa17cd5e35b552..9209135b6358e246f3a7c02169d4ba076343a198 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -44,7 +44,6 @@
 262
 265
 266
-287
 319
 326
 357