From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 17 Nov 2017 22:21:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.1RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31d9287d2b4bc30a5fc032a94cb3cec214aa715e;p=php

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

31d9287d2b4bc30a5fc032a94cb3cec214aa715e
diff --cc NEWS
index a747b52838,806cf7df83..13bff4bf37
--- a/NEWS
+++ b/NEWS
@@@ -13,14 -16,10 +13,16 @@@ PH
    . Fixed bug #75511 (fread not free unused buffer). (Laruence)
    . Fixed bug #75514 (mt_rand returns value outside [$min,$max]+ on 32-bit)
      (Remi)
+   . Fixed bug #75535 (Inappropriately parsing HTTP response leads to PHP
+     segment fault). (Nikita)
  
 -23 Nov 2017, PHP 7.1.12
 +?? ??? ????, PHP 7.2.0
 +
 +- Core:
 +
 +  . Fixed bug #75515 ("stream_copy_to_stream" doesn't stream anymore). (Sara)
 +
 +09 Nov 2017, PHP 7.2.0RC6
  
  - Core:
    . Fixed bug #75420 (Crash when modifing property name in __isset for