granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

author	Xinchen Hui <laruence@gmail.com>
	Fri, 26 Aug 2016 10:32:54 +0000 (18:32 +0800)
committer	Xinchen Hui <laruence@gmail.com>
	Fri, 26 Aug 2016 10:32:54 +0000 (18:32 +0800)
commit	557f1ccf0cc185d712597e11ecedff3171a69110
tree	6c361c8212070a51de2d8618cd8371d4de382adb	tree \| snapshot
parent	726e3b8ff0195bfa97b072cb6f986948cd49d8a9	commit \| diff
parent	c67fa3c91d314fd932fa1c921497fe3e6a968785	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #72943 (assign_dim on string doesn't reset hval)

Conflicts:
Zend/zend_execute.c

NEWS	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

NEWS	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute.c	diff1 \|	diff2 \|	blob \| history