From c43127414d89ccb9ef6517081f68986d991bcfb3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 17 Jan 2013 12:59:23 +0100
Subject: always-multi: always use non-blocking internals

Remove internal separated behavior of the easy vs multi intercace.
curl_easy_perform() is now using the multi interface itself.

Several minor multi interface quirks and bugs have been fixed in the
process.

Much help with debugging this has been provided by: Yang Tse
---
 tests/data/test1208 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tests/data/test1208')

diff --git a/tests/data/test1208 b/tests/data/test1208
index a0d428b43..504f6c7bb 100644
--- a/tests/data/test1208
+++ b/tests/data/test1208
@@ -36,6 +36,11 @@ FTP PORT download, no data conn and no transient negative reply
 <strippart>
 s/^EPRT \|1\|(.*)/EPRT \|1\|/
 </strippart>
+
+# This test doesn't send a QUIT because the main state machine in multi.c
+# triggers the timeout and sets the CURLE_OPERATION_TIMEDOUT error (28) for
+# which the FTP disconect code generically has to assume could mean the
+# control the connection and thus it cannot send any command.
 <protocol>
 USER anonymous
 PASS ftp@example.com
@@ -44,10 +49,9 @@ EPRT |1|
 TYPE I
 SIZE 1208
 RETR 1208
-QUIT
 </protocol>
 <errorcode>
-12
+28
 </errorcode>
 </verify>
 </testcase>
-- 
cgit v1.2.3