Fixed SAPI modules to properly register their related modules.

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 5b1af17ec75e1d639186f747f8b77e33c3d6669c..2b588dc1f213fbad338b7bd3dd2e667646e5cee1 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -281,7 +281,7 @@ static int
 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;

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 72cba44f2e11667df9b439748e0fa84b947720ec..1485b3801dde85a759fc87bbdba9324bc137a741 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -261,7 +261,7 @@ static int
 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 @@ void php_init_handler(server_rec *s, pool *p)
        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

diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 8aa39f927c07e0b7030ce3acbd077d52f60637b2..ac921e1d0d3881a453ef6e1ed8bcdd0da45759d4 100644 (file)
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -229,7 +229,7 @@ static int sapi_isapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
 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;

diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 62e3edc0c86281b88e8e9c1e8933de5282a02b77..57d14e9639516eeb6d83604cf5b51aafbeaade17 100644 (file)
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -50,7 +50,7 @@ php_phttpd_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) {
 */
        fprintf(stderr,"***php_phttpd_startup\n");
 

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index a17cf5a3e66d541970f6643c3460ee96ed759dca..9fb78b5a93194449d2139f2ea373b9d168f5561a 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -504,7 +504,7 @@ static zend_module_entry php_roxen_module = {
 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;