From: Felipe Pena <felipe@php.net>
Date: Sun, 18 Apr 2010 18:07:27 +0000 (+0000)
Subject: - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)
X-Git-Tag: php-5.3.3RC1~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45c090f3e7dcdc4bd2570d274763e65baa15f691;p=php

- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)
---

diff --git a/NEWS b/NEWS
index 744631d9da..51a6f16355 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,8 @@ PHP                                                                        NEWS
 - Fixed a NULL pointer dereference when processing invalid XML-RPC
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 
-- Fixed Bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
+- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
+- Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
   (Oracle Corp.)
 - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
 - Fixed bug #51394 (Error line reported incorrectly if error handler throws an 
diff --git a/ext/json/json.c b/ext/json/json.c
index 5d166f0a3e..6916b5375a 100644
--- a/ext/json/json.c
+++ b/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;
 }