Added test cases 1089 and 1090 to test --write-out after a redirect to

test a report that the size didn't work, but these test cases pass.

diff --git a/CHANGES b/CHANGES
index 38b3e118807318a7c44f7d910bce75a8704d2d21..15a74c6e094e76c5f00d34bf962a50300d5a1eeb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Daniel Fandrich (9 Dec 2008)
+- Added test cases 1089 and 1090 to test --write-out after a redirect to
+  test a report that the size didn't work, but these test cases pass.
+
+- Documented CURLOPT_CONNECT_ONLY as being useful only on HTTP URLs.
+
 Daniel Stenberg (9 Dec 2008)
 - Ken Hirsch simplified how libcurl does FTPS: now it doesn't assume any
   particular state for the control connection like it did before for implicit

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 5c9426b4029102088a4dc13b7774e5d7942992cb..85a90dc959eb647ff36a8ad0860d2cec55f04926 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -59,7 +59,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46           \
  test1064 test1065 test1066 test1067 test1068 test1069 test1070 test1071   \
  test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079   \
  test1080 test1081 test1082 test1083 test1084 test1085 test633 test634     \
- test635 test636 test637 test558 test559 test1086 test1087 test1088
+ test635 test636 test637 test558 test559 test1086 test1087 test1088        \
+ test1089 test1090
 
 filecheck:
        @mkdir test-place; \

diff --git a/tests/data/test1089 b/tests/data/test1089
new file mode 100644 (file)
index 0000000..ca8e648
--- /dev/null
+++ b/tests/data/test1089
@@ -0,0 +1,91 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+--write-out
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="1">
+HTTP/1.1 302 OK swsbounce swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 8\r
+Connection: close\r
+Content-Type: text/plain\r
+Location: ./10890001\r
+\r
+monster
+</data>
+<data1 nocheck="1">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 15\r
+Connection: close\r
+Content-Type: text/plain; charset=us-ascii\r
+\r
+bigger monster
+</data1>
+
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET --write-out with redirected fetch
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1089 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+GET /10890001 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+
+<stdout>
+HTTP/1.1 302 OK swsbounce swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 8\r
+Connection: close\r
+Content-Type: text/plain\r
+Location: ./10890001\r
+\r
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 15\r
+Connection: close\r
+Content-Type: text/plain; charset=us-ascii\r
+\r
+bigger monster
+2
+1
+15
+http://%HOSTIP:%HTTPPORT/10890001
+text/plain; charset=us-ascii
+200
+</stdout>
+
+</verify>
+</testcase>

diff --git a/tests/data/test1090 b/tests/data/test1090
new file mode 100644 (file)
index 0000000..8768dc2
--- /dev/null
+++ b/tests/data/test1090
@@ -0,0 +1,98 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+chunked Transfer-Encoding
+--write-out
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="1">
+HTTP/1.1 302 OK swsbounce swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 8\r
+Connection: close\r
+Content-Type: text/plain\r
+Location: ./10900001\r
+\r
+monster
+</data>
+<data1 nocheck="1">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Transfer-Encoding: chunked\r
+Connection: close\r
+Content-Type: text/plain; charset=us-ascii\r
+\r
+0007\r
+bigger \r
+0008\r
+monster
+\r
+0\r
+\r
+</data1>
+
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET --write-out with redirected fetch
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1090 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+GET /10900001 HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+
+<stdout>
+HTTP/1.1 302 OK swsbounce swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 8\r
+Connection: close\r
+Content-Type: text/plain\r
+Location: ./10900001\r
+\r
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Transfer-Encoding: chunked\r
+Connection: close\r
+Content-Type: text/plain; charset=us-ascii\r
+\r
+bigger monster
+2
+1
+15
+http://%HOSTIP:%HTTPPORT/10900001
+text/plain; charset=us-ascii
+200
+</stdout>
+
+</verify>
+</testcase>