From: Christopher Jones <sixd@php.net>
Date: Mon, 16 Sep 2013 17:21:31 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHPNG_MERGE~222^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b740bfc741d127349a6e7e27b65e7e2706c1033d;p=php

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

# By Michael Wallner (3) and others
# Via Michael Wallner (2) and Xinchen Hui (2)
* 'master' of https://git.php.net/repository/php-src:
  use 65k of data to get a more explicit result
  double test timeout for travis
  this test is fragile on travis, let's see why
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)
  Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
---

b740bfc741d127349a6e7e27b65e7e2706c1033d