diff options
author | Tjerk Meesters <datibbaw@php.net> | 2014-12-04 07:22:54 +0800 |
---|---|---|
committer | Tjerk Meesters <datibbaw@php.net> | 2014-12-04 07:22:54 +0800 |
commit | 7e933c5ff89ae3dc8b48f94ad9c9a8bc77d93a25 (patch) | |
tree | d8adf33d7cd222f05df7898c9f15324aae55e33d /sapi/apache2handler/php_functions.c | |
parent | e04971ce21401d7761492d1ab2f18aa98afa7d10 (diff) | |
parent | 52b41f24e32c2c3f503a90e4f9879babc945c8e7 (diff) | |
download | php-git-7e933c5ff89ae3dc8b48f94ad9c9a8bc77d93a25.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed #65213 - cannot cast SplFileInfo to boolean
Conflicts:
ext/spl/spl_directory.c
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions