Added two test cases for multipart formpost over a proxy with --anyauth. Our

HTTP test server is a bit limited though, as it never responds to the POST
request until all data has been sent (and received)...

3 files changed, 284 insertions, 38 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 8a63ce3dd..59b6818dc 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -2,41 +2,34 @@ iall:
 install:
 test:
 
-EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\
- test10 test109 test118 test13 test200 test28 test36 test47 test100	\
- test11 test119 test14 test201 test29 test37 test5 test101 test110	\
- test12 test15 test202 test3 test4 test6 test102 test111 test120	\
- test16 test21 test30 test7 test103 test112 test121 test17 test22	\
- test300 test8 test104 test113 test122 test18 test23 test301 test9	\
- 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 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 test41 test40 test42 test69 test70 test71 test72 test73		\
- test146 test505 test74 test75 test76 test77 test78 test147 test148	\
- test506 test79 test80 test81 test82 test83 test84 test85 test86	\
- test87 test507 test149 test88 test89 test90 test508 test91 test92	\
- test203 test93 test94 test95 test509 test510 test97 test98 test99	\
- test150 test151 test152 test153 test154 test155 test156 test157	\
- test158 test159 test511 test160 test161 test162 test163 test164	\
- test512 test165 test166 test167 test168 test169 test170 test171	\
- test172 test204 test205 test173 test174 test175 test176 test177	\
- test513 test514 test178 test179 test180 test181 test182 test183	\
- test184 test185 test186 test187 test188 test189 test191 test192	\
- test193 test194 test195 test196 test197 test198 test515 test516	\
- test517 test518 test210 test211 test212 test220 test221 test222	\
- test223 test224 test206 test207 test208 test209 test213 test240	\
- test241 test242 test519 test214 test215 test216 test217 test218	\
- test199 test225 test226 test227 test230 test231 test232 test228	\
- test229 test233 test234 test235 test236 test520 test237 test238 \
- test239 test243 test245 test246 test247 test248 test249 test250 \
- test251 test252 test253 test254 test255 test521 test522 test523 \
- test256 test257
-
-# The following tests have been removed from the dist since they no longer
-# work. We need to fix the test suite's FTPS server first, then bring them
-# back: test400 test401 test402 test403
+EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
+ test10 test109 test118 test13 test200 test28 test36 test47 test100 test11 \
+ test119 test14 test201 test29 test37 test5 test101 test110 test12 test15  \
+ test202 test3 test4 test6 test102 test111 test120 test16 test21 test30	   \
+ test7 test103 test112 test121 test17 test22 test300 test8 test104 test113 \
+ test122 test18 test23 test301 test9 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 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 test41 test40 test42 test69 test70 test71 test72 test73 test146	   \
+ test505 test74 test75 test76 test77 test78 test147 test148 test506 test79 \
+ test80 test81 test82 test83 test84 test85 test86 test87 test507 test149   \
+ test88 test89 test90 test508 test91 test92 test203 test93 test94 test95   \
+ test509 test510 test97 test98 test99 test150 test151 test152 test153	   \
+ test154 test155 test156 test157 test158 test159 test511 test160 test161   \
+ test162 test163 test164 test512 test165 test166 test167 test168 test169   \
+ test170 test171 test172 test204 test205 test173 test174 test175 test176   \
+ test177 test513 test514 test178 test179 test180 test181 test182 test183   \
+ test184 test185 test186 test187 test188 test189 test191 test192 test193   \
+ test194 test195 test196 test197 test198 test515 test516 test517 test518   \
+ test210 test211 test212 test220 test221 test222 test223 test224 test206   \
+ test207 test208 test209 test213 test240 test241 test242 test519 test214   \
+ test215 test216 test217 test218 test199 test225 test226 test227 test230   \
+ test231 test232 test228 test229 test233 test234 test235 test236 test520   \
+ test237 test238 test239 test243 test245 test246 test247 test248 test249   \
+ test250 test251 test252 test253 test254 test255 test521 test522 test523   \
+ test256 test257 test258 test259
diff --git a/tests/data/test258 b/tests/data/test258
new file mode 100644
index 000000000..7b115eaa1
--- /dev/null
+++ b/tests/data/test258
@@ -0,0 +1,127 @@
+<info>
+<keywords>
+HTTP
+HTTP FORMPOST
+HTTP replaced headers
+HTTP proxy
+HTTP proxy Digest auth
+</keywords>
+</info>
+# Server-side
+<reply>
+# The stupid test server doesn't response anything at all until the full
+# request has been sent, and then of course the full POST has already been
+# sent!
+<data>
+HTTP/1.1 407 no, tell me who you are first swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Proxy-Authenticate: Digest realm="many secrets", nonce="911"
+Proxy-Connection: close
+Content-Length: 0
+
+</data>
+<data1000>
+HTTP/1.1 200 A OK

