]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:33:47 +0000 (10:33 +0100)
committerMichael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:33:47 +0000 (10:33 +0100)
commit9ea2489f5c769e15eed3f637a82c7b304e0b79e8
tree6a021e016af8b2aa60626151a5374682721db61a
parentf0248bdce598a382899056d348d204c9d61746df
parenta48d82d23824a1d81e3ab847774476485f9388a5
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
main/streams/plain_wrapper.c