From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 13 Oct 2017 11:00:21 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7045362ce7f5512de0742854debb21fbfbe308db;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
---

7045362ce7f5512de0742854debb21fbfbe308db
diff --cc NEWS
index c3d31055dd,b2d4c90025..7d6db75536
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,11 +1,14 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017, PHP 7.1.12
 +?? ??? ????, PHP 7.2.0RC5
 +
 +- Fileinfo:
 +  . Upgrade bundled libmagic to 5.31. (Anatol)
  
+ - Core:
+   . Fixed bug #75368 (mmap/munmap trashing on unlucky allocations). (Nikita,
+     Dmitry)
+ 
  - Exif:
    . Fixed bug #75301 (Exif extension has built in revision version). (Peter
      Kokot)