moriyoshi Mon Dec 30 08:56:29 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/session session.c
Log:
MFH: Ilia's patch for bug #21268 (session_decode() returned FALSE on success)
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.336.2.3 php4/ext/session/session.c:1.336.2.4
--- php4/ext/session/session.c:1.336.2.3 Thu Dec 5 15:42:05 2002
+++ php4/ext/session/session.c Mon Dec 30 08:56:28 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.336.2.3 2002/12/05 20:42:05 helly Exp $ */
+/* $Id: session.c,v 1.336.2.4 2002/12/30 13:56:28 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1433,15 +1433,19 @@
{
zval **str;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE)
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
+ }
- if (PS(session_status) == php_session_none)
+ if (PS(session_status) == php_session_none) {
RETURN_FALSE;
+ }
convert_to_string_ex(str);
php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
+
+ RETURN_TRUE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php