From: Jakub Zelenka <bukka@php.net>
Date: Mon, 29 Aug 2016 14:01:00 +0000 (+0100)
Subject: Merge branch 'json_encode_fail_return' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a;p=php

Merge branch 'json_encode_fail_return' into PHP-7.1
---

ab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a