svn: /php/php-src/trunk/ NEWS UPGRADING ext/json/json.c ext/json/php_json.h ext/json/tests/json_encode_unescaped_slashes.phpt
| From: | Adam Harvey | Date: | Thu, 16 Sep 2010 13:53:27 +0000 |
| Subject: | svn: /php/php-src/trunk/ NEWS UPGRADING ext/json/json.c ext/json/php_json.h ext/json/tests/json_encode_unescaped_slashes.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63508@lists.php.net to get a copy of this message | ||
aharvey Thu, 16 Sep 2010 13:53:27 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303421
Log:
Implemented FR #49366 (Make slash escaping optional in json_encode()).
Bug: http://bugs.php.net/49366 (Open) json_encode
incorrectly escapes slashes (/)
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/UPGRADING
U php/php-src/trunk/ext/json/json.c
U php/php-src/trunk/ext/json/php_json.h
A php/php-src/trunk/ext/json/tests/json_encode_unescaped_slashes.phpt
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2010-09-16 13:47:13 UTC (rev 303420)
+++ php/php-src/trunk/NEWS 2010-09-16 13:53:27 UTC (rev 303421)
@@ -118,6 +118,7 @@
- Implemented FR #52555 (Ability to get HTTP response code). (Paul Dragoonis)
- Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark)
+- Implemented FR #49366 (Make slash escaping optional in json_encode()). (Adam)
- Implemented FR #48632 (OpenSSL AES support). (yonas dot y
at gmail dot com, Pierre)
- Implemented FR #42060 (Add paged Results support). (ando@OpenLDAP.org,
Modified: php/php-src/trunk/UPGRADING
===================================================================
--- php/php-src/trunk/UPGRADING 2010-09-16 13:47:13 UTC (rev 303420)
+++ php/php-src/trunk/UPGRADING 2010-09-16 13:53:27 UTC (rev 303421)
@@ -235,7 +235,7 @@
f. New global constants
- -
+ - JSON_UNESCAPED_SLASHES
g. New classes
Modified: php/php-src/trunk/ext/json/json.c
===================================================================
--- php/php-src/trunk/ext/json/json.c 2010-09-16 13:47:13 UTC (rev 303420)
+++ php/php-src/trunk/ext/json/json.c 2010-09-16 13:53:27 UTC (rev 303421)
@@ -92,6 +92,7 @@
REGISTER_LONG_CONSTANT("JSON_HEX_QUOT", PHP_JSON_HEX_QUOT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_FORCE_OBJECT", PHP_JSON_FORCE_OBJECT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_NUMERIC_CHECK", PHP_JSON_NUMERIC_CHECK, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("JSON_UNESCAPED_SLASHES", PHP_JSON_UNESCAPED_SLASHES, 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);
@@ -372,7 +373,11 @@
break;
case '/':
- smart_str_appendl(buf, "\\/", 2);
+ if (options & PHP_JSON_UNESCAPED_SLASHES) {
+ smart_str_appendc(buf, '/');
+ } else {
+ smart_str_appendl(buf, "\\/", 2);
+ }
break;
case '\b':
Modified: php/php-src/trunk/ext/json/php_json.h
===================================================================
--- php/php-src/trunk/ext/json/php_json.h 2010-09-16 13:47:13 UTC (rev 303420)
+++ php/php-src/trunk/ext/json/php_json.h 2010-09-16 13:53:27 UTC (rev 303421)
@@ -59,6 +59,7 @@
#define PHP_JSON_HEX_QUOT (1<<3)
#define PHP_JSON_FORCE_OBJECT (1<<4)
#define PHP_JSON_NUMERIC_CHECK (1<<5)
+#define PHP_JSON_UNESCAPED_SLASHES (1<<6)
/* Internal flags */
#define PHP_JSON_OUTPUT_ARRAY 0
Added: php/php-src/trunk/ext/json/tests/json_encode_unescaped_slashes.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/json_encode_unescaped_slashes.phpt (rev
0)
+++ php/php-src/trunk/ext/json/tests/json_encode_unescaped_slashes.phpt 2010-09-16 13:53:27 UTC (rev
303421)
@@ -0,0 +1,12 @@
+--TEST--
+json_decode() tests
+--SKIPIF--
+<?php if (!extension_loaded("json")) print "skip"; ?>
+--FILE--
+<?php
+var_dump(json_encode('a/b'));
+var_dump(json_encode('a/b', JSON_UNESCAPED_SLASHES));
+?>
+--EXPECT--
+string(6) ""a\/b""
+string(5) ""a/b""