]> granicus.if.org Git - php/commit
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)
commit01a13bb8c1eaf86ec6c794be21462c933447c59f
tree614daf26f9db4e738262a7e1ac014267454aa3fc
parent9adfcea2412b74692bfc7c1ad5174bd3ac655470
parent9ea2489f5c769e15eed3f637a82c7b304e0b79e8
Merge branch 'PHP-5.6'

* 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