com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS Zend/zend_generators.c
| From: | Bob Weinand | Date: | Sat, 22 Jul 2017 09:14:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS Zend/zend_generators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98711@lists.php.net to get a copy of this message | ||
Commit: 134e713be2e93fd4a6c7504992448667d4e668d0
Author: Bob Weinand <bobwei9@hotmail.com> Sat, 22 Jul 2017 11:14:54 +0200
Parents: 4cb1151fff357273d82357492ceaa1033de9608e bad5d0d6c56e078502b21ebdbf829b7a1c9b3bd3
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=134e713be2e93fd4a6c7504992448667d4e668d0
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM Zend/zend_generators.c
Diff:
diff --cc NEWS
index 102b8a7,fed2edb..b9c7a9a
--- 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)