diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | lib/transfer.c | 20 | ||||
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test1031 | 76 |
5 files changed, 95 insertions, 9 deletions
@@ -8,6 +8,11 @@ Daniel Stenberg (26 May 2008) +- Bug report #1973352 (http://curl.haxx.se/bug/view.cgi?id=1973352) identified + how the HTTP redirect following code didn't properly follow to a new URL if + the new url was but a query string such as "Location: ?moo=foo". Test case + 1031 was added to verify this fix. + - Andreas Faerber and Scott McCreary made (lib)curl build for the Haiku OS. Yang Tse (26 May 2008) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 67075ad2f..c88ca2d69 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -37,6 +37,7 @@ This release includes the following bugfixes: o internal time differences now use monotonic time source if available o several curl_multi_socket() fixes o builds fine for Haiku OS + o follow redirect with only a new query string This release includes the following known bugs: diff --git a/lib/transfer.c b/lib/transfer.c index 9cae70346..aafec6d4e 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -2044,14 +2044,18 @@ CURLcode Curl_follow(struct SessionHandle *data, if(pathsep) *pathsep=0; - /* we have a relative path to append to the last slash if - there's one available */ - pathsep = strrchr(protsep, '/'); - if(pathsep) - *pathsep=0; + /* we have a relative path to append to the last slash if there's one + available, or if the new URL is just a query string (starts with a + '?') we append the new one at the end of the entire currently worked + out URL */ + if(useurl[0] != '?') { + pathsep = strrchr(protsep, '/'); + if(pathsep) + *pathsep=0; + } - /* Check if there's any slash after the host name, and if so, - remember that position instead */ + /* Check if there's any slash after the host name, and if so, remember + that position instead */ pathsep = strchr(protsep, '/'); if(pathsep) protsep = pathsep+1; @@ -2129,7 +2133,7 @@ CURLcode Curl_follow(struct SessionHandle *data, memcpy(newest, url_clone, urllen); /* check if we need to append a slash */ - if(('/' == useurl[0]) || (protsep && !*protsep)) + if(('/' == useurl[0]) || (protsep && !*protsep) || ('?' == useurl[0])) ; else newest[urllen++]='/'; diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index a58ea7c24..bc78cb2e8 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -51,7 +51,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test1021 test1022 test1023 test309 test616 test617 test618 test619 \ test620 test621 test622 test623 test624 test625 test626 test627 test554 \ test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030 \ - test556 + test556 test1031 filecheck: @mkdir test-place; \ diff --git a/tests/data/test1031 b/tests/data/test1031 new file mode 100644 index 000000000..9cfbab5c5 --- /dev/null +++ b/tests/data/test1031 @@ -0,0 +1,76 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +followlocation +</keywords> +</info> +# Server-side +<reply> +<data> +HTTP/1.1 301 This is a weirdo text message swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Location: ?coolsite=yes/10310002.txt +Connection: close + +This server reply is for testing a simple Location: following + +</data> +<data2> +HTTP/1.1 200 Followed here fine swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 52 + +If this is received, the location following worked + +</data2> +<datacheck> +HTTP/1.1 301 This is a weirdo text message swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Location: ?coolsite=yes/10310002.txt +Connection: close + +HTTP/1.1 200 Followed here fine swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 52 + +If this is received, the location following worked + +</datacheck> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +HTTP Location: following to a query string + </name> + <command> +http://%HOSTIP:%HTTPPORT/want/this/1031 -L +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /want/this/1031 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> |