[Svn] r4547 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Tue Feb 15 14:24:47 CET 2011


Author: alec
Date: 2011-02-15 07:24:47 -0600 (Tue, 15 Feb 2011)
New Revision: 4547

Modified:
   trunk/roundcubemail/program/include/rcmail.php
Log:
- Close IMAP connection after SMTP, per discussion in (#1485975)


Modified: trunk/roundcubemail/program/include/rcmail.php
===================================================================
--- trunk/roundcubemail/program/include/rcmail.php	2011-02-15 12:26:26 UTC (rev 4546)
+++ trunk/roundcubemail/program/include/rcmail.php	2011-02-15 13:24:47 UTC (rev 4547)
@@ -1060,9 +1060,6 @@
    */
   public function shutdown()
   {
-    if (is_object($this->imap))
-      $this->imap->close();
-
     if (is_object($this->smtp))
       $this->smtp->disconnect();
 
@@ -1073,6 +1070,9 @@
         $book->close();
     }
 
+    if (is_object($this->imap))
+      $this->imap->close();
+
     // before closing the database connection, write session data
     if ($_SERVER['REMOTE_ADDR'])
       session_write_close();

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list