From: Yang Tse Date: Thu, 1 Mar 2007 12:02:17 +0000 (+0000) Subject: Do not remove CURLM_STATE_WAITPROXYCONNECT from the CURLMstate enum X-Git-Tag: curl-7_16_2~218 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82d310d0d9220ead1c232cbca560762fee9e09f6;p=thirdparty%2Fcurl.git Do not remove CURLM_STATE_WAITPROXYCONNECT from the CURLMstate enum in builds with HTTP support disabled to keep consistent enum values for CURLMstate in all kind of builds. --- diff --git a/lib/multi.c b/lib/multi.c index 96d013d3e6..59e4b4419e 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -61,11 +61,8 @@ 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_PROTOCONNECT, /* completing the protocol-specific connect phase */ CURLM_STATE_WAITDO, /* wait for our turn to send the request */ CURLM_STATE_DO, /* start send off the request (part 1) */ CURLM_STATE_DOING, /* sending off the request (part 1) */