From 5cd85db9faadc25d997f16880a1451b9d5cc28a2 Mon Sep 17 00:00:00 2001
From: ulion <ulion2002@gmail.com>
Date: Sun, 10 Feb 2013 08:16:24 +0800
Subject: SOCKS: fix socks proxy when noproxy matched

Test 1212 added to verify

Bug: http://curl.haxx.se/bug/view.cgi?id=1190
---
 lib/url.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/url.c b/lib/url.c
index df70b69da..f9ce3ce0b 100644
--- 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:
-- 
cgit v1.2.3