[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c trunk/sapi/fpm/fpm/fpm_conf.c

[Antony Dovgal]

tony2001                                 Tue, 08 Jun 2010 18:59:11 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300290

Log:
support both 'warn' and 'warning' as error levels

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2010-06-08 
18:27:23 UTC (rev 300289)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2010-06-08 
18:59:11 UTC (rev 300290)
@@ -196,7 +196,7 @@
                fpm_globals.log_level = ZLOG_DEBUG;
        } else if (!strcasecmp(val, "notice")) {
                fpm_globals.log_level = ZLOG_NOTICE;
-       } else if (!strcasecmp(val, "warn")) {
+       } else if (!strcasecmp(val, "warning") || !strcasecmp(val, "warn")) {
                fpm_globals.log_level = ZLOG_WARNING;
        } else if (!strcasecmp(val, "error")) {
                fpm_globals.log_level = ZLOG_ERROR;

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-06-08 18:27:23 UTC (rev 
300289)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-06-08 18:59:11 UTC (rev 
300290)
@@ -196,7 +196,7 @@
                fpm_globals.log_level = ZLOG_DEBUG;
        } else if (!strcasecmp(val, "notice")) {
                fpm_globals.log_level = ZLOG_NOTICE;
-       } else if (!strcasecmp(val, "warn")) {
+       } else if (!strcasecmp(val, "warning") || !strcasecmp(val, "warn")) {
                fpm_globals.log_level = ZLOG_WARNING;
        } else if (!strcasecmp(val, "error")) {
                fpm_globals.log_level = ZLOG_ERROR;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php