diff options
| author | Anatol Belski <ab@php.net> | 2017-05-02 12:32:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-05-02 12:32:40 +0200 |
| commit | 3d9563b8b28d0d56e6aa8a35164c2000c602b76d (patch) | |
| tree | ec5a9e0dfc9742b2232b56eb6fd83cd2a1601efa /win32 | |
| parent | 6bd30e8f1a12f062f13013796d736847c827d1a4 (diff) | |
| parent | 20a608d9dae4c758bf608e10fd2cdb9cc1559625 (diff) | |
| download | php-git-3d9563b8b28d0d56e6aa8a35164c2000c602b76d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/sendmail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c index d460f22fda..d83663a475 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -535,7 +535,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char efree(tempMailTo); } else if (headers) { - if (pos1 = strstr(headers_lc, "bcc:")) { + if ((pos1 = strstr(headers_lc, "bcc:")) && (pos1 == headers_lc || *(pos1-1) == '\n')) { /* Real offset is memaddress from the original headers + difference of * string found in the lowercase headrs + 4 characters to jump over * the bcc: */ |