Browse files

- Request #17888: Reduce peak memory usage when using the smtp/smtpmx…

… backend

git-svn-id: http://svn.php.net/repository/pear/packages/Mail/trunk@307487 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent a1ef6b7 commit eb6a07f16dc064c120b9cb2cbb3940ccda632c50 Aleksander Machniak committed Jan 14, 2011
Showing with 4 additions and 2 deletions.
  1. +1 −1 Mail/smtp.php
  2. +1 −1 Mail/smtpmx.php
  3. +2 −0 package.xml
View
2 Mail/smtp.php
@@ -304,7 +304,7 @@ function send($recipients, $headers, $body)
}
/* Send the message's headers and the body as SMTP data. */
- $res = $this->_smtp->data($textHeaders . "\r\n\r\n" . $body);
+ $res = $this->_smtp->data($body, $textHeaders);
list(,$args) = $this->_smtp->getResponse();
if (preg_match("/Ok: queued as (.*)/", $args, $queued)) {
View
2 Mail/smtpmx.php
@@ -386,7 +386,7 @@ function send($recipients, $headers, $body)
}
// Send data
- $res = $this->_smtp->data("$textHeaders\r\n$body");
+ $res = $this->_smtp->data($body, $textHeaders);
if (is_a($res, 'PEAR_Error')) {
$info = array('rcpt' => $rcpt);
return $this->_raiseError('failed_send_data', $info);
View
2 package.xml
@@ -34,6 +34,8 @@
</stability>
<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD Style</license>
<notes>
+Request #17888: Reduce peak memory usage when using the smtp/smtpmx backend [alec]
+
Fixed Bug #18109: New "pipelining" parameter for SMTP backend never used [alec]
Fixed Bug #17317: Invalid periods in mailbox not marked as invalid [alec]
</notes>

0 comments on commit eb6a07f

Please sign in to comment.