14 files changed, 220 insertions, 20 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 72db6b148..27d80514f 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -128,9 +128,8 @@ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
 test1136 test1137 test1138                   test1141 test1142 test1143 \
 test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
 test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \
-\
-test1160 test1161 test1162 test1163 test1164 \
-test1170 test1171 test1172 \
+test1160 test1161 test1162 test1163 test1164 test1165 \
+test1170 test1171 test1172 test1173 \
 \
 test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
 test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
@@ -170,15 +169,15 @@ test1444 test1445 test1446 test1447 test1448 test1449 test1450 test1451 \
 test1452 test1453 test1454 test1455 test1456 test1457 test1458\
 test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
 test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
-test1516 test1517 test1518 test1519 test1520 test1521 test1522 \
+test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \
 \
 test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \
 test1533 test1534 test1535 test1536 test1537 test1538 \
 test1540 test1541 \
 test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \
-test1558 test1559 test1560 test1561 test1562 \
+test1558 test1559 test1560 test1561 test1562 test1563 \
 \
-test1590 test1591 test1592 \
+test1590 test1591 test1592 test1593 \
 \
 test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \
 test1608 test1609 test1620 test1621 \
diff --git a/tests/data/test1001 b/tests/data/test1001
index 91b13203e..53d7da381 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -66,6 +66,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP POST --digest with PUT and resumed upload and modified method
diff --git a/tests/data/test1165 b/tests/data/test1165
new file mode 100644
index 000000000..24c1c3eb1
--- /dev/null
+++ b/tests/data/test1165
@@ -0,0 +1,25 @@
+<testcase>
+<info>
+<keywords>
+source analysis
+CURL_DISABLE
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+
+ <name>
+Verify configure.ac and source code CURL_DISABLE_-sync
+ </name>
+
+<command type="perl">
+%SRCDIR/disable-scan.pl %SRCDIR/..
+</command>
+</client>
+
+</testcase>
diff --git a/tests/data/test1173 b/tests/data/test1173
new file mode 100644
index 000000000..dd09f81d8
--- /dev/null
+++ b/tests/data/test1173
@@ -0,0 +1,26 @@
+<testcase>
+<info>
+<keywords>
+source analysis
+documentation
+--manual
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+
+ <name>
+Basic man page syntax check
+ </name>
+
+<command type="perl">
+%SRCDIR/manpage-syntax.pl %SRCDIR/../docs/*.1  %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3
+</command>
+</client>
+
+</testcase>
diff --git a/tests/data/test1519 b/tests/data/test1519
index ab23dadca..292a49c65 100644
--- a/tests/data/test1519
+++ b/tests/data/test1519
@@ -53,7 +53,7 @@ res: 0
 status: 302
 redirects: 0
 effectiveurl: http://%HOSTIP:%HTTPPORT/1519
-redirecturl: http://127.0.0.1:8990/h%20ttp://1.2.4.5/test
+redirecturl: http://%HOSTIP:%HTTPPORT/h%20ttp://1.2.4.5/test
 </stdout>
 <errorcode>
 0
diff --git a/tests/data/test1523 b/tests/data/test1523
new file mode 100644
index 000000000..015f50518
--- /dev/null
+++ b/tests/data/test1523
@@ -0,0 +1,49 @@
+<testcase>
+<info>
+<keywords>
+CURLINFO_LOW_SPEED_LIMIT
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Length: 3
+Connection: close
+Funny-head: yesyes
+
+AA
+</data>
+<servercmd>
+writedelay: 1
+</servercmd>
+</reply>
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<tool>
+lib1523
+</tool>
+
+<name>
+CURLINFO_LOW_SPEED_LIMIT
+</name>
+
+<command>
+http://%HOSTIP:%HTTPPORT/1523
+</command>
+<killserver>
+http
+</killserver>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+</verify>
+</testcase>
diff --git a/tests/data/test153 b/tests/data/test153
index fc1d812de..f679de4ea 100644
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -40,7 +40,7 @@ HTTP/1.1 401 Authorization re-negotiation please swsbounce
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2
 WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
 Content-Type: text/html; charset=iso-8859-1
-Content-Length: 25
+Content-Length: 26
 
 This is not the real page
 </data1002>
@@ -121,7 +121,7 @@ HTTP/1.1 401 Authorization re-negotiation please swsbounce
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2
 WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
 Content-Type: text/html; charset=iso-8859-1
-Content-Length: 25
+Content-Length: 26
 
 HTTP/1.1 200 OK
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2
diff --git a/tests/data/test1563 b/tests/data/test1563
new file mode 100644
index 000000000..a3597b9b5
--- /dev/null
+++ b/tests/data/test1563
@@ -0,0 +1,51 @@
+<testcase>
+<info>
+<keywords>
+GOPHER
+HTTP GET
+followlocation
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data1>
+HTTP/1.1 302 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 7
+Location: gopher://www.example.co.uk
+
+nomnom
+</data1>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<name>
+Make sure redirects to CURLPROTO_GOPHER are forbidden by default
+</name>
+<command>
+http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com"
+</command>
+</client>
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<errorcode>
+1
+</errorcode>
+<protocol>
+GET /15630001 HTTP/1.1
+Host: www.example.com
+Accept: */*
+
+</protocol>
+
+</verify>
+
+</testcase>
diff --git a/tests/data/test1593 b/tests/data/test1593
new file mode 100644
index 000000000..405aa84e5
--- /dev/null
+++ b/tests/data/test1593
@@ -0,0 +1,49 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP replaced headers
+CURLOPT_TIMECONDITION
+If-Modified-Since
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 304 Not Modified
+Date: Thu, 11 Jul 2019 02:26:59 GMT
+Server: test-server/swsclose
+
+</data>
+</reply>
+# Client-side
+<client>
+<server>
+http
+</server>
+<name>
+HTTP custom header overrides CURLOPT_TIMECONDITION
+</name>
+<tool>
+lib1593
+</tool>
+<command>
+http://%HOSTIP:%HTTPPORT/1593
+</command>
+</client>
+
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+# Note here the lack of If-Modified-Since
+<protocol>
+GET /1593 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test188 b/tests/data/test188
index a23a2a11e..d8ca1cd47 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -14,7 +14,7 @@ followlocation
 <data>
 HTTP/1.1 301 OK swsbounce
 Location: /188
