Yes, you guessed it... More cleanup

diff --git a/main/SAPI.h b/main/SAPI.h
index 48f001200cd7ea50813a31bd63900703474e4180..e9e17589a878cb829b65edded8b4158f64bf7110 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -158,6 +158,9 @@ struct _sapi_module_struct {
        void (*register_server_variables)(zval *track_vars_array ELS_DC SLS_DC PLS_DC);
        void (*log_message)(char *message);
 
+       void (*block_interruptions)(void);
+       void (*unblock_interruptions)(void);
+
        void (*default_post_reader)(char *content_type_dup SLS_DC);
 };
 

diff --git a/main/main.c b/main/main.c
index 8d70d524375198e0c96dd1083abd3c120cc56b75..089fe367bf2caa353775e4b28de0b05e5f859245 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -815,8 +815,8 @@ int php_module_startup(sapi_module_struct *sf)
        zuf.write_function = php_body_write_wrapper;
        zuf.fopen_function = php_fopen_wrapper_for_zend;
        zuf.message_handler = php_message_handler_for_zend;
-       zuf.block_interruptions = BLOCK_INTERRUPTIONS;
-       zuf.unblock_interruptions = UNBLOCK_INTERRUPTIONS;
+       zuf.block_interruptions = sapi_module.block_interruptions;
+       zuf.unblock_interruptions = sapi_module.unblock_interruptions;
        zuf.get_ini_entry = php_get_ini_entry_for_zend;
        zuf.ticks_function = NULL;
        zend_startup(&zuf, NULL);

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index a7d200754e4670ddbd5da343b6978df934c4b858..05323ded6aaa505108420fc90ceb86b8b8fa03c1 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -317,6 +317,9 @@ static sapi_module_struct sapi_module = {
        NULL,                                                                   /* register server variables */
        NULL,                                                                   /* Log message */
 
+       NULL,                                                                   /* Block interruptions */
+       NULL,                                                                   /* Unblock interruptions */
+
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 8e1c27ae02a133652c5a4106f7055b04e44d7277..5a94ea001cec707ca69012c1aa36babf393a93c4 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -340,6 +340,9 @@ static sapi_module_struct sapi_module = {
        sapi_apache_register_server_variables,          /* register server variables */
        php_apache_log_message,                 /* Log message */
 
+       block_alarms,                                   /* Block interruptions */
+       unblock_alarms,                                 /* Unblock interruptions */
+
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index db0c5cda526855cbb111f0298f1c5cb793b3af47..af4bf9da1c289e51b3038e92f190a863eed69246 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -203,6 +203,9 @@ static sapi_module_struct sapi_module = {
        sapi_cgi_register_variables,    /* register server variables */
        sapi_cgi_log_message,                   /* Log message */
 
+       NULL,                                                   /* Block interruptions */
+       NULL,                                                   /* Unblock interruptions */
+
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 9f71738211372df2ca46aeef360bbde528ac66cc..5277f93e3ec504d02f67aabaa8d689e28e6e3ace 100644 (file)
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -365,6 +365,9 @@ static sapi_module_struct sapi_module = {
        sapi_isapi_register_server_variables,   /* register server variables */
        NULL,                                                                   /* Log message */
 
+       NULL,                                                                   /* Block interruptions */
+       NULL,                                                                   /* Unblock interruptions */
+
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 194cf9ebf50e39463a0d2789b387d42e90da526f..f22d11fb61a34eca199d9bb5821067216a4df94c 100644 (file)
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -187,6 +187,9 @@ static sapi_module_struct sapi_module = {
        NULL,                                                                   /* register server variables */
        NULL,                                                                   /* Log message */
 
+       NULL,                                                                   /* Block interruptions */
+       NULL,                                                                   /* Unblock interruptions */
+
     STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 0b87ed855e2fc35b9690c0f2b40e8b0335a697b9..cdd95795a449140a2e69e7b2bc19b8160e32af74 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -541,6 +541,8 @@ static sapi_module_struct sapi_module = {
   NULL,                                                                                /* register server variables */
   NULL,                                                                                /* Log message */
 
+  NULL,                                                                                /* Block interruptions */
+  NULL,                                                                                /* Unblock interruptions */
 
   STANDARD_SAPI_MODULE_PROPERTIES
 };

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index bc80e0f3be51cf90cf564619d113e314a77dc4b0..e92bb2e33c18254adeb4148171697510e882482d 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -236,6 +236,9 @@ static sapi_module_struct sapi_module = {
        NULL,                                                   /* register server variables */
        NULL,                                                   /* Log message */
 
+       NULL,                                                   /* Block interruptions */
+       NULL,                                                   /* Unblock interruptions */
+
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 236439e4e3b37e1f241c6001e94f86588dc5bc30..57e3ed80461995245c9f656b2996c6063f2170f1 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -123,8 +123,11 @@ static sapi_module_struct sapi_module = {
        sapi_thttpd_read_post,
        sapi_thttpd_read_cookies,
 
-       NULL,                                                   /* register server variables */
-       NULL,                                                   /* Log message */
+       NULL,                                                                   /* register server variables */
+       NULL,                                                                   /* Log message */
+
+       NULL,                                                                   /* Block interruptions */
+       NULL,                                                                   /* Unblock interruptions */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };