From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 21 Apr 2016 07:15:57 +0000 (+0300)
Subject: Merge branch 'master' into safe_timeout
X-Git-Tag: php-7.1.0alpha1~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c026ca6cdccc74ca78d8b0ab203281c19b93cdde;p=php

Merge branch 'master' into safe_timeout

* 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
---

c026ca6cdccc74ca78d8b0ab203281c19b93cdde