Commit 73ec9d3b authored by Marian Durkovic's avatar Marian Durkovic Committed by Derk-Jan Hartman

Don't hang VLC on ABOR in FTP access (closes #2027)

Signed-off-by: default avatarDerk-Jan Hartman <hartman@videolan.org>
(cherry picked from commit 5a16baa2)
parent 8ad8bb3d
......@@ -791,16 +791,13 @@ static int ftp_StopStream ( vlc_object_t *p_access, access_sys_t *p_sys )
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;
/* Read the final response from RETR/STOR, i.e. 426 or 226 */
ftp_ReadCommand( p_access, p_sys, NULL, NULL );
}
/* Read the response from ABOR, i.e. 226 or 225 */
ftp_ReadCommand( p_access, p_sys, NULL, NULL );
return VLC_SUCCESS;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment