From: Jakub Zelenka <bukka@php.net>
Date: Fri, 13 Apr 2018 19:17:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.6RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8aec1e7254cd6868d0b7c42c338cf25d2df6f98;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

b8aec1e7254cd6868d0b7c42c338cf25d2df6f98
diff --cc NEWS
index 59e137539c,07542c07ca..b1a485f0b0
--- a/NEWS
+++ b/NEWS
@@@ -1,23 -1,17 +1,27 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.18
 +?? ??? 2018, PHP 7.2.6
 +
 +- EXIF:
 +  . Fixed bug #76164 (exif_read_data zend_mm_heap corrupted). (cmb)
  
+ - FPM:
+   . Fixed bug #76075 --with-fpm-acl wrongly tries to find libacl on FreeBSD.
+     (mgorny)
+ 
  - Reflection:
 -  . Fixed arginfo for array_replace(_recursive) and array_merge(_recursive).
 +  . Fixed arginfo of array_replace(_recursive) and array_merge(_recursive).
      (carusogabriel)
  
 +- Session:
 +  . Fixed bug #74892 (Url Rewriting (trans_sid) not working on urls that start
 +    with "#"). (Andrew Nester)
 +
 +26 Apr 2018, PHP 7.2.5
  
 -26 Apr 2018, PHP 7.1.17
 +- Core:
 +  . Fixed bug #75722 (Convert valgrind detection to configure option).
 +    (Michael Heimpold)
  
  - Date:
    . Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel)