fat Wed, 12 May 2010 18:29:09 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299302
Log: Fix #51799, when glob returns nothing, it was handle as an error instead of a warning. Bug: http://bugs.php.net/51799 (Assigned) FPM crashes if the include is enabled, but there are no files Changed paths: U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2010-05-12 18:08:36 UTC (rev 299301) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2010-05-12 18:29:09 UTC (rev 299302) @@ -660,8 +660,7 @@ if ((i = glob(inc, GLOB_ERR | GLOB_MARK | GLOB_NOSORT, NULL, &g)) != 0) { #ifdef GLOB_NOMATCH if (i == GLOB_NOMATCH) { - zlog(ZLOG_STUFF, ZLOG_ERROR, "Nothing match the include pattern '%s' from %s at line %d.", inc, filename, ini_lineno); - *error = 1; + zlog(ZLOG_STUFF, ZLOG_WARNING, "Nothing match the include pattern '%s' from %s at line %d.", inc, filename, ini_lineno); return; } #endif /* GLOB_NOMATCH */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
