com php-src: Merge branch 'pull-request/518' into PHP-5.4: ext/json/json.c
| From: | Stanislav Malyshev | Date: | Mon, 14 Apr 2014 01:50:39 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/518' into PHP-5.4: ext/json/json.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76869@lists.php.net to get a copy of this message | ||
Commit: 5e66ce929350b98003becd362464d47e8f49c8fb
Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 18:50:39 -0700
Parents: b05c088a3abf8e4c6fb6e40418423a9e2dd3d929 82a4f1a1a287d9dbf01156bc14ceb13ccbf16d7a
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e66ce929350b98003becd362464d47e8f49c8fb
Log:
Merge branch 'pull-request/518' into PHP-5.4
* pull-request/518:
Fix #66021 (Blank line inside empty array/object)
Bugs:
https://bugs.php.net/66021
Changed paths:
MM ext/json/json.c
Diff: