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

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
---

2e82ed9b7326cf8bf716efcdb600937b626a80b2
diff --cc NEWS
index 928f25f915,19dc26829b..d0c0efa919
--- a/NEWS
+++ b/NEWS
@@@ -9,7 -9,7 +9,8 @@@ 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)
  
  - Date:
    . Fixed bug #74852 (property_exists returns true on unknown DateInterval