From 7092d93f913fd49e9b34e50f30eb856226b28dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org> Date: Fri, 10 Mar 2006 23:19:18 +0000 Subject: [PATCH] Tell user we disabled EPSV mode _before_ reconnecting so (s)he doesn't get confused --- modules/access/ftp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 246ebe8e6de0..7a1eeb9c6c6f 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -1,7 +1,7 @@ /***************************************************************************** * ftp.c: FTP input module ***************************************************************************** - * Copyright (C) 2001-2005 the VideoLAN team + * Copyright (C) 2001-2006 the VideoLAN team * $Id$ * * Authors: Laurent Aimar <fenrir@via.ecp.fr> - original code @@ -264,12 +264,12 @@ static int Open( vlc_object_t *p_this ) p_sys->fd_cmd = -1; *p_sys->sz_epsv_ip = '\0'; + msg_Info( p_access, "FTP Extended passive mode disabled" ); + if( ( p_sys->fd_cmd = Connect( p_access, p_sys ) ) < 0 ) goto exit_error; - - msg_Info( p_access, "FTP Extended passive mode disabled" ); } - + /* binary mode */ if( ftp_SendCommand( p_access, "TYPE I" ) < 0 || ftp_ReadCommand( p_access, &i_answer, NULL ) != 2 ) -- GitLab