Fix arginfo and clean up fpm_get_status

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index fd594607e1f29fdb0cd2f13bd6ee11d5d236e876..fa75efbf8516933071528df69e561d3afe71b720 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1467,6 +1467,9 @@ static PHP_MINFO_FUNCTION(cgi)
 }
 /* }}} */
 
+ZEND_BEGIN_ARG_INFO(cgi_fcgi_sapi_no_arginfo, 0)
+ZEND_END_ARG_INFO()
+
 PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
 {
        fcgi_request *request = (fcgi_request*) SG(server_context);
@@ -1489,9 +1492,6 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
 }
 /* }}} */
 
-ZEND_BEGIN_ARG_INFO(cgi_fcgi_sapi_no_arginfo, 0)
-ZEND_END_ARG_INFO()
-
 PHP_FUNCTION(apache_request_headers) /* {{{ */
 {
        fcgi_request *request;
@@ -1510,8 +1510,11 @@ PHP_FUNCTION(apache_request_headers) /* {{{ */
  * Returns the status of the fastcgi process manager */
 PHP_FUNCTION(fpm_get_status) /* {{{ */
 {
-       int error = fpm_status_export_to_zval(return_value);
-       if(error){
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
+       }
+
+       if (fpm_status_export_to_zval(return_value)) {
                RETURN_FALSE;
        }
 }
@@ -1519,7 +1522,7 @@ PHP_FUNCTION(fpm_get_status) /* {{{ */
 
 static const zend_function_entry cgi_fcgi_sapi_functions[] = {
        PHP_FE(fastcgi_finish_request,                    cgi_fcgi_sapi_no_arginfo)
-       PHP_FE(fpm_get_status,                            NULL)
+       PHP_FE(fpm_get_status,                            cgi_fcgi_sapi_no_arginfo)
        PHP_FE(apache_request_headers,                    cgi_fcgi_sapi_no_arginfo)
        PHP_FALIAS(getallheaders, apache_request_headers, cgi_fcgi_sapi_no_arginfo)
        PHP_FE_END