From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 22 Jul 2017 09:14:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta2~77^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=134e713be2e93fd4a6c7504992448667d4e668d0;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

134e713be2e93fd4a6c7504992448667d4e668d0
diff --cc NEWS
index 102b8a7db8,fed2edb098..b9c7a9a202
--- a/NEWS
+++ b/NEWS
@@@ -4,11 -4,8 +4,12 @@@ PH
  
  - Core:
    . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
+   . Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
  
 +- Session:
 +  . Fixed bug #74892 (Url Rewriting (trans_sid) not working on urls that start
 +    with "#"). (Andrew Nester)
 +
  - SimpleXML:
    . Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces).
      (Laruence)