Updated Branches: refs/heads/master 797595049 -> 4d1b0eac7
THRIFT-2298 TJsonProtocol implementation for C# does not allow for both possible slash (solidus) encodings Patch: Jens Geyer Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4d1b0eac Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4d1b0eac Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4d1b0eac Branch: refs/heads/master Commit: 4d1b0eac7ddea3d1de59477723958106b6d0209f Parents: 7975950 Author: Jens Geyer <[email protected]> Authored: Thu Dec 26 18:56:05 2013 +0100 Committer: Jens Geyer <[email protected]> Committed: Thu Dec 26 19:00:28 2013 +0100 ---------------------------------------------------------------------- lib/csharp/src/Protocol/TJSONProtocol.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4d1b0eac/lib/csharp/src/Protocol/TJSONProtocol.cs ---------------------------------------------------------------------- diff --git a/lib/csharp/src/Protocol/TJSONProtocol.cs b/lib/csharp/src/Protocol/TJSONProtocol.cs index cad9134..14db9cc 100644 --- a/lib/csharp/src/Protocol/TJSONProtocol.cs +++ b/lib/csharp/src/Protocol/TJSONProtocol.cs @@ -69,10 +69,10 @@ namespace Thrift.Protocol 1, 1,(byte)'"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; - private char[] ESCAPE_CHARS = "\"\\bfnrt".ToCharArray(); + private char[] ESCAPE_CHARS = "\"\\/bfnrt".ToCharArray(); private byte[] ESCAPE_CHAR_VALS = { - (byte)'"', (byte)'\\', (byte)'\b', (byte)'\f', (byte)'\n', (byte)'\r', (byte)'\t', + (byte)'"', (byte)'\\', (byte)'/', (byte)'\b', (byte)'\f', (byte)'\n', (byte)'\r', (byte)'\t', }; private const int DEF_STRING_SIZE = 16;
