From: Christoph M. Becker <cmb@php.net>
Date: Mon, 13 Jul 2015 11:59:33 +0000 (+0200)
Subject: Merge branch 'master' of http://git.php.net/repository/php-src
X-Git-Tag: php-7.1.1RC1~35^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e990c809bb2591ea34187adb07ca5fed3b3f2f73;p=php

Merge branch 'master' of http://git.php.net/repository/php-src

# By Xinchen Hui (5) and others
# Via Xinchen Hui (6) and others
* 'master' of http://git.php.net/repository/php-src:
  Revert "Fixed test fail in travis from time to time"
  Fixed test fail in travis from time to time
  Update NEWS
  Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
  Fixed Bug #70058 Build fails when building for i386
  Some OCI8 fixes (Rajendra)
  Updated zend_update_static_property
  updated NEWS
  updated NEWS
  Fix #53154: Zero-height rectangle has whiskers
  Fix #70048: When running a phpinfo(), if you have a very long cell value you got a table overflow.
  Hint label lookup table initialization branch on GOTO VM kind.
  adding scenario of test to improve test coverage
  Added php tests to improve extension coverage
---

e990c809bb2591ea34187adb07ca5fed3b3f2f73