new tests

6 files changed, 336 insertions, 1 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index b855c77a6..a8e5768ae 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -20,4 +20,5 @@ test130  test131  test132  test133  test134 test135 test403 test305 \
 test49 test50 test51 test52 test53 test54 test55 test56 \
 test500 test501 test502 test503 test504 test136 test57 test137 test138 \
 test58 test139 test140 test141 test59 test60 test61 test142 test143 test62 \
-test63 test64 test65 test66 test144 test145 test67 test68
+test63 test64 test65 test66 test144 test145 test67 test68 test41 \
+test40 test42 test69 test70
diff --git a/tests/data/test40 b/tests/data/test40
new file mode 100644
index 000000000..bbf111d6a
--- /dev/null
+++ b/tests/data/test40
@@ -0,0 +1,67 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK

+Location: ../moo.html/?name=d a niel&testcase=/400002    

+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/?name=d a niel&testcase=/400002    

+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>
+<server>
+http
+</server>
+ <name>
+HTTP redirect with whitespace after ? (and conversion)
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/40 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/40 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/?name=d+a+niel&testcase=/400002 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/test41 b/tests/data/test41
new file mode 100644
index 000000000..e29324eb2
--- /dev/null
+++ b/tests/data/test41
@@ -0,0 +1,23 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP formpost with missing file
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/41 -F moo=@boo
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+26
+</errorcode>
+</verify>
diff --git a/tests/data/test42 b/tests/data/test42
new file mode 100644
index 000000000..eec7f451a
--- /dev/null
+++ b/tests/data/test42
@@ -0,0 +1,67 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK

+Location: ../m o o.html/420002    

+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: ../m o o.html/420002    

+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>
+<server>
+http
+</server>
+ <name>
+HTTP redirect with whitespace in path (and conversion)
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/42 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/42 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/m%20o%20o.html/420002 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/test69 b/tests/data/test69
new file mode 100644
index 000000000..c0f85ef20
--- /dev/null
+++ b/tests/data/test69
@@ -0,0 +1,101 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 401 Authorization Required

+Server: Apache/1.3.27 (Darwin) PHP/4.1.2

+WWW-Authenticate: Basic

+WWW-Authenticate: Wild-and-crazy

+WWW-Authenticate: NTLM

+Content-Type: text/html; charset=iso-8859-1

+

+This is not the real page
+</data>
+
+# This is supposed to be returned when the server gets a first
+# Authorization: NTLM line passed-in from the client
+<data1001>
+HTTP/1.1 401 Now gimme that second request of crap

+Server: Microsoft-IIS/5.0

+Content-Type: text/html; charset=iso-8859-1

+WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==

+

+This is not the real page either!
+</data1001>
+
+# This is supposed to be returned when the server gets the second
+# Authorization: NTLM line passed-in from the client
+<data1002>
+HTTP/1.1 200 Things are fine in server land

+Server: Microsoft-IIS/5.0

+Content-Type: text/html; charset=iso-8859-1

+

+Finally, this is the real page!
+</data1002>
+
+<datacheck>
+HTTP/1.1 401 Authorization Required

+Server: Apache/1.3.27 (Darwin) PHP/4.1.2

+WWW-Authenticate: Basic

+WWW-Authenticate: Wild-and-crazy

+WWW-Authenticate: NTLM

+Content-Type: text/html; charset=iso-8859-1

+

+HTTP/1.1 401 Now gimme that second request of crap

+Server: Microsoft-IIS/5.0

+Content-Type: text/html; charset=iso-8859-1

+WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==

+

+HTTP/1.1 200 Things are fine in server land

+Server: Microsoft-IIS/5.0

+Content-Type: text/html; charset=iso-8859-1

+

+Finally, this is the real page!
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+# NTLM only works if SSL-support is present
+<features>
+SSL
+</features>
+<server>
+http
+</server>
+ <name>
+HTTP with NTLM, Basic or Wild-and-crazy authorization
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/69 -u testuser:testpass --anyauth
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /69 HTTP/1.1

+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

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

+

+GET /69 HTTP/1.1

+Authorization: NTLM TlRMTVNTUAABAAAAA7IAAAQABAAkAAAABAAEACAAAABIQVhYQ1VSTA==

+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

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

+

+GET /69 HTTP/1.1

+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAGAAAAAYABgAeAAAAAgACABAAAAAEAAQAEgAAAAIAAgAWAAAAAAAAACQAAAAAYIAAEMAVQBSAEwAdABlAHMAdAB1AHMAZQByAEgAQQBYAFgAWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145

+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a 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/test70 b/tests/data/test70
new file mode 100644
index 000000000..eaa65d00d
--- /dev/null
+++ b/tests/data/test70
@@ -0,0 +1,76 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 401 Authorization Required

+Server: Apache/1.3.27 (Darwin) PHP/4.1.2

+WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"

+WWW-Authenticate: NTLM

+Content-Type: text/html; charset=iso-8859-1

+

+This is not the real page
+</data>
+
+# This is supposed to be returned when the server gets a
+# Authorization: Digest line passed-in from the client
+<data1000>
+HTTP/1.1 200 OK

+Server: Apache/1.3.27 (Darwin) PHP/4.1.2

+Content-Type: text/html; charset=iso-8859-1

+

+This IS the real page!
+</data1000>
+
+<datacheck>
+HTTP/1.1 401 Authorization Required

+Server: Apache/1.3.27 (Darwin) PHP/4.1.2

+WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"

+WWW-Authenticate: NTLM

+Content-Type: text/html; charset=iso-8859-1

+

+HTTP/1.1 200 OK

+Server: Apache/1.3.27 (Darwin) PHP/4.1.2

+Content-Type: text/html; charset=iso-8859-1

+

+This IS the real page!
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+# NTLM only works if SSL-support is present
+<features>
+SSL
+</features>
+<server>
+http
+</server>
+ <name>
+HTTP with Digest *OR* NTLM authorization
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/70 -u testuser:testpass --anyauth
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /70 HTTP/1.1

+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3

+Host: 127.0.0.1:8999

+Pragma: no-cache

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

+

+GET /70 HTTP/1.1

+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"

+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a 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>