Changeset 11823

Timestamp:

08/15/2009 12:01:04 PM (15 years ago)

Author:

azaozz

Message:

Add constants for ftp connections timeouts, props dd32, see #10522

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-ftpext.php (modified) (4 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (4 diffs)
• class-wp-filesystem-ssh2.php (modified) (2 diffs)
• file.php (modified) (1 diff)

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

@@ -17 +17 @@
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
     var $link;
-    var $timeout = 5;
     var $errors = null;
     var $options = array();
@@ -34 +33 @@
 
         // Set defaults:
+        //This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
+
+        if ( ! defined('FS_TIMEOUT') )
+            define('FS_TIMEOUT', 240);
+
         if ( empty($opt['port']) )
             $this->options['port'] = 21;
@@ -65 +69 @@
     function connect() {
         if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-            $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], $this->timeout);
-        else
-            $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], $this->timeout);
+            $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+        else
+            $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 
         if ( ! $this->link ) {
@@ -81 +85 @@
         //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);
 
         return true;

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

@@ -17 +17 @@
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
     var $ftp = false;
-    var $timeout = 5;
     var $errors = null;
     var $options = array();
@@ -62 +61 @@
             return false;
 
-        //$this->ftp->Verbose = true;
+        $this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 
         if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port']) ) {
@@ -68 +67 @@
             return false;
         }
+
         if ( ! $this->ftp->connect() ) {
             $this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
@@ -80 +80 @@
         $this->ftp->SetType(FTP_AUTOASCII);
         $this->ftp->Passive(true);
+        $this->ftp->setTimeout(FS_TIMEOUT);
         return true;
     }

trunk/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -46 +46 @@
     var $sftp_link = false;
     var $keys = false;
-    /*
-     * This is the timeout value for ssh results.
-     * Slower servers might need this incressed, but this number otherwise should not change.
-     *
-     * @parm $timeout int
-     *
-     */
-    var $timeout = 15;
     var $errors = array();
     var $options = array();
@@ -149 +141 @@
         } else {
             stream_set_blocking( $stream, true );
-            stream_set_timeout( $stream, $this->timeout );
+            stream_set_timeout( $stream, FS_TIMEOUT );
             $data = stream_get_contents( $stream );
             fclose( $stream );

trunk/wp-admin/includes/file.php

@@ -606 +606 @@
     $wp_filesystem = new $method($args);
 
+    //Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
+    if ( ! defined('FS_CONNECT_TIMEOUT') )
+        define('FS_CONNECT_TIMEOUT', 30);
+    if ( ! defined('FS_TIMEOUT') )
+        define('FS_TIMEOUT', 30);
+
     if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
         return false;