SOCKS: fix socks proxy when noproxy matched

Test 1212 added to verify Bug: http://curl.haxx.se/bug/view.cgi?id=1190
2013-02-10 08:16:24 +08:00
parent 9a6e580e3a
commit 5cd85db9fa
3 changed files with 54 additions and 1 deletions
--- a/lib/url.c
+++ b/lib/url.c
@@ -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: