zeev Fri Sep 20 21:53:15 2002 EDT
Modified files:
/php4/sapi/apache2filter php_apache.h php_functions.c
sapi_apache2.c
Log:
Fix double initialization
Index: php4/sapi/apache2filter/php_apache.h
diff -u php4/sapi/apache2filter/php_apache.h:1.14
php4/sapi/apache2filter/php_apache.h:1.15
--- php4/sapi/apache2filter/php_apache.h:1.14 Thu Apr 18 18:10:57 2002
+++ php4/sapi/apache2filter/php_apache.h Fri Sep 20 21:53:15 2002
@@ -44,7 +44,6 @@
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 *);
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.26
php4/sapi/apache2filter/php_functions.c:1.27
--- php4/sapi/apache2filter/php_functions.c:1.26 Wed Sep 18 17:57:30 2002
+++ php4/sapi/apache2filter/php_functions.c Fri Sep 20 21:53:15 2002
@@ -167,11 +167,6 @@
STANDARD_MODULE_PROPERTIES
};
-int php_apache_register_module(void)
-{
- return zend_startup_module(&php_apache_module);
-}
-
/*
* Local variables:
* tab-width: 4
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.82
php4/sapi/apache2filter/sapi_apache2.c:1.83
--- php4/sapi/apache2filter/sapi_apache2.c:1.82 Wed Sep 18 17:57:31 2002
+++ php4/sapi/apache2filter/sapi_apache2.c Fri Sep 20 21:53:15 2002
@@ -502,7 +502,6 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
