clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Fix #72964: White space not unfolded for CC/Bcc headers
This commit is contained in:
Christoph M. Becker 2020-11-19 19:27:12 +01:00
commit 38b80aaf85
2 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ext/standard/tests/mail/bug72964.phpt Normal file
View File

@ -0,0 +1,73 @@
--TEST--
Bug #72964 (White space not unfolded for CC/Bcc headers)
--SKIPIF--
<?php
if (PHP_OS_FAMILY !== 'Windows') die('skip Windows only test');
if (getenv("SKIP_SLOW_TESTS")) die('skip slow test');
require_once __DIR__ . '/mail_skipif.inc';
?>
--INI--
SMTP=localhost
smtp_port=25
--FILE--
<?php
require_once __DIR__ . '/mail_include.inc';
function find_and_delete_message($username, $subject) {
global $default_mailbox, $password;
$imap_stream = imap_open($default_mailbox, $username, $password);
if ($imap_stream === false) {
die("Cannot connect to IMAP server $server: " . imap_last_error() . "\n");
}
$found = false;
$repeat_count = 20; // we will repeat a max of 20 times
while (!$found && $repeat_count > 0) {
// sleep for a while to allow msg to be delivered
sleep(1);
$num_messages = imap_check($imap_stream)->Nmsgs;
for ($i = $num_messages; $i > 0; $i--) {
$info = imap_headerinfo($imap_stream, $i);
if ($info->subject === $subject) {
imap_delete($imap_stream, $i);
$found = true;
break;
}
}
$repeat_count--;
}
imap_close($imap_stream, CL_EXPUNGE);
return $found;
}
$to = "{$users[2]}@$domain";
$subject = bin2hex(random_bytes(16));
$message = 'hello';
$headers = "From: webmaster@example.com\r\n"
. "Cc: {$users[0]}@$domain,\r\n\t{$users[1]}@$domain\r\n"
. "Bcc: {$users[2]}@$domain,\r\n {$users[3]}@$domain\r\n";
$res = mail($to, $subject, $message, $headers);
if ($res !== true) {
die("TEST FAILED : Unable to send test email\n");
} else {
echo "Message sent OK\n";
}
foreach ($users as $user) {
if (!find_and_delete_message("$user@$domain", $subject)) {
echo "TEST FAILED: email not delivered\n";
} else {
echo "TEST PASSED: Message sent and deleted OK\n";
}
}
?>
--EXPECT--
Message sent OK
TEST PASSED: Message sent and deleted OK
TEST PASSED: Message sent and deleted OK
TEST PASSED: Message sent and deleted OK
TEST PASSED: Message sent and deleted OK

25
win32/sendmail.c
View File

@ -459,6 +459,16 @@ static int SendText(char *RPath, const char *Subject, const char *mailTo, char *
if (NULL == (pos2 = strstr(pos1, "\r\n"))) {
tempMailTo = estrndup(pos1, strlen(pos1));
} else {
char *pos3;
while (pos2[2] == ' ' || pos2[2] == '\t') {
pos3 = strstr(pos2 + 2, "\r\n");
if (pos3 != NULL) {
pos2 = pos3;
} else {
pos2 += strlen(pos2);
break;
}
}
tempMailTo = estrndup(pos1, pos2 - pos1);
}
@ -517,7 +527,22 @@ static int SendText(char *RPath, const char *Subject, const char *mailTo, char *
header we know it was the last thing. */
pos2 = pos1;
} else {
char *pos3 = NULL;
while (pos2[2] == ' ' || pos2[2] == '\t') {
pos3 = strstr(pos2 + 2, "\r\n");
if (pos3 != NULL) {
pos2 = pos3;
} else {
pos2 += strlen(pos2);
break;
}
}
tempMailTo = estrndup(pos1, pos2 - pos1);
if (pos3 == NULL) {
/* Later, when we remove the Bcc: out of the
header we know it was the last thing. */
pos2 = pos1;
}
}
token = strtok(tempMailTo, ",");