summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@cacert1.it-sls.de>2011-05-30 10:30:45 +0200
committerroot <root@cacert1.it-sls.de>2011-05-30 10:30:45 +0200
commit5bdc30d839d3486f917b4798832aa2c217aadc0b (patch)
treed5b21bda201f3e21ca7c09f152590b73542368d6
parent00675c949494888ac5f3cd802de41bf6f2caf45b (diff)
downloadcacert-devel-5bdc30d839d3486f917b4798832aa2c217aadc0b.tar.gz
cacert-devel-5bdc30d839d3486f917b4798832aa2c217aadc0b.tar.xz
cacert-devel-5bdc30d839d3486f917b4798832aa2c217aadc0b.zip
bug-948 fixed the ' '-issue for MAIL FROM: und RCPT TO: according to RFC 2821
-rw-r--r--includes/general.php4
-rw-r--r--includes/mysql.php.sample4
2 files changed, 4 insertions, 4 deletions
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: <returns@cacert.org>\r\n");
+ fputs($fp, "MAIL FROM:<returns@cacert.org>\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: <returns@cacert.org>\r\n");
+ fputs($smtp, "MAIL FROM:<returns@cacert.org>\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);