archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed a problem that allowed users to override admin_value's and admin_flag's

Browse source
This commit is contained in:
Zeev Suraski 2000-10-11 16:24:35 +00:00
parent 9aa38aad45
commit 1abd99a443
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -2,6 +2,8 @@ PHP 4.0 NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
05 Oct 2000, Version 4.0.3 05 Oct 2000, Version 4.0.3
- Fixed a problem that allowed users to override admin_value's and admin_flag's
(Zeev)
- Fixed PostgreSQL module to work when the link handle is omitted (Zeev) - Fixed PostgreSQL module to work when the link handle is omitted (Zeev)
- Fixed returning of empty LOB fields in OCI8. (Thies) - Fixed returning of empty LOB fields in OCI8. (Thies)
- Added Calendar module to default Win32 build (Andi) - Added Calendar module to default Win32 build (Andi)

17
sapi/apache/mod_php4.c
View file

@ -548,12 +548,24 @@ static void copy_per_dir_entry(php_per_dir_entry *per_dir_entry)
} }
static zend_bool should_overwrite_per_dir_entry(php_per_dir_entry *orig_per_dir_entry, php_per_dir_entry *new_per_dir_entry)
{
if (orig_per_dir_entry->type==PHP_INI_SYSTEM
&& new_per_dir_entry->type!=PHP_INI_SYSTEM) {
return 0;
} else {
return 1;
}
}
static void php_destroy_per_dir_info(HashTable *per_dir_info) static void php_destroy_per_dir_info(HashTable *per_dir_info)
{ {
zend_hash_destroy(per_dir_info); zend_hash_destroy(per_dir_info);
free(per_dir_info); free(per_dir_info);
} }
static void *php_create_dir(pool *p, char *dummy) static void *php_create_dir(pool *p, char *dummy)
{ {
HashTable *per_dir_info; HashTable *per_dir_info;
@ -570,8 +582,9 @@ static void *php_merge_dir(pool *p, void *basev, void *addv)
{ {
php_per_dir_entry tmp; php_per_dir_entry tmp;
zend_hash_merge((HashTable *) addv, (HashTable *) basev, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 0); zend_hash_merge_ex((HashTable *) basev, (HashTable *) addv, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
return addv; /*zend_hash_merge((HashTable *) addv, (HashTable *) basev, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 0);*/
return basev;
} }