diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-07-09 23:37:40 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-07-09 23:37:40 +0000 |
| commit | 363863fd812f6b2f931641a7ea646a886850e4b0 (patch) | |
| tree | ee1a881dc10bedd5475593e807d55a3d3abe5e7a /packet-http.c | |
| parent | 7661a992b6e6fa0cd50ae0b9f968a131f299b3cb (diff) | |
Use "iscntrl()", rather than "isprint()", to test whether a character is
a CTL in HTTP, ICAP, and RTSP.
Check for non-ASCII characters in ICAP and RTSP, just as we do in HTTP.
The headers in those protocols are just "headers", not "MIME headers",
at least in the RFCs (common usage nonwithstanding; not all of those
headers are for MIME stuff such as Content-Type).
Add some RFC numbers.
svn path=/trunk/; revision=11357
Diffstat (limited to 'packet-http.c')
| -rw-r--r-- | packet-http.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/packet-http.c b/packet-http.c index 46b8e9286a..4af3b57849 100644 --- a/packet-http.c +++ b/packet-http.c @@ -1,5 +1,7 @@ /* packet-http.c * Routines for HTTP packet disassembly + * RFC 1945 (HTTP/1.0) + * RFC 2616 (HTTP/1.1) * * Guy Harris <guy@alum.mit.edu> * @@ -7,7 +9,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 1999, Andrew Tridgell <tridge@samba.org> * - * $Id: packet-http.c,v 1.110 2004/06/02 06:35:57 guy Exp $ + * $Id: packet-http.c,v 1.111 2004/07/09 23:37:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -387,14 +389,13 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, break; /* not ASCII, thus not a CHAR */ /* - * This mustn't be a CTL to be part of a token; - * that means it must be printable. + * This mustn't be a CTL to be part of a token. * * XXX - what about leading LWS on continuation * lines of a header? */ - if (!isprint(c)) - break; /* not printable, not a header */ + if (iscntrl(c)) + break; /* CTL, not part of a header */ /* * This mustn't be a SEP to be part of a token; @@ -426,7 +427,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * beginning of a header. * * (We don't have to check for HT; that's - * already been ruled out by "isprint()".) + * already been ruled out by "iscntrl()".) */ goto not_http; |