Permalink
Browse files

Merge pull request #6339

77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)
  • Loading branch information...
laanwj committed Jun 25, 2015
2 parents 91389e5 + 77aeb7c commit c3f0490a0687c7d2d5c45a8f448ebdc640629a1b
Showing with 2 additions and 3 deletions.
  1. +1 −1 src/test/univalue_tests.cpp
  2. +0 −1 src/univalue/gen.cpp
  3. +1 −1 src/univalue/univalue_escapes.h
@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
}
static const char *json1 =
-"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]";
+"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian http://test.com\"}}]";
BOOST_AUTO_TEST_CASE(univalue_readwrite)
{
View
@@ -22,7 +22,6 @@ static void initJsonEscape()
{
escapes[(int)'"'] = "\\\"";
escapes[(int)'\\'] = "\\\\";
- escapes[(int)'/'] = "\\/";
escapes[(int)'\b'] = "\\b";
escapes[(int)'\f'] = "\\f";
escapes[(int)'\n'] = "\\n";
@@ -49,7 +49,7 @@ static const char *escapes[256] = {
NULL,
NULL,
NULL,
- "\\/",
+ NULL,
NULL,
NULL,
NULL,

0 comments on commit c3f0490

Please sign in to comment.