svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/mail.c trunk/ext/standard/mail.c
| From: | Johannes Schlüter | Date: | Fri, 18 Jun 2010 10:16:35 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/mail.c trunk/ext/standard/mail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62925@lists.php.net to get a copy of this message | ||
johannes Fri, 18 Jun 2010 10:16:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300566
Log:
- Ignore empty filename for mail.log, treat it like none given
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-06-18 09:56:18 UTC (rev 300565)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-06-18 10:16:35 UTC (rev 300566)
@@ -1,8 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2010, PHP 5.3.3 RC2
+- Fixed the mail.log ini setting when no filename was given. (Johannes)
-
17 Jun 2010, PHP 5.3.3 RC1
- Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
- Upgraded bundled PCRE to version 8.02. (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/standard/mail.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/mail.c 2010-06-18 09:56:18 UTC (rev 300565)
+++ php/php-src/branches/PHP_5_3/ext/standard/mail.c 2010-06-18 10:16:35 UTC (rev 300566)
@@ -220,7 +220,7 @@
} \
return val; \
- if (mail_log) {
+ if (mail_log && *mail_log) {
char *tmp;
int l = spprintf(&tmp, 0, "mail() on [%s:%d]: To: %s -- Headers: %s\n",
zend_get_executed_filename(TSRMLS_C), zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr :
"");
php_stream *stream = php_stream_open_wrapper(mail_log, "a", IGNORE_URL_WIN |
REPORT_ERRORS | STREAM_DISABLE_OPEN_BASEDIR, NULL);
Modified: php/php-src/trunk/ext/standard/mail.c
===================================================================
--- php/php-src/trunk/ext/standard/mail.c 2010-06-18 09:56:18 UTC (rev 300565)
+++ php/php-src/trunk/ext/standard/mail.c 2010-06-18 10:16:35 UTC (rev 300566)
@@ -212,7 +212,7 @@
} \
return val; \
- if (mail_log) {
+ if (mail_log && *mail_log) {
char *tmp;
int l = spprintf(&tmp, 0, "mail() on [%s:%d]: To: %s -- Headers: %s\n",
zend_get_executed_filename(TSRMLS_C), zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr :
"");
php_stream *stream = php_stream_open_wrapper(mail_log, "a", IGNORE_URL_WIN |
REPORT_ERRORS | STREAM_DISABLE_OPEN_BASEDIR, NULL);