From: Joe Watkins <krakjoe@php.net>
Date: Wed, 27 Sep 2017 05:15:59 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC4~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=474ee702ab7509f2a144c20581349fe0df0cd0ce;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #75248 and #75251
---

474ee702ab7509f2a144c20581349fe0df0cd0ce
diff --cc NEWS
index bf6942e25b,cf5a185ffb..abc4f804d5
--- a/NEWS
+++ b/NEWS
@@@ -6,19 -11,11 +6,24 @@@ PH
    . Fixed bug #75220 (Segfault when calling is_callable on parent). 
      (andrewnester)
  
+ - litespeed:
+   . Fixed bug #75248 (Binary directory doesn't get created when building 
+     only litespeed SAPI). (petk)
+   . Fixed bug #75251 (Missing program prefix and suffix). (petk)
+ 
 +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)