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

CONNECT: keep close connection flag in http_connect_state struct

Browse Source 
Fixes #2088
Closes #2157
This commit is contained in:
Zachary Seguin 2017-12-05 22:15:31 -05:00 committed by Daniel Stenberg
parent c103cac3c8
commit 55e609890f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/http_proxy.c
View File

@ -167,6 +167,7 @@ static CURLcode connect_init(struct connectdata *conn, bool reinit)
s->line_start = s->connect_buffer; s->line_start = s->connect_buffer;
s->ptr = s->line_start; s->ptr = s->line_start;
s->cl = 0; s->cl = 0;
s->close_connection = FALSE;
return CURLE_OK; return CURLE_OK;
} }
@ -187,7 +188,6 @@ static CURLcode CONNECT(struct connectdata *conn,
struct SingleRequest *k = &data->req; struct SingleRequest *k = &data->req;
CURLcode result; CURLcode result;
curl_socket_t tunnelsocket = conn->sock[sockindex]; curl_socket_t tunnelsocket = conn->sock[sockindex];
bool closeConnection = FALSE;
timediff_t check; timediff_t check;
struct http_connect_state *s = conn->connect_state; struct http_connect_state *s = conn->connect_state;
@ -529,7 +529,7 @@ static CURLcode CONNECT(struct connectdata *conn,
} }
} }
else if(Curl_compareheader(s->line_start, "Connection:", "close")) else if(Curl_compareheader(s->line_start, "Connection:", "close"))
closeConnection = TRUE; s->close_connection = TRUE;
else if(checkprefix("Transfer-Encoding:", s->line_start)) { else if(checkprefix("Transfer-Encoding:", s->line_start)) {
if(k->httpcode/100 == 2) { if(k->httpcode/100 == 2) {
/* A client MUST ignore any Content-Length or Transfer-Encoding /* A client MUST ignore any Content-Length or Transfer-Encoding
@ -548,7 +548,7 @@ static CURLcode CONNECT(struct connectdata *conn,
} }
else if(Curl_compareheader(s->line_start, else if(Curl_compareheader(s->line_start,
"Proxy-Connection:", "close")) "Proxy-Connection:", "close"))
closeConnection = TRUE; s->close_connection = TRUE;
else if(2 == sscanf(s->line_start, "HTTP/1.%d %d", else if(2 == sscanf(s->line_start, "HTTP/1.%d %d",
&subversion, &subversion,
&k->httpcode)) { &k->httpcode)) {
@ -578,10 +578,10 @@ static CURLcode CONNECT(struct connectdata *conn,
/* the connection has been marked for closure, most likely in the /* the connection has been marked for closure, most likely in the
Curl_http_auth_act() function and thus we can kill it at once Curl_http_auth_act() function and thus we can kill it at once
below */ below */
closeConnection = TRUE; s->close_connection = TRUE;
} }
if(closeConnection && data->req.newurl) { if(s->close_connection && data->req.newurl) {
/* Connection closed by server. Don't use it anymore */ /* Connection closed by server. Don't use it anymore */
Curl_closesocket(conn, conn->sock[sockindex]); Curl_closesocket(conn, conn->sock[sockindex]);
conn->sock[sockindex] = CURL_SOCKET_BAD; conn->sock[sockindex] = CURL_SOCKET_BAD;
@ -599,7 +599,7 @@ static CURLcode CONNECT(struct connectdata *conn,
} while(data->req.newurl); } while(data->req.newurl);
if(data->info.httpproxycode/100 != 2) { if(data->info.httpproxycode/100 != 2) {
if(closeConnection && data->req.newurl) { if(s->close_connection && data->req.newurl) {
conn->bits.proxy_connect_closed = TRUE; conn->bits.proxy_connect_closed = TRUE;
infof(data, "Connect me again please\n"); infof(data, "Connect me again please\n");
connect_done(conn); connect_done(conn);

1
lib/urldata.h
View File

@ -755,6 +755,7 @@ struct http_connect_state {
TUNNEL_CONNECT, /* CONNECT has been sent off */ TUNNEL_CONNECT, /* CONNECT has been sent off */
TUNNEL_COMPLETE /* CONNECT response received completely */ TUNNEL_COMPLETE /* CONNECT response received completely */
} tunnel_state; } tunnel_state;
bool close_connection;
}; };
/* /*