moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00
Code Issues Releases Wiki Activity

http-proxy: fix chunked-encoded CONNECT responses

Browse Source 
Regression since 5113ad0424.

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

Closes #1579
This commit is contained in:
Daniel Stenberg 2017-06-16 17:30:39 +02:00
parent 12ccaed2a5
commit 01811b6740
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/http_proxy.c
View File

@ -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);
}

1
lib/urldata.h
View File

@ -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 */

1
tests/data/test1061
View File

@ -8,7 +8,6 @@ HTTP proxy
chunked Transfer-Encoding
proxytunnel
HTTP proxy Digest auth
flaky
</keywords>
</info>