+Server: Microsoft-IIS/6.0

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

+Content-Length: 3

+

+ok
+</data1000>
+<datacheck>
+HTTP/1.1 407 no, tell me who you are first swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Proxy-Authenticate: Digest realm="many secrets", nonce="911"
+Proxy-Connection: close
+Content-Length: 0
+
+HTTP/1.1 200 A OK

+Server: Microsoft-IIS/6.0

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

+Content-Length: 3

+

+ok
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP POST multipart without Expect: header using proxy anyauth (Digest)
+ </name>
+ <command>
+-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/258 -F name=daniel -F tool=curl -F file=@log/test258.txt -H 'Expect:' -U uuuser:pppassword --proxy-anyauth
+</command>
+# We create this file before the command is invoked!
+<file name="log/test258.txt">
+foo-
+This is a moo-
+bar
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|------).*
+</strip>
+<protocol>
+POST http://remotehost:54321/we/want/258 HTTP/1.1

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

+Host: remotehost:54321

+Pragma: no-cache

+Accept: */*

+Content-Length: 409

+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce

+

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="name"

+

+daniel

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="tool"

+

+curl

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="file"; filename="test258.txt"

+Content-Type: text/plain

+

+foo-
+This is a moo-
+bar
+

+------------------------------7c633d5c27ce--

+POST http://remotehost:54321/we/want/258 HTTP/1.1

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

+Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"

+Host: remotehost:54321

+Pragma: no-cache

+Accept: */*

+Content-Length: 409

+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce

+

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="name"

+

+daniel

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="tool"

+

+curl

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="file"; filename="test258.txt"

+Content-Type: text/plain

+

+foo-
+This is a moo-
+bar
+

+------------------------------7c633d5c27ce--

+</protocol>
+</verify>
diff --git a/tests/data/test259 b/tests/data/test259
new file mode 100644
index 000000000..d7deb0094
--- /dev/null
+++ b/tests/data/test259
@@ -0,0 +1,126 @@
+<info>
+<keywords>
+HTTP
+HTTP FORMPOST
+HTTP proxy
+HTTP proxy Digest auth
+</keywords>
+</info>
+# Server-side
+<reply>
+# The stupid test server doesn't response anything at all until the full
+# request has been sent, and then of course the full POST has already been
+# sent!
+<data>
+HTTP/1.1 407 no, tell me who you are first
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Proxy-Authenticate: Digest realm="many secrets", nonce="911"
+Content-Length: 0
+
+</data>
+<data1000>
+HTTP/1.1 200 A OK

+Server: Microsoft-IIS/6.0

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

+Content-Length: 3

+

+ok
+</data1000>
+<datacheck>
+HTTP/1.1 407 no, tell me who you are first
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Proxy-Authenticate: Digest realm="many secrets", nonce="911"
+Content-Length: 0
+
+HTTP/1.1 200 A OK

+Server: Microsoft-IIS/6.0

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

+Content-Length: 3

+

+ok
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP POST multipart with Expect: header using proxy anyauth (Digest)
+ </name>
+ <command>
+-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/259 -F name=daniel -F tool=curl -F file=@log/test259.txt -U uuuser:pppassword --proxy-anyauth
+</command>
+# We create this file before the command is invoked!
+<file name="log/test259.txt">
+foo-
+This is a moo-
+bar
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|------).*
+</strip>
+<protocol>
+POST http://remotehost:54321/we/want/259 HTTP/1.1

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

+Host: remotehost:54321

+Pragma: no-cache

+Accept: */*

+Content-Length: 409

+Expect: 100-continue

+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce

+

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="name"

+

+daniel

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="tool"

+

+curl

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="file"; filename="test259.txt"

+Content-Type: text/plain

+

+foo-
+This is a moo-
+bar
+

+------------------------------7c633d5c27ce--

+POST http://remotehost:54321/we/want/259 HTTP/1.1

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

+Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"

+Host: remotehost:54321

+Pragma: no-cache

+Accept: */*

+Content-Length: 409

+Expect: 100-continue

+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce

+

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="name"

+

+daniel

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="tool"

+

+curl

+------------------------------7c633d5c27ce

+Content-Disposition: form-data; name="file"; filename="test259.txt"

+Content-Type: text/plain

+

+foo-
+This is a moo-
+bar
+

+------------------------------7c633d5c27ce--

+</protocol>
+</verify>