7 files changed, 195 insertions, 3 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a7b4fc1fb..fa02c5a54 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -58,7 +58,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1056 test1057 test1058 test1059 test1060 test1061 test1062 test1063   \
  test1064 test1065 test1066 test1067 test1068 test1069 test1070 test1071   \
  test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079   \
- test1080 test1081
+ test1080 test1081 test1082 test1083 test1084 test1085
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1045 b/tests/data/test1045
index 97f3a7297..fa8ad4b44 100644
--- a/tests/data/test1045
+++ b/tests/data/test1045
@@ -29,7 +29,7 @@ Content-Type: text/plain
 http
 </server>
  <name>
-HTTP GET with localhost --interface
+HTTP GET with numeric localhost --interface
  </name>
  <command>
 http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
diff --git a/tests/data/test1046 b/tests/data/test1046
index 59da6dce4..bc4e5c293 100644
--- a/tests/data/test1046
+++ b/tests/data/test1046
@@ -33,7 +33,7 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET with localhost --interface
+HTTP-IPv6 GET with numeric localhost --interface
  </name>
  <command>
 -g "http://%HOST6IP:%HTTP6PORT/1046" --interface ::1
diff --git a/tests/data/test1082 b/tests/data/test1082
new file mode 100644
index 000000000..d58dd25cd
--- /dev/null
+++ b/tests/data/test1082
@@ -0,0 +1,55 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+--interface
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Mon, 28 Jul 2008 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/plain
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET with localhost --interface
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1082 --interface localhost
+</command>
+<precheck>
+perl -e "print 'Test requires default test server host address' if ( '%CLIENTIP' ne '127.0.0.1' );"
+</precheck>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1082 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test1083 b/tests/data/test1083
new file mode 100644
index 000000000..4a21b9a43
--- /dev/null
+++ b/tests/data/test1083
@@ -0,0 +1,59 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+--interface
+IPv6
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Mon, 28 Jul 2008 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/plain
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<features>
+ipv6
+</features>
+<server>
+http-ipv6
+</server>
+ <name>
+HTTP-IPv6 GET with ip6-localhost --interface
+ </name>
+ <command>
+-g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+</command>
+<precheck>
+perl -e "print 'Test requires default test server host address' if ( '%CLIENT6IP' ne '[::1]' );" && ./server/resolve --ipv6 ip6-localhost
+</precheck>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1083 HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test1084 b/tests/data/test1084
new file mode 100644
index 000000000..fdaa16a74
--- /dev/null
+++ b/tests/data/test1084
@@ -0,0 +1,37 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+--interface
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+ <name>
+HTTP GET with invalid --interface
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1084 --interface non-existing-host.haxx.se.
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+7
+</errorcode>
+</verify>
+</testcase>
diff --git a/tests/data/test1085 b/tests/data/test1085
new file mode 100644
index 000000000..a69a9db64
--- /dev/null
+++ b/tests/data/test1085
@@ -0,0 +1,41 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+--interface
+IPv6
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<features>
+ipv6
+</features>
+<server>
+none
+</server>
+ <name>
+HTTP-IPv6 GET with invalid --interface
+ </name>
+ <command>
+-g "http://%HOST6IP:%HTTP6PORT/1085" --interface non-existing-host.haxx.se.
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+7
+</errorcode>
+</verify>
+</testcase>