From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Jul 2017 05:54:46 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.8RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0282c3b585fa24880d005d3b0a9ec7bdb469abc;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74906 redirecting incorrect include <sys/errno.h>
---

e0282c3b585fa24880d005d3b0a9ec7bdb469abc
diff --cc NEWS
index d0c0efa919,b3c9d6fb9d..ce8b8e74ac
--- a/NEWS
+++ b/NEWS
@@@ -9,8 -9,8 +9,9 @@@ PH
      (jhdxr)
    . Fixed bug #74761 (Unary operator expected error on some systems). (petk)
    . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
 +  . Fixed bug #74923 (Crash when crawling through network share). (Anatol)
    . Fixed bug #74913 (fixed incorrect poll.h include). (petk)
+   . Fixed bug #74906 (fixed incorrect errno.h include). (petk)
  
  - Date:
    . Fixed bug #74852 (property_exists returns true on unknown DateInterval