]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2'
authorXinchen Hui <laruence@gmail.com>
Wed, 27 Jun 2018 05:08:47 +0000 (13:08 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 27 Jun 2018 05:08:47 +0000 (13:08 +0800)
commit3d8c82c35313ab254a3ffa81cd8a16e10d8bd103
tree90e227e9fb70ee6034f54410506e9b5f83f0d765
parent76827e39ba0d6fd271a3cd78b91deb430425eb56
parent7b98d056d3958cc3fcf763c171ca2e1e8724b59a
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)

Conflicts:
Zend/zend_vm_execute.h
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h