diff options
author | ulion <ulion2002@gmail.com> | 2013-02-10 08:16:24 +0800 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2013-02-11 20:10:52 +0100 |
commit | 5cd85db9faadc25d997f16880a1451b9d5cc28a2 (patch) | |
tree | c6875e53b9c65278d44e0ed4d2d86ec150b3a51f /lib/url.c | |
parent | 9a6e580e3a91dbfe234cc0c7d0c5f7a3374fc219 (diff) |
SOCKS: fix socks proxy when noproxy matched
Test 1212 added to verify
Bug: http://curl.haxx.se/bug/view.cgi?id=1190
Diffstat (limited to 'lib/url.c')
-rw-r--r-- | lib/url.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -3080,6 +3080,9 @@ static CURLcode ConnectionStore(struct SessionHandle *data, */ CURLcode Curl_connected_proxy(struct connectdata *conn) { + if(!conn->bits.proxy) + return CURLE_OK; + switch(conn->proxytype) { #ifndef CURL_DISABLE_PROXY case CURLPROXY_SOCKS5: |