sapi: Remove sapi_terminate_process (#23524)

This is unused; this is a vestige of 6c158374ba
and 45e327a672, which set up some timeout code
which was removed in 650c1c0a7d. Remove this
useless function from SAPIs.
This commit is contained in:
Calvin Buckley authored and GitHub committed 2026-09-28 15:06:30 -03:00
1 parent 49f8de7ae5
commit 20f4c4d605
12 files changed
+4 -17

No files matched your search

+3
View File
@@ -17,6 +17,7 @@ PHP 8.7 INTERNALS UPGRADE NOTES
- Removed zend_execute_scripts(). Manually call zend_execute_script() in a loop
instead.
- Removed ZEND_STATIC_ASSERT(). Use C11 static_assert() directly instead.
- The sapi_terminate_process() function was removed.
========================
2. Build system changes
@@ -40,3 +41,5 @@ PHP 8.7 INTERNALS UPGRADE NOTES
========================
5. SAPI changes
========================
- The terminate_process method has been removed.
-6
View File
@@ -1089,12 +1089,6 @@ SAPI_API double sapi_get_request_time(void)
return SG(global_request_time);
}
SAPI_API void sapi_terminate_process(void) {
if (sapi_module.terminate_process) {
sapi_module.terminate_process();
}
}
SAPI_API void sapi_add_request_header(const char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */
{
zval *return_value = (zval*)arg;
-2
View File
@@ -230,7 +230,6 @@ SAPI_API int sapi_force_http_10(void);
SAPI_API int sapi_get_target_uid(uid_t *);
SAPI_API int sapi_get_target_gid(gid_t *);
SAPI_API double sapi_get_request_time(void);
SAPI_API void sapi_terminate_process(void);
END_EXTERN_C()
struct _sapi_module_struct {
@@ -260,7 +259,6 @@ struct _sapi_module_struct {
void (*register_server_variables)(zval *track_vars_array);
void (*log_message)(const char *message, int syslog_type_int);
zend_result (*get_request_time)(double *request_time);
void (*terminate_process)(void);
char *php_ini_path_override;
-1
View File
@@ -410,7 +410,6 @@ static sapi_module_struct apache2_sapi_module = {
php_apache_sapi_register_variables,
php_apache_sapi_log_message, /* Log message */
php_apache_sapi_get_request_time, /* Request Time */
NULL, /* Child Terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
-1
View File
@@ -999,7 +999,6 @@ static sapi_module_struct cgi_sapi_module = {
sapi_cgi_register_variables, /* register server variables */
sapi_cgi_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
-1
View File
@@ -431,7 +431,6 @@ static sapi_module_struct cli_sapi_module = {
sapi_cli_register_variables, /* register server variables */
sapi_cli_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
-1
View File
@@ -813,7 +813,6 @@ sapi_module_struct cli_server_sapi_module = {
sapi_cli_server_register_variables, /* register server variables */
sapi_cli_server_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
}; /* }}} */
-1
View File
@@ -142,7 +142,6 @@ EMBED_SAPI_API sapi_module_struct php_embed_module = {
php_embed_register_variables, /* register server variables */
php_embed_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
-1
View File
@@ -812,7 +812,6 @@ static sapi_module_struct cgi_sapi_module = {
sapi_cgi_register_variables, /* register server variables */
sapi_cgi_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
-1
View File
@@ -119,7 +119,6 @@ static sapi_module_struct fuzzer_module = {
register_variables, /* register server variables */
log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
-1
View File
@@ -614,7 +614,6 @@ static sapi_module_struct lsapi_sapi_module =
sapi_lsapi_register_variables, /* register server variables */
sapi_lsapi_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
+1 -1
View File
@@ -953,7 +953,7 @@ static sapi_module_struct phpdbg_sapi_module = {
php_sapi_phpdbg_register_vars, /* register server variables */
php_sapi_phpdbg_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
STANDARD_SAPI_MODULE_PROPERTIES
};
/* }}} */