archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make unset($_SESSION['foo']) actually remove the variable from the session,

Browse source 
if register_globals is off.
This commit is contained in:
Zeev Suraski 2002-08-15 21:44:44 +00:00
parent cc287d4c21
commit 900651b7ab
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ext/session/php_session.h
View file

@ -186,8 +186,14 @@ PHPAPI int php_session_register_serializer(const char *name,
PHPAPI void php_session_set_id(char *id TSRMLS_DC); PHPAPI void php_session_set_id(char *id TSRMLS_DC);
PHPAPI void php_session_start(TSRMLS_D); PHPAPI void php_session_start(TSRMLS_D);
#define PS_ADD_VARL(name,namelen) \ #define PS_ADD_VARL(name,namelen) \
zend_hash_add_empty_element(&PS(vars), name, namelen + 1) zend_hash_add_empty_element(&PS(vars), name, namelen + 1); \
if (PS(http_session_vars)) { \
zval *empty_var; \
\
ALLOC_INIT_ZVAL(empty_var); \
zend_hash_add(Z_ARRVAL_P(PS(http_session_vars)), name, namelen+1, &empty_var, sizeof(zval *), NULL); \
}
#define PS_ADD_VAR(name) PS_ADD_VARL(name, strlen(name)) #define PS_ADD_VAR(name) PS_ADD_VARL(name, strlen(name))
@ -205,13 +211,17 @@ PHPAPI void php_session_start(TSRMLS_D);
zval **struc; zval **struc;
#define PS_ENCODE_LOOP(code) \ #define PS_ENCODE_LOOP(code) \
for (zend_hash_internal_pointer_reset(&PS(vars)); \ { \
zend_hash_get_current_key_ex(&PS(vars), &key, &key_length, &num_key, 0, NULL) == HASH_KEY_IS_STRING; \ HashTable *_ht = (PS(http_session_vars) ? Z_ARRVAL_P(PS(http_session_vars)) : &PS(vars)); \
zend_hash_move_forward(&PS(vars))) { \ \
key_length--; \ for (zend_hash_internal_pointer_reset(_ht); \
if (php_get_session_var(key, key_length, &struc TSRMLS_CC) == SUCCESS) { \ zend_hash_get_current_key_ex(_ht, &key, &key_length, &num_key, 0, NULL) == HASH_KEY_IS_STRING; \
code; \ zend_hash_move_forward(_ht)) { \
} \ key_length--; \
if (php_get_session_var(key, key_length, &struc TSRMLS_CC) == SUCCESS) { \
code; \
} \
} \
} }
ZEND_EXTERN_MODULE_GLOBALS(ps); ZEND_EXTERN_MODULE_GLOBALS(ps);