fat Tue, 05 Jul 2011 18:09:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312943
Log:
- Fixed wrong value of log_level when invoking fpm with -tt
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.h
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-07-05 17:36:36 UTC (rev 312942)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-07-05 18:09:07 UTC (rev 312943)
@@ -34,6 +34,7 @@
. Fixed missing Expires and Cache-Control headers for ping and status pages.
(fat)
. Fixed memory leak. (fat) Reported and fixed by Giovanni Giacobbi.
+ . Fixed wrong value of log_level when invoking fpm with -tt. (fat)
- SPL extension:
. Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys
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 2011-07-05
17:36:36 UTC (rev 312942)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-07-05
18:09:07 UTC (rev 312943)
@@ -1151,7 +1151,7 @@
zlog(ZLOG_NOTICE, "\tpid = %s",
STR2STR(fpm_global_config.pid_file));
zlog(ZLOG_NOTICE, "\tdaemonize = %s",
BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, "\terror_log = %s",
STR2STR(fpm_global_config.error_log));
- zlog(ZLOG_NOTICE, "\tlog_level = %s",
zlog_get_level_name());
+ zlog(ZLOG_NOTICE, "\tlog_level = %s",
zlog_get_level_name(fpm_globals.log_level));
zlog(ZLOG_NOTICE, "\tprocess_control_timeout = %ds",
fpm_global_config.process_control_timeout);
zlog(ZLOG_NOTICE, "\temergency_restart_interval = %ds",
fpm_global_config.emergency_restart_interval);
zlog(ZLOG_NOTICE, "\temergency_restart_threshold = %d",
fpm_global_config.emergency_restart_threshold);
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c 2011-07-05 17:36:36 UTC
(rev 312942)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c 2011-07-05 18:09:07 UTC
(rev 312943)
@@ -29,9 +29,15 @@
[ZLOG_ALERT] = "ALERT",
};
-const char *zlog_get_level_name() /* {{{ */
+const char *zlog_get_level_name(int log_level) /* {{{ */
{
- return level_names[zlog_level];
+ if (log_level < 0) {
+ log_level = zlog_level;
+ } else if (log_level < ZLOG_DEBUG || log_level > ZLOG_ALERT) {
+ return "unknown value";
+ }
+
+ return level_names[log_level];
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h 2011-07-05 17:36:36 UTC
(rev 312942)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h 2011-07-05 18:09:07 UTC
(rev 312943)
@@ -11,7 +11,7 @@
int zlog_set_fd(int new_fd);
int zlog_set_level(int new_value);
-const char *zlog_get_level_name();
+const char *zlog_get_level_name(int log_level);
void zlog_set_launched(void);
size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-07-05
17:36:36 UTC (rev 312942)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-07-05
18:09:07 UTC (rev 312943)
@@ -1151,7 +1151,7 @@
zlog(ZLOG_NOTICE, "\tpid = %s",
STR2STR(fpm_global_config.pid_file));
zlog(ZLOG_NOTICE, "\tdaemonize = %s",
BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, "\terror_log = %s",
STR2STR(fpm_global_config.error_log));
- zlog(ZLOG_NOTICE, "\tlog_level = %s",
zlog_get_level_name());
+ zlog(ZLOG_NOTICE, "\tlog_level = %s",
zlog_get_level_name(fpm_globals.log_level));
zlog(ZLOG_NOTICE, "\tprocess_control_timeout = %ds",
fpm_global_config.process_control_timeout);
zlog(ZLOG_NOTICE, "\temergency_restart_interval = %ds",
fpm_global_config.emergency_restart_interval);
zlog(ZLOG_NOTICE, "\temergency_restart_threshold = %d",
fpm_global_config.emergency_restart_threshold);
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c 2011-07-05 17:36:36 UTC
(rev 312942)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c 2011-07-05 18:09:07 UTC
(rev 312943)
@@ -29,9 +29,15 @@
[ZLOG_ALERT] = "ALERT",
};
-const char *zlog_get_level_name() /* {{{ */
+const char *zlog_get_level_name(int log_level) /* {{{ */
{
- return level_names[zlog_level];
+ if (log_level < 0) {
+ log_level = zlog_level;
+ } else if (log_level < ZLOG_DEBUG || log_level > ZLOG_ALERT) {
+ return "unknown value";
+ }
+
+ return level_names[log_level];
}
/* }}} */
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.h
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.h 2011-07-05 17:36:36 UTC
(rev 312942)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.h 2011-07-05 18:09:07 UTC
(rev 312943)
@@ -11,7 +11,7 @@
int zlog_set_fd(int new_fd);
int zlog_set_level(int new_value);
-const char *zlog_get_level_name();
+const char *zlog_get_level_name(int log_level);
void zlog_set_launched(void);
size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-07-05 17:36:36 UTC (rev
312942)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-07-05 18:09:07 UTC (rev
312943)
@@ -1151,7 +1151,7 @@
zlog(ZLOG_NOTICE, "\tpid = %s",
STR2STR(fpm_global_config.pid_file));
zlog(ZLOG_NOTICE, "\tdaemonize = %s",
BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, "\terror_log = %s",
STR2STR(fpm_global_config.error_log));
- zlog(ZLOG_NOTICE, "\tlog_level = %s",
zlog_get_level_name());
+ zlog(ZLOG_NOTICE, "\tlog_level = %s",
zlog_get_level_name(fpm_globals.log_level));
zlog(ZLOG_NOTICE, "\tprocess_control_timeout = %ds",
fpm_global_config.process_control_timeout);
zlog(ZLOG_NOTICE, "\temergency_restart_interval = %ds",
fpm_global_config.emergency_restart_interval);
zlog(ZLOG_NOTICE, "\temergency_restart_threshold = %d",
fpm_global_config.emergency_restart_threshold);
Modified: php/php-src/trunk/sapi/fpm/fpm/zlog.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/zlog.c 2011-07-05 17:36:36 UTC (rev
312942)
+++ php/php-src/trunk/sapi/fpm/fpm/zlog.c 2011-07-05 18:09:07 UTC (rev
312943)
@@ -29,9 +29,15 @@
[ZLOG_ALERT] = "ALERT",
};
-const char *zlog_get_level_name() /* {{{ */
+const char *zlog_get_level_name(int log_level) /* {{{ */
{
- return level_names[zlog_level];
+ if (log_level < 0) {
+ log_level = zlog_level;
+ } else if (log_level < ZLOG_DEBUG || log_level > ZLOG_ALERT) {
+ return "unknown value";
+ }
+
+ return level_names[log_level];
}
/* }}} */
Modified: php/php-src/trunk/sapi/fpm/fpm/zlog.h
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/zlog.h 2011-07-05 17:36:36 UTC (rev
312942)
+++ php/php-src/trunk/sapi/fpm/fpm/zlog.h 2011-07-05 18:09:07 UTC (rev
312943)
@@ -11,7 +11,7 @@
int zlog_set_fd(int new_fd);
int zlog_set_level(int new_value);
-const char *zlog_get_level_name();
+const char *zlog_get_level_name(int log_level);
void zlog_set_launched(void);
size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
