]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Tue, 11 Dec 2012 11:53:02 +0000 (19:53 +0800)
committerAdam Harvey <aharvey@php.net>
Tue, 11 Dec 2012 11:53:02 +0000 (19:53 +0800)
* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

1  2 
ext/json/json.c

diff --cc ext/json/json.c
Simple merge