cvs: /php4 SAPI.h main.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c
/php4/sapi/phttpd phttpd.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c /php4/sapi/thttpd thttpd.c

zeev Thu Feb 10 10:45:04 2000 EDT Modified files: /php4 SAPI.h main.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c /php4/sapi/thttpd thttpd.c Log: Yes, you guessed it... More cleanup Index: php4/SAPI.h diff -u php4/SAPI.h:1.33 php4/SAPI.h:1.34 --- php4/SAPI.h:1.33 Thu Feb 10 10:19:02 2000 +++ php4/SAPI.h Thu Feb 10 10:44:32 2000 @@ -158,6 +158,9 @@ 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); }; Index: php4/main.c diff -u php4/main.c:1.198 php4/main.c:1.199 --- php4/main.c:1.198 Thu Feb 10 09:15:49 2000 +++ php4/main.c Thu Feb 10 10:44:32 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.198 2000/02/10 17:15:49 andi Exp $ */ +/* $Id: main.c,v 1.199 2000/02/10 18:44:32 zeev Exp $ */ #include <stdio.h> @@ -815,8 +815,8 @@ 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); Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.34 php4/sapi/aolserver/aolserver.c:1.35 --- php4/sapi/aolserver/aolserver.c:1.34 Thu Feb 10 09:55:00 2000 +++ php4/sapi/aolserver/aolserver.c Thu Feb 10 10:44:32 2000 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.34 2000/02/10 17:55:00 zeev Exp $ */ +/* $Id: aolserver.c,v 1.35 2000/02/10 18:44:32 zeev Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -206,7 +206,7 @@ NSLS_FETCH(); PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.34 2000/02/10 17:55:00 zeev Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.35 2000/02/10 18:44:32 zeev Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -316,6 +316,9 @@ NULL, /* register server variables */ NULL, /* Log message */ + + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.26 php4/sapi/apache/mod_php4.c:1.27 --- php4/sapi/apache/mod_php4.c:1.26 Thu Feb 10 10:19:04 2000 +++ php4/sapi/apache/mod_php4.c Thu Feb 10 10:44:32 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.26 2000/02/10 18:19:04 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.27 2000/02/10 18:44:32 zeev Exp $ */ #include "zend.h" #include "php.h" @@ -339,6 +339,9 @@ 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 }; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.24 php4/sapi/cgi/cgi_main.c:1.25 --- php4/sapi/cgi/cgi_main.c:1.24 Thu Feb 10 09:55:00 2000 +++ php4/sapi/cgi/cgi_main.c Thu Feb 10 10:44:32 2000 @@ -203,6 +203,9 @@ sapi_cgi_register_variables, /* register server variables */ sapi_cgi_log_message, /* Log message */ + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ + STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.20 php4/sapi/isapi/php4isapi.c:1.21 --- php4/sapi/isapi/php4isapi.c:1.20 Thu Feb 10 09:55:00 2000 +++ php4/sapi/isapi/php4isapi.c Thu Feb 10 10:44:33 2000 @@ -365,6 +365,9 @@ sapi_isapi_register_server_variables, /* register server variables */ NULL, /* Log message */ + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ + STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.12 php4/sapi/phttpd/phttpd.c:1.13 --- php4/sapi/phttpd/phttpd.c:1.12 Thu Feb 10 09:55:01 2000 +++ php4/sapi/phttpd/phttpd.c Thu Feb 10 10:44:33 2000 @@ -187,6 +187,9 @@ NULL, /* register server variables */ NULL, /* Log message */ + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ + STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.18 php4/sapi/roxen/roxen.c:1.19 --- php4/sapi/roxen/roxen.c:1.18 Thu Feb 10 09:55:01 2000 +++ php4/sapi/roxen/roxen.c Thu Feb 10 10:44:33 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.18 2000/02/10 17:55:01 zeev Exp $ */ +/* $Id: roxen.c,v 1.19 2000/02/10 18:44:33 zeev Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -470,7 +470,7 @@ /* char buf[512]; */ PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.18 2000/02/10 17:55:01 zeev Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.19 2000/02/10 18:44:33 zeev Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -541,6 +541,8 @@ NULL, /* register server variables */ NULL, /* Log message */ + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.17 php4/sapi/servlet/servlet.c:1.18 --- php4/sapi/servlet/servlet.c:1.17 Thu Feb 10 09:55:01 2000 +++ php4/sapi/servlet/servlet.c Thu Feb 10 10:44:33 2000 @@ -236,6 +236,9 @@ NULL, /* register server variables */ NULL, /* Log message */ + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ + STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.9 php4/sapi/thttpd/thttpd.c:1.10 --- php4/sapi/thttpd/thttpd.c:1.9 Thu Feb 10 09:55:01 2000 +++ php4/sapi/thttpd/thttpd.c Thu Feb 10 10:44:33 2000 @@ -123,8 +123,11 @@ 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 };