iliaa Sun Jun 21 15:29:16 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard mail.c Log: Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in existing headers) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.7.2.10&r2=1.87.2.1.2.7.2.11&diff_format=u Index: php-src/ext/standard/mail.c diff -u php-src/ext/standard/mail.c:1.87.2.1.2.7.2.10 php-src/ext/standard/mail.c:1.87.2.1.2.7.2.11 --- php-src/ext/standard/mail.c:1.87.2.1.2.7.2.10 Wed Apr 15 14:24:38 2009 +++ php-src/ext/standard/mail.c Sun Jun 21 15:29:16 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.87.2.1.2.7.2.10 2009/04/15 14:24:38 iliaa Exp $ */ +/* $Id: mail.c,v 1.87.2.1.2.7.2.11 2009/06/21 15:29:16 iliaa Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -241,7 +241,7 @@ 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); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php