Changeset 11823 for trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

Timestamp:

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

Author:

azaozz

Message:

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

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (4 diffs)

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;