com php-src: Merge branch 'PHP-5.6': ext/json/json.c
| From: | Adam Harvey | Date: | Sun, 10 Nov 2013 21:16:38 +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-73926@lists.php.net to get a copy of this message | ||
Commit: 91cb0877275ed56715afcc8fb5e0cf85c591f049
Author: Adam Harvey <aharvey@php.net> Sun, 10 Nov 2013 16:16:38 -0500
Parents: fac240b5d1363305acb3c40a814ab397e842c966 1205a6c7dc1e5123279e1cbb946dfbc538d8a976
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=91cb0877275ed56715afcc8fb5e0cf85c591f049
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity
incorrectly")
Bugs:
https://bugs.php.net/64874
Changed paths:
MM ext/json/json.c
Diff: