diff --git a/tests/data/test1325 b/tests/data/test1325 index 2b98d6adc4085f70424af35408b6bf731b735422..9f5ee58e8f962c73dd33d7af4d69040fdc3bdc41 100644 --- a/tests/data/test1325 +++ b/tests/data/test1325 @@ -1,5 +1,5 @@ -# http://greenbytes.de/tech/webdav/draft-reschke-http-status-308-latest.html +# http://greenbytes.de/tech/webdav/draft-reschke-http-status-308-latest.html HTTP diff --git a/tests/data/test1331 b/tests/data/test1331 index 406cb9e1ab0e1ba3a3ec610f42a48628746754ec..6896856923c9daa63877fc4ae9a68d7b13102faf 100644 --- a/tests/data/test1331 +++ b/tests/data/test1331 @@ -1,8 +1,8 @@ + # Test case inspired by this question on stackoverflow: # # http://stackoverflow.com/questions/10017165/use-libcurl-with-bluecoat-cookie-proxy # - HTTP diff --git a/tests/data/test1332 b/tests/data/test1332 index 1850ece80864cb8cc6798b79a121899b3c1bec0c..3447b2dddac56f796430ca6135a482ac4774b1ab 100644 --- a/tests/data/test1332 +++ b/tests/data/test1332 @@ -1,5 +1,5 @@ -# test case cloned from 1076 and then 302 was replaced with 303 +# test case cloned from 1076 and then 302 was replaced with 303 HTTP diff --git a/tests/data/test1349 b/tests/data/test1349 index 28576fe90c31cf54e547c5eb4dc7fbc52afc9b0f..33906f8a2919f45832c57d4f93b1123a8891b12c 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -60,7 +60,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1350 b/tests/data/test1350 index df12de59d2448f319f19ab1c3fdc63b8137fe466..b7885972cf05630357c9d20148cf686bddca7c55 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -60,7 +60,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1351 b/tests/data/test1351 index d81265e01c69d2b83af8d7b2ca74674fa2f923ca..3e9cc211b8c17ceea44e8504b12478253c29a3f3 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -61,7 +61,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1352 b/tests/data/test1352 index fa9d1ce7bdabb98405a0a5919676304e43d31899..cf690af67767a1165ad11735048ffce0abd02e5f 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -61,7 +61,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1353 b/tests/data/test1353 index b2954b14daef16183c530ed22a6a37cf2c741a6a..8bd751c269d26c38f4b585f49f7e75c80b7a1c5b 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -60,7 +60,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1354 b/tests/data/test1354 index aa54f2d07e700b1419e2fab62114e3b90ed6b1ea..13c5a1bb527ba9d6f88f23eabe22abd9ea3c457f 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -58,7 +58,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1357 b/tests/data/test1357 index 952572032b250a591237a029dacd8c59f7436d84..3df0ad3392790d26f3e2b200eccc6f8f12ef4e1e 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1358 b/tests/data/test1358 index 24cc724ea06690642f86d592dde6396eee6be841..b0e2795ed3200d0af21accc0fbaaf442217a116c 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1359 b/tests/data/test1359 index 96445bb4e844f96c1e9a4d6cbc79d919c9a7969c..fc7851d9205c0e194af18ba686dd636770d0385c 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -77,7 +77,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1360 b/tests/data/test1360 index abfbe8c682b5c183a4cbc6c0a9baf7b7c30b147f..0000d60bb2a8d0b501cf45657fb4d585ad083375 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -77,7 +77,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1361 b/tests/data/test1361 index b97de16cd635c0e8fe5342de8ce4e2c47f04ab2b..884e0b216975c64e7106ea5408078b0793fbd6dc 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1362 b/tests/data/test1362 index 0ea7461ea66d9ce89a588f20b488260fd1bc007e..98fffb6b0c1c9cb25527136cc8c9ec4a564054d5 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1379 b/tests/data/test1379 index 0fd06d5c541deabebd681c952aa9037322592211..81314b6db6fbca4b79ecafd96d9dc3f31bc5478d 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1380 b/tests/data/test1380 index ec7800d5d3741aa506daa9d70c7700081939aba5..e71527001b8634906a9ef110cab86c877f117f5d 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1381 b/tests/data/test1381 index 8f3bc37f08c524e93b03d39e32e383c9b7cc6432..a55c6b588687c39f941fd34784c20037255fe54f 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -54,7 +54,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1382 b/tests/data/test1382 index fbf5195f72838cd7fd36728fcc8b7929d0052881..a657e1fe2d70572201413e8cc0f6efd7e67be069 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -54,7 +54,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1383 b/tests/data/test1383 index 0469e72e019e65264fb8543fec4e514ec2be4d56..0694a22407c747888c3989cf22a54a76f7994bce 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1384 b/tests/data/test1384 index 2deeb7c4c6e4641a5cadb989a6b45d7e44506f13..c07c266b4c4ce31d6cf49f89b8a73403ce84f429 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1387 b/tests/data/test1387 index a2c5a4d6b056a98adc76f6fec630ba4dd9097fb1..85ea948d3d0a58eda1cfd33d01246fe1c0c774b1 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1388 b/tests/data/test1388 index b4662e654b87c47780c0d92c9a7c0d6ae78ad32a..5f5cc0cffe0305a4426332e5b9bcce0ff19dee36 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1389 b/tests/data/test1389 index c2ac3ad9d3044c11f104b24e0143a9a1fb876ff8..2357e314cfef25c44b4720150cf470f18f938407 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -69,7 +69,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1390 b/tests/data/test1390 index 3cf86e775f2d106eaca1059af4031433fea4a32f..53eac5b9517cdfada1be34eea0ac0cabbbb633a4 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -69,7 +69,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1391 b/tests/data/test1391 index 913f25afe724f3903b99f1e0345ed6a97e99f220..911bb5f51f23a603201676ec2d8fc90fa16d8488 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1392 b/tests/data/test1392 index b05fc317c6fb12864505a2d04fdf912cf47c1ab0..4c8f0b190b1e1d0eab45ffef214776892964da8b 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1415 b/tests/data/test1415 index 51eed3eedab27bdbd8f5f9398d1712c9b886ca2f..e5871089d9be21ba12f1c661c10faf3b11ceae57 100644 --- a/tests/data/test1415 +++ b/tests/data/test1415 @@ -44,6 +44,7 @@ TZ=GMT http://example.com/we/want/1415 -b none -c log/jar1415.txt -x %HOSTIP:%HTTPPORT + # Verify data after the test has been "shot" diff --git a/tests/data/test1900 b/tests/data/test1900 index 857c6096b6269fa1ec44bf15fdd1fc7254ebf62b..74f624dae1b6f97c93e339c2618703164fe64d05 100644 --- a/tests/data/test1900 +++ b/tests/data/test1900 @@ -49,6 +49,7 @@ http://%HOSTIP:%HTTPPIPEPORT/ 0 1k.txt 0 1k.txt 0 1k.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test1901 b/tests/data/test1901 index bacf9cb097642b8ec3a0a5f3d159a50b3860981f..792de8e7f749ffb6ca294092b2cd1200f1f8c4a1 100644 --- a/tests/data/test1901 +++ b/tests/data/test1901 @@ -50,6 +50,7 @@ blacklist_site 127.0.0.1:%HTTPPIPEPORT 0 1k.txt 0 1k.txt 0 1k.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test1902 b/tests/data/test1902 index 22f262176ee7bff543c7b4c4002ce3ffeb600f8f..ee6b40391bf04add2788eea4c3d2ad657758e9e5 100644 --- a/tests/data/test1902 +++ b/tests/data/test1902 @@ -49,6 +49,7 @@ http://%HOSTIP:%HTTPPIPEPORT/ 0 1k.txt 0 1k.txt 0 1k.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test1903 b/tests/data/test1903 index 01efa67f883390df89beff7ebb30a51cfce2c009..e35ebcd19f78e50a0c703499d9790cf8914e5c9a 100644 --- a/tests/data/test1903 +++ b/tests/data/test1903 @@ -49,6 +49,7 @@ http://%HOSTIP:%HTTPPIPEPORT/ 10 alphabet.txt 10 alphabet.txt 10 alphabet.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test320 b/tests/data/test320 index 899bec5974ac522144b97cf2434dfc2b1843c816..cb0e234030d61526508a7ab22967f60c3615968d 100644 --- a/tests/data/test320 +++ b/tests/data/test320 @@ -71,13 +71,13 @@ Content-type: text/html
If your browser supports session resuming, then you should see the same session ID, when you press the reload button.

