commit 797595049274b9085385de5ef402075f6fc3de56
author Jens Geyer <jensg@apache.org> Thu Dec 26 18:56:54 2013 +0100
committer Jens Geyer <jensg@apache.org> Thu Dec 26 18:59:15 2013 +0100
tree 8bd64a12f152d31852be3a97e4ea80d612bf0fb0
parent 53db7cc486a9f1f0e000d977d853a6811238a9e6

THRIFT-2285 TJsonProtocol implementation for Java/JavaMe/PHP doesn't allow a slash (/) to be escaped (\/)

Patch: Jens Geyer

lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java

diff --git a/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java b/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
index f07a4a7..02f36e3 100644
--- a/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
@@ -70,10 +70,10 @@
     1,  1,'"',  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, // 2
   };
 
-  private static final String ESCAPE_CHARS = "\"\\bfnrt";
+  private static final String ESCAPE_CHARS = "\"\\/bfnrt";
 
   private static final byte[] ESCAPE_CHAR_VALS = {
-    '"', '\\', '\b', '\f', '\n', '\r', '\t',
+    '"', '\\', '/', '\b', '\f', '\n', '\r', '\t',
   };
 
   private static final int  DEF_STRING_SIZE = 16;

lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java

diff --git a/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java b/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
index fd92d45..de7086f 100644
--- a/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
+++ b/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
@@ -66,10 +66,10 @@
       1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
                                                 };
 
-  private static final String  ESCAPE_CHARS     = "\"\\bfnrt";
+  private static final String  ESCAPE_CHARS     = "\"\\/bfnrt";
 
   private static final byte[]  ESCAPE_CHAR_VALS = {
-                                                '"', '\\', '\b', '\f', '\n', '\r', '\t',
+                                                '"', '\\', '/', '\b', '\f', '\n', '\r', '\t',
                                                 };
 
   private static final int     DEF_STRING_SIZE  = 16;

lib/php/lib/Thrift/Protocol/TJSONProtocol.php

diff --git a/lib/php/lib/Thrift/Protocol/TJSONProtocol.php b/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
index 3d39583..402401a 100644
--- a/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
+++ b/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
@@ -57,10 +57,10 @@
         1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
     );
 
-    public static $ESCAPE_CHARS = array('"', '\\', "b", "f", "n", "r", "t");
+    public static $ESCAPE_CHARS = array('"', '\\', '/', "b", "f", "n", "r", "t");
 
     public static $ESCAPE_CHAR_VALS = array(
-        '"', '\\', "\x08", "\f", "\n", "\r", "\t",
+        '"', '\\', '/', "\x08", "\f", "\n", "\r", "\t",
     );
 
     const NAME_BOOL = "tf";