diff options
| -rw-r--r-- | sapi/aolserver/aolserver.c | 2 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 4 | ||||
| -rw-r--r-- | sapi/isapi/php4isapi.c | 2 | ||||
| -rw-r--r-- | sapi/phttpd/phttpd.c | 2 | ||||
| -rw-r--r-- | sapi/roxen/roxen.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 5b1af17ec7..2b588dc1f2 100644 --- 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 72cba44f2e..1485b3801d 100644 --- 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 8aa39f927c..ac921e1d0d 100644 --- 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 62e3edc0c8..57d14e9639 100644 --- 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 a17cf5a3e6..9fb78b5a93 100644 --- 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; |