Merge pull request #13 from ashnazg/bug20513

Bug #20513: Mail_smtp::send() doesn't close socket for smtp connection [patch by e79ene]

Mail/smtp.php

@@ -254,6 +254,18 @@ public function __destruct()
  * failure.
  */
  public function send($recipients, $headers, $body)
+ {
+ $result = $this->send_or_fail($recipients, $headers, $body);
+
+ /* If persistent connections are disabled, destroy our SMTP object. */
+ if ($this->persist === false) {
+ $this->disconnect();
+ }
+
+ return $result;
+ }
+
+ protected function send_or_fail($recipients, $headers, $body)
  {
  /* If we don't already have an SMTP object, create one. */
  $result = $this->getSMTPObject();
@@ -332,11 +344,6 @@ public function send($recipients, $headers, $body)
  return PEAR::raiseError($error, PEAR_MAIL_SMTP_ERROR_DATA);
  }
 
- /* If persistent connections are disabled, destroy our SMTP object. */
- if ($this->persist === false) {
- $this->disconnect();
- }
-
  return true;
  }