From: Zeev Suraski <zeev@php.net>
Date: Sat, 21 Sep 2002 01:53:15 +0000 (+0000)
Subject: Fix double initialization
X-Git-Tag: MODERN_SYMMETRIC_SESSION_BEHAVIOUR_20021003~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b23adfb43bf486929040243aac804d91340215c3;p=php

Fix double initialization
---

diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h
index e96fd404f1..d65bc6de3c 100644
--- 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 e7631266b2..1530593296 100644
--- 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 c8589e39ff..b89784008c 100644
--- 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;