summaryrefslogtreecommitdiff
path: root/tests/FILEFORMAT
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-12-17 23:47:22 +0100
committerDaniel Stenberg <daniel@haxx.se>2012-01-03 15:01:22 +0100
commit82180643f4886d47816cf654f2ee46114e9c296f (patch)
treeee7b55634dbeca7fd641397a6c10dd360cc602d4 /tests/FILEFORMAT
parent585b89a6c3640af5a1ca963eeafc7d0d82408f00 (diff)
downloadcurl-82180643f4886d47816cf654f2ee46114e9c296f.tar.gz
test proxy supports CONNECT
There's a new 'http-proxy' server for tests that runs on a separate port and lets clients do HTTP CONNECT to other ports on the same host to allow us to test HTTP "tunneling" properly. Test cases now have a <proxy> section in <verify> to check that the proxy protocol part matches correctly. Test case 80, 83, 95, 275, 503 and 1078 have been converted. Test 1316 was added.
Diffstat (limited to 'tests/FILEFORMAT')
-rw-r--r--tests/FILEFORMAT24
1 files changed, 20 insertions, 4 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index ec8506e25..5432b4378 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -160,6 +160,7 @@ pop3
smtp
httptls+srp
httptls+srp-ipv6
+http-proxy
Give only one per line. This subsection is mandatory.
</server>
@@ -275,6 +276,7 @@ Available substitute variables include:
%HOST6IP - IPv6 address of the host running this test
%HTTP6PORT - IPv6 port number of the HTTP server
%HTTPSPORT - Port number of the HTTPS server
+%PROXYPORT - Port number of the HTTP proxy
%FTPPORT - Port number of the FTP server
%FTP6PORT - IPv6 port number of the FTP server
%FTPSPORT - Port number of the FTPS server
@@ -321,12 +323,26 @@ changing protocol data such as port numbers or user-agent strings.
One perl op per line that operates on the protocol dump. This is pretty
advanced. Example: "s/^EPRT .*/EPRT stripped/"
</strippart>
+
<protocol [nonewline="yes"]>
-the protocol dump curl should transmit, if 'nonewline' is set, we will cut
-off the trailing newline of this given data before comparing with the one
-actually sent by the client
-Variables are substituted as in the <command> section.
+
+the protocol dump curl should transmit, if 'nonewline' is set, we will cut off
+the trailing newline of this given data before comparing with the one actually
+sent by the client Variables are substituted as in the <command> section. The
+<strip> and <strippart> rules are applied before comparisons are made.
+
</protocol>
+
+<proxy [nonewline="yes"]>
+
+The protocol dump curl should transmit to a HTTP proxy (when the http-proxy
+server is used), if 'nonewline' is set, we will cut off the trailing newline
+of this given data before comparing with the one actually sent by the client
+Variables are substituted as in the <command> section. The <strip> and
+<strippart> rules are applied before comparisons are made.
+
+</proxy>
+
<stdout [mode="text"] [nonewline="yes"]>
This verifies that this data was passed to stdout. Variables are
substituted as in the <command> section.