From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 10 Oct 2017 11:55:45 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.11RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fee21a45dfe2c9d5df32371cb82ea714eeee547e;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] Add NEWS entry for bug #75349
---

fee21a45dfe2c9d5df32371cb82ea714eeee547e
diff --cc NEWS
index a4c0e3958e,ebb6057d0b..2748bf76ab
--- a/NEWS
+++ b/NEWS
@@@ -95,7 -84,7 +95,8 @@@ PH
    . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
    . Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
    . Fixed bug #74725 (html_errors=1 breaks unhandled exceptions). (Andrea)
 +  . Fixed bug #75063 (Main CWD initialized with wrong codepage). (Anatol)
+   . Fixed bug #75349 (NAN comparison). (Sara)
  
  - cURL:
    . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).