]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorXinchen Hui <laruence@gmail.com>
Fri, 21 Jul 2017 04:02:54 +0000 (12:02 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 21 Jul 2017 04:02:54 +0000 (12:02 +0800)
commit463413db53768d3922ac3703eec5ec3f128484a2
tree811f52e2d5e601e5f4ceefea9053675e87cc801f
parent0b2c456312f5d318664ca6616a7d9820eaa7d60f
parente2b240c164967b5326e41e88d0de45cc57815490
Merge branch 'PHP-7.1' into PHP-7.2

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

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
sapi/phpdbg/phpdbg_lexer.c