zeev Wed Sep 18 17:57:36 2002 EDT
Modified files:
/php4/main main.c php_main.h
/php4/sapi/activescript php4activescript.c
/php4/sapi/aolserver aolserver.c
/php4/sapi/apache mod_php4.c
/php4/sapi/apache2filter php_functions.c sapi_apache2.c
/php4/sapi/caudium caudium.c
/php4/sapi/cgi cgi_main.c
/php4/sapi/cli php_cli.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/thttpd thttpd.c
/php4/sapi/tux php_tux.c
/php4/sapi/webjames webjames.c
Log:
another startup initialization fix - only ISAPI and CGI SAPI's tested,
minor compile buglets might occur in other SAPIs, but should be trivial
to fix...
Index: php4/main/main.c
diff -u php4/main/main.c:1.486 php4/main/main.c:1.487
--- php4/main/main.c:1.486 Tue Sep 17 05:07:10 2002
+++ php4/main/main.c Wed Sep 18 17:57:29 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.486 2002/09/17 09:07:10 zeev Exp $ */
+/* $Id: main.c,v 1.487 2002/09/18 21:57:29 zeev Exp $ */
/* {{{ includes
*/
@@ -966,7 +966,7 @@
/* {{{ php_module_startup
*/
-int php_module_startup(sapi_module_struct *sf)
+int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules,
+uint num_additional_modules)
{
zend_utility_functions zuf;
zend_utility_values zuv;
@@ -1118,6 +1118,9 @@
php_printf("Unable to start builtin modules\n");
return FAILURE;
}
+ /* start additional PHP extensions */
+ php_startup_extensions(&additional_modules, num_additional_modules);
+
/* load and startup extensions compiled as shared objects (aka DLLs)
as requested by php.ini entries
@@ -1131,6 +1134,7 @@
/* disable certain functions as requested by php.ini */
php_disable_functions(TSRMLS_C);
+ /* start Zend extensions */
zend_startup_extensions();
#ifdef ZTS
Index: php4/main/php_main.h
diff -u php4/main/php_main.h:1.22 php4/main/php_main.h:1.23
--- php4/main/php_main.h:1.22 Fri Aug 2 02:53:48 2002
+++ php4/main/php_main.h Wed Sep 18 17:57:29 2002
@@ -18,7 +18,7 @@
*/
-/* $Id: php_main.h,v 1.22 2002/08/02 06:53:48 hirokawa Exp $ */
+/* $Id: php_main.h,v 1.23 2002/09/18 21:57:29 zeev Exp $ */
#ifndef PHP_MAIN_H
@@ -31,7 +31,7 @@
PHPAPI int php_request_startup(TSRMLS_D);
PHPAPI void php_request_shutdown(void *dummy);
PHPAPI void php_request_shutdown_for_exec(void *dummy);
-PHPAPI int php_module_startup(sapi_module_struct *sf);
+PHPAPI int php_module_startup(sapi_module_struct *sf, zend_module_entry
+*additional_modules, uint num_additional_modules);
PHPAPI void php_module_shutdown(TSRMLS_D);
PHPAPI void php_module_shutdown_for_exec(void);
PHPAPI int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals);
Index: php4/sapi/activescript/php4activescript.c
diff -u php4/sapi/activescript/php4activescript.c:1.1
php4/sapi/activescript/php4activescript.c:1.2
--- php4/sapi/activescript/php4activescript.c:1.1 Sun May 19 21:35:29 2002
+++ php4/sapi/activescript/php4activescript.c Wed Sep 18 17:57:29 2002
@@ -15,7 +15,7 @@
| Authors: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php4activescript.c,v 1.1 2002/05/20 01:35:29 wez Exp $ */
+/* $Id: php4activescript.c,v 1.2 2002/09/18 21:57:29 zeev Exp $ */
#include "php.h"
#include "php_main.h"
@@ -30,8 +30,7 @@
static int php_activescript_startup(sapi_module_struct *sapi_module)
{
- if (php_module_startup(sapi_module) == FAILURE ||
- zend_startup_module(&php_activescript_module) == FAILURE) {
+ if (php_module_startup(sapi_module, &php_activescript_module, 1) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/aolserver/aolserver.c
diff -u php4/sapi/aolserver/aolserver.c:1.69 php4/sapi/aolserver/aolserver.c:1.70
--- php4/sapi/aolserver/aolserver.c:1.69 Wed Jun 26 03:54:49 2002
+++ php4/sapi/aolserver/aolserver.c Wed Sep 18 17:57:30 2002
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.69 2002/06/26 07:54:49 sas Exp $ */
+/* $Id: aolserver.c,v 1.70 2002/09/18 21:57:30 zeev 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.69
2002/06/26 07:54:49 sas Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.70
+2002/09/18 21:57:30 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());
@@ -277,8 +277,7 @@
static int
php_ns_startup(sapi_module_struct *sapi_module)
{
- if(php_module_startup(sapi_module) == FAILURE
- || zend_startup_module(&php_aolserver_module) == FAILURE) {
+ if (php_module_startup(sapi_module, &php_aolserver_module, 1) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.141 php4/sapi/apache/mod_php4.c:1.142
--- php4/sapi/apache/mod_php4.c:1.141 Thu Aug 22 03:48:23 2002
+++ php4/sapi/apache/mod_php4.c Wed Sep 18 17:57:30 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.141 2002/08/22 07:48:23 chregu Exp $ */
+/* $Id: mod_php4.c,v 1.142 2002/09/18 21:57:30 zeev Exp $ */
#include "php_apache_http.h"
@@ -256,8 +256,7 @@
*/
static int php_apache_startup(sapi_module_struct *sapi_module)
{
- if (php_module_startup(sapi_module) == FAILURE
- || zend_startup_module(&apache_module_entry) == FAILURE) {
+ if (php_module_startup(sapi_module, &apache_module_entry, 1) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.25
php4/sapi/apache2filter/php_functions.c:1.26
--- php4/sapi/apache2filter/php_functions.c:1.25 Thu May 30 02:07:28 2002
+++ php4/sapi/apache2filter/php_functions.c Wed Sep 18 17:57:30 2002
@@ -154,7 +154,7 @@
{NULL, NULL, NULL}
};
-static zend_module_entry php_apache_module = {
+zend_module_entry php_apache_module = {
STANDARD_MODULE_HEADER,
"Apache 2.0",
apache_functions,
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.81
php4/sapi/apache2filter/sapi_apache2.c:1.82
--- php4/sapi/apache2filter/sapi_apache2.c:1.81 Fri Jun 28 10:45:10 2002
+++ php4/sapi/apache2filter/sapi_apache2.c Wed Sep 18 17:57:31 2002
@@ -230,11 +230,22 @@
}
}
+
+extern zend_module_entry php_apache_module;
+
+static int php_apache2_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, &php_apache_module, 1)==FAILURE) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+
static sapi_module_struct apache2_sapi_module = {
"apache2filter",
"Apache 2.0 Filter",
- php_module_startup, /* startup */
+ php_apache2_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /*
activate */
Index: php4/sapi/caudium/caudium.c
diff -u php4/sapi/caudium/caudium.c:1.27 php4/sapi/caudium/caudium.c:1.28
--- php4/sapi/caudium/caudium.c:1.27 Tue Feb 19 15:46:29 2002
+++ php4/sapi/caudium/caudium.c Wed Sep 18 17:57:31 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: caudium.c,v 1.27 2002/02/19 20:46:29 neotron Exp $ */
+/* $Id: caudium.c,v 1.28 2002/09/18 21:57:31 zeev 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.27
2002/02/19 20:46:29 neotron Exp $");
+ 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, "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());
@@ -520,11 +520,21 @@
THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC),
"register_variables");
}
+
+static int php_caudium_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, &php_caudium_module, 1)==FAILURE) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+
+
/* this structure is static (as in "it does not change") */
static sapi_module_struct caudium_sapi_module = {
"caudium",
"Caudium",
- php_module_startup, /* startup */
+ php_caudium_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /* activate */
NULL, /* deactivate */
@@ -762,7 +772,6 @@
ts_allocate_id(&caudium_globals_id, sizeof(php_caudium_request), NULL, NULL);
sapi_startup(&caudium_sapi_module);
sapi_module.startup(&caudium_sapi_module);
- zend_startup_module(&php_caudium_module);
}
start_new_program(); /* Text */
pike_add_function("run", f_php_caudium_request_handler,
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.180 php4/sapi/cgi/cgi_main.c:1.181
--- php4/sapi/cgi/cgi_main.c:1.180 Wed Sep 4 11:30:56 2002
+++ php4/sapi/cgi/cgi_main.c Wed Sep 18 17:57:32 2002
@@ -296,6 +296,15 @@
}
+static int php_cgi_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+
+
/* {{{ sapi_module_struct cgi_sapi_module
*/
static sapi_module_struct cgi_sapi_module = {
@@ -306,7 +315,7 @@
"CGI", /* pretty name */
#endif
- php_module_startup, /* startup */
+ php_cgi_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /* activate */
@@ -591,7 +600,7 @@
cgi_sapi_module.executable_location = argv[0];
/* startup after we get the above ini override se we get things right */
- if (php_module_startup(&cgi_sapi_module)==FAILURE) {
+ if (php_module_startup(&cgi_sapi_module, NULL, 0)==FAILURE) {
#ifdef ZTS
tsrm_shutdown();
#endif
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.32 php4/sapi/cli/php_cli.c:1.33
--- php4/sapi/cli/php_cli.c:1.32 Mon Sep 2 16:44:01 2002
+++ php4/sapi/cli/php_cli.c Wed Sep 18 17:57:32 2002
@@ -200,13 +200,23 @@
PHPWRITE_H("\r\n", 2);
}
+
+static int php_cli_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+
+
/* {{{ sapi_module_struct cli_sapi_module
*/
static sapi_module_struct cli_sapi_module = {
"cli", /* name */
"Command Line Interface", /* pretty name */
- php_module_startup, /* startup */
+ php_cli_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /* activate */
@@ -421,7 +431,7 @@
cli_sapi_module.executable_location = argv[0];
/* startup after we get the above ini override se we get things right */
- if (php_module_startup(&cli_sapi_module)==FAILURE) {
+ if (php_module_startup(&cli_sapi_module, NULL, 0)==FAILURE) {
return FAILURE;
}
Index: php4/sapi/fastcgi/fastcgi.c
diff -u php4/sapi/fastcgi/fastcgi.c:1.25 php4/sapi/fastcgi/fastcgi.c:1.26
--- php4/sapi/fastcgi/fastcgi.c:1.25 Sun Mar 17 23:46:32 2002
+++ php4/sapi/fastcgi/fastcgi.c Wed Sep 18 17:57:33 2002
@@ -174,11 +174,20 @@
}
+static int php_fastcgi_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+
+
static sapi_module_struct fastcgi_sapi_module = {
"fastcgi",
"FastCGI",
- php_module_startup,
+ php_fastcgi_startup,
php_module_shutdown_wrapper,
NULL, /*
activate */
@@ -444,7 +453,7 @@
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be
binary */
#endif
- if (php_module_startup(&fastcgi_sapi_module)==FAILURE) {
+ if (php_module_startup(&fastcgi_sapi_module, NULL, 0)==FAILURE) {
return FAILURE;
}
#ifdef ZTS
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.91 php4/sapi/isapi/php4isapi.c:1.92
--- php4/sapi/isapi/php4isapi.c:1.91 Mon Sep 16 09:13:52 2002
+++ php4/sapi/isapi/php4isapi.c Wed Sep 18 17:57:33 2002
@@ -296,8 +296,7 @@
static int php_isapi_startup(sapi_module_struct *sapi_module)
{
- if (php_module_startup(sapi_module)==FAILURE
- || zend_startup_module(&php_isapi_module)==FAILURE) {
+ if (php_module_startup(sapi_module, &php_isapi_module, 1)==FAILURE) {
return FAILURE;
} else {
bTerminateThreadsOnError = (zend_bool)
INI_INT("isapi.terminate_threads_on_error");
Index: php4/sapi/nsapi/nsapi.c
diff -u php4/sapi/nsapi/nsapi.c:1.26 php4/sapi/nsapi/nsapi.c:1.27
--- php4/sapi/nsapi/nsapi.c:1.26 Fri Jun 21 10:47:59 2002
+++ php4/sapi/nsapi/nsapi.c Wed Sep 18 17:57:34 2002
@@ -342,11 +342,20 @@
}
+static int php_nsapi_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+
+
static sapi_module_struct nsapi_sapi_module = {
"nsapi", /* name */
"NSAPI", /* pretty name */
- php_module_startup, /* startup */
+ php_nsapi_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /* activate */
Index: php4/sapi/phttpd/phttpd.c
diff -u php4/sapi/phttpd/phttpd.c:1.34 php4/sapi/phttpd/phttpd.c:1.35
--- php4/sapi/phttpd/phttpd.c:1.34 Tue Dec 11 10:32:05 2001
+++ php4/sapi/phttpd/phttpd.c Wed Sep 18 17:57:34 2002
@@ -43,13 +43,9 @@
static int
php_phttpd_startup(sapi_module_struct *sapi_module)
{
-/*
- if(php_module_startup(sapi_module) == FAILURE
- || zend_startup_module(&php_aolserver_module) == FAILURE) {
-*/
fprintf(stderr,"***php_phttpd_startup\n");
- if (php_module_startup(sapi_module)) {
+ if (php_module_startup(sapi_module, NULL, 0)) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.45 php4/sapi/pi3web/pi3web_sapi.c:1.46
--- php4/sapi/pi3web/pi3web_sapi.c:1.45 Sun Aug 18 11:46:48 2002
+++ php4/sapi/pi3web/pi3web_sapi.c Wed Sep 18 17:57:34 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.45 2002/08/18 15:46:48 holger Exp $ */
+/* $Id: pi3web_sapi.c,v 1.46 2002/09/18 21:57:34 zeev 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.45 2002/08/18 15:46:48 holger Exp $");
+ 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, "Server Name Stamp", HTTPCore_getServerStamp());
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
php_info_print_table_row(2, "Debug Enabled", variable_buf);
@@ -215,8 +215,7 @@
static int php_pi3web_startup(sapi_module_struct *sapi_module)
{
- if (php_module_startup(sapi_module)==FAILURE
- || zend_register_module(&php_pi3web_module)==FAILURE) {
+ if (php_module_startup(sapi_module, &php_pi3web_module, 1)==FAILURE) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/roxen/roxen.c
diff -u php4/sapi/roxen/roxen.c:1.52 php4/sapi/roxen/roxen.c:1.53
--- php4/sapi/roxen/roxen.c:1.52 Thu Jan 31 05:15:07 2002
+++ php4/sapi/roxen/roxen.c Wed Sep 18 17:57:35 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: roxen.c,v 1.52 2002/01/31 10:15:07 yohgaki Exp $ */
+/* $Id: roxen.c,v 1.53 2002/09/18 21:57:35 zeev 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.52 2002/01/31
10:15:07 yohgaki Exp $");
+ 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, "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());
@@ -473,8 +473,7 @@
static int php_roxen_startup(sapi_module_struct *sapi_module)
{
- if(php_module_startup(sapi_module) == FAILURE
- || zend_startup_module(&php_roxen_module) == FAILURE) {
+ if(php_module_startup(sapi_module, &php_roxen_module) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
@@ -486,7 +485,7 @@
static sapi_module_struct roxen_sapi_module = {
"roxen",
"Roxen",
- php_module_startup, /* startup */
+ php_roxen_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /* activate */
NULL, /* deactivate */
@@ -698,7 +697,7 @@
#endif
#endif
sapi_startup(&roxen_sapi_module);
- php_roxen_startup(&roxen_sapi_module);
+ /*php_roxen_startup(&roxen_sapi_module); removed - should be called from SAPI
+activation*/
roxen_php_initialized = 1;
PHP_INIT_LOCK();
}
Index: php4/sapi/servlet/servlet.c
diff -u php4/sapi/servlet/servlet.c:1.63 php4/sapi/servlet/servlet.c:1.64
--- php4/sapi/servlet/servlet.c:1.63 Sat Feb 2 14:53:42 2002
+++ php4/sapi/servlet/servlet.c Wed Sep 18 17:57:35 2002
@@ -205,15 +205,25 @@
/***************************************************************************/
+
/*
* sapi maintenance
*/
+static int php_servlet_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
+ return FAILURE;
+ } else {
+ return SUCCESS;
+ }
+}
+
static sapi_module_struct servlet_sapi_module = {
"java_servlet", /* name */
"Java Servlet", /* pretty name */
- php_module_startup, /* startup */
+ php_servlet_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
NULL, /* activate */
@@ -253,16 +263,10 @@
sapi_startup(&servlet_sapi_module);
- if (php_module_startup(&servlet_sapi_module)==FAILURE) {
+ if (php_module_startup(&servlet_sapi_module, additional_php_extensions,
+EXTCOUNT)==FAILURE) {
ThrowServletException(jenv,"module startup failure");
return;
}
-
- if (php_startup_extensions(additional_php_extensions, EXTCOUNT)==FAILURE) {
- ThrowServletException(jenv,"extension startup failure");
- return;
- }
-
}
Index: php4/sapi/thttpd/thttpd.c
diff -u php4/sapi/thttpd/thttpd.c:1.67 php4/sapi/thttpd/thttpd.c:1.68
--- php4/sapi/thttpd/thttpd.c:1.67 Sun Jul 14 14:01:07 2002
+++ php4/sapi/thttpd/thttpd.c Wed Sep 18 17:57:35 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: thttpd.c,v 1.67 2002/07/14 18:01:07 sas Exp $ */
+/* $Id: thttpd.c,v 1.68 2002/09/18 21:57:35 zeev Exp $ */
#include "php.h"
#include "SAPI.h"
@@ -355,8 +355,7 @@
static int php_thttpd_startup(sapi_module_struct *sapi_module)
{
- if (php_module_startup(sapi_module) == FAILURE
- || zend_startup_module(&php_thttpd_module) == FAILURE) {
+ if (php_module_startup(sapi_module, &php_thttpd_module, 1) == FAILURE) {
return FAILURE;
}
return SUCCESS;
Index: php4/sapi/tux/php_tux.c
diff -u php4/sapi/tux/php_tux.c:1.17 php4/sapi/tux/php_tux.c:1.18
--- php4/sapi/tux/php_tux.c:1.17 Wed Jul 3 06:42:31 2002
+++ php4/sapi/tux/php_tux.c Wed Sep 18 17:57:35 2002
@@ -252,11 +252,21 @@
#endif
}
+
+static int php_tux_startup(sapi_module_struct *sapi_module)
+{
+ if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
+ return FAILURE;
+ } else {
+ return SUCCESS;
+ }
+}
+
static sapi_module_struct tux_sapi_module = {
"tux",
"tux",
- php_module_startup,
+ php_tux_startup,
php_module_shutdown_wrapper,
NULL, /*
activate */
Index: php4/sapi/webjames/webjames.c
diff -u php4/sapi/webjames/webjames.c:1.4 php4/sapi/webjames/webjames.c:1.5
--- php4/sapi/webjames/webjames.c:1.4 Wed Jul 3 06:42:31 2002
+++ php4/sapi/webjames/webjames.c Wed Sep 18 17:57:36 2002
@@ -242,10 +242,10 @@
STANDARD_MODULE_PROPERTIES
};
+
static int php_webjames_startup(sapi_module_struct *sapi_module)
{
- if(php_module_startup(sapi_module) == FAILURE
- || zend_startup_module(&php_webjames_module) == FAILURE) {
+ if(php_module_startup(sapi_module, &php_webjames_module, 1) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
