[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 118/150: NO_PROXY: fix for IPv6 numericals in the U
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 118/150: NO_PROXY: fix for IPv6 numericals in the URL |
Date: |
Fri, 30 Mar 2018 16:49:32 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit b7f90470be9b75f57167abbcd63aadb2e3b33958
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Mar 3 14:12:35 2018 +0100
NO_PROXY: fix for IPv6 numericals in the URL
Added test 1265 that verifies.
Reported-by: steelman on github
Fixes #2353
Closes #2355
---
lib/url.c | 10 +++++++++-
tests/data/Makefile.inc | 2 +-
tests/data/test1265 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index f991ade5c..945d4e327 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2574,7 +2574,15 @@ static bool check_noproxy(const char *name, const char
*no_proxy)
/* NO_PROXY was specified and it wasn't just an asterisk */
no_proxy_len = strlen(no_proxy);
- endptr = strchr(name, ':');
+ if(name[0] == '[') {
+ /* IPv6 numerical address */
+ endptr = strchr(name, ']');
+ if(!endptr)
+ return FALSE;
+ name++;
+ }
+ else
+ endptr = strchr(name, ':');
if(endptr)
namelen = endptr - name;
else
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 55abec873..e28066fcd 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -135,7 +135,7 @@ test1228 test1229 test1230 test1231 test1232 test1233
test1234 test1235 \
test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \
test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \
test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \
-test1260 test1261 test1262 test1263 test1264 \
+test1260 test1261 test1262 test1263 test1264 test1265 \
\
test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \
test1288 test1289 test1290 test1291 \
diff --git a/tests/data/test1265 b/tests/data/test1265
new file mode 100644
index 000000000..5d3ef6dc8
--- /dev/null
+++ b/tests/data/test1265
@@ -0,0 +1,53 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP 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
+
+foo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http-ipv6
+</server>
+<name>
+NO_PROXY with IPv6 numerical address
+</name>
+<setenv>
+http_proxy=http://%HOSTIP:%HTTPPORT
+NO_PROXY=::1
+</setenv>
+<command>
+http://%HOST6IP:%HTTP6PORT/1265
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1265 HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 84/150: CURLOPT_HEADERFUNCTION.3: mention folded headers, (continued)
- [GNUnet-SVN] [gnurl] 84/150: CURLOPT_HEADERFUNCTION.3: mention folded headers, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 91/150: TODO: "Support in-memory certs/ca certs/keys", gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 107/150: winbuild: Use macros for the names of some build utilities, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 93/150: examples/sftpuploadresume: resume upload via CURLOPT_APPEND, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 97/150: url: Add option CURLOPT_HAPPY_EYEBALLS_TIMEOUT, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 87/150: test1154: verify that long HTTP headers get rejected, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 99/150: sasl: prefer PLAIN mechanism over LOGIN, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 123/150: RELEASE-NOTES/THANKS: synced with cc1d4c505, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 88/150: header callback: don't chop headers into smaller pieces, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 113/150: travis: update compiler versions, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 118/150: NO_PROXY: fix for IPv6 numericals in the URL,
gnunet <=
- [GNUnet-SVN] [gnurl] 132/150: SECURITY.md: call it the security process, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 100/150: lib: CURLOPT_HAPPY_EYEBALLS_TIMEOUT => CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 117/150: build: get CFLAGS (including -werror) used for examples and tests, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 114/150: unit1309: fix warning on Windows x64, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 135/150: BUGS: updated link to security process, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 142/150: FAQ: fix a broken URL [ci skip], gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 145/150: limit-rate: fix compiler warning, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 140/150: credits: Viktor prefers without accent, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 138/150: openldap: check ldap_get_attribute_ber() results for NULL before using, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 134/150: limit-rate: kick in even before "limit" data has been received, gnunet, 2018/03/30