curl: pass through [] in URLs instead of calling globbing error

Assisted-by: Per Lundberg
Fixes #2044
Closes #2046
Closes #2048
This commit is contained in:
Daniel Stenberg 2017-11-03 15:04:53 +02:00
parent 921bf1de52
commit 90abb74ff0
3 changed files with 54 additions and 4 deletions

View File

@ -367,9 +367,11 @@ static CURLcode glob_parse(URLGlob *glob, char *pattern,
size_t sublen = 0; size_t sublen = 0;
while(*pattern && *pattern != '{') { while(*pattern && *pattern != '{') {
if(*pattern == '[') { if(*pattern == '[') {
/* Skip over potential IPv6 literals. */ /* skip over IPv6 literals and [] */
size_t skip; size_t skip = 0;
if(peek_ipv6(pattern, &skip)) { if(!peek_ipv6(pattern, &skip) && (pattern[1] == ']'))
skip = 2;
if(skip) {
memcpy(buf, pattern, skip); memcpy(buf, pattern, skip);
buf += skip; buf += skip;
pattern += skip; pattern += skip;

View File

@ -137,7 +137,7 @@ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \
test1260 test1261 test1262 \ test1260 test1261 test1262 \
\ \
test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \ test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \
test1288 test1289 \ test1288 test1289 test1290 \
test1298 test1299 \ test1298 test1299 \
test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \
test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \

48
tests/data/test1290 Normal file
View File

@ -0,0 +1,48 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
globbing
</keywords>
</info>
#
# Server-side
<reply>
<data>
HTTP/1.1 200 OK
Content-Length: 6
Connection: close
Content-Type: text/html
-foo-
</data>
</reply>
# Client-side
<client>
<server>
http
</server>
<name>
Verify URL globbing ignores []
</name>
<command>
"http://%HOSTIP:%HTTPPORT/we/want/[]/page/1290"
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /we/want/[]/page/1290 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
</protocol>
</verify>
</testcase>