summaryrefslogtreecommitdiff
path: root/lib/http_proxy.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-02-05 23:01:50 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-02-05 23:06:00 +0100
commitcb3e6dfa3511e75334f70f53370ce3f1d711c904 (patch)
treec55653afd497b79d899ad6e7d2b7457f86765014 /lib/http_proxy.c
parent1d22407863849fc3d5f5ba26735ef479295f3d57 (diff)
downloadcurl-cb3e6dfa3511e75334f70f53370ce3f1d711c904.tar.gz
Curl_proxyCONNECT: return once CONNECT is sent
By doing this unconditionally, we infer a simpler and more defined behavior. This also has the upside that test 1021 no longer fails for me even if I run with valgrind. Also fixed some wrong comments.
Diffstat (limited to 'lib/http_proxy.c')
-rw-r--r--lib/http_proxy.c29
1 files changed, 3 insertions, 26 deletions
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index ed0fe9503..4f17ce2f6 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -223,35 +223,12 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
return result;
conn->tunnel_state[sockindex] = TUNNEL_CONNECT;
- } /* END CONNECT PHASE */
-
- /* now we've issued the CONNECT and we're waiting to hear back -
- we try not to block here in multi-mode because that might be a LONG
- wait if the proxy cannot connect-through to the remote host. */
-
- /* if timeout is requested, find out how much remaining time we have */
- check = timeout - /* timeout time */
- Curl_tvdiff(Curl_tvnow(), conn->now); /* spent time */
- if(check <= 0) {
- failf(data, "Proxy CONNECT aborted due to timeout");
- return CURLE_RECV_ERROR;
- }
- if(0 == Curl_socket_ready(tunnelsocket, CURL_SOCKET_BAD, 0))
- /* return so we'll be called again polling-style */
+ /* now we've issued the CONNECT and we're waiting to hear back, return
+ and get called again polling-style */
return CURLE_OK;
- else {
- DEBUGF(infof(data,
- "Multi mode finished polling for response from "
- "proxy CONNECT\n"));
- }
- /* at this point, either:
- 1) we're in easy-mode and so it's okay to block waiting for a CONNECT
- response
- 2) we're in multi-mode and we didn't block - it's either an error or we
- now have some data waiting.
- In any case, the tunnel_connecting phase is over. */
+ } /* END CONNECT PHASE */
{ /* BEGIN NEGOTIATION PHASE */
size_t nread; /* total size read */