com php-src: Remove leftover of previous change: ext/session/session.c
| From: | Xinchen Hui | Date: | Thu, 18 Aug 2016 07:44:33 +0000 |
| Subject: | com php-src: Remove leftover of previous change: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93934@lists.php.net to get a copy of this message | ||
Commit: 1eb4851fa2b8f5dccfc81a254d345e160dbfa921
Author: Xinchen Hui <laruence@gmail.com> Thu, 18 Aug 2016 15:44:33 +0800
Parents: 66a527b8c1942cae140c5dab5f3eff2e33ca9740
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1eb4851fa2b8f5dccfc81a254d345e160dbfa921
Log:
Remove leftover of previous change
Changed paths:
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index 9668db4..9024de6 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -830,12 +830,10 @@ PS_SERIALIZER_DECODE_FUNC(php_binary) /* {{{ */
int namelen;
zend_string *name;
php_unserialize_data_t var_hash;
- int skip = 0;
PHP_VAR_UNSERIALIZE_INIT(var_hash);
for (p = val; p < endptr; ) {
- skip = 0;
namelen = ((unsigned char)(*p)) & (~PS_BIN_UNDEF);
if (namelen < 0 || namelen > PS_BIN_MAX || (p + namelen) >= endptr) {
@@ -854,9 +852,7 @@ PS_SERIALIZER_DECODE_FUNC(php_binary) /* {{{ */
current = var_tmp_var(&var_hash);
if (php_var_unserialize(current, (const unsigned char **) &p, (const unsigned char *)
endptr, &var_hash)) {
ZVAL_PTR(&rv, current);
- if (!skip) {
- php_set_session_var(name, &rv, &var_hash);
- }
+ php_set_session_var(name, &rv, &var_hash);
} else {
zend_string_release(name);
php_session_normalize_vars();
@@ -918,7 +914,6 @@ PS_SERIALIZER_DECODE_FUNC(php) /* {{{ */
zend_string *name;
int has_value, retval = SUCCESS;
php_unserialize_data_t var_hash;
- int skip = 0;
PHP_VAR_UNSERIALIZE_INIT(var_hash);
@@ -926,7 +921,6 @@ PS_SERIALIZER_DECODE_FUNC(php) /* {{{ */
while (p < endptr) {
q = p;
- skip = 0;
while (*q != PS_DELIMITER) {
if (++q >= endptr) goto break_outer_loop;
}
@@ -946,18 +940,14 @@ PS_SERIALIZER_DECODE_FUNC(php) /* {{{ */
current = var_tmp_var(&var_hash);
if (php_var_unserialize(current, (const unsigned char **)&q, (const unsigned char *)endptr,
&var_hash)) {
ZVAL_PTR(&rv, current);
- if (!skip) {
- php_set_session_var(name, &rv, &var_hash);
- }
+ php_set_session_var(name, &rv, &var_hash);
} else {
zend_string_release(name);
retval = FAILURE;
goto break_outer_loop;
}
} else {
- if(!skip) {
- PS_ADD_VARL(name);
- }
+ PS_ADD_VARL(name);
}
zend_string_release(name);