Commit 8c630ef0 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

glob: fix [a-c] globbing regression 

Brought in ee4f7660

Added test case 1280 to verify

Reported-by: Dave Reisner

Bug: https://github.com/curl/curl/commit/ee4f76606cfa4ee068bf28edd37c8dae7e8db317#commitcomment-19823146
parent f82bbe01

src/tool_urlglob.c

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, 
      else if(end_c != ']')

        /* then this is wrong */

        rc = 0;

      else

        /* end_c == ']' */

        pattern += 4;

    }



    *posp += (pattern - *patternp);

tests/data/Makefile.inc

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \ 
test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \

test1244 test1245 test1246 test1247 \

\

test1280 \

\

test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \

test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \

test1316 test1317 test1318 test1319 test1320 test1321 test1322          \

tests/data/test1280

0 → 100644
+58 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

globbing

</keywords>

</info>



#

# Server-side

<reply>

<data>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Content-Length: 6

Connection: close



bytes

</data>

</reply>



# Client-side

<client>

<server>

http

</server>

 <name>

simple [a-d] globbing

 </name>

 <command>

http://%HOSTIP:%HTTPPORT/[a-d]/1280

</command>

</client>



# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET /a/1280 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*



GET /b/1280 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*



GET /c/1280 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*



GET /d/1280 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*



</protocol>

</verify>

</testcase>