From: Michael Wallner <mike@php.net>
Date: Fri, 6 Dec 2013 09:34:11 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01a13bb8c1eaf86ec6c794be21462c933447c59f;p=php

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
---

01a13bb8c1eaf86ec6c794be21462c933447c59f