-Content-Length: 2
+Content-Length: 3
 
 OK
 </data>
@@ -30,7 +30,7 @@ Actual content
 <datacheck>
 HTTP/1.1 301 OK swsbounce
 Location: /188
-Content-Length: 2
+Content-Length: 3
 
 HTTP/1.1 200 OK 
 Connection: close
diff --git a/tests/data/test189 b/tests/data/test189
index f82b4ad90..65780f804 100644
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -11,7 +11,7 @@ HTTP GET
 <data>
 HTTP/1.1 301 OK swsbounce
 Location: /189
-Content-Length: 2
+Content-Length: 3
 
 OK
 </data>
@@ -26,7 +26,7 @@ Actual content
 <datacheck>
 HTTP/1.1 301 OK swsbounce
 Location: /189
-Content-Length: 2
+Content-Length: 3
 
 HTTP/1.1 200 OK 
 Connection: close
diff --git a/tests/data/test2032 b/tests/data/test2032
index a63e11ef1..ec5771f81 100644
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -99,22 +99,22 @@ chkhostname curlhost
 </strip>
 <protocol>
 GET /20320100 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
 GET /20320100 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
 GET /20320200 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
 GET /20320200 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
diff --git a/tests/data/test651 b/tests/data/test651
index b00ca5d0e..ae6409479 100644
--- a/tests/data/test651
+++ b/tests/data/test651
@@ -57,7 +57,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # (5*12) == 60 bytes less
 <protocol>
 POST /651 HTTP/1.1
-Host: 127.0.0.1:8990
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 17139
 Content-Type: multipart/form-data; boundary=----------------------------
diff --git a/tests/data/test653 b/tests/data/test653
index d620b5761..d7be05923 100644
--- a/tests/data/test653
+++ b/tests/data/test653
@@ -67,7 +67,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # (5*12) == 60 bytes less
 <protocol>
 POST /653 HTTP/1.1
-Host: 127.0.0.1:8990
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 150
 Content-Type: multipart/form-data; boundary=----------------------------
@@ -78,7 +78,7 @@ Content-Disposition: form-data; name="name"
 short value
 --------------------------------
 POST /653 HTTP/1.1
-Host: 127.0.0.1:8990
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 167
 Content-Type: multipart/form-data; boundary=----------------------------