diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-08 11:32:29 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-08 11:32:29 +0400 |
| commit | 8ce2f2caacc99c8a579ebfaa078ac9a063e2936f (patch) | |
| tree | eeac185eb793b7a4e81d32ae4bbf84fb66b05246 /ext/session/mod_user.c | |
| parent | b36aaea6ede499589b3298e204095c292d025c34 (diff) | |
| parent | 6e9bc95f6726f4d397d6f78e778f512b92b1b54b (diff) | |
| download | php-git-8ce2f2caacc99c8a579ebfaa078ac9a063e2936f.tar.gz | |
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
Diffstat (limited to 'ext/session/mod_user.c')
| -rw-r--r-- | ext/session/mod_user.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 7996575cd4..9e09dff83b 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -80,7 +80,10 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval TSRML /* 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); \ } \ |