iliaa Tue, 02 Feb 2010 12:50:21 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294335
Log: Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX). Bug: http://bugs.php.net/50907 (Open) X-PHP-Originating-Script adding two new lines in *NIX Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/mail.c U php/php-src/trunk/ext/standard/mail.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-02-02 12:32:29 UTC (rev 294334) +++ php/php-src/branches/PHP_5_3/NEWS 2010-02-02 12:50:21 UTC (rev 294335) @@ -23,6 +23,8 @@ 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 Modified: php/php-src/branches/PHP_5_3/ext/standard/mail.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/mail.c 2010-02-02 12:32:29 UTC (rev 294334) +++ php/php-src/branches/PHP_5_3/ext/standard/mail.c 2010-02-02 12:50:21 UTC (rev 294335) @@ -241,7 +241,7 @@ 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); } Modified: php/php-src/trunk/ext/standard/mail.c =================================================================== --- php/php-src/trunk/ext/standard/mail.c 2010-02-02 12:32:29 UTC (rev 294334) +++ php/php-src/trunk/ext/standard/mail.c 2010-02-02 12:50:21 UTC (rev 294335) @@ -235,7 +235,7 @@ 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); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
