From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 06:57:35 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e86d355c4c828be63fbccb24ba60cb08310408e8;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #69442 closing of fd incorrect when PTS enabled
---

e86d355c4c828be63fbccb24ba60cb08310408e8
diff --cc NEWS
index 61ee9502d8,d1442272ce..137d9a4191
--- a/NEWS
+++ b/NEWS
@@@ -11,7 -11,10 +11,10 @@@ PH
  - Session:
    . Fixed bug #69582 (session not readable by root in CLI). (EvgeniySpinov)
  
+ - Standard:
+   . Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
+ 
 -19 Jan 2017 PHP 7.0.15
 +19 Jan 2017, PHP 7.1.1
  
  - Core:
    . Fixed bug #73792 (invalid foreach loop hangs script). (Dmitry)