33 files changed, 266 insertions, 239 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3f8196d57..c3c68cae3 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -59,8 +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	   \
- test574 test575 test576 test577 test1113 test1114 test1089 test1090	   \
+ test635 test636 test637 test1086 test1087 test1088	   \
+ test574 test575 test576 test1113 test1114 test1089 test1090	   \
  test1091 test1092 test1093 test1094 test1095 test1096 test1097 test560	   \
  test561 test1098 test1099 test562 test563 test1100 test564 test1101	   \
  test1102 test1103 test1104 test299 test310 test311 test312 test1105	   \
@@ -70,7 +70,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test313 test1115 test578 test579 test1116 test1200 test1201 test1202	   \
  test1203 test1117 test1118 test1119 test1120 test1300 test1301 test1302 \
  test1303 test320 test321 test322 test323 test324 test1121 test581 test580 \
- test1304
+ test1304 test1305 test1306 test1307 test582 test583
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1008 b/tests/data/test1008
index 5334f856e..251a6e8f6 100644
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -93,7 +93,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
+http://test.remote.example.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -106,19 +106,19 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se:1008 HTTP/1.1
-Host: test.remote.haxx.se:1008
+CONNECT test.remote.example.com:1008 HTTP/1.1
+Host: test.remote.example.com:1008
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se:1008 HTTP/1.1
-Host: test.remote.haxx.se:1008
+CONNECT test.remote.example.com:1008 HTTP/1.1
+Host: test.remote.example.com:1008
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
 Proxy-Connection: Keep-Alive
 
 GET /path/10080002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.haxx.se:1008
+Host: test.remote.example.com:1008
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test1021 b/tests/data/test1021
index 5ab772878..1979f7507 100644
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -102,7 +102,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel
+http://test.remote.example.com:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -115,23 +115,23 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se:1021 HTTP/1.1
-Host: test.remote.haxx.se:1021
+CONNECT test.remote.example.com:1021 HTTP/1.1
+Host: test.remote.example.com:1021
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se:1021 HTTP/1.1
-Host: test.remote.haxx.se:1021
+CONNECT test.remote.example.com:1021 HTTP/1.1
+Host: test.remote.example.com:1021
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se:1021 HTTP/1.1
-Host: test.remote.haxx.se:1021
+CONNECT test.remote.example.com:1021 HTTP/1.1
+Host: test.remote.example.com:1021
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
 Proxy-Connection: Keep-Alive
 
 GET /path/10210002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.haxx.se:1021
+Host: test.remote.example.com:1021
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test130 b/tests/data/test130
index 43ab24c09..fbcf5251b 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -30,9 +30,6 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 ftp
 </server>
@@ -40,7 +37,7 @@ ftp
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc ftp://%HOSTIP:%FTPPORT/
 </command>
 <file name="log/netrc" >
 # the following two lines were created while testing curl
diff --git a/tests/data/test1305 b/tests/data/test1305
new file mode 100644
index 000000000..91149b3ad
--- /dev/null
+++ b/tests/data/test1305
@@ -0,0 +1,30 @@
+<testcase>
+<!-- This replaces test 558 -->
+<info>
+<keywords>
+unittest
+hash
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+ <name>
+internal hash create/destroy testing
+ </name>
+<tool>
+unit1305
+</tool>
+<command>
+1305
+</command>
+</client>
+
+</testcase>
diff --git a/tests/data/test1306 b/tests/data/test1306
new file mode 100644
index 000000000..b490efb51
--- /dev/null
+++ b/tests/data/test1306
@@ -0,0 +1,30 @@
+<testcase>
+<!-- This replaces test 559 -->
+<info>
+<keywords>
+unittest
+hash
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+ <name>
+internal hash create/add/destroy testing
+ </name>
+<tool>
+unit1305
+</tool>
+<command>
+1306
+</command>
+</client>
+
+</testcase>
diff --git a/tests/data/test1307 b/tests/data/test1307
new file mode 100644
index 000000000..82ed3c07f
--- /dev/null
+++ b/tests/data/test1307
@@ -0,0 +1,27 @@
+<testcase>
+<!-- This replaces test 577 -->
+<info>
+<keywords>
+unittest
+wildcardmatch
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+ <name>
+internal Curl_fnmatch() testing
+ </name>
+<tool>
+unit1307
+</tool>
+</client>
+
+</testcase>
diff --git a/tests/data/test131 b/tests/data/test131
index 4e9ba6d9a..ad7f9e22a 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -31,9 +31,6 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 ftp
 </server>
