Support content-type x-gzip and x-deflate, as described in RFC2616 as

equivalent to gzip and deflate.

This fixes bug 5882.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36963 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 1ae5069ce60aed9efa3bfd502300935b30e463fe..317a74e5819b4d974025f3780a0ce182ae6ba312 100644 (file)
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -1122,9 +1122,10 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
                        if (http_decompress_body &&
                            (g_ascii_strcasecmp(headers.content_encoding, "gzip") == 0 ||
-                           g_ascii_strcasecmp(headers.content_encoding, "deflate")
-                           == 0)) {
-
+                            g_ascii_strcasecmp(headers.content_encoding, "deflate") == 0 ||
+                            g_ascii_strcasecmp(headers.content_encoding, "x-gzip") == 0 ||
+                            g_ascii_strcasecmp(headers.content_encoding, "x-deflate") == 0))
+                       {
                                uncomp_tvb = tvb_child_uncompress(tvb, next_tvb, 0,
                                    tvb_length(next_tvb));
                        }