summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArpad Ray <arpad@php.net>2012-01-04 01:31:30 +0000
committerArpad Ray <arpad@php.net>2012-01-04 01:31:30 +0000
commit08eb16f0153798ec880afec3c9fd5a65124a6feb (patch)
tree27fe9e075729856899ad837f6e391a7705050da1
parent7486849b562bfe1d9a04a79c5aba00edb88d3bbf (diff)
downloadphp-git-08eb16f0153798ec880afec3c9fd5a65124a6feb.tar.gz
fix return values of inherited session handler to match user handlers - #60640
-rw-r--r--NEWS2
-rw-r--r--ext/session/mod_user_class.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index c7868efe9e..aa3170e037 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ PHP NEWS
. Fixed bug #60629 (memory corruption when web server closed the fcgi fd).
(fat)
+- Improved Session extension:
+ . Fixed bug #60640 (invalid return values). (Arpad)
22 Dec 2011, PHP 5.4.0 RC4
- Core:
diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c
index 835005f178..70d2f40df1 100644
--- a/ext/session/mod_user_class.c
+++ b/ext/session/mod_user_class.c
@@ -48,7 +48,7 @@ PHP_METHOD(SessionHandler, open)
}
PS(mod_user_is_open) = 1;
- RETVAL_LONG(PS(default_mod)->s_open(&PS(mod_data), save_path, session_name TSRMLS_CC));
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_open(&PS(mod_data), save_path, session_name TSRMLS_CC));
}
/* }}} */
@@ -63,7 +63,7 @@ PHP_METHOD(SessionHandler, close)
zend_parse_parameters_none();
PS(mod_user_is_open) = 0;
- RETVAL_LONG(PS(default_mod)->s_close(&PS(mod_data) TSRMLS_CC));
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_close(&PS(mod_data) TSRMLS_CC));
}
/* }}} */
@@ -104,7 +104,7 @@ PHP_METHOD(SessionHandler, write)
return;
}
- RETVAL_LONG(PS(default_mod)->s_write(&PS(mod_data), key, val, val_len TSRMLS_CC));
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_write(&PS(mod_data), key, val, val_len TSRMLS_CC));
}
/* }}} */
@@ -122,7 +122,7 @@ PHP_METHOD(SessionHandler, destroy)
}
PS(mod_user_is_open) = 0;
- RETVAL_LONG(PS(default_mod)->s_destroy(&PS(mod_data), key TSRMLS_CC));
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_destroy(&PS(mod_data), key TSRMLS_CC));
}
/* }}} */
@@ -139,6 +139,6 @@ PHP_METHOD(SessionHandler, gc)
return;
}
- RETVAL_LONG(PS(default_mod)->s_gc(&PS(mod_data), maxlifetime, &nrdels TSRMLS_CC));
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_gc(&PS(mod_data), maxlifetime, &nrdels TSRMLS_CC));
}
/* }}} */