Fix double initialization

diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h
index e96fd404f1e5f0eefcbf1d254ca418103bef7e25..d65bc6de3cc5b84b90ecaac918115a0c45eeee18 100644 (file)
--- a/sapi/apache2filter/php_apache.h
+++ b/sapi/apache2filter/php_apache.h
@@ -44,7 +44,6 @@ typedef struct php_struct {
        int request_processed;
 } php_struct;
 
-int php_apache_register_module(void);
 void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf);
 void *create_php_config(apr_pool_t *p, char *dummy);
 void apply_config(void *);

diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index e7631266b2134d6548a49ffe2b7f16df6b56235c..15305932967c1fe173806b72c563b9d57759cbc5 100644 (file)
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -167,11 +167,6 @@ zend_module_entry php_apache_module = {
        STANDARD_MODULE_PROPERTIES
 };
 
-int php_apache_register_module(void)
-{
-       return zend_startup_module(&php_apache_module);
-}
-
 /*
  * Local variables:
  * tab-width: 4

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index c8589e39ffe14a663afa518484fb4f8f10e698b5..b89784008ccc0ad8ac9166702274348c818f678f 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -502,7 +502,6 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog,
        sapi_startup(&apache2_sapi_module);
        apache2_sapi_module.startup(&apache2_sapi_module);
        apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null);
-       php_apache_register_module();
        php_apache_add_version(pconf);
 
        return OK;