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/imap/php_imap.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/imap/php_imap.c')
0 files changed, 0 insertions, 0 deletions