Merge pull request #6339

77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)

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)
 {

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";

src/univalue/univalue_escapes.h

@@ -49,7 +49,7 @@ static const char *escapes[256] = {
 	NULL,
 	NULL,
 	NULL,
-	"\\/",
+	NULL,
 	NULL,
 	NULL,
 	NULL,