summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2017-10-10 13:59:09 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2017-10-10 13:59:28 +0200
commitfcaf1831748cfb6c956a458644e14a04517c534b (patch)
tree7d5af54daa824af57ec36b52a5b6ab51cd86a557
parent9c5a1dad6434c717e5ba555f626c6f3e062c92ba (diff)
parentfee21a45dfe2c9d5df32371cb82ea714eeee547e (diff)
downloadphp-git-fcaf1831748cfb6c956a458644e14a04517c534b.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: [ci skip] Add NEWS entry for bug #75349
-rw-r--r--NEWS1
1 files changed, 1 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index cee8288c72..8ec24e7a46 100644
--- a/NEWS
+++ b/NEWS
@@ -200,6 +200,7 @@ PHP NEWS
non-object). (Laruence)
. Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
. Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
+ . Fixed bug #75349 (NAN comparison). (Sara)
- CLI:
. Fixed bug #74979 (Interactive shell opening instead of script execution