Ticket #10522: class-wp-filesystem-ftpext_and_file_without_timeout_error_message.php.patch

class-wp-filesystem-ftpext.php

@@ -16 +16 @@
  */
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
         var $link;
-        var $timeout = 5;
+        var $timeout = 30;
         var $errors = null;
         var $options = array();
 
@@ -43 +43 @@
                 else
                         $this->options['hostname'] = $opt['hostname'];
 
+                if ( isset($opt['connect_timeout']) && ! empty($opt['connect_timeout']) && 0 < intval($opt['connect_timeout']))
+                        $this->timeout = intval($opt['connect_timeout']);
+
                 if ( isset($opt['base']) && ! empty($opt['base']) )
                         $this->wp_base = $opt['base'];
 
@@ -72 +75 @@
                         $this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
                         return false;
                 }
-
+        
                 if ( ! @ftp_login($this->link,$this->options['username'], $this->options['password']) ) {
                         $this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
                         return false;

file.php

@@ -679 +679 @@
         $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']);
         $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
         $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : '');
+        $credentials['connect_timeout'] = defined('FTP_CONNECT_TIMEOUT') ? FTP_CONNECT_TIMEOUT : (!empty($_POST['connect_timeout']) ? $_POST['connect_timeout'] : $credentials['connect_timeout']);
 
         // Check to see if we are setting the public/private keys for ssh
         $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? $_POST['public_key'] : '');