From b5b4e3d57ae59f19a0dddb719390ef43000b0777 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 6 Dec 1999 20:27:40 +0000
Subject: Patch from Jerry Talkington to:

	treat CONNECT as an HTTP request;

	add DELETE and OPTIONS as request names.

Make the order of names in the AUTHORS file match that of the man page
and the About box.

svn path=/trunk/; revision=1231
---
 AUTHORS                   | 12 ++++++++----
 doc/ethereal.pod.template |  1 +
 gtk/main.c                |  3 ++-
 packet-http.c             | 19 ++++++++++++++++---
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 968f807c8a..995fa74fad 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -175,16 +175,20 @@ Warren Young <tangent@mail.com> {
 	"Print" button support in "Tools:Follow TCP Stream" window
 }
 
+Heikki Vatiainen <hessu@cs.tut.fi> {
+	SAP (Session Announcement Protocol) support
+	VRRP (Virtual Router Redundancy)
+	HSRP (Hot Standby Router Protocol)
+}
+
 Greg Hankins <gregh@twoguys.org> {
 	http://www.twoguys.org/~gregh
 
 	updates to BGP (Border Gateway Protocol) support
 }
 
-Heikki Vatiainen <hessu@cs.tut.fi> {
-	SAP (Session Announcement Protocol) support
-	VRRP (Virtual Router Redundancy)
-	HSRP (Hot Standby Router Protocol)
+Jerry Talkington <jerryt@netapp.com> {
+	updates to HTTP support
 }
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 176e850031..9624a4a0ca 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -713,6 +713,7 @@ B<http://ethereal.zing.org>.
   Warren Young             <tangent@mail.com>
   Heikki Vatiainen         <hessu@cs.tut.fi>
   Greg Hankins             <gregh@twoguys.org>
+  Jerry Talkington         <jerryt@netapp.com>
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
diff --git a/gtk/main.c b/gtk/main.c
index 491131a0f4..053945ac55 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.61 1999/12/03 21:28:56 nneul Exp $
+ * $Id: main.c,v 1.62 1999/12/06 20:27:26 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -171,6 +171,7 @@ about_ethereal( GtkWidget *w, gpointer data ) {
 		"Warren Young             <tangent@mail.com>\n"
 		"Heikki Vatiainen         <hessu@cs.tut.fi>\n"
 		"Greg Hankins             <gregh@twoguys.org>\n"
+		"Jerry Talkington         <jerryt@netapp.com>\n"
 
 		"\nSee http://ethereal.zing.org for more information",
                 VERSION, comp_info_str);
diff --git a/packet-http.c b/packet-http.c
index ff6eeaf1a3..df23cd9b6d 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -3,7 +3,7 @@
  *
  * Guy Harris <guy@netapp.com>
  *
- * $Id: packet-http.c,v 1.11 1999/11/16 11:42:31 guy Exp $
+ * $Id: packet-http.c,v 1.12 1999/12/06 20:27:19 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -216,12 +216,25 @@ is_http_request_or_reply(const u_char *data, int linelen)
 		}
 	}
 	if (linelen >= 6) {
-		if (strncasecmp(data, "DELETE", 6) == 0)
+		if (strncasecmp(data, "DELETE", 6) == 0) {
+			proto_tree_add_item_hidden(http_tree, 
+						   hf_http_request, 0, 0, 1);
+			return TRUE;
+		}
+	}
+	if (linelen >= 7) {
+		if (strncasecmp(data, "OPTIONS", 7) == 0) {
+			proto_tree_add_item_hidden(http_tree, 
+						   hf_http_request, 0, 0, 1);
 			return TRUE;
+		}
 	}
 	if (linelen >= 7) {
-		if (strncasecmp(data, "OPTIONS", 7) == 0)
+		if (strncasecmp(data, "CONNECT", 7) == 0) {
+			proto_tree_add_item_hidden(http_tree, 
+						   hf_http_request, 0, 0, 1);
 			return TRUE;
+		}
 	}
 	return FALSE;
 }
-- 
cgit v1.2.3