archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFB: Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in

Browse source 
existing headers)
This commit is contained in:
Ilia Alshanetsky 2009-06-21 15:30:23 +00:00
parent 8990a91fd7
commit ca74bf9e44
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/mail.c
View file

@ -235,7 +235,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
php_basename(tmp, strlen(tmp), NULL, 0, &f, &f_len TSRMLS_CC); php_basename(tmp, strlen(tmp), NULL, 0, &f, &f_len TSRMLS_CC);
if (headers != NULL) { if (headers != NULL) {
spprintf(&hdr, 0, "%s\r\nX-PHP-Originating-Script: %ld:%s\n", headers, php_getuid(), f); spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\r\n%s", php_getuid(), f, headers);
} else { } else {
spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f); spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f);
} }