Added test case 1025 to test a command-line cookie with Location: following

3 files changed, 108 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index d94df11bf..cc6ae31cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,9 +7,9 @@
                                   Changelog
 
 Daniel Fandrich (9 Apr 2008)
-- Added test case 1024 to test a scenario similar to the one reported
+- Added test cases 1024 & 1025 to test a scenario similar to the one reported
   by Ben Combee where libcurl would send the wrong cookie to a redirected
-  server.  libcurl was doing the right thing in this test case.
+  server.  libcurl was doing the right thing in these test cases.
 
 Michal Marek (7 Apr 2008)
 - Fix the MIT / Heimdal check for good:
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 7863c89e6..ad2e63a00 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -50,7 +50,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test551 test552 test1016 test1017 test1018 test1019 test1020 test553      \
  test1021 test1022 test1023 test309 test616 test617 test618 test619        \
  test620 test621 test622 test623 test624 test625 test626 test627 test554   \
- test1024
+ test1024 test1025
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1025 b/tests/data/test1025
new file mode 100644
index 000000000..494f8f8d5
--- /dev/null
+++ b/tests/data/test1025
@@ -0,0 +1,105 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+cookies
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+HTTP/1.1 301 This is a weirdo text message

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

+Server: test-server/fake

+Location: ../data/10250002.txt

+Set-Cookie: firstcookie=want; path=/want/

+Content-Length: 69

+

+This server reply is for testing a Location: following with cookies
+
+</data>
+<data2>
+HTTP/1.1 301 This is a weirdo text message

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

+Server: test-server/fake

+Location: ../want/10250003.txt

+Set-Cookie: nextcookie=data; path=/data/

+Content-Length: 69

+

+This server reply is for testing a Location: following with cookies
+
+</data2>
+<data3>
+HTTP/1.1 200 Followed here fine

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

+Server: test-server/fake

+Content-Length: 52

+

+If this is received, the location following worked
+
+</data3>
+<datacheck>
+HTTP/1.1 301 This is a weirdo text message

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

+Server: test-server/fake

+Location: ../data/10250002.txt

+Set-Cookie: firstcookie=want; path=/want/

+Content-Length: 69

+

+HTTP/1.1 301 This is a weirdo text message

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

+Server: test-server/fake

+Location: ../want/10250003.txt

+Set-Cookie: nextcookie=data; path=/data/

+Content-Length: 69

+

+HTTP/1.1 200 Followed here fine

+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 with command-line and server cookies
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/want/1025 -L -c log/jar1025 -b forcedcookie=yes
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/1025 HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+Cookie: forcedcookie=yes

+

+GET /data/10250002.txt HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+Cookie: forcedcookie=yes

+

+GET /want/10250003.txt HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+Cookie: firstcookie=want; forcedcookie=yes

+

+</protocol>
+</verify>
+</testcase>