From d5fd93e9975a966c35e2e4938c60568697c7b2c8 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 2 Feb 2010 12:50:21 +0000 Subject: [PATCH] Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX). --- NEWS | 2 ++ ext/standard/mail.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f770d58e24..6193b1257a 100644 --- 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 3b22d6f023..ab65f164e7 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, "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); } -- 2.50.1