Changeset 3684 in subversion

Timestamp:

May 28, 2010 9:54:32 AM (3 years ago)

Author:

alec

Message:

• Add 'imap_timeout' option (#1486760)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (2 diffs)
• program/include/rcmail.php (modified) (1 diff)
• program/include/rcube_imap_generic.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Add 'imap_timeout' option (#1486760)
 - Fix forwarding of messages with winmail attachments
 - Fix handling of uuencoded attachments in message body (#1485839)

trunk/roundcubemail/config/main.inc.php.dist

@@ -81 +81 @@
 $rcmail_config['imap_force_caps'] = false;
 
+// IMAP connection timeout, in seconds. Default: 0 (no limit)
+$rcmail_config['imap_timeout'] = 0;
+
 // ----------------------------------
 // SMTP
@@ -111 +114 @@
 // localhost if that isn't defined. 
 $rcmail_config['smtp_helo_host'] = '';
+
+// SMTP connection timeout, in seconds. Default: 0 (no limit)
+$rcmail_config['smtp_timeout'] = 0;
 
 // ----------------------------------

trunk/roundcubemail/program/include/rcmail.php

@@ -429 +429 @@
     $options = array(
       'auth_method' => $this->config->get('imap_auth_type', 'check'),
-      'delimiter' => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
-      'rootdir' => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),
-      'debug_mode' => (bool) $this->config->get('imap_debug', 0),
-      'force_caps' => (bool) $this->config->get('imap_force_caps'),
+      'delimiter'   => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
+      'rootdir'     => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),
+      'debug_mode'  => (bool) $this->config->get('imap_debug', 0),
+      'force_caps'  => (bool) $this->config->get('imap_force_caps'),
+      'timeout'     => (int) $this->config->get('imap_timeout', 0),
     );
 

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -612 +612 @@
             }
 
-            $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, 10);
+        // Connect
+        if ($this->prefs['timeout'] > 0)
+                $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']);
+            else
+                $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr);
+
             if (!$this->fp) {
                 $this->error    = sprintf("Could not connect to %s:%d: %s", $host, $this->prefs['port'], $errstr);
@@ -619 +624 @@
             }
 
-            stream_set_timeout($this->fp, 10);
+        if ($this->prefs['timeout'] > 0)
+                stream_set_timeout($this->fp, $this->prefs['timeout']);
+
             $line = trim(fgets($this->fp, 8192));