@@ -41,7 +38,7 @@ ftp
 FTP (optional .netrc; user/no pass) dir list PASV
  </name>
  <command>
---netrc-optional ftp://user2@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc ftp://user2@%HOSTIP:%FTPPORT/
 </command>
 <file name="log/netrc" >
 # the following two lines were created while testing curl
diff --git a/tests/data/test132 b/tests/data/test132
index 2ff39fb9a..8d9e3ed60 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -30,9 +30,6 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 ftp
 </server>
@@ -40,7 +37,7 @@ ftp
 FTP (optional .netrc; user/passwd supplied) dir list PASV
  </name>
  <command>
---netrc-optional ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
 <file name="log/netrc" >
 # the following two lines were created while testing curl
diff --git a/tests/data/test133 b/tests/data/test133
index 2e6b2c3a4..a15cfc371 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -30,9 +30,6 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 ftp
 </server>
@@ -40,7 +37,7 @@ ftp
 FTP (compulsory .netrc; ignored user/passwd) dir list PASV
  </name>
  <command>
--n ftp://mary:mark@%HOSTIP:%FTPPORT/
+-n --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
 <file name="log/netrc" >
 # the following two lines were created while testing curl
diff --git a/tests/data/test134 b/tests/data/test134
index 8ff9c1902..83035849e 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -30,9 +30,6 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 ftp
 </server>
@@ -40,7 +37,7 @@ ftp
 FTP (optional .netrc; programmatic user/passwd) dir list PASV
  </name>
  <command>
---netrc-optional -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
 <file name="log/netrc" >
 # the following two lines were created while testing curl
diff --git a/tests/data/test209 b/tests/data/test209
index 81cdcbd84..b248faf9f 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -86,7 +86,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
+http://test.remote.example.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -99,19 +99,19 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se:209 HTTP/1.1
-Host: test.remote.haxx.se:209
+CONNECT test.remote.example.com:209 HTTP/1.1
+Host: test.remote.example.com:209
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se:209 HTTP/1.1
-Host: test.remote.haxx.se:209
+CONNECT test.remote.example.com:209 HTTP/1.1
+Host: test.remote.example.com:209
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
 Proxy-Connection: Keep-Alive
 
 GET /path/2090002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.haxx.se:209
+Host: test.remote.example.com:209
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test213 b/tests/data/test213
index bb7763bb6..55b20b0d8 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -86,7 +86,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.example.com:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -99,19 +99,19 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol nonewline="yes">
-CONNECT test.remote.haxx.se:213 HTTP/1.0
-Host: test.remote.haxx.se:213
+CONNECT test.remote.example.com:213 HTTP/1.0
+Host: test.remote.example.com:213
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se:213 HTTP/1.0
-Host: test.remote.haxx.se:213
+CONNECT test.remote.example.com:213 HTTP/1.0
+Host: test.remote.example.com:213
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
 Proxy-Connection: Keep-Alive
 
 POST /path/2130002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.haxx.se:213
