diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-11-19 15:11:01 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-23 06:03:24 +0000 |
| commit | e36f987c51e6b6e35160ef8995dd1570dc6011fd (patch) | |
| tree | b2c2c34b583e098f68727593c47147377e1e16fd /epan/dissectors/packet-http.c | |
| parent | 9fad599c0f58092f0719839d980de849ba8f8400 (diff) | |
http: case-insensitive custom headers match
Header names are typically not case-sensitive (like X-Powered-By).
Become consistent with headers such as User-Agent and match custom
headers case-insensitively.
Change-Id: Icde2dc32b5020cc8c68d631667c7c79dfc58435a
Reviewed-on: https://code.wireshark.org/review/11965
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-http.c')
| -rw-r--r-- | epan/dissectors/packet-http.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index db49374fa7..e93e644c22 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -2314,7 +2314,7 @@ static const header_info headers[] = { }; /* - * + * Look up a header name (assume lower-case header_name). */ static gint* get_hf_for_header(char* header_name) @@ -2340,6 +2340,7 @@ header_fields_initialize_cb(void) gint* hf_id; guint i; gchar* header_name; + gchar* header_name_key; if (header_fields_hash && hf) { guint hf_size = g_hash_table_size (header_fields_hash); @@ -2354,13 +2355,15 @@ header_fields_initialize_cb(void) } if (num_header_fields) { - header_fields_hash = g_hash_table_new(g_str_hash, g_str_equal); + header_fields_hash = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, NULL); hf = g_new0(hf_register_info, num_header_fields); for (i = 0; i < num_header_fields; i++) { hf_id = g_new(gint,1); *hf_id = -1; header_name = g_strdup(header_fields[i].header_name); + header_name_key = g_ascii_strdown(header_name, -1); hf[i].p_id = hf_id; hf[i].hfinfo.name = header_name; @@ -2372,7 +2375,7 @@ header_fields_initialize_cb(void) hf[i].hfinfo.same_name_prev_id = -1; hf[i].hfinfo.same_name_next = NULL; - g_hash_table_insert(header_fields_hash, header_name, hf_id); + g_hash_table_insert(header_fields_hash, header_name_key, hf_id); } proto_register_field_array(proto_http, hf, num_header_fields); @@ -2403,7 +2406,7 @@ process_header(tvbuff_t *tvb, int offset, int next_offset, len = next_offset - offset; line_end_offset = offset + linelen; header_len = colon_offset - offset; - header_name = wmem_strndup(wmem_packet_scope(), &line[0], header_len); + header_name = wmem_ascii_strdown(wmem_packet_scope(), &line[0], header_len); hf_index = find_header_hf_value(tvb, offset, header_len); /* |