com php-src: Merge branch 'master' into phpng: .travis.yml ext/session/mod_user.c ext/session/session.c ext/sess
ion/tests/session_set_save_handler_class_012. phpt sapi/cli/php_cli_server.c

Commit: 8ce2f2caacc99c8a579ebfaa078ac9a063e2936f Author: Dmitry Stogov <dmitry@zend.com> Tue, 8 Jul 2014 11:32:29 +0400 Parents: b36aaea6ede499589b3298e204095c292d025c34 6e9bc95f6726f4d397d6f78e778f512b92b1b54b Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8ce2f2caacc99c8a579ebfaa078ac9a063e2936f Log: Merge branch 'master' into phpng * master: Fix still broken session test. Only return true/false. Fixed bug #66830 (Empty header causes PHP built-in web server to hang). Followup fix to custom session save handlers create locales and re-add test rm test for now Conflicts: ext/session/tests/session_set_save_handler_class_012.phpt Bugs: https://bugs.php.net/66830 Changed paths: MM .travis.yml MM ext/session/mod_user.c MM ext/session/session.c MM ext/session/tests/session_set_save_handler_class_012.phpt MM sapi/cli/php_cli_server.c Diff: diff --cc ext/session/mod_user.c index 7996575,1eabc94..9e09dff --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@@ -80,10 -79,13 +80,13 @@@ static void ps_call_handler(zval *func /* BC for clever users - Deprecate me */ \ ret = SUCCESS; \ } else { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Session callback expects true/false return value"); \ + if (!EG(exception)) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, \ + "Session callback expects true/false return value"); \ + } \ ret = FAILURE; \ + zval_ptr_dtor(&retval); \ } \ - zval_ptr_dtor(&retval); \ } \ return ret diff --cc ext/session/tests/session_set_save_handler_class_012.phpt index 282f293,60cd129..91e751b --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@@ -55,6 -57,8 +57,8 @@@ int(2 array(0) { } -Warning: Unknown: Parent session handler is not open in Unknown on line 0 +Warning: SessionHandler::write(): Parent session handler is not open in Unknown on line 0 -Warning: Unknown: Failed to write session data %s in %s on line %d ++Warning: session_write_close(): Failed to write session data %s in %s on line %d + -Warning: Unknown: Parent session handler is not open in Unknown on line 0 +Warning: SessionHandler::close(): Parent session handler is not open in Unknown on line 0