]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa33b06 95d2908)
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Fri, 21 Jul 2017 03:58:07 +0000 (11:58 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 21 Jul 2017 03:58:07 +0000 (11:58 +0800)
commit84926a0d71d1254c41070ec6818dabcd57ef5d5b
tree8d5c0e5e9b8eee9bca24dccc4e6a1921bb3fceb5tree | snapshot
parentfa33b065acb4b70e2d0020f5d379f1eac9e1c3cecommit | diff
parent95d2908814585bd9c3c9a1eab4989bc551b6cc73commit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.c diff1 | diff2 | blob | history
Zend/zend_language_scanner.l diff1 | diff2 | blob | history
Zend/zend_strtod.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.