summaryrefslogtreecommitdiff
path: root/packet-http.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-09-30 05:37:07 +0000
committerGuy Harris <guy@alum.mit.edu>2000-09-30 05:37:07 +0000
commit041981783b1027f45c2be1a52a908148b6d6a463 (patch)
tree384f3de95aae801dcdc998d0bdbbdf30341f7766 /packet-http.c
parent691b2f0244c33d6d9cdeb6945dcced0b4da9da37 (diff)
downloadwireshark-041981783b1027f45c2be1a52a908148b6d6a463.tar.gz
Don't put any "\r" and/or "\n" at the end of an HTTP request or reply
into the "Info" column. svn path=/trunk/; revision=2468
Diffstat (limited to 'packet-http.c')
-rw-r--r--packet-http.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/packet-http.c b/packet-http.c
index daacc6e1d2..7e5ba22ee0 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-http.c,v 1.22 2000/09/11 16:16:02 gram Exp $
+ * $Id: packet-http.c,v 1.23 2000/09/30 05:37:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -83,11 +83,12 @@ void dissect_http(const u_char *pd, int offset, frame_data *fd, proto_tree *tree
if (check_col(fd, COL_INFO)) {
/*
* Put the first line from the buffer into the summary,
- * if it's an HTTP request or reply.
+ * if it's an HTTP request or reply (but leave out the
+ * "\r\n", or whatever, at the end).
* Otherwise, just call it a continuation.
*/
lineend = find_line_end(data, dataend, &eol);
- linelen = lineend - data;
+ linelen = eol - data;
if (is_http_request_or_reply(data, linelen, &http_type))
col_add_str(fd, COL_INFO, format_text(data, linelen));
else