aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-json.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2013-02-25 06:48:35 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2013-02-25 06:48:35 +0000
commit1b205127f8640fb84d20806e1ab7def752a448fe (patch)
tree85c0ab1675dc0feb39f72af2e8983cb378d3e0eb /epan/dissectors/packet-json.c
parent977730ed7c4ca0a3696357fd3c04aea5814b4d22 (diff)
Fix for bug 7939:
Register application/json-rpc and application/jsonrequest media types for JSON. svn path=/trunk/; revision=47872
Diffstat (limited to 'epan/dissectors/packet-json.c')
-rw-r--r--epan/dissectors/packet-json.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c
index 28031ef06d..1d55a42a98 100644
--- a/epan/dissectors/packet-json.c
+++ b/epan/dissectors/packet-json.c
@@ -585,6 +585,8 @@ proto_reg_handoff_json(void)
json_handle = find_dissector("json");
dissector_add_string("media_type", "application/json", json_handle); /* RFC 4627 */
+ dissector_add_string("media_type", "application/json-rpc", json_handle); /* JSON-RPC over HTTP */
+ dissector_add_string("media_type", "application/jsonrequest", json_handle); /* JSON-RPC over HTTP */
text_lines_handle = find_dissector("data-text-lines");
}