com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/json/json.c
| From: | Adam Harvey | Date: | Tue, 11 Dec 2012 11:53:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/json/json.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70696@lists.php.net to get a copy of this message | ||
Commit: 8bb106d20c8f36d814772c45d693af2b42b06732
Author: Adam Harvey <aharvey@php.net> Tue, 11 Dec 2012 19:53:02 +0800
Parents: ec83534d88da4c96777b86d8db7fd20a52ed012e 2d1694d4ebd51ab61f12e6bc545a17e3baf3b4a0
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8bb106d20c8f36d814772c45d693af2b42b06732
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
Changed paths:
MM ext/json/json.c
Diff: