svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/session/mod_user_class.c trunk/ext/session/mod_user_class.c

arpad Wed, 04 Jan 2012 01:31:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=321741 Log: fix return values of inherited session handler to match user handlers - #60640 Bug: https://bugs.php.net/60640 (Assigned) Invalid return values Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c U php/php-src/trunk/ext/session/mod_user_class.c Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2012-01-04 01:22:15 UTC (rev 321740) +++ php/php-src/branches/PHP_5_4/NEWS 2012-01-04 01:31:30 UTC (rev 321741) @@ -22,6 +22,8 @@ . 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: Modified: php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c 2012-01-04 01:22:15 UTC (rev 321740) +++ php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c 2012-01-04 01:31:30 UTC (rev 321741) @@ -48,7 +48,7 @@ } 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 @@ 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 @@ 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 @@ } 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 @@ 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)); } /* }}} */ Modified: php/php-src/trunk/ext/session/mod_user_class.c =================================================================== --- php/php-src/trunk/ext/session/mod_user_class.c 2012-01-04 01:22:15 UTC (rev 321740) +++ php/php-src/trunk/ext/session/mod_user_class.c 2012-01-04 01:31:30 UTC (rev 321741) @@ -48,7 +48,7 @@ } 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 @@ 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 @@ 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 @@ } 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 @@ 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)); } /* }}} */