[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 29/208: http-proxy: fix chunked-encoded CONNECT res
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 29/208: http-proxy: fix chunked-encoded CONNECT responses |
Date: |
Wed, 09 Aug 2017 17:33:46 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.
commit 01811b67405c54960c2175075691f59a0d066068
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Jun 16 17:30:39 2017 +0200
http-proxy: fix chunked-encoded CONNECT responses
Regression since 5113ad0424.
... and remove 'flaky' from test 1061 again
Closes #1579
---
lib/http_proxy.c | 5 ++---
lib/urldata.h | 1 +
tests/data/test1061 | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index bb788bd2e..e1545ddf4 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -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);
}
diff --git a/lib/urldata.h b/lib/urldata.h
index 23423e11b..62037d0f2 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -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 */
diff --git a/tests/data/test1061 b/tests/data/test1061
index 35d5d35ae..c481d39c4 100644
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -8,7 +8,6 @@ HTTP proxy
chunked Transfer-Encoding
proxytunnel
HTTP proxy Digest auth
-flaky
</keywords>
</info>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 34/208: Makefile.m32: enable -W for MinGW32 build, (continued)
- [GNUnet-SVN] [gnurl] 34/208: Makefile.m32: enable -W for MinGW32 build, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 40/208: http_proxy: fix build with http and proxy, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 51/208: travis: do the distcheck test build out-of-tree as well, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 43/208: PIPELINING_SERVER_BL: cleanup the internal list use, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 37/208: TODO: implement support for CURLOPT_PREQUOTE with SFTP, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 73/208: socks: use proxy_user instead of proxy_name, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 70/208: test1537: fixed memory leak on OOM, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 22/208: url: refactor the check for Windows drive letter in path, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 54/208: ci: whitelist branches to avoid testing feature branches twice, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 49/208: test1521: test getinfo's OFF_T types too, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 29/208: http-proxy: fix chunked-encoded CONNECT responses,
gnunet <=
- [GNUnet-SVN] [gnurl] 74/208: socks: deduplicate the code for auth request, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 69/208: test1521: fix compiler warnings, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 44/208: getinfo: return sizes as curl_off_t, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 31/208: curl-compilers.m4: enable double-promotion warning, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 50/208: http: add --strip-path-slash and CURLOPT_STRIP_PATH_SLASH, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 35/208: curl: prevent binary output spewed to terminal, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 86/208: make: build the docs subdir only from within src, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 84/208: test1450: add simple testing for DICT, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 99/208: configure: try ldap/lber in reversed order first, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 93/208: tool_sleep: typecast to avoid macos compiler warning, gnunet, 2017/08/09