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

[Jérôme Loyet]

fat                                      Mon, 02 Aug 2010 21:46:52 +0000

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

Log:
BUG: all value comparaisons were not case insensitive in the conf file parser

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-08-02 
21:45:23 UTC (rev 301806)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2010-08-02 
21:46:52 UTC (rev 301807)
@@ -204,7 +204,7 @@
 {
        char *val = Z_STRVAL_P(value);

-       if (!strcmp(val, "debug")) {
+       if (!strcasecmp(val, "debug")) {
                fpm_globals.log_level = ZLOG_DEBUG;
        } else if (!strcasecmp(val, "notice")) {
                fpm_globals.log_level = ZLOG_NOTICE;
@@ -227,7 +227,7 @@
        char *val = Z_STRVAL_P(value);
        struct fpm_worker_pool_config_s *c = *config;

-       if (!strcmp(val, "unlimited")) {
+       if (!strcasecmp(val, "unlimited")) {
                c->rlimit_core = -1;
        } else {
                int int_value;
@@ -255,9 +255,9 @@
 {
        char *val = Z_STRVAL_P(value);
        struct fpm_worker_pool_config_s  *c = *config;
-       if (!strcmp(val, "static")) {
+       if (!strcasecmp(val, "static")) {
                c->pm = PM_STYLE_STATIC;
-       } else if (!strcmp(val, "dynamic")) {
+       } else if (!strcasecmp(val, "dynamic")) {
                c->pm = PM_STYLE_DYNAMIC;
        } else {
                return "invalid process manager (static or dynamic)";

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-08-02 21:45:23 UTC (rev 
301806)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-08-02 21:46:52 UTC (rev 
301807)
@@ -204,7 +204,7 @@
 {
        char *val = Z_STRVAL_P(value);

-       if (!strcmp(val, "debug")) {
+       if (!strcasecmp(val, "debug")) {
                fpm_globals.log_level = ZLOG_DEBUG;
        } else if (!strcasecmp(val, "notice")) {
                fpm_globals.log_level = ZLOG_NOTICE;
@@ -227,7 +227,7 @@
        char *val = Z_STRVAL_P(value);
        struct fpm_worker_pool_config_s *c = *config;

-       if (!strcmp(val, "unlimited")) {
+       if (!strcasecmp(val, "unlimited")) {
                c->rlimit_core = -1;
        } else {
                int int_value;
@@ -255,9 +255,9 @@
 {
        char *val = Z_STRVAL_P(value);
        struct fpm_worker_pool_config_s  *c = *config;
-       if (!strcmp(val, "static")) {
+       if (!strcasecmp(val, "static")) {
                c->pm = PM_STYLE_STATIC;
-       } else if (!strcmp(val, "dynamic")) {
+       } else if (!strcasecmp(val, "dynamic")) {
                c->pm = PM_STYLE_DYNAMIC;
        } else {
                return "invalid process manager (static or dynamic)";


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