diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:39:08 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:39:08 -0400 |
| commit | 993e1866df547532a05ab6db76c9ff5aefc9a3df (patch) | |
| tree | 169d3bde0974235d3cde164786ef6f381a4749a7 /ext/json | |
| parent | 1f589a2bd44ba835ad1b009a5d83abd453724829 (diff) | |
| download | php-upstream/5.2.6.tar.gz | |
Imported Upstream version 5.2.6upstream/5.2.6
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/json.c | 4 | ||||
| -rw-r--r-- | ext/json/php_json.h | 4 | ||||
| -rw-r--r-- | ext/json/tests/005.phpt | 10 | ||||
| -rw-r--r-- | ext/json/tests/bug41567.phpt | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 393d41f5e..e7bb805e7 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2007 The PHP Group | + | Copyright (c) 1997-2008 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.20 2007/10/01 15:23:15 iliaa Exp $ */ +/* $Id: json.c,v 1.9.2.21 2007/12/31 07:20:07 sebastian Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/ext/json/php_json.h b/ext/json/php_json.h index e9e6395a0..27ef7a0ac 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2007 The PHP Group | + | Copyright (c) 1997-2008 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_json.h,v 1.8.2.2 2007/01/01 09:36:02 sebastian Exp $ */ +/* $Id: php_json.h,v 1.8.2.3 2007/12/31 07:20:07 sebastian Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H diff --git a/ext/json/tests/005.phpt b/ext/json/tests/005.phpt index f6a8977d1..01a307f4a 100644 --- a/ext/json/tests/005.phpt +++ b/ext/json/tests/005.phpt @@ -13,15 +13,11 @@ var_dump(json_encode($a)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { [0]=> - array(1) { - [0]=> - *RECURSION* + array(0) { } } - -Warning: json_encode(): recursion detected in %s on line %d -string(8) "[[null]]" +string(4) "[[]]" Done diff --git a/ext/json/tests/bug41567.phpt b/ext/json/tests/bug41567.phpt index 5553df397..5a141003e 100644 --- a/ext/json/tests/bug41567.phpt +++ b/ext/json/tests/bug41567.phpt @@ -10,6 +10,8 @@ var_dump(json_decode($a)); echo "Done\n"; ?> +--INI-- +precision=14 --EXPECT-- float(123456789.12345) Done |