diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2012-07-10 10:31:25 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2012-07-10 10:31:25 -0400 |
| commit | 731c6fd274932a4d31a76a38a4006cad6ffc50d3 (patch) | |
| tree | 60f3f3da7cc29954a7dd0f8c9203acccba8174b8 /ext/json/php_json.h | |
| parent | 03536e889ad29ed3b6153aafa77b647bdcfe2592 (diff) | |
| parent | b210766084cbd00b0e479d2800e1920271a3faba (diff) | |
| download | php-git-731c6fd274932a4d31a76a38a4006cad6ffc50d3.tar.gz | |
Merge remote branch 'upstream/master' into hash_pbkdf2
* upstream/master: (101 commits)
Fixed Bug #62500 (Segfault in DateInterval class when extended)
Fixed test bug #62312 (warnings changed one more time)
fix valgrind warning
fix valgrind warning
fixed #62433 test for win
update NEWS
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
appease MSVC (doesnt like unary minus of unsigned ints)
appease MSVC (doesnt like unary minus of unsigned ints)
appease MSVC (doesnt like unary minus of unsigned ints)
- Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
Fixed Bug #62500 (Segfault in DateInterval class when extended)
Added in NEWS and UPGRADING for feature 55218
Fix two issues with run-tests.php
Fix potential integer overflow in nl2br
Fix potential integer overflow in bin2hex
This wil be PHP 5.3.16
Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too.
fix (signed) integer overflow (part of bug #52550
fix (signed) integer overflow (part of bug #52550
...
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index ef3e4b5a79..afeff3f6cc 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -63,6 +63,7 @@ extern zend_class_entry *php_json_serializable_ce; #define PHP_JSON_UNESCAPED_SLASHES (1<<6) #define PHP_JSON_PRETTY_PRINT (1<<7) #define PHP_JSON_UNESCAPED_UNICODE (1<<8) +#define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9) /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 |