]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)
committerAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)
commit8b5d09a195f4d254d257d56fe7d10073fdf0cb23
tree74e62609d1111c78b045b82e58eb3d3c1970d269
parent99c44458da7f60af017f233a1e9d0b3f54efcdb4
parent8cd903ea685a6ef56aa77e95c00db8aac53a7c39
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix error condition, part of bug #71753
ext/standard/flock_compat.c