diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-03-18 11:28:21 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-03-18 11:28:21 +0100 |
| commit | 038ba12e8724d537040e88ec794354b0c063f0a6 (patch) | |
| tree | a7181b4f4d10e3a154522d4b96fdf42f4597bf2a /ext/session/session.c | |
| parent | fd5a0b31640419ca63d1ddeaffd6d3cf2a741814 (diff) | |
| download | php-038ba12e8724d537040e88ec794354b0c063f0a6.tar.gz | |
Imported Upstream version 5.3.6upstream/5.3.6
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 9d4905d88..b7a2451b9 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2010 The PHP Group | + | Copyright (c) 1997-2011 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c 305034 2010-11-02 18:34:56Z felipe $ */ +/* $Id: session.c 307671 2011-01-23 10:02:06Z pajoye $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1914,10 +1914,10 @@ static PHP_FUNCTION(session_unset) } IF_SESSION_VARS() { - HashTable *ht; + HashTable *ht_sess_var; SEPARATE_ZVAL_IF_NOT_REF(&PS(http_session_vars)); - ht = Z_ARRVAL_P(PS(http_session_vars)); + ht_sess_var = Z_ARRVAL_P(PS(http_session_vars)); if (PG(register_globals)) { uint str_len; @@ -1925,16 +1925,16 @@ static PHP_FUNCTION(session_unset) ulong num_key; HashPosition pos; - zend_hash_internal_pointer_reset_ex(ht, &pos); + zend_hash_internal_pointer_reset_ex(ht_sess_var, &pos); - while (zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) { + while (zend_hash_get_current_key_ex(ht_sess_var, &str, &str_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) { zend_delete_global_variable(str, str_len - 1 TSRMLS_CC); - zend_hash_move_forward_ex(ht, &pos); + zend_hash_move_forward_ex(ht_sess_var, &pos); } } /* Clean $_SESSION. */ - zend_hash_clean(ht); + zend_hash_clean(ht_sess_var); } } /* }}} */ |