com php-src: keep backward compat with our private patch: ext/json/json.c
| From: | Antony Dovgal | Date: | Thu, 12 Dec 2013 08:47:41 +0000 |
| Subject: | com php-src: keep backward compat with our private patch: ext/json/json.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76649@lists.php.net to get a copy of this message | ||
Commit: 3fe1f1cc8850395f40b024472fd2ed539a18e4df
Author: Antony Dovgal <tony@daylessday.org> Sat, 31 Dec 2011 00:41:52 +0400
Committer: Antony Dovgal <tony2001@php.net> Thu, 12 Dec 2013 12:47:41 +0400
Parents: 73b562084e8185d32551ebc0d008ba059a1f992e
Branches: badoo-5..5_mysqlnd
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3fe1f1cc8850395f40b024472fd2ed539a18e4df
Log:
keep backward compat with our private patch
Conflicts:
ext/json/json.c
Changed paths:
M ext/json/json.c
Diff:
diff --git a/ext/json/json.c b/ext/json/json.c
index c3664b9..9bc8d5e 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -103,6 +103,7 @@ static PHP_MINIT_FUNCTION(json)
REGISTER_LONG_CONSTANT("JSON_PRETTY_PRINT", PHP_JSON_PRETTY_PRINT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_UNESCAPED_UNICODE", PHP_JSON_UNESCAPED_UNICODE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_PARTIAL_OUTPUT_ON_ERROR", PHP_JSON_PARTIAL_OUTPUT_ON_ERROR,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("JSON_NO_UNICODE", PHP_JSON_UNESCAPED_UNICODE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_ERROR_NONE", PHP_JSON_ERROR_NONE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_ERROR_DEPTH", PHP_JSON_ERROR_DEPTH, CONST_CS |
CONST_PERSISTENT);