Major overhaul introducing http pipelining support and shared connection

cache within the multi handle.

4 files changed, 185 insertions, 1 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 48038a66b..250084de7 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -34,5 +34,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test250 test251 test252 test253 test254 test255 test521 test522 test523   \
  test256 test257 test258 test259 test260 test261 test262 test263 test264   \
  test265 test266 test267 test268 test269 test270 test271 test272 test273   \
- test274 test275 test524 test525 test276 test277
+ test274 test275 test524 test525 test276 test277 test526 test527 test528
 
diff --git a/tests/data/test526 b/tests/data/test526
new file mode 100644
index 000000000..29d995983
--- /dev/null
+++ b/tests/data/test526
@@ -0,0 +1,61 @@
+<info>
+<keywords>
+FTP
+PASV
+RETR
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+file contents should appear once for each file
+</data>
+<datacheck>
+file contents should appear once for each file
+file contents should appear once for each file
+file contents should appear once for each file
+file contents should appear once for each file
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+<tool>
+lib526
+</tool>
+ <name>
+FTP RETR same file using different handles but same connection
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/526
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous

+PASS curl_by_daniel@haxx.se

+PWD

+CWD path

+EPSV

+TYPE I

+SIZE 526

+RETR 526

+EPSV

+SIZE 526

+RETR 526

+EPSV

+SIZE 526

+RETR 526

+EPSV

+SIZE 526

+RETR 526

+QUIT

+</protocol>
+</verify>
diff --git a/tests/data/test527 b/tests/data/test527
new file mode 100644
index 000000000..f00a5c69f
--- /dev/null
+++ b/tests/data/test527
@@ -0,0 +1,61 @@
+<info>
+<keywords>
+FTP
+PASV
+RETR
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+file contents should appear once for each file
+</data>
+<datacheck>
+file contents should appear once for each file
+file contents should appear once for each file
+file contents should appear once for each file
+file contents should appear once for each file
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+<tool>
+lib527
+</tool>
+ <name>
+FTP RETR same file using different handles but same connection
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/527
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous

+PASS curl_by_daniel@haxx.se

+PWD

+CWD path

+EPSV

+TYPE I

+SIZE 527

+RETR 527

+EPSV

+SIZE 527

+RETR 527

+EPSV

+SIZE 527

+RETR 527

+EPSV

+SIZE 527

+RETR 527

+QUIT

+</protocol>
+</verify>
diff --git a/tests/data/test528 b/tests/data/test528
new file mode 100644
index 000000000..2bfdc20ce
--- /dev/null
+++ b/tests/data/test528
@@ -0,0 +1,62 @@
+<info>
+<keywords>
+HTTP
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 47
+
+file contents should appear once for each file
+</data>
+<datacheck>
+file contents should appear once for each file
+file contents should appear once for each file
+file contents should appear once for each file
+file contents should appear once for each file
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<tool>
+lib526
+</tool>
+ <name>
+HTTP GET same file using different handles but same connection
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/path/528
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+GET /path/528 HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+

+GET /path/528 HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+

+GET /path/528 HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+

+GET /path/528 HTTP/1.1

+Host: %HOSTIP:%HTTPPORT

+Accept: */*

+

+</protocol>
+</verify>