Connected as user 'jsmith'.

-
+

Key Exchange:SRP
CompressionNULL
CipherAES-128-CBC
MACSHA1
CiphersuiteSRP_SHA_AES_128_CBC_SHA1
- +
 Host: %HOSTIP:%HTTPTLSSRPPORT
 Accept: */*
 
@@ -87,8 +87,8 @@ Accept: */*
 
 
 s/^
Session ID:.*//
-s/^
Your HTTP header was:.*//
-s/Protocol version:.*//
+s/^
Your HTTP header was:
.*/
/
+s/Protocol version:.*[0-9]//
 
 
 
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index c975244253a3a5f2107a94206ab62bcd4f715394..f2b12ebc3a1c572ddd49cf71f5c5a7cec7eed47b 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -559,7 +559,7 @@ sub protocolsetup {
             '220-        _   _ ____  _     '."\r\n",
             '220-    ___| | | |  _ \| |    '."\r\n",
             '220-   / __| | | | |_) | |    '."\r\n",
-            '220-  | (__| |_| |  _ <| |___ '."\r\n",
+            '220-  | (__| |_| |  _ {| |___ '."\r\n",
             '220    \___|\___/|_| \_\_____|'."\r\n")
         );
     }
@@ -585,7 +585,7 @@ sub protocolsetup {
             '        _   _ ____  _     '."\r\n",
             '    ___| | | |  _ \| |    '."\r\n",
             '   / __| | | | |_) | |    '."\r\n",
-            '  | (__| |_| |  _ <| |___ '."\r\n",
+            '  | (__| |_| |  _ {| |___ '."\r\n",
             '   \___|\___/|_| \_\_____|'."\r\n",
             '+OK cURL POP3 server ready to serve '."\r\n")
         );
@@ -619,7 +619,7 @@ sub protocolsetup {
             '        _   _ ____  _     '."\r\n",
             '    ___| | | |  _ \| |    '."\r\n",
             '   / __| | | | |_) | |    '."\r\n",
-            '  | (__| |_| |  _ <| |___ '."\r\n",
+            '  | (__| |_| |  _ {| |___ '."\r\n",
             '   \___|\___/|_| \_\_____|'."\r\n",
             '* OK cURL IMAP server ready to serve'."\r\n")
         );
@@ -643,7 +643,7 @@ sub protocolsetup {
             '220-        _   _ ____  _     '."\r\n",
             '220-    ___| | | |  _ \| |    '."\r\n",
             '220-   / __| | | | |_) | |    '."\r\n",
-            '220-  | (__| |_| |  _ <| |___ '."\r\n",
+            '220-  | (__| |_| |  _ {| |___ '."\r\n",
             '220    \___|\___/|_| \_\_____|'."\r\n")
         );
     }