Unity-Technologies
/
curl
зеркало из https://github.com/Unity-Technologies/curl.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

url: Fix NO_PROXY env var to work properly with --proxy option. 

The combination of --noproxy option and http_proxy env var works well
both for proxied hosts and non-proxied hosts.

However, when combining NO_PROXY env var with --proxy option,
non-proxied hosts are not reachable while proxied host is OK.

This patch allows us to access non-proxied hosts even if using NO_PROXY
env var with --proxy option.
This commit is contained in:
ERAMOTO Masaya 2016-11-25 13:26:51 +09:00 коммит произвёл Daniel Stenberg
Родитель f30cbcac11
Коммит 1b57557882
6 изменённых файлов: 219 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
lib/url.c
Просмотреть файл

@ -6079,6 +6079,7 @@ static CURLcode create_conn(struct Curl_easy *data,
bool reuse;
char *proxy = NULL;
char *socksproxy = NULL;
char *no_proxy = NULL;
bool prot_missing = FALSE;
bool connections_available = TRUE;
bool force_reuse = FALSE;
@ -6255,14 +6256,21 @@ static CURLcode create_conn(struct Curl_easy *data,
}
}
if(data->set.str[STRING_NOPROXY] &&
check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY])) {
no_proxy = curl_getenv("no_proxy");
if(!no_proxy)
no_proxy = curl_getenv("NO_PROXY");
if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY]) ||
(!data->set.str[STRING_NOPROXY] &&
check_noproxy(conn->host.name, no_proxy))) {
Curl_safefree(proxy);
Curl_safefree(socksproxy);
}
else if(!proxy && !socksproxy)
proxy = detect_proxy(conn);
Curl_safefree(no_proxy);
#ifdef USE_UNIX_SOCKETS
if(data->set.str[STRING_UNIX_SOCKET_PATH]) {
if(proxy) {

2
tests/data/Makefile.inc
Просмотреть файл

@ -127,7 +127,7 @@ test1216 test1217 test1218 test1219 \
test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \
test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \
test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \
test1244 test1245 test1246 test1247 \
test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \
\
test1280 test1281 test1282 \
\

49
tests/data/test1248 Normal file
Просмотреть файл

@ -0,0 +1,49 @@
<testcase>
<info>
<keywords>
HTTP
HTTP 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
foo
</data>
</reply>
# Client-side
<client>
<server>
http
</server>
<name>
Access a non-proxied host with using the combination of --proxy option and --noproxy option
</name>
<command>
http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%PROXYPORT/ --noproxy %HOSTIP --max-time 5
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /1248 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Authorization: Basic dXNlcjpzZWNyZXQ=
Accept: */*
</protocol>
</verify>
</testcase>

52
tests/data/test1249 Normal file
Просмотреть файл

@ -0,0 +1,52 @@
<testcase>
<info>
<keywords>
HTTP
HTTP proxy
NO_PROXY
</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
foo
</data>
</reply>
# Client-side
<client>
<server>
http
</server>
<name>
Access a non-proxied host with using the combination of --proxy option and NO_PROXY env var
</name>
<setenv>
NO_PROXY=%HOSTIP
</setenv>
<command>
http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%PROXYPORT/ --max-time 5
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /1249 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Authorization: Basic dXNlcjpzZWNyZXQ=
Accept: */*
</protocol>
</verify>
</testcase>

53
tests/data/test1250 Normal file
Просмотреть файл

@ -0,0 +1,53 @@
<testcase>
<info>
<keywords>
HTTP
HTTP proxy
http_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
foo
</data>
</reply>
# Client-side
<client>
<server>
http
</server>
<name>
Access a non-proxied host with using the combination of http_proxy env var and --noproxy option
</name>
<setenv>
http_proxy=http://dummy:%PROXYPORT/
</setenv>
<command>
http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /1250 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Authorization: Basic dXNlcjpzZWNyZXQ=
Accept: */*
</protocol>
</verify>
</testcase>

54
tests/data/test1251 Normal file
Просмотреть файл

@ -0,0 +1,54 @@
<testcase>
<info>
<keywords>
HTTP
HTTP proxy
http_proxy
NO_PROXY
</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
foo
</data>
</reply>
# Client-side
<client>
<server>
http
</server>
<name>
Access a non-proxied host with using the combination of http_proxy env var and NO_PROXY env var
</name>
<setenv>
http_proxy=http://dummy:%PROXYPORT/
NO_PROXY=%HOSTIP
</setenv>
<command>
http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /1251 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Authorization: Basic dXNlcjpzZWNyZXQ=
Accept: */*
</protocol>
</verify>
</testcase>