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 | |
| 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
| -rw-r--r-- | lib/url.c | 3 | ||||
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test1212 | 50 |
3 files changed, 54 insertions, 1 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: diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index c138e36a9..a50bc6043 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -77,7 +77,7 @@ test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \ test1126 test1127 test1128 test1129 test1130 test1131 test1132 test1133 \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ -test1208 test1209 test1210 test1211 \ +test1208 test1209 test1210 test1211 test1212 \ test1220 test1221 test1222 test1223 \ test1300 test1301 test1302 test1303 test1304 test1305 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ diff --git a/tests/data/test1212 b/tests/data/test1212 new file mode 100644 index 000000000..9d92a8dfb --- /dev/null +++ b/tests/data/test1212 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +Proxy +Socks Proxy +NO_PROXY +noproxy +</keywords> +</info> +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +boo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +noproxy setting together with socks proxy + </name> + +<command> +http://user:secret@%HOSTIP:%HTTPPORT/ulion/1212 --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /ulion/1212 HTTP/1.1
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> |