Commit 01811b67 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http-proxy: fix chunked-encoded CONNECT responses 

Regression since 5113ad04.

... and remove 'flaky' from test 1061 again

Closes #1579
parent 12ccaed2

lib/http_proxy.c

+2 −3
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ static CURLcode CONNECT(struct connectdata *conn, 
  CURLcode result;

  curl_socket_t tunnelsocket = conn->sock[sockindex];

  bool closeConnection = FALSE;

  bool chunked_encoding = FALSE;

  time_t check;

  struct http_connect_state *s = conn->connect_state;
@@ -454,7 +453,7 @@ static CURLcode CONNECT(struct connectdata *conn, 
              infof(data, "Ignore %" CURL_FORMAT_CURL_OFF_T

                    " bytes of response-body\n", s->cl);

            }

            else if(chunked_encoding) {

            else if(s->chunked_encoding) {

              CHUNKcode r;



              infof(data, "Ignore chunked response-body\n");
@@ -541,7 +540,7 @@ static CURLcode CONNECT(struct connectdata *conn, 
          else if(Curl_compareheader(s->line_start,

                                     "Transfer-Encoding:", "chunked")) {

            infof(data, "CONNECT responded chunked\n");

            chunked_encoding = TRUE;

            s->chunked_encoding = TRUE;

            /* init our chunky engine */

            Curl_httpchunk_init(conn);

          }

lib/urldata.h

+1 −0
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ struct http_connect_state { 
  char *line_start;

  char *ptr; /* where to store more data */

  curl_off_t cl; /* size of content to read and ignore */

  bool chunked_encoding;

  enum {

    TUNNEL_INIT,    /* init/default/no tunnel state */

    TUNNEL_CONNECT, /* CONNECT has been sent off */

tests/data/test1061

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ HTTP proxy 
chunked Transfer-Encoding

proxytunnel

HTTP proxy Digest auth

flaky

</keywords>

</info>