Handle unconnected connection resource consistently

vossenfort · Jun 5, 2014 · b1cb86a · b1cb86a
1 parent d89f8c2
commit b1cb86a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/class.smtp.php b/class.smtp.php
@@ -210,7 +210,7 @@ public function connect($host, $port = null, $timeout = 30, $options = array())
             $socket_context
         );
         // Verify we connected properly
-        if (empty($this->smtp_conn)) {
+        if (is_resource($this->smtp_conn)) {
             $this->error = array(
                 'error' => 'Failed to connect to server',
                 'errno' => $errno,
@@ -426,7 +426,7 @@ protected function hmac($data, $key)
      */
     public function connected()
     {
-        if (!empty($this->smtp_conn)) {
+        if (is_resource($this->smtp_conn)) {
             $sock_status = stream_get_meta_data($this->smtp_conn);
             if ($sock_status['eof']) {
                 // the socket is valid but we are not connected
@@ -454,13 +454,12 @@ public function close()
     {
         $this->error = array();
         $this->helo_rply = null;
-        if (!empty($this->smtp_conn)) {
+        if (is_resource($this->smtp_conn)) {
             // close the connection and cleanup
             fclose($this->smtp_conn);
             if ($this->do_debug >= 3) {
                 $this->edebug('Connection: closed');
             }
-            $this->smtp_conn = null;
         }
     }