Changeset 462de2d in github

Timestamp:

Apr 17, 2011 5:22:03 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

968754b

Parents:

f62468d

Message:

• PEAR::Net_SMTP 1.5.2, fixed timeout issue (#1487843)

Files:

• CHANGELOG (modified) (2 diffs)
• program/include/rcube_smtp.php (modified) (2 diffs)
• program/lib/Net/SMTP.php (modified) (6 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- PEAR::Net_SMTP 1.5.2, fixed timeout issue (#1487843)
 - Added plugin hook for request token creation
 - Replace LDAP vars in group queries (#1487837)
@@ -18 +19 @@
 - TinyMCE 3.4.1
 - Stateless request tokens. No keep-alive necessary on login page (#1487829)
-- PEAR::Net_SMTP 1.5.1
 - Allow multiple concurrent compose sessions
 - Force names of unique constraints in PostgreSQL DDL

program/include/rcube_smtp.php

@@ -106 +106 @@
     $this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
 
-    if($RCMAIL->config->get('smtp_debug'))
+    if ($RCMAIL->config->get('smtp_debug'))
       $this->conn->setDebug(true, array($this, 'debug_handler'));
 
@@ -117 +117 @@
       $this->conn = null;
       return false;
+    }
+
+    // workaround for timeout bug in Net_SMTP 1.5.[0-1] (#1487843)
+    if (method_exists($this->conn, 'setTimeout')
+      && ($timeout = ini_get('default_socket_timeout'))
+    ) {
+      $this->conn->setTimeout($timeout);
     }
 

program/lib/Net/SMTP.php

@@ -107 +107 @@
 
     /**
+     * Array of socket options that will be passed to Net_Socket::connect().
+     * @see stream_context_create()
+     * @var array
+     * @access private
+     */
+    var $_socket_options = null;
+
+    /**
      * The socket I/O timeout value in seconds.
      * @var int
@@ -157 +165 @@
      * @param boolean $pipeling   Use SMTP command pipelining
      * @param integer $timeout    Socket I/O timeout in seconds.
+     * @param array   $socket_options Socket stream_context_create() options.
      *
      * @access  public
@@ -162 +171 @@
      */
     function Net_SMTP($host = null, $port = null, $localhost = null,
-        $pipelining = false, $timeout = 0)
+        $pipelining = false, $timeout = 0, $socket_options = null)
     {
         if (isset($host)) {
@@ -176 +185 @@
 
         $this->_socket = new Net_Socket();
+        $this->_socket_options = $socket_options;
         $this->_timeout = $timeout;
 
@@ -406 +416 @@
         $this->_greeting = null;
         $result = $this->_socket->connect($this->host, $this->port,
-                                          $persistent, $timeout);
+                                          $persistent, $timeout,
+                                          $this->_socket_options);
         if (PEAR::isError($result)) {
             return PEAR::raiseError('Failed to connect socket: ' .
@@ -418 +429 @@
          * and all other socket operations.
          */
-        if (PEAR::isError($error = $this->setTimeout($this->_timeout))) {
-            return $error;
+        if ($this->_timeout > 0) {
+            if (PEAR::isError($error = $this->setTimeout($this->_timeout))) {
+                return $error;
+            }
         }