From: Jakub Zelenka <bukka@php.net>
Date: Sun, 21 Oct 2018 18:39:47 +0000 (+0100)
Subject: Fix arginfo and clean up fpm_get_status
X-Git-Tag: php-7.3.0RC4~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8febbe0396d8d2a3b09480beeb82845ca71dc1f;p=php

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 fd594607e1..fa75efbf85 100644
--- 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