From kde-devel  Sun May 16 16:46:18 1999
From: David Faure <faure () alpha ! tat ! physik ! uni-tuebingen ! de>
Date: Sun, 16 May 1999 16:46:18 +0000
To: kde-devel
Subject: Re: kfm upload problems...
X-MARC-Message: https://marc.info/?l=kde-devel&m=92687279602840
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--qDbXVdCdHGoSgWSk"


--qDbXVdCdHGoSgWSk
Content-Type: text/plain; charset=us-ascii

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


--qDbXVdCdHGoSgWSk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ftp.cpp.diff"

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

--qDbXVdCdHGoSgWSk--