[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: kfm upload problems...
From:       David Faure <faure () alpha ! tat ! physik ! uni-tuebingen ! de>
Date:       1999-05-16 16:46:18
[Download RAW message or body]

On Thu, May 13, 1999 at 03:06:22PM +0200, David Faure wrote:
> The attached patch ...
... is now attached

-- 
David FAURE
david.faure@insa-lyon.fr, faure@kde.org
http://www.insa-lyon.fr/People/AEDI/dfaure/index.html 
KDE, Making The Future of Computing Available Today


["ftp.cpp.diff" (text/plain)]

Index: ftp.cpp
===================================================================
RCS file: /home/kde/kdebase/kfm/kioslave/ftp.cpp,v
retrieving revision 1.21.4.4
retrieving revision 1.21.4.5
diff -u -p -r1.21.4.4 -r1.21.4.5
--- ftp.cpp	1999/04/06 14:37:47	1.21.4.4
+++ ftp.cpp	1999/05/13 15:06:35	1.21.4.5
@@ -549,10 +549,16 @@ int KProtocolFTP::OpenConnection( const 
     buf.sprintf("type %c",mode);
     if ( !ftpSendCmd( buf, '2' ) ) return Error(KIO_ERROR_CouldNotConnect,
 				"Could not set ftp to correct mode for transmission");
-#ifdef DONT_TRY_PASV // never defined - define if you don't want to try PASV first
+
+#ifndef DONT_TRY_PASV // never defined - define if you don't want to try PASV first
+  if (!strcmp(command,"stor")) // no passive mode for uploading
+  {
+#endif
     if ( !ftpPort() ) return Error(KIO_ERROR_CouldNotConnect,
 				"Could not setup ftp data port", errno);
-#else
+#ifndef DONT_TRY_PASV
+  }
+  else
     if ( !ftpPasv() ) return Error(KIO_ERROR_CouldNotConnect,
 				"Could not setup ftp data port", errno);
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]