From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 27 Sep 2017 14:17:46 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC4~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=978c6c4e31227a89fea0627b6a7238f87bb3207c;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75255 (Request hangs and not finish)
---

978c6c4e31227a89fea0627b6a7238f87bb3207c
diff --cc NEWS
index de668e252b,6d541d4a6e..e5bc24d8a0
--- a/NEWS
+++ b/NEWS
@@@ -14,19 -16,6 +14,22 @@@ PH
      only litespeed SAPI). (petk)
    . Fixed bug #75251 (Missing program prefix and suffix). (petk)
  
++- Opcache
++  . Fixed bug #75255 (Request hangs and not finish). (Dmitry)
++
 +28 Sep 2017, PHP 7.2.0RC3
 +
 +- Core
 +  . Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
 +    (Laruence)
 +  . Fixed bug #74878 (Data race in ZTS builds). (Nikita, Dmitry)
 +  . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
 +  . Fixed bug #75252 (Incorrect token formatting on two parse errors in one
 +    request). (Nikita)
 +
 +- FPM:
 +  . Fixed bug #75212 (php_value acts like php_admin_value). (Remi)
 +
  - MySQLi:
    . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)