sniper Tue Nov 26 00:57:06 2002 EDT Modified files: /php4/main SAPI.h /php4/sapi/activescript php4activescript.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/apache_hooks mod_php4.c /php4/sapi/caudium caudium.c /php4/sapi/cgi cgi_main.c /php4/sapi/cli php_cli.c /php4/sapi/embed php_embed.c /php4/sapi/fastcgi fastcgi.c /php4/sapi/isapi php4isapi.c /php4/sapi/nsapi nsapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c /php4/sapi/tux php_tux.c /php4/sapi/webjames webjames.c Log: - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is.
Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.90 php4/main/SAPI.h:1.91 --- php4/main/SAPI.h:1.90 Tue Nov 26 00:15:55 2002 +++ php4/main/SAPI.h Tue Nov 26 00:57:01 2002 @@ -215,12 +215,12 @@ void (*register_server_variables)(zval *track_vars_array TSRMLS_DC); void (*log_message)(char *message); + char *php_ini_path_override; void (*block_interruptions)(void); void (*unblock_interruptions)(void); - void (*default_post_reader)(TSRMLS_D); void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC); char *executable_location; @@ -262,7 +262,7 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader); SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data); -#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, 0 +#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL #endif /* SAPI_H */ Index: php4/sapi/activescript/php4activescript.c diff -u php4/sapi/activescript/php4activescript.c:1.2 php4/sapi/activescript/php4activescript.c:1.3 --- php4/sapi/activescript/php4activescript.c:1.2 Wed Sep 18 17:57:29 2002 +++ php4/sapi/activescript/php4activescript.c Tue Nov 26 00:57:01 2002 @@ -15,7 +15,7 @@ | Authors: Wez Furlong <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php4activescript.c,v 1.2 2002/09/18 21:57:29 zeev Exp $ */ +/* $Id: php4activescript.c,v 1.3 2002/11/26 05:57:01 sniper Exp $ */ #include "php.h" #include "php_main.h" @@ -117,9 +117,6 @@ sapi_activescript_register_server_variables, /* register server variables */ NULL, /* Log message */ - - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.72 php4/sapi/aolserver/aolserver.c:1.73 --- php4/sapi/aolserver/aolserver.c:1.72 Thu Sep 26 13:54:53 2002 +++ php4/sapi/aolserver/aolserver.c Tue Nov 26 00:57:01 2002 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.72 2002/09/26 17:54:53 cmv Exp $ */ +/* $Id: aolserver.c,v 1.73 2002/11/26 05:57:01 sniper Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72 2002/09/26 17:54:53 cmv Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.73 +2002/11/26 05:57:01 sniper 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()); @@ -387,11 +387,6 @@ php_ns_sapi_register_variables, NULL, /* Log message */ - - NULL, /* php.ini path override */ - - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91 php4/sapi/apache2filter/sapi_apache2.c:1.92 --- php4/sapi/apache2filter/sapi_apache2.c:1.91 Sat Nov 2 11:04:27 2002 +++ php4/sapi/apache2filter/sapi_apache2.c Tue Nov 26 00:57:02 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.91 2002/11/02 16:04:27 imajes Exp $ */ +/* $Id: sapi_apache2.c,v 1.92 2002/11/26 05:57:02 sniper Exp $ */ #include <fcntl.h> @@ -298,11 +298,6 @@ php_apache_sapi_register_variables, php_apache_sapi_log_message, /* Log message */ - - NULL, /* php_ini_path_override */ - - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/apache_hooks/mod_php4.c diff -u php4/sapi/apache_hooks/mod_php4.c:1.3 php4/sapi/apache_hooks/mod_php4.c:1.4 --- php4/sapi/apache_hooks/mod_php4.c:1.3 Mon Nov 18 14:07:37 2002 +++ php4/sapi/apache_hooks/mod_php4.c Tue Nov 26 00:57:02 2002 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.3 2002/11/18 19:07:37 gschlossnagle Exp $ */ +/* $Id: mod_php4.c,v 1.4 2002/11/26 05:57:02 sniper Exp $ */ #include "php_apache_http.h" @@ -540,7 +540,12 @@ unblock_alarms, /* Unblock interruptions */ #endif - STANDARD_SAPI_MODULE_PROPERTIES + NULL, /* default post reader */ + NULL, /* treat data */ + NULL, /* exe location */ + 0, /* ini ignore */ + NULL + }; /* }}} */ Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.28 php4/sapi/caudium/caudium.c:1.29 --- php4/sapi/caudium/caudium.c:1.28 Wed Sep 18 17:57:31 2002 +++ php4/sapi/caudium/caudium.c Tue Nov 26 00:57:02 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.28 2002/09/18 21:57:31 zeev Exp $ */ +/* $Id: caudium.c,v 1.29 2002/11/26 05:57:02 sniper Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -444,7 +444,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28 2002/09/18 21:57:31 zeev Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.29 +2002/11/26 05:57:02 sniper 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()); @@ -550,8 +550,6 @@ php_caudium_sapi_read_cookies, /* read cookies */ sapi_caudium_register_variables, /* register server variables */ NULL, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.197 php4/sapi/cgi/cgi_main.c:1.198 --- php4/sapi/cgi/cgi_main.c:1.197 Tue Nov 26 00:51:15 2002 +++ php4/sapi/cgi/cgi_main.c Tue Nov 26 00:57:03 2002 @@ -445,9 +445,6 @@ 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/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.52 php4/sapi/cli/php_cli.c:1.53 --- php4/sapi/cli/php_cli.c:1.52 Thu Nov 14 15:32:28 2002 +++ php4/sapi/cli/php_cli.c Tue Nov 26 00:57:03 2002 @@ -277,9 +277,6 @@ sapi_cli_register_variables, /* register server variables */ sapi_cli_log_message, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES }; /* }}} */ Index: php4/sapi/embed/php_embed.c diff -u php4/sapi/embed/php_embed.c:1.1 php4/sapi/embed/php_embed.c:1.2 --- php4/sapi/embed/php_embed.c:1.1 Sun Sep 29 12:22:48 2002 +++ php4/sapi/embed/php_embed.c Tue Nov 26 00:57:04 2002 @@ -15,7 +15,7 @@ | Author: Edin Kadribasic <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_embed.c,v 1.1 2002/09/29 16:22:48 sas Exp $ */ +/* $Id: php_embed.c,v 1.2 2002/11/26 05:57:04 sniper Exp $ */ #include "php_embed.h" @@ -126,9 +126,6 @@ php_embed_register_variables, /* register server variables */ php_embed_log_message, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES }; /* }}} */ Index: php4/sapi/fastcgi/fastcgi.c diff -u php4/sapi/fastcgi/fastcgi.c:1.27 php4/sapi/fastcgi/fastcgi.c:1.28 --- php4/sapi/fastcgi/fastcgi.c:1.27 Tue Nov 5 17:04:12 2002 +++ php4/sapi/fastcgi/fastcgi.c Tue Nov 26 00:57:04 2002 @@ -209,9 +209,6 @@ sapi_fastcgi_register_variables, sapi_fastcgi_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.92 php4/sapi/isapi/php4isapi.c:1.93 --- php4/sapi/isapi/php4isapi.c:1.92 Wed Sep 18 17:57:33 2002 +++ php4/sapi/isapi/php4isapi.c Tue Nov 26 00:57:04 2002 @@ -603,9 +603,6 @@ sapi_isapi_register_server_variables, /* register server variables */ NULL, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.28 php4/sapi/nsapi/nsapi.c:1.29 --- php4/sapi/nsapi/nsapi.c:1.28 Sat Oct 26 18:00:36 2002 +++ php4/sapi/nsapi/nsapi.c Tue Nov 26 00:57:04 2002 @@ -380,9 +380,6 @@ sapi_nsapi_register_server_variables, /* register server variables */ nsapi_log_message, /* 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.35 php4/sapi/phttpd/phttpd.c:1.36 --- php4/sapi/phttpd/phttpd.c:1.35 Wed Sep 18 17:57:34 2002 +++ php4/sapi/phttpd/phttpd.c Tue Nov 26 00:57:05 2002 @@ -180,9 +180,6 @@ NULL, /* register server variables */ NULL, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.46 php4/sapi/pi3web/pi3web_sapi.c:1.47 --- php4/sapi/pi3web/pi3web_sapi.c:1.46 Wed Sep 18 17:57:34 2002 +++ php4/sapi/pi3web/pi3web_sapi.c Tue Nov 26 00:57:05 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.46 2002/09/18 21:57:34 zeev Exp $ */ +/* $Id: pi3web_sapi.c,v 1.47 2002/11/26 05:57:05 sniper Exp $ */ #include "pi3web_sapi.h" #include "php.h" @@ -77,7 +77,7 @@ PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46 2002/09/18 21:57:34 zeev Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: +pi3web_sapi.c,v 1.47 2002/11/26 05:57:05 sniper Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -378,8 +378,6 @@ sapi_pi3web_read_cookies, /* read Cookies */ sapi_pi3web_register_variables, /* 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.53 php4/sapi/roxen/roxen.c:1.54 --- php4/sapi/roxen/roxen.c:1.53 Wed Sep 18 17:57:35 2002 +++ php4/sapi/roxen/roxen.c Tue Nov 26 00:57:05 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.53 2002/09/18 21:57:35 zeev Exp $ */ +/* $Id: roxen.c,v 1.54 2002/11/26 05:57:05 sniper Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -438,7 +438,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53 2002/09/18 21:57:35 zeev Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.54 2002/11/26 +05:57:05 sniper 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()); @@ -501,8 +501,6 @@ php_roxen_sapi_read_cookies, /* read Cookies */ 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.65 php4/sapi/servlet/servlet.c:1.66 --- php4/sapi/servlet/servlet.c:1.65 Thu Oct 24 09:14:49 2002 +++ php4/sapi/servlet/servlet.c Tue Nov 26 00:57:05 2002 @@ -244,9 +244,6 @@ NULL, /* register server variables */ NULL, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/tux/php_tux.c diff -u php4/sapi/tux/php_tux.c:1.18 php4/sapi/tux/php_tux.c:1.19 --- php4/sapi/tux/php_tux.c:1.18 Wed Sep 18 17:57:35 2002 +++ php4/sapi/tux/php_tux.c Tue Nov 26 00:57:06 2002 @@ -288,9 +288,6 @@ sapi_tux_register_variables, NULL, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/webjames/webjames.c diff -u php4/sapi/webjames/webjames.c:1.5 php4/sapi/webjames/webjames.c:1.6 --- php4/sapi/webjames/webjames.c:1.5 Wed Sep 18 17:57:36 2002 +++ php4/sapi/webjames/webjames.c Tue Nov 26 00:57:06 2002 @@ -278,9 +278,6 @@ sapi_webjames_register_variables, /* register server variables */ NULL, /* Log message */ - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ - STANDARD_SAPI_MODULE_PROPERTIES };
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php