From 45e327a672746e4fb5fe57fa10ff758d1143ad0a Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Tue, 18 Mar 2008 22:23:21 +0000 Subject: Add new empty child terminate sapi hook to the rest of the sapis --- sapi/aolserver/aolserver.c | 1 + sapi/apache2filter/sapi_apache2.c | 1 + sapi/apache2handler/sapi_apache2.c | 1 + sapi/apache_hooks/mod_php5.c | 1 + sapi/caudium/caudium.c | 1 + sapi/cgi/cgi_main.c | 1 + sapi/cli/php_cli.c | 1 + sapi/continuity/capi.c | 3 ++- sapi/embed/php_embed.c | 1 + sapi/isapi/php5isapi.c | 1 + sapi/milter/php_milter.c | 1 + sapi/nsapi/nsapi.c | 1 + sapi/phttpd/phttpd.c | 1 + sapi/pi3web/pi3web_sapi.c | 1 + sapi/roxen/roxen.c | 1 + sapi/thttpd/thttpd.c | 1 + sapi/tux/php_tux.c | 1 + sapi/webjames/webjames.c | 1 + 18 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 8f1eecfadd..1cc5a5b87e 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -386,6 +386,7 @@ static sapi_module_struct aolserver_sapi_module = { php_ns_sapi_register_variables, NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 0b163c8273..f901fbc82f 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -335,6 +335,7 @@ 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, /* Get Request Time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 524a10f52a..b8671c59d4 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -343,6 +343,7 @@ 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 }; diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 91de95929c..83cca78b80 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -524,6 +524,7 @@ static sapi_module_struct apache_sapi_module = { sapi_apache_register_server_variables, /* register server variables */ php_apache_log_message, /* Log message */ NULL, /* Get request time */ + NULL, /* child terminate */ NULL, /* php.ini path override */ diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c index 197448a433..9bbd419050 100644 --- a/sapi/caudium/caudium.c +++ b/sapi/caudium/caudium.c @@ -551,6 +551,7 @@ static sapi_module_struct caudium_sapi_module = { sapi_caudium_register_variables, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index c5f722e04c..5e48ac9bf7 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -808,6 +808,7 @@ 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 }; diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index f36f84427a..29ff833dda 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -408,6 +408,7 @@ 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 }; diff --git a/sapi/continuity/capi.c b/sapi/continuity/capi.c index 3908499b27..05e9700f14 100644 --- a/sapi/continuity/capi.c +++ b/sapi/continuity/capi.c @@ -378,7 +378,8 @@ sapi_module_struct capi_sapi_module = { sapi_capi_register_server_variables, /* register server variables */ capi_log_message, /* Log message */ - NULL, /* Get request time */ + NULL, /* Get request time */ + NULL, / Child terminate */ NULL, /* Block interruptions */ NULL, /* Unblock interruptions */ diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index da7cc8bbf4..5b0c63c1e3 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -134,6 +134,7 @@ 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 }; diff --git a/sapi/isapi/php5isapi.c b/sapi/isapi/php5isapi.c index e5f536deaa..967424ada0 100644 --- a/sapi/isapi/php5isapi.c +++ b/sapi/isapi/php5isapi.c @@ -688,6 +688,7 @@ static sapi_module_struct isapi_sapi_module = { sapi_isapi_register_server_variables, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index aa8e59d01b..d868f801c4 100644 --- a/sapi/milter/php_milter.c +++ b/sapi/milter/php_milter.c @@ -869,6 +869,7 @@ static sapi_module_struct milter_sapi_module = { sapi_milter_register_variables, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ NULL, /* Block interruptions */ NULL, /* Unblock interruptions */ diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index 9394d8f056..54609a1c5e 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -757,6 +757,7 @@ static sapi_module_struct nsapi_sapi_module = { sapi_nsapi_register_server_variables, /* register server variables */ nsapi_log_message, /* Log message */ sapi_nsapi_get_request_time, /* Get request time */ + NULL, /* Child terminate */ NULL, /* Block interruptions */ NULL, /* Unblock interruptions */ diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c index ed4b3fd57f..c2a4166f2d 100644 --- a/sapi/phttpd/phttpd.c +++ b/sapi/phttpd/phttpd.c @@ -180,6 +180,7 @@ static sapi_module_struct phttpd_sapi_module = { NULL, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index 6365f5ee07..5c1f4ff99a 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -337,6 +337,7 @@ static sapi_module_struct pi3web_sapi_module = { sapi_pi3web_register_variables, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index 13155d49f4..695262556e 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -502,6 +502,7 @@ static sapi_module_struct roxen_sapi_module = { NULL, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index faa8f4f43f..32f81ab522 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -394,6 +394,7 @@ static sapi_module_struct thttpd_sapi_module = { sapi_thttpd_register_variables, NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ NULL, /* php.ini path override */ NULL, /* Block interruptions */ diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 65a7cde054..a57b2cf2a2 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -288,6 +288,7 @@ static sapi_module_struct tux_sapi_module = { sapi_tux_register_variables, NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/webjames/webjames.c b/sapi/webjames/webjames.c index f166eddfb8..2fb52f5661 100644 --- a/sapi/webjames/webjames.c +++ b/sapi/webjames/webjames.c @@ -301,6 +301,7 @@ static sapi_module_struct sapi_module = { sapi_webjames_register_variables, /* register server variables */ NULL, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; -- cgit v1.2.1