diff options
| -rw-r--r-- | main/SAPI.h | 3 | ||||
| -rw-r--r-- | main/main.c | 4 | ||||
| -rw-r--r-- | sapi/aolserver/aolserver.c | 3 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 3 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 3 | ||||
| -rw-r--r-- | sapi/isapi/php4isapi.c | 3 | ||||
| -rw-r--r-- | sapi/phttpd/phttpd.c | 3 | ||||
| -rw-r--r-- | sapi/roxen/roxen.c | 2 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 3 | ||||
| -rw-r--r-- | sapi/thttpd/thttpd.c | 7 |
10 files changed, 30 insertions, 4 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index 48f001200c..e9e17589a8 100644 --- 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 8d70d52437..089fe367bf 100644 --- 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 a7d200754e..05323ded6a 100644 --- 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 8e1c27ae02..5a94ea001c 100644 --- 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 db0c5cda52..af4bf9da1c 100644 --- 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 9f71738211..5277f93e3e 100644 --- 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 194cf9ebf5..f22d11fb61 100644 --- 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 0b87ed855e..cdd95795a4 100644 --- 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 bc80e0f3be..e92bb2e33c 100644 --- 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 236439e4e3..57e3ed8046 100644 --- 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 }; |