diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2009-06-21 15:29:16 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2009-06-21 15:29:16 +0000 |
| commit | 81e578794902b4e07609d45807871ee643cb76e7 (patch) | |
| tree | cf2bebd68f18d3c66b0c340c617ba9930dead39c | |
| parent | ef9c23468c753979d51c6ffa25bbe978b8764bc8 (diff) | |
| download | php-git-81e578794902b4e07609d45807871ee643cb76e7.tar.gz | |
Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
existing headers)
| -rw-r--r-- | ext/standard/mail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 46aa305e9a..7126d4168c 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -241,7 +241,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); 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 { spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f); } |