From: Anatol Belski <ab@php.net>
Date: Sat, 15 Apr 2017 16:29:37 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=871ea20e9ca76510366840cd44fc330dc9cd8a40;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix error handling
---

871ea20e9ca76510366840cd44fc330dc9cd8a40