From b2954e66e87be7414a4508f8167ca531e653bea8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 4 Nov 2012 18:22:48 +0100 Subject: FTP: prevent the multi interface from blocking As pointed out in Bug report #3579064, curl_multi_perform() would wrongly use a blocking mechanism internally for some commands which could lead to for example a very long block if the LIST response never showed. The solution was to make sure to properly continue to use the multi interface non-blocking state machine. The new test 1501 verifies the fix. Bug: http://curl.haxx.se/bug/view.cgi?id=3579064 Reported by: Guido Berhoerster --- tests/data/test592 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/data/test592') diff --git a/tests/data/test592 b/tests/data/test592 index 487290dd4..23aa6c465 100644 --- a/tests/data/test592 +++ b/tests/data/test592 @@ -52,6 +52,7 @@ Moooooooooooo for 592 s/^PORT (.*)/PORT/ s/^EPRT \|1\|(.*)/EPRT \|1\|/ +# a 421 response must prevent further commands from being sent USER anonymous PASS ftp@example.com @@ -61,10 +62,10 @@ EPRT |1| PORT TYPE I STOR 592 -QUIT +# 28 == CURLE_OPERATION_TIMEDOUT -10 +28 -- cgit v1.2.3