aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-10-26 20:19:27 +0200
committerDaniel Stenberg <daniel@haxx.se>2013-10-26 23:33:06 +0200
commitd44b0142714041b784ffd10792318674ecb1ed56 (patch)
treecad83bbb4196769983345ddf8eb310f9f39f8ca0 /tests
parent469b42335076b15ccfed1db411d3fadca699c39c (diff)
FTP: make the data connection work when going through proxy
This is a regression since the switch to always-multi internally c43127414d89c. Test 1316 was modified since we now clearly call the Curl_client_write() function when doing the LIST transfer part and then the handler->protocol says FTP and ftpc.transfertype is 'A' which implies text converting even though that the response is initially a HTTP CONNECT response in this case.
Diffstat (limited to 'tests')
-rw-r--r--tests/data/test13166
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/data/test1316 b/tests/data/test1316
index 51f58c268..cdf434d5b 100644
--- a/tests/data/test1316
+++ b/tests/data/test1316
@@ -25,9 +25,9 @@ Magic: sure you can FTP me
HTTP/1.1 200 Mighty fine indeed
Magic: sure you can FTP me
-HTTP/1.1 200 Mighty fine indeed
-Magic: sure you can FTP me
-
+HTTP/1.1 200 Mighty fine indeed
+Magic: sure you can FTP me
+
total 20
drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..