From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 27 Nov 2020 09:58:04 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4e1768e2117d7e5a3cca7ac03d8ed631e08f1b4;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #80368
---

f4e1768e2117d7e5a3cca7ac03d8ed631e08f1b4
diff --cc NEWS
index 8ad31db07b,7ede11b09c..bd7d3b62ae
--- a/NEWS
+++ b/NEWS
@@@ -16,15 -20,14 +16,19 @@@ PH
  - Intl:
    . Fixed bug #80425 (MessageFormatAdapter::getArgTypeList redefined). (Nikita)
  
 +- Opcache:
 +  . Fixed bug #80404 (Incorrect range inference result when division results
 +    in float). (Nikita)
 +  . Fixed bug #80377 (Opcache misses executor_globals). (Nikita)
-   . Fixed bug #80433 ( 	Unable to disable the use of the AVX command when using
++  . Fixed bug #80433 (Unable to disable the use of the AVX command when using
 +    JIT). (Nikita)
 +
+ - OpenSSL:
+   . Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to
+     lack of OCB support). (Nikita)
+ 
  - Standard:
    . Fixed bug #80366 (Return Value of zend_fstat() not Checked). (sagpant, cmb)
 -  . Fixed bug #80411 (References to null-serialized object break serialize()).
 -    (Nikita)
  
  - Tidy:
    . Fixed bug #77594 (ob_tidyhandler is never reset). (cmb)