From 5bdc30d839d3486f917b4798832aa2c217aadc0b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 May 2011 10:30:45 +0200 Subject: bug-948 fixed the ' '-issue for MAIL FROM: und RCPT TO: according to RFC 2821 --- includes/general.php | 4 ++-- includes/mysql.php.sample | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'includes') diff --git a/includes/general.php b/includes/general.php index 5789875..16b75e4 100644 --- a/includes/general.php +++ b/includes/general.php @@ -673,12 +673,12 @@ $line = fgets($fp, 4096); if(substr($line, 0, 3) != "250") continue; - fputs($fp, "MAIL FROM: \r\n"); + fputs($fp, "MAIL FROM:\r\n"); $line = fgets($fp, 4096); if(substr($line, 0, 3) != "250") continue; - fputs($fp, "RCPT TO: <$email>\r\n"); + fputs($fp, "RCPT TO:<$email>\r\n"); $line = trim(fgets($fp, 4096)); fputs($fp, "QUIT\r\n"); fclose($fp); diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index 1f477e4..ff5cfc3 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -55,11 +55,11 @@ $InputBuffer = fgets($smtp, 1024); fputs($smtp, "HELO www.cacert.org\r\n"); $InputBuffer = fgets($smtp, 1024); - fputs($smtp, "MAIL FROM: \r\n"); + fputs($smtp, "MAIL FROM:\r\n"); $InputBuffer = fgets($smtp, 1024); $bits = explode(",", $to); foreach($bits as $user) - fputs($smtp, "RCPT TO: <".trim($user).">\r\n"); + fputs($smtp, "RCPT TO:<".trim($user).">\r\n"); $InputBuffer = fgets($smtp, 1024); fputs($smtp, "DATA\r\n"); $InputBuffer = fgets($smtp, 1024); -- cgit v1.2.1