c-hyper: abort CONNECT response reading early on non 2xx responses

Fixes test 493

Closes #7209

lib/c-hyper.c

@@ -186,6 +186,12 @@ static int hyper_body_chunk(void *userdata, const hyper_buf *chunk)
       Curl_safefree(data->req.newurl);
     }
 #endif
+    if(data->state.hconnect &&
+       (data->req.httpcode/100 != 2)) {
+      done = TRUE;
+      result = CURLE_OK;
+    }
+    else
       result = Curl_http_firstwrite(data, data->conn, &done);
     if(result || done) {
       infof(data, "Return early from hyper_body_chunk\n");

lib/http_proxy.c

@@ -744,6 +744,8 @@ static CURLcode CONNECT(struct Curl_easy *data,
       hyper_io_set_write(io, Curl_hyper_send);
       conn->sockfd = tunnelsocket;
 
+      data->state.hconnect = TRUE;
+
       /* create an executor to poll futures */
       if(!h->exec) {
         h->exec = hyper_executor_new();

lib/urldata.h

@@ -1411,6 +1411,7 @@ struct UrlState {
   trailers_state trailers_state; /* whether we are sending trailers
                                        and what stage are we at */
 #ifdef USE_HYPER
+  bool hconnect;  /* set if a CONNECT request */
   CURLcode hresult; /* used to pass return codes back from hyper callbacks */
 #endif
 

tests/data/test493

@@ -1,6 +1,7 @@
 <testcase>
 <info>
 <keywords>
+HTTP
 HSTS
 url_effective
 </keywords>
@@ -9,7 +10,7 @@ url_effective
 <reply>
 
 # we use this as response to a CONNECT
-<data nocheck="yes">
+<connect nocheck="yes">
 HTTP/1.1 403 not OK at all
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -18,7 +19,7 @@ Connection: close
 Funny-head: yesyes
 
 -foo-
-</data>
+</connect>
 </reply>
 
 <client>
@@ -53,6 +54,13 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
+HTTP/1.1 403 not OK at all
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Funny-head: yesyes
+
 https://this.hsts.example/%TESTNUMBER
 </stdout>
 # Proxy CONNECT aborted