ftp access hangs at ABOR

commit r2573910c is wrong.

Some FTP servers (e.g. vsftpd) deliberately disable asynchronous ABOR requests for security reasons.

And, response to ABOR is never 227.

FTP access needs to

1. send ABOR

2. close data connection if it exists

3. read two responses (typically 426 & 226)

This patch fixes the problem:

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 75878f4..7232cd5 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -791,16 +791,17 @@ static int ftp_StopStream ( vlc_object_t *p_access, access

     if( p_sys->fd_data != -1 )
     {
-        int i_answer;
-        ftp_ReadCommand( p_access, p_sys, &i_answer, NULL );
-        if ( i_answer != 227 )
-            /* If answer is from the previous command,
-             * rathen that succesful ABOR - read next command */
-            ftp_ReadCommand( p_access, p_sys, NULL, NULL );
-
         net_Close( p_sys->fd_data );
         p_sys->fd_data = -1;
     }

+    int i_answer;
+    ftp_ReadCommand( p_access, p_sys, &i_answer, NULL );
+    if ( i_answer != 225 || i_answer != 226 )
+        /* If answer is from the previous command,
+         * rather than from ABOR - read next answer */
+        ftp_ReadCommand( p_access, p_sys, NULL, NULL );
+
+
     return VLC_SUCCESS;
 }

changed milestone to %0.9.2

Fixed in [5a16baa2]

added Status::fixed label

closed