Merge pull request #6339

laanwj · laanwj · commit c3f0490a0687 · 2015-06-25T14:54:40.000+02:00
77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)
diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp
@@ -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)
 {
diff --git a/src/univalue/gen.cpp b/src/univalue/gen.cpp
@@ -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";
diff --git a/src/univalue/univalue_escapes.h b/src/univalue/univalue_escapes.h
@@ -49,7 +49,7 @@ static const char *escapes[256] = {
 	NULL,
 	NULL,
 	NULL,
-	"\\/",
+	NULL,
 	NULL,
 	NULL,
 	NULL,

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`static const char *json1 =`
`289`		`-"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]";`
	`289`	`+"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian http://test.com\"}}]";`
`290`	`290`
`291`	`291`	`BOOST_AUTO_TEST_CASE(univalue_readwrite)`
`292`	`292`	`{`
-Original file line number
+Diff line change
 	NULL,
 	NULL,
 	NULL,
 -	"\\/",
 +	NULL,
 	NULL,
 	NULL,
 	NULL,