mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Implemented FR #54499 (FPM ping and status_path should handle HEAD request)

Browse Source
This commit is contained in:
Jérôme Loyet 2011-07-02 16:34:39 +00:00
parent 217382d4ef
commit 6d64b2a4c9
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -24,6 +24,7 @@ PHP NEWS
real-time FPM status. (fat)
. Fixed missing Expires and Cache-Control headers for ping and status pages.
(fat)
. Implemented FR #54499 (FPM ping and status_path should handle HEAD request). (fat)
- SPL extension:
. Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys

20
sapi/fpm/fpm/fpm_status.c
View File

@ -65,6 +65,12 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
sapi_add_header_ex(ZEND_STRL("Expires: Thu, 01 Jan 1970 00:00:00 GMT"), 1, 1 TSRMLS_CC);
sapi_add_header_ex(ZEND_STRL("Cache-Control: no-cache, no-store, must-revalidate, max-age=0"), 1, 1 TSRMLS_CC);
SG(sapi_headers).http_response_code = 200;
/* handle HEAD */
if (SG(request_info).headers_only) {
return 1;
}
PUTS(fpm_status_ping_response);
return 1;
}
@ -107,6 +113,16 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
return 1;
}
/* send common headers */
sapi_add_header_ex(ZEND_STRL("Expires: Thu, 01 Jan 1970 00:00:00 GMT"), 1, 1 TSRMLS_CC);
sapi_add_header_ex(ZEND_STRL("Cache-Control: no-cache, no-store, must-revalidate, max-age=0"), 1, 1 TSRMLS_CC);
SG(sapi_headers).http_response_code = 200;
/* handle HEAD */
if (SG(request_info).headers_only) {
return 1;
}
/* full status ? */
full = SG(request_info).request_uri && strstr(SG(request_info).query_string, "full");
short_syntax = short_post = NULL;
@ -332,9 +348,6 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
}
}
sapi_add_header_ex(ZEND_STRL("Expires: Thu, 01 Jan 1970 00:00:00 GMT"), 1, 1 TSRMLS_CC);
sapi_add_header_ex(ZEND_STRL("Cache-Control: no-cache, no-store, must-revalidate, max-age=0"), 1, 1 TSRMLS_CC);
strftime(time_buffer, sizeof(time_buffer) - 1, time_format, localtime(&scoreboard.start_epoch));
now_epoch = time(NULL);
spprintf(&buffer, 0, short_syntax,
@ -354,7 +367,6 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
scoreboard.active_max,
scoreboard.max_children_reached);
SG(sapi_headers).http_response_code = 200;
PUTS(buffer);
efree(buffer);