+Host: test.remote.example.com:213
 Accept: */*
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test217 b/tests/data/test217
index f28800853..4b1bed9c9 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -32,7 +32,7 @@ http
 HTTP proxy CONNECT to proxy returning 405
  </name>
  <command>
-http://test.remote.haxx.se:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
+http://test.remote.example.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
 </command>
 </client>
 
@@ -42,8 +42,8 @@ http://test.remote.haxx.se:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --p
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se:217 HTTP/1.1
-Host: test.remote.haxx.se:217
+CONNECT test.remote.example.com:217 HTTP/1.1
+Host: test.remote.example.com:217
 Proxy-Connection: Keep-Alive
 
 </protocol>
diff --git a/tests/data/test257 b/tests/data/test257
index c211c2f47..cc3b7f00a 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -64,9 +64,6 @@ If this is received, the location following worked
 
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 http
 </server>
@@ -74,7 +71,7 @@ http
 HTTP Location: following with --netrc-optional
  </name>
  <command>
-http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional
+http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc
 </command>
 
 # netrc auth for two out of three sites:
diff --git a/tests/data/test265 b/tests/data/test265
index 18d20a60a..dfac8bfaf 100644
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -89,7 +89,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.example.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,19 +102,19 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol nonewline="yes">
-CONNECT test.remote.haxx.se:265 HTTP/1.1
-Host: test.remote.haxx.se:265
+CONNECT test.remote.example.com:265 HTTP/1.1
+Host: test.remote.example.com:265
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se:265 HTTP/1.1
-Host: test.remote.haxx.se:265
+CONNECT test.remote.example.com:265 HTTP/1.1
+Host: test.remote.example.com:265
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
 Proxy-Connection: Keep-Alive
 
 POST /path/2650002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.haxx.se:265
+Host: test.remote.example.com:265
 Accept: */*
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test287 b/tests/data/test287
index 30f5834d5..323d3f392 100644
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -29,15 +29,15 @@ http
 HTTP proxy CONNECT with custom User-Agent header
  </name>
  <command>
-http://test.remote.haxx.se:287/path/287 -H "User-Agent: looser/2007" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
+http://test.remote.example.com:287/path/287 -H "User-Agent: looser/2007" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se:287 HTTP/1.1
-Host: test.remote.haxx.se:287
+CONNECT test.remote.example.com:287 HTTP/1.1
+Host: test.remote.example.com:287
 Proxy-Connection: Keep-Alive
 User-Agent: looser/2007
 
diff --git a/tests/data/test523 b/tests/data/test523
index 6c1efbd5d..bae7e6ffa 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -39,7 +39,7 @@ HTTP GET with proxy and CURLOPT_PORT
  </name>
 # first URL then proxy
  <command>
-http://www.haxx.se:999/523 http://%HOSTIP:%HTTPPORT 
+http://www.example.com:999/523 http://%HOSTIP:%HTTPPORT 
 </command>
 </client>
 
@@ -50,9 +50,9 @@ http://www.haxx.se:999/523 http://%HOSTIP:%HTTPPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET HTTP://www.haxx.se:19999/523 HTTP/1.1
+GET HTTP://www.example.com:19999/523 HTTP/1.1
 Authorization: Basic eHh4Onl5eQ==
-Host: www.haxx.se:19999
+Host: www.example.com:19999
 Accept: */*
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test540 b/tests/data/test540
index 7c5b9a86d..c99f9a0a8 100644
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -64,7 +64,7 @@ crypto
 HTTP proxy auth Digest multi API re-using connection
  </name>
  <command>
-http://test.remote.haxx.se/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
+http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
 </command>
 </client>
 
@@ -74,18 +74,18 @@ http://test.remote.haxx.se/path/540 http://%HOSTIP:%HTTPPORT silly:person custom
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-GET http://test.remote.haxx.se/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/540 HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: custom.set.host.name
 
-GET http://test.remote.haxx.se/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/540 HTTP/1.1
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: custom.set.host.name
 
-GET http://test.remote.haxx.se/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/540 HTTP/1.1
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test547 b/tests/data/test547
index d1e26040a..7bcf5a4d4 100644
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -87,7 +87,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 <precheck>
 chkhostname curlhost
@@ -100,28 +100,28 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-POST http://test.remote.haxx.se/path/547 HTTP/1.1
+POST http://test.remote.example.com/path/547 HTTP/1.1
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.haxx.se/path/547 HTTP/1.1
+POST http://test.remote.example.com/path/547 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.haxx.se/path/547 HTTP/1.1
+POST http://test.remote.example.com/path/547 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAIYrD1xJmhNBNL9fLzuk9PV9436GAxPu0EKWzqQ/sZDVLXnp1JrySgl8A+cibE6z4HMxbGx5Y3VybGhvc3Q=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test548 b/tests/data/test548
index c4942e602..a6e2a9bf2 100644
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -87,7 +87,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 <precheck>
 chkhostname curlhost
@@ -100,28 +100,28 @@ chkhostname curlhost
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-POST http://test.remote.haxx.se/path/548 HTTP/1.1
+POST http://test.remote.example.com/path/548 HTTP/1.1
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.haxx.se/path/548 HTTP/1.1
+POST http://test.remote.example.com/path/548 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.haxx.se/path/548 HTTP/1.1
+POST http://test.remote.example.com/path/548 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAIYrD1xJmhNBNL9fLzuk9PV9436GAxPu0EKWzqQ/sZDVLXnp1JrySgl8A+cibE6z4HMxbGx5Y3VybGhvc3Q=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test549 b/tests/data/test549
index 298d0ad98..e4bd6bf2c 100644
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -41,7 +41,7 @@ FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE
  </name>
 # first URL then proxy
  <command>
-ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT 
+ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT 
 </command>
 </client>
 
@@ -52,8 +52,8 @@ ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET ftp://www.haxx.se/moo/549;type=i HTTP/1.1
-Host: www.haxx.se:21
+GET ftp://www.example.com/moo/549;type=i HTTP/1.1
+Host: www.example.com:21
 Accept: */*
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test550 b/tests/data/test550
index c99cf4bed..e9605d6cd 100644
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -41,7 +41,7 @@ FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
  </name>
 # first URL then proxy
  <command>
-ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii
+ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>
 
@@ -52,8 +52,8 @@ ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii
 ^User-Agent:.*
 </strip>
 <protocol>
-GET ftp://www.haxx.se/moo/550;type=a HTTP/1.1
-Host: www.haxx.se:21
+GET ftp://www.example.com/moo/550;type=a HTTP/1.1
+Host: www.example.com:21
 Accept: */*
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test551 b/tests/data/test551
index 8027d91cf..4f5220a26 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -66,7 +66,7 @@ lib547
 HTTP proxy auth Digest with POST data from read callback
  </name>
  <command>
-http://test.remote.haxx.se/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
@@ -76,17 +76,17 @@ http://test.remote.haxx.se/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-POST http://test.remote.haxx.se/path/551 HTTP/1.1
-Host: test.remote.haxx.se
+POST http://test.remote.example.com/path/551 HTTP/1.1
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.haxx.se/path/551 HTTP/1.1
+POST http://test.remote.example.com/path/551 HTTP/1.1
 Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c"
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test552 b/tests/data/test552
index b0db37c1e..a974fc5cb 100644
--- a/tests/data/test552
+++ b/tests/data/test552
diff --git a/tests/data/test555 b/tests/data/test555
index 32223452e..bf06b524d 100644
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.haxx.se/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 <precheck>
 chkhostname curlhost
@@ -109,28 +109,28 @@ chkhostname curlhost
 s/^(this is the blurb we want to upload)\r\n/$1\n/ if($has_charconv)
 </strippart>
 <protocol>
-POST http://test.remote.haxx.se/path/555 HTTP/1.1
+POST http://test.remote.example.com/path/555 HTTP/1.1
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.haxx.se/path/555 HTTP/1.1
+POST http://test.remote.example.com/path/555 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.haxx.se/path/555 HTTP/1.1
+POST http://test.remote.example.com/path/555 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAIYrD1xJmhNBNL9fLzuk9PV9436GAxPu0EKWzqQ/sZDVLXnp1JrySgl8A+cibE6z4HMxbGx5Y3VybGhvc3Q=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.haxx.se
+Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test558 b/tests/data/test558
deleted file mode 100644
index 5b69ea027..000000000
--- a/tests/data/test558
+++ /dev/null
@@ -1,44 +0,0 @@
-<testcase>
-#
-# Server-side
-<reply>
-</reply>
-
-# Client-side
-<client>
-<server>
-none
-</server>
-# tool is what to use instead of 'curl'
-<tool>
-lib558
-</tool>
-# precheck is a command line to run before the test,
-# to see if we can execute the test or not
-<precheck>
-./libtest/lib558 check
-</precheck>
-
-<name>
-internal hash create/destroy testing
-</name>
-<command>
-nothing
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-<stdout mode="text">
-easy handle init OK
-creating hash...
-hash creation OK
-destroying hash...
-hash destruction OK
-destroying easy handle...
-easy handle destruction OK
-</stdout>
-</verify>
-
-</testcase>
diff --git a/tests/data/test559 b/tests/data/test559
deleted file mode 100644
index ecaf54c7e..000000000
--- a/tests/data/test559
+++ /dev/null
@@ -1,44 +0,0 @@
-<testcase>
-#
-# Server-side
-<reply>
-</reply>
-
-# Client-side
-<client>
-<server>
-none
-</server>
-# tool is what to use instead of 'curl'
-<tool>
-lib559
-</tool>
-# precheck is a command line to run before the test,
-# to see if we can execute the test or not
-<precheck>
-./libtest/lib559 check
-</precheck>
-
-<name>
-internal hash create/add/destroy testing
-</name>
-<command>
-nothing
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-<stdout mode="text">
-easy handle init OK
-creating hash...
-hash creation OK
-destroying hash...
-hash destruction OK
-destroying easy handle...
-easy handle destruction OK
-</stdout>
-</verify>
-
-</testcase>
diff --git a/tests/data/test561 b/tests/data/test561
index 18e827c10..8f069e6ed 100644
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -42,7 +42,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
  </name>
 # first URL then proxy
  <command>
-"ftp://www.haxx.se/moo/561;type=i" http://%HOSTIP:%HTTPPORT ascii
+"ftp://www.example.com/moo/561;type=i" http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>
 
@@ -53,8 +53,8 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 ^User-Agent:.*
 </strip>
 <protocol>
-GET ftp://www.haxx.se/moo/561;type=i HTTP/1.1
-Host: www.haxx.se:21
+GET ftp://www.example.com/moo/561;type=i HTTP/1.1
+Host: www.example.com:21
 Accept: */*
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test568 b/tests/data/test568
index d746e96dd..0f8440fbd 100644
--- a/tests/data/test568
+++ b/tests/data/test568
@@ -27,7 +27,7 @@ Content-Type: application/sdp
 v=0
 s=rtspd SDP
 i=A fake SDP reply
