]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:34:11 +0000 (10:34 +0100)
committerMichael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:34:11 +0000 (10:34 +0100)
* PHP-5.6:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
  Use 'user@example.com' rather than 'user@company.com' in tests


Trivial merge