aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-02-27 02:24:13 +0000
committerYang Tse <yangsita@gmail.com>2007-02-27 02:24:13 +0000
commitacc4cf87cda36d4c82e074e9ee8cc9d4e8940707 (patch)
tree886d30ab319d0b9bc01497147c1bd60a64a95d20
parent7444342675a88adcd85145a702c222b71064466c (diff)
no proxy support if libcurl is built with HTTP disabled
-rw-r--r--lib/multi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/multi.c b/lib/multi.c
index c04cad142..96d013d3e 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -61,7 +61,9 @@ typedef enum {
CURLM_STATE_CONNECT, /* resolve/connect has been sent off */
CURLM_STATE_WAITRESOLVE, /* awaiting the resolve to finalize */
CURLM_STATE_WAITCONNECT, /* awaiting the connect to finalize */
+#ifndef CURL_DISABLE_HTTP
CURLM_STATE_WAITPROXYCONNECT, /* awaiting proxy CONNECT to finalize */
+#endif
CURLM_STATE_PROTOCONNECT, /* completing the protocol-specific connect
phase */
CURLM_STATE_WAITDO, /* wait for our turn to send the request */
@@ -875,9 +877,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
if(protocol_connect)
multistate(easy, CURLM_STATE_WAITDO);
else {
+#ifndef CURL_DISABLE_HTTP
if (easy->easy_conn->bits.tunnel_connecting)
multistate(easy, CURLM_STATE_WAITPROXYCONNECT);
else
+#endif
multistate(easy, CURLM_STATE_WAITCONNECT);
}
}
@@ -908,9 +912,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
if(protocol_connect)
multistate(easy, CURLM_STATE_DO);
else {
+#ifndef CURL_DISABLE_HTTP
if (easy->easy_conn->bits.tunnel_connecting)
multistate(easy, CURLM_STATE_WAITPROXYCONNECT);
else
+#endif
multistate(easy, CURLM_STATE_WAITCONNECT);
}
}
@@ -925,6 +931,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
}
break;
+#ifndef CURL_DISABLE_HTTP
case CURLM_STATE_WAITPROXYCONNECT:
/* this is HTTP-specific, but sending CONNECT to a proxy is HTTP... */
easy->result = Curl_http_connect(easy->easy_conn, &protocol_connect);
@@ -934,6 +941,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
multistate(easy, CURLM_STATE_WAITCONNECT);
}
break;
+#endif
case CURLM_STATE_WAITCONNECT:
/* awaiting a completion of an asynch connect */