Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).

diff --git a/NEWS b/NEWS
index f770d58e24d1ead2fcff900e96566e7d8e92ccf4..6193b1257a54e3eddfa563fc0256a15e319c355d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,8 @@ PHP                                                                        NEWS
   links or invalid paths. (Pierre)
 - Fixed error output to stderr on Windows. (Pierre)
 
+- Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
+  (Ilia)
 - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).   
   (Ilia, hanno at hboeck dot de)
 - Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 3b22d6f0235a91bc3b1118052d5cfffabb1c34c1..ab65f164e70982cb93476e6b79ea0a9bdc25461c 100644 (file)
--- 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, "X-PHP-Originating-Script: %ld:%s\r\n%s", php_getuid(), f, headers);
+                       spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n%s", php_getuid(), f, headers);
                } else {
                        spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f);
                }