summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-02-08 18:43:36 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-02-08 18:43:51 +0100
commitf731477cd798615f9f8412bd2d95a40b911b64fa (patch)
tree88585b58736375269f901b4d0f8ba64bb480b89e /win32
parente2c30c6a2ee4968b546e08eb19cb5f483c4c8088 (diff)
parentca7547c9e2f9120768d8290001ec6e1509b3597f (diff)
downloadphp-git-f731477cd798615f9f8412bd2d95a40b911b64fa.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fix #80706: mail(): Headers after Bcc headers may be ignored
Diffstat (limited to 'win32')
-rw-r--r--win32/sendmail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 059bc946ee..da5bddde37 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -527,7 +527,7 @@ 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;
+ char *pos3 = pos2;
while (pos2[2] == ' ' || pos2[2] == '\t') {
pos3 = strstr(pos2 + 2, "\r\n");
if (pos3 != NULL) {