Browse Source

Fix double initialization

migration/unlabaled-1.1.2
Zeev Suraski 24 years ago
parent
commit
b23adfb43b
  1. 1
      sapi/apache2filter/php_apache.h
  2. 5
      sapi/apache2filter/php_functions.c
  3. 1
      sapi/apache2filter/sapi_apache2.c

1
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 *);

5
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

1
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;

Loading…
Cancel
Save