Merge branch 'PHP-7.3'

Author: bukka

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,16 +1510,19 @@ 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;
 	}
 }
 /* }}} */
 
 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