aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf/JsonParser.cs
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #941 from jskeet/recursion-limitJan Tattermusch2015-11-051-13/+24
|\
| * Reimplement JSON recursion by detecting the depth in the tokenizer.Jon Skeet2015-11-051-34/+33
| * Add recursion limit handling to JSON parsing.Jon Skeet2015-11-041-42/+54
* | Merge pull request #940 from jskeet/json-namesJon Skeet2015-11-051-6/+1
|\ \
| * | Move the creation of the "fields by JSON name" dictionary to the descriptor.Jon Skeet2015-11-041-6/+1
| |/
* / Created a new exception for JSON failures.Jon Skeet2015-11-051-0/+4
|/
* Implement JSON parsing in C#.Jon Skeet2015-11-031-0/+813