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

Print out warning only, if a variable was actually migrated

Browse source
This commit is contained in:
Sascha Schumann 2002-10-07 02:37:50 +00:00
parent 5c782303a1
commit 2dde6fb594
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/session/session.c
View file

@ -611,13 +611,14 @@ static void php_session_initialize(TSRMLS_D)
} }
} }
static void migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC) static int migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC)
{ {
char *str; char *str;
uint str_len; uint str_len;
ulong num_key; ulong num_key;
int n; int n;
zval **val = NULL; zval **val = NULL;
int ret = 0;
n = zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 0, pos); n = zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 0, pos);
@ -626,6 +627,7 @@ static void migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC)
zend_hash_find(&EG(symbol_table), str, str_len, (void **) &val); zend_hash_find(&EG(symbol_table), str, str_len, (void **) &val);
if (val) { if (val) {
ZEND_SET_SYMBOL_WITH_LENGTH(ht, str, str_len, *val, (*val)->refcount + 1 , 1); ZEND_SET_SYMBOL_WITH_LENGTH(ht, str, str_len, *val, (*val)->refcount + 1 , 1);
ret = 1;
} }
break; break;
case HASH_KEY_IS_LONG: case HASH_KEY_IS_LONG:
@ -634,6 +636,8 @@ static void migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC)
"numeric nature.", num_key); "numeric nature.", num_key);
break; break;
} }
return ret;
} }
static void php_session_save_current_state(TSRMLS_D) static void php_session_save_current_state(TSRMLS_D)
@ -652,9 +656,8 @@ static void php_session_save_current_state(TSRMLS_D)
while (zend_hash_get_current_data_ex(ht, while (zend_hash_get_current_data_ex(ht,
(void **) &val, &pos) != FAILURE) { (void **) &val, &pos) != FAILURE) {
if (Z_TYPE_PP(val) == IS_NULL) { if (Z_TYPE_PP(val) == IS_NULL) {
if (migrate_global(ht, &pos TSRMLS_CC))
do_warn = 1; do_warn = 1;
migrate_global(ht, &pos TSRMLS_CC);
} }
zend_hash_move_forward_ex(ht, &pos); zend_hash_move_forward_ex(ht, &pos);
} }