granicus.if.org Git - php/commitdiff

author	Dmitry Stogov <dmitry@zend.com>
	Thu, 21 Apr 2016 07:15:57 +0000 (10:15 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Thu, 21 Apr 2016 07:15:57 +0000 (10:15 +0300)

* master:
  Fixed bug #72059 - Reference the bug id directly in NEWS
  Fix magic constants (__LINE__) with ?? for constant scalar exprs
  Add NEWS entry for ?? in constant scalar expressions
  allow null coalescing (??) on constant expressions
  Fix intl tests for ICU < 52
  Fix ZTS builds by adding a missing TSRMLS_FETCH().
  Fix bug #71737
  Update NEWS
  Fix RECV opcode to handle all kinds of exceptions
  Fix RECV opcode to handle all kinds of exceptions

		1	2
Zend/zend_execute.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge