[Pkg-php-commits] [php/debian-sid] Cherry pick patch to add missing definition of JSON_ERROR_UTF8

[Raphael Geissert]

---
 debian/patches/series                              |    1 +
 .../patches/upstream/define_json_error_utf8.patch  |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/define_json_error_utf8.patch

diff --git a/debian/patches/series b/debian/patches/series
index 4680096..314001b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,3 +55,4 @@ enchant_unaligned_memory_access.patch
 use_system_crypt_fixes.patch
 upstream/mysqli_ssl.patch
 upstream/pdo_reset_error_beginTransaction.patch
+upstream/define_json_error_utf8.patch
diff --git a/debian/patches/upstream/define_json_error_utf8.patch b/debian/patches/upstream/define_json_error_utf8.patch
new file mode 100644
index 0000000..d5107ec
--- /dev/null
+++ b/debian/patches/upstream/define_json_error_utf8.patch
@@ -0,0 +1,16 @@
+Description: Add missing definition of JSON_ERROR_UTF8
+Origin: http://svn.php.net/viewvc?view=revision&revision=298145
+Last-Update: 2010-05-01
+
+Index: php/ext/json/json.c
+===================================================================
+--- php.orig/ext/json/json.c
++++ php/ext/json/json.c
+@@ -87,6 +87,7 @@ static PHP_MINIT_FUNCTION(json)
+ 	REGISTER_LONG_CONSTANT("JSON_ERROR_STATE_MISMATCH", PHP_JSON_ERROR_STATE_MISMATCH, CONST_CS | CONST_PERSISTENT);
+ 	REGISTER_LONG_CONSTANT("JSON_ERROR_CTRL_CHAR", PHP_JSON_ERROR_CTRL_CHAR, CONST_CS | CONST_PERSISTENT);
+ 	REGISTER_LONG_CONSTANT("JSON_ERROR_SYNTAX", PHP_JSON_ERROR_SYNTAX, CONST_CS | CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("JSON_ERROR_UTF8", PHP_JSON_ERROR_UTF8, CONST_CS | CONST_PERSISTENT);
+ 
+ 	return SUCCESS;
+ }
-- 
1.6.5