use default timeout of 1 minute

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index f485e9a7b0c6b410c884e53fec0ec44d26a88ae5..6ff5d5a9418f461742cd2ee77ac036c33400097b 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -469,9 +469,15 @@ bool wxFTP::RmFile(const wxString& path)
 class wxInputFTPStream : public wxSocketInputStream
 {
 public:
 class wxInputFTPStream : public wxSocketInputStream
 {
 public:

-    wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
-        : wxSocketInputStream(*sock), m_ftp(ftp_clt)
+    wxInputFTPStream(wxFTP *ftp, wxSocketBase *sock)
+        : wxSocketInputStream(*sock)

     {
     {

+        m_ftp = ftp;
+
+        // FIXME make the timeout configurable
+
+        // set a shorter than default timeout
+        m_i_socket->SetTimeout(60); // 1 minute

     }
 
     size_t GetSize() const { return m_ftpsize; }
     }
 
     size_t GetSize() const { return m_ftpsize; }