com php-src: Merge branch 'PHP-5.6': ext/json/json.c
| From: | Stanislav Malyshev | Date: | Mon, 14 Apr 2014 01:56:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/json/json.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76866@lists.php.net to get a copy of this message | ||
Commit: 3970b9d7dd27cfd34eb600c3becf03f982bae51f
Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 18:56:26 -0700
Parents: 9f9f378c884ff5ef24b1a065b7ceaecf8144fb2d 7c9209a0d1bba946c36f3df7745c0bc565adf632
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3970b9d7dd27cfd34eb600c3becf03f982bae51f
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #66021 (Blank line inside empty array/object)
Bugs:
https://bugs.php.net/66021
Changed paths:
MM ext/json/json.c
Diff: