aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-text-media.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2007-07-30 13:06:01 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2007-07-30 13:06:01 +0000
commit9636fdfefd44bd4105c893928a6f4359e68c9fe0 (patch)
tree27adc43f86f207447bf63be8213049911af9741a /epan/dissectors/packet-text-media.c
parent7f02fcd555bcf8bb9b3630aadeaa9580890413de (diff)
Fix for bug 1712:
RFC 4627 defines "The application/json Media Type for JavaScript Object Notation (JSON)" application/json is a text based type used by JavaScript applications and web pages. svn path=/trunk/; revision=22420
Diffstat (limited to 'epan/dissectors/packet-text-media.c')
-rw-r--r--epan/dissectors/packet-text-media.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index 7b3a36120a..8bae6975fe 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -158,4 +158,6 @@ proto_reg_handoff_text_lines(void)
dissector_add_string("media_type", "text/vnd.sun.j2me.app-descriptor", text_lines_handle);
dissector_add_string("media_type", "application/vnd.poc.refer-to", text_lines_handle);
dissector_add_string("media_type", "application/vnd.drm.message", text_lines_handle);
+
+ dissector_add_string("media_type", "application/json", text_lines_handle); /* RFC 4627 */
}