Ticket #10522: 10522.3.diff

wp-admin/includes/file.php

@@ -609 +609 @@
         if ( ! defined('FS_CONNECT_TIMEOUT') )
                 define('FS_CONNECT_TIMEOUT', 30);
         if ( ! defined('FS_TIMEOUT') )
-                define('FS_TIMEOUT', 30);
+                define('FS_TIMEOUT', 300);
 
         if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
                 return false;

wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -28 +28 @@
                                 return false;
                 $this->ftp = new ftp();
 
+                //FTP uses the timeout on a per-connection basis, Others use it on a per-action basis.
+                if ( ! defined('FS_TIMEOUT') )
+                        define('FS_TIMEOUT', 300);
+
                 //Set defaults:
                 if ( empty($opt['port']) )
                         $this->options['port'] = 21;

wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -29 +29 @@
                         return false;
                 }
 
-                // Set defaults:
-                //This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
-
+                //FTP uses the timeout on a per-connection basis, Others use it on a per-action basis.
                 if ( ! defined('FS_TIMEOUT') )
-                        define('FS_TIMEOUT', 240);
+                        define('FS_TIMEOUT', 300);
 
+                // Set defaults:
                 if ( empty($opt['port']) )
                         $this->options['port'] = 21;
                 else
@@ -82 +81 @@
 
                 //Set the Connection to use Passive FTP
                 @ftp_pasv( $this->link, true );
-                if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FTP_TIMEOUT )
-                        @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FTP_TIMEOUT);
+                if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+                        @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 
                 return true;
         }