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

existing headers)

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index dd26522eff5d22659d50d7db57c09209999e66d0..9eeb30022a2602fc766e370c129f115757749e3a 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -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);
 
                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);
                }