-u=http://www.curl.haxx.se/fakesdp.ps
+u=http://www.curl.example.com/fakesdp.ps
 </data2>
 <data3>
 RTSP/1.0 200 Okie Dokie
diff --git a/tests/data/test577 b/tests/data/test577
deleted file mode 100644
index 7a69ead20..000000000
--- a/tests/data/test577
+++ /dev/null
@@ -1,43 +0,0 @@
-<testcase>
-<info>
-<keywords>
-wildcardmatch
-</keywords>
-</info>
-#
-# Server-side
-<reply>
-</reply>
-
-# Client-side
-<client>
-<server>
-none
-</server>
-# tool is what to use instead of 'curl'
-<tool>
-lib577
-</tool>
-# precheck is a command line to run before the test,
-# to see if we can execute the test or not
-<precheck>
-./libtest/lib577 check
-</precheck>
-
- <name>
-Curl_fnmatch() testing
- </name>
- <command>
-nothing
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-<stdout mode="text">
-===========================
-===========================
-</stdout>
-</verify>
-</testcase>
diff --git a/tests/data/test582 b/tests/data/test582
new file mode 100644
index 000000000..8881a87d7
--- /dev/null
+++ b/tests/data/test582
@@ -0,0 +1,46 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+multi
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+sftp
+</server>
+<tool>
+lib582
+</tool>
+ <name>
+SFTP upload using multi interface
+ </name>
+ <command>
+Sftp://%HOSTIP:%SSHPORT%PWD/log/upload582.txt %PWD/log/file582.txt %USER:
+</command>
+<file name="log/file582.txt">
+Moooooooooooo
+ upload this
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+</protocol>
+<file name="log/file582.txt">
+Moooooooooooo
+ upload this
+</file>
+</verify>
+</testcase>
diff --git a/tests/data/test583 b/tests/data/test583
new file mode 100644
index 000000000..2129ee729
--- /dev/null
+++ b/tests/data/test583
@@ -0,0 +1,43 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+multi
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+sftp
+</server>
+<tool>
+lib583
+</tool>
+ <name>
+SFTP with multi interface, remove handle early
+ </name>
+
+# The command here uses 'localhost' just to make sure that curl_multi_perform
+# won't reach too far in the first invoke. When using c-ares at least, the
+# name resolve will cause it to return rather quickly and thus we could trigger
+# the problem we're looking to verify.
+ <command>
+sftp://localhost:%SSHPORT%PWD/log/upload583.txt %USER:
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+</protocol>
+</verify>
+</testcase>