archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Build Fix.

Browse source
This commit is contained in:
Ilia Alshanetsky 2003-02-05 00:41:40 +00:00
parent ad7facdf2b
commit acc9c13c36
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/apache/mod_php4.c
View file

@ -717,7 +717,7 @@ static void *php_create_dir(pool *p, char *dummy)
static void *php_merge_dir(pool *p, void *basev, void *addv) static void *php_merge_dir(pool *p, void *basev, void *addv)
{ {
/* This function *must* return addv, and not modify basev */ /* This function *must* return addv, and not modify basev */
zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry); zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
return addv; return addv;
} }
/* }}} */ /* }}} */

2
sapi/apache_hooks/mod_php4.c
View file

@ -874,7 +874,7 @@ static void *php_merge_dir(pool *p, void *basev, void *addv)
php_per_dir_config *a = (php_per_dir_config *) addv; php_per_dir_config *a = (php_per_dir_config *) addv;
php_per_dir_config *b = (php_per_dir_config *) basev; php_per_dir_config *b = (php_per_dir_config *) basev;
/* This function *must* return addv, and not modify basev */ /* This function *must* return addv, and not modify basev */
zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *) b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry); zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *) b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
a->headers_handlers = (a->headers_handlers.top)?a->headers_handlers:b->headers_handlers; a->headers_handlers = (a->headers_handlers.top)?a->headers_handlers:b->headers_handlers;
a->auth_handlers = (a->auth_handlers.top)?a->auth_handlers:b->auth_handlers; a->auth_handlers = (a->auth_handlers.top)?a->auth_handlers:b->auth_handlers;
a->access_handlers = (a->access_handlers.top)?a->access_handlers:b->access_handlers; a->access_handlers = (a->access_handlers.top)?a->access_handlers:b->access_handlers;