new redirect tests with ./ and ../

5 files changed, 258 insertions, 1 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 964a73b98..99363a05e 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -16,4 +16,5 @@ test105  test114  test123  test19   test24   test302  test43   test31 \
 test106  test115  test124  test190  test25   test303  test44   test38 \
 test107  test116  test125  test2    test26   test33   test45   test126 \
 test304  test39   test32   test128  test48 test306 \
-test130  test131  test132  test133  test134 test135 test403 test305
+test130  test131  test132  test133  test134 test135 test403 test305 \
+test49 test50 test51 test52
\ No newline at end of file
diff --git a/tests/data/test49 b/tests/data/test49
new file mode 100644
index 000000000..8c31ed4b4
--- /dev/null
+++ b/tests/data/test49
@@ -0,0 +1,64 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ../moo.html/490002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ../moo.html/490002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP follow redirect with ../
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/49 HTTP/1.1

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+GET /we/are/all/moo.html/490002 HTTP/1.1

+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+</protocol>
+</verify>
diff --git a/tests/data/test50 b/tests/data/test50
new file mode 100644
index 000000000..8b304265c
--- /dev/null
+++ b/tests/data/test50
@@ -0,0 +1,64 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ../../moo.html/500002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ../../moo.html/500002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP follow redirect with ../../
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/50 HTTP/1.1

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+GET /we/are/moo.html/500002 HTTP/1.1

+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+</protocol>
+</verify>
diff --git a/tests/data/test51 b/tests/data/test51
new file mode 100644
index 000000000..b2271e846
--- /dev/null
+++ b/tests/data/test51
@@ -0,0 +1,64 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ../../../../../../../510002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ../../../../../../../510002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP follow redirect with exessive ../
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/51 HTTP/1.1

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+GET /510002 HTTP/1.1

+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+</protocol>
+</verify>
diff --git a/tests/data/test52 b/tests/data/test52
new file mode 100644
index 000000000..ddaa2d725
--- /dev/null
+++ b/tests/data/test52
@@ -0,0 +1,64 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ./520002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ./520002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP follow redirect with ./-prefix
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/52 HTTP/1.1

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+GET /we/are/all/twits/520002 HTTP/1.1

+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

+

+</protocol>
+</verify>