aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-04-12 21:34:26 -0400
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-04-13 15:36:30 +0000
commit21f1cec9c8c85b75fcb94d793062b5d1a8ed9a9e (patch)
treeace4bf80ff00e67b82d250e8427bc6200599aec6 /epan
parent91bb340b033226a6d2c4cffa16ad4b3137e33b13 (diff)
HTTP: treat request_uri and file_data as Unicode.
These strings were pulled from the TVB using tvb_get_string_enc() (as ASCII) so any non-printable characters have already been replaced with the unicode replacement character. So display the strings as Unicode, not ASCII. Bug: 10681 Change-Id: I64cf51aafcca921c6f9257a2ebd577c599f20883 Reviewed-on: https://code.wireshark.org/review/14899 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index de8e4cdd37..bb4ea9816a 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -3202,7 +3202,7 @@ proto_register_http(void)
"HTTP Request Method", HFILL }},
{ &hf_http_request_uri,
{ "Request URI", "http.request.uri",
- FT_STRING, BASE_NONE, NULL, 0x0,
+ FT_STRING, STR_UNICODE, NULL, 0x0,
"HTTP Request-URI", HFILL }},
{ &hf_http_version,
{ "Request Version", "http.request.version",
@@ -3394,7 +3394,7 @@ proto_register_http(void)
NULL, HFILL }},
{ &hf_http_file_data,
{ "File Data", "http.file_data",
- FT_STRING, BASE_NONE, NULL, 0,
+ FT_STRING, STR_UNICODE, NULL, 0,
NULL, HFILL }},
{ &hf_http_unknown_header,
{ "Unknown header", "http.unknown_header",