3 files changed, 58 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 468369282..9ecfa8136 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Daniel Fandrich (7 Aug 2008)
 - Fixed an uninitialized variable in multi_runsingle() that could cause a
   request to prematurely end.
 
+- Added test1059 to test the FTP proxy tunnel problem fixed July 11.
+
 Yang Tse (7 Aug 2008)
 - Added curlbuild.h and curlrules.h header files to libcurl's public headers.
   File curlbuild.h is a generated file on configure-capable systems. This is
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 46199f944..9a44698ab 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1033 test539 test1034 test1035 test1036 test1037 test1038 test1039    \
  test1040 test1041 test1042 test1043 test1044 test1045 test1046 test1047   \
  test1048 test1049 test1050 test1051 test1052 test1053 test1054 test1055   \
- test1056 test1057 test1058
+ test1056 test1057 test1058 test1059
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1059 b/tests/data/test1059
new file mode 100644
index 000000000..0e55a5842
--- /dev/null
+++ b/tests/data/test1059
@@ -0,0 +1,55 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP CONNECT
+proxytunnel
+FTP
+FAILURE
+</keywords>
+
+</info>
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 501 Method not implemented swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+Content-Length: 0
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP CONNECT with proxytunnel to unsupported FTP URL
+ </name>
+ <command>
+ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+# The server doesn't implement CONNECT for ftp, so this must be a failure test
+<errorcode>
+56
+</errorcode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+CONNECT test-number:1059 HTTP/1.0
+Host: test-number:1059
+Proxy-Connection: Keep-Alive
+
+</protocol>
+</verify>
+</testcase>