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

more cleanup (lingering ini settings which do not exist anymore, etc.)

Browse source
This commit is contained in:
foobar 2006-04-10 15:09:15 +00:00
parent 672266c735
commit 6af3218f81
9 changed files with 21 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/php_variables.c
View file

@ -772,7 +772,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC)
) {
(*src_entry)->refcount++;
if (key_type == HASH_KEY_IS_STRING) {
/* if register_globals is on and working with main symbol table, prevent overwriting of GLOBALS */
/* prevent overwriting of GLOBALS */
if (string_key_len != sizeof("GLOBALS") || memcmp(string_key.s, "GLOBALS", sizeof("GLOBALS") - 1)) {
zend_u_hash_update(dest, key_type, string_key, string_key_len, src_entry, sizeof(zval *), NULL);
} else {