cvs: /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/isapi php4isapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/roxen roxen.c
| From: | Andrei Zmievski | Date: | Wed, 02 Feb 2000 17:19:36 +0000 |
| Subject: | cvs: /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/isapi php4isapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/roxen roxen.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-9688@lists.php.net to get a copy of this message | ||
andrei Wed Feb 2 18:19:36 2000 EDT
Modified files:
/php4/sapi/aolserver aolserver.c
/php4/sapi/apache mod_php4.c
/php4/sapi/isapi php4isapi.c
/php4/sapi/phttpd phttpd.c
/php4/sapi/roxen roxen.c
Log:
Fixed SAPI modules to properly register their related modules.
Index: php4/sapi/aolserver/aolserver.c
diff -u php4/sapi/aolserver/aolserver.c:1.29 php4/sapi/aolserver/aolserver.c:1.30
--- php4/sapi/aolserver/aolserver.c:1.29 Fri Jan 28 18:24:50 2000
+++ php4/sapi/aolserver/aolserver.c Wed Feb 2 18:19:35 2000
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.29 2000/01/28 17:24:50 zeev Exp $ */
+/* $Id: aolserver.c,v 1.30 2000/02/02 17:19:35 andrei 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.29
2000/01/28 17:24:50 zeev Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.30
2000/02/02 17:19:35 andrei 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());
@@ -281,7 +281,7 @@
php_ns_startup(sapi_module_struct *sapi_module)
{
if(php_module_startup(sapi_module) == FAILURE
- || zend_register_module(&php_aolserver_module) == FAILURE) {
+ || zend_startup_module(&php_aolserver_module) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.19 php4/sapi/apache/mod_php4.c:1.20
--- php4/sapi/apache/mod_php4.c:1.19 Wed Feb 2 17:49:39 2000
+++ php4/sapi/apache/mod_php4.c Wed Feb 2 18:19:35 2000
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.19 2000/02/02 16:49:39 andrei Exp $ */
+/* $Id: mod_php4.c,v 1.20 2000/02/02 17:19:35 andrei Exp $ */
#include "zend.h"
#include "php.h"
@@ -261,7 +261,7 @@
php_apache_startup(sapi_module_struct *sapi_module)
{
if(php_module_startup(sapi_module) == FAILURE
- || zend_register_module(&apache_module_entry) == FAILURE) {
+ || zend_startup_module(&apache_module_entry) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
@@ -581,7 +581,7 @@
register_cleanup(p, NULL, (void (*)(void *))apache_php_module_shutdown_wrapper, (void (*)(void
*))php_module_shutdown_for_exec);
if (!apache_php_initialized) {
sapi_startup(&sapi_module);
- php_module_startup(&sapi_module);
+ php_apache_startup(&sapi_module);
apache_php_initialized = 1;
}
#if MODULE_MAGIC_NUMBER >= 19980527
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.13 php4/sapi/isapi/php4isapi.c:1.14
--- php4/sapi/isapi/php4isapi.c:1.13 Sat Jan 29 12:55:44 2000
+++ php4/sapi/isapi/php4isapi.c Wed Feb 2 18:19:35 2000
@@ -229,7 +229,7 @@
static int php_isapi_startup(sapi_module_struct *sapi_module)
{
if (php_module_startup(sapi_module)==FAILURE
- || zend_register_module(&php_isapi_module)==FAILURE) {
+ || zend_startup_module(&php_isapi_module)==FAILURE) {
return FAILURE;
} else {
return SUCCESS;
Index: php4/sapi/phttpd/phttpd.c
diff -u php4/sapi/phttpd/phttpd.c:1.7 php4/sapi/phttpd/phttpd.c:1.8
--- php4/sapi/phttpd/phttpd.c:1.7 Fri Jan 28 18:24:52 2000
+++ php4/sapi/phttpd/phttpd.c Wed Feb 2 18:19:36 2000
@@ -50,7 +50,7 @@
{
/*
if(php_module_startup(sapi_module) == FAILURE
- || zend_register_module(&php_aolserver_module) == FAILURE) {
+ || zend_startup_module(&php_aolserver_module) == FAILURE) {
*/
fprintf(stderr,"***php_phttpd_startup\n");
Index: php4/sapi/roxen/roxen.c
diff -u php4/sapi/roxen/roxen.c:1.13 php4/sapi/roxen/roxen.c:1.14
--- php4/sapi/roxen/roxen.c:1.13 Fri Jan 28 18:24:52 2000
+++ php4/sapi/roxen/roxen.c Wed Feb 2 18:19:36 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: roxen.c,v 1.13 2000/01/28 17:24:52 zeev Exp $ */
+/* $Id: roxen.c,v 1.14 2000/02/02 17:19:36 andrei 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.13 2000/01/28
17:24:52 zeev Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.14 2000/02/02
17:19:36 andrei 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());
@@ -504,7 +504,7 @@
static int php_roxen_startup(sapi_module_struct *sapi_module)
{
if(php_module_startup(sapi_module) == FAILURE
- || zend_register_module(&php_roxen_module) == FAILURE) {
+ || zend_startup_module(&php_roxen_module) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;