summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/mod_php5.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-12-12 10:46:21 +0100
committerAnatol Belski <ab@php.net>2013-12-12 10:46:21 +0100
commit39a2dcdeac1c65076b54750435786ae1fbcf2694 (patch)
tree7b9f443f1cbb33312cc4500d324f6bb1a758544b /sapi/apache2handler/mod_php5.c
parentd40a5a2797970a316e32a3f6af18f0ce6e1c264a (diff)
parentda62fd5ed824bafc4dc3e90278c3d57d8e74cbe1 (diff)
downloadphp-git-39a2dcdeac1c65076b54750435786ae1fbcf2694.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed bug #65486 mysqli_poll() is broken on Win x64
Diffstat (limited to 'sapi/apache2handler/mod_php5.c')
0 files changed, 0 insertions, 0 deletions