]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value

1  2 
main/streams/plain_wrapper.c

Simple merge