From: Jerome Loyet <fat@php.net>
Date: Thu, 27 Sep 2012 23:24:52 +0000 (+0200)
Subject: - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
X-Git-Tag: php-5.4.8RC1~25^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=151b16cf7ff6ddbf2e11932949aaa2ecb0f22724;p=php

- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
---

diff --git a/NEWS b/NEWS
index 69a6c7ea26..14e81cac21 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ PHP                                                                        NEWS
   . Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)
   . Fixed bug #63085 (Systemd integration and daemonize). (remi, fat)
   . Fixed bug #62947 (Unneccesary warnings on FPM). (fat)
+  . Fixed bug #62887 (Only /status?plain&full gives "last request cpu"). (fat)
 
 - Intl:
   . Fix bug #62915 (defective cloning in several intl classes). (Gustavo)
diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
index 3b09d3b895..7bad5951d8 100644
--- a/sapi/fpm/fpm/fpm_status.c
+++ b/sapi/fpm/fpm/fpm_status.c
@@ -148,7 +148,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 					"<tr><th>start time</th><td>%s</td></tr>\n"
 					"<tr><th>start since</th><td>%lu</td></tr>\n"
 					"<tr><th>accepted conn</th><td>%lu</td></tr>\n"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 					"<tr><th>listen queue</th><td>%u</td></tr>\n"
 					"<tr><th>max listen queue</th><td>%u</td></tr>\n"
 					"<tr><th>listen queue len</th><td>%d</td></tr>\n"
@@ -177,7 +177,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 						"<th>content length</th>"
 						"<th>user</th>"
 						"<th>script</th>"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 						"<th>last request cpu</th>"
 #endif
 						"<th>last request memory</th>"
@@ -196,7 +196,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 						"<td>%zu</td>"
 						"<td>%s</td>"
 						"<td>%s</td>"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 						"<td>%.2f</td>"
 #endif
 						"<td>%zu</td>"
@@ -219,7 +219,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 				"<start-time>%s</start-time>\n"
 				"<start-since>%lu</start-since>\n"
 				"<accepted-conn>%lu</accepted-conn>\n"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 				"<listen-queue>%u</listen-queue>\n"
 				"<max-listen-queue>%u</max-listen-queue>\n"
 				"<listen-queue-len>%d</listen-queue-len>\n"
@@ -247,7 +247,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 							"<content-length>%zu</content-length>"
 							"<user>%s</user>"
 							"<script>%s</script>"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 							"<last-request-cpu>%.2f</last-request-cpu>"
 #endif
 							"<last-request-memory>%zu</last-request-memory>"
@@ -268,7 +268,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 				"\"start time\":%s,"
 				"\"start since\":%lu,"
 				"\"accepted conn\":%lu,"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 				"\"listen queue\":%u,"
 				"\"max listen queue\":%u,"
 				"\"listen queue len\":%d,"
@@ -297,7 +297,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 					"\"content length\":%zu,"
 					"\"user\":\"%s\","
 					"\"script\":\"%s\","
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 					"\"last request cpu\":%.2f,"
 #endif
 					"\"last request memory\":%zu"
@@ -317,7 +317,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 				"start time:           %s\n"
 				"start since:          %lu\n"
 				"accepted conn:        %lu\n"
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 				"listen queue:         %u\n"
 				"max listen queue:     %u\n"
 				"listen queue len:     %d\n"
@@ -358,7 +358,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 				time_buffer,
 				now_epoch - scoreboard.start_epoch,
 				scoreboard.requests,
-#if HAVE_FPM_LQ
+#ifdef HAVE_FPM_LQ
 				scoreboard.lq,
 				scoreboard.lq_max,
 				scoreboard.lq_len,