From b517af4a471283adc62ef82cb30b97e896bb6799 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 6 Dec 2006 21:37:37 +0000
Subject: Optimized memory usage when sending mail; Include SMTP response in
 log; Fixed wrong header encoding

---
 program/lib/Mail/mime.php | 2 +-
 program/lib/Net/SMTP.php  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'program/lib')

diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
index 96d7025d8..a9f798ed8 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.php
@@ -820,7 +820,7 @@ class Mail_mime
                 if (preg_match('#[\x80-\xFF]{1}#', $value)) {
                     $suffix = '';
                     // Don't encode e-mail address
-                    if (preg_match('/(.+)\s(<.+@[a-z0-9\-\.]+\.[a-z]{2,5}>)$/Ui', $value, $matches)) {
+                    if (preg_match('/(.+)\s(<.+@[a-z0-9\-\.]+>)$/Ui', $value, $matches)) {
                         $value = $matches[1];
                         $suffix = ' '.$matches[2];
                     }
diff --git a/program/lib/Net/SMTP.php b/program/lib/Net/SMTP.php
index 4a29f4d0a..bda1494d8 100644
--- a/program/lib/Net/SMTP.php
+++ b/program/lib/Net/SMTP.php
@@ -760,7 +760,7 @@ class Net_SMTP
      * @access public
      * @since  1.0
      */
-    function data($data)
+    function data(&$data)
     {
         /* RFC 1870, section 3, subsection 3 states "a value of zero
          * indicates that no fixed maximum message size is in force".
@@ -784,7 +784,8 @@ class Net_SMTP
             return $error;
         }
 
-        if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) {
+        $data .= "\r\n.\r\n";
+        if (PEAR::isError($result = $this->_send($data))) {
             return $result;
         }
         if (PEAR::isError($error = $this->_parseResponse(250))) {
-- 
cgit v1.2.3