Removed some of the members of the structures and renamed a few others.

2 files changed, 16 insertions, 13 deletions

diff --git a/src/conns.c b/src/conns.c
index d47701c..e0881ed 100644
--- a/src/conns.c
+++ b/src/conns.c
@@ -1,4 +1,4 @@
-/* $Id: conns.c,v 1.5 2001-11-22 00:31:10 rjkaes Exp $
+/* $Id: conns.c,v 1.6 2001-11-25 22:06:20 rjkaes Exp $
  *
  * Create and free the connection structure. One day there could be
  * other connnection related tasks put here, but for now the header
@@ -32,11 +32,8 @@ initialize_conn(struct conn_s *connptr)
 	connptr->cbuffer = new_buffer();
 	connptr->sbuffer = new_buffer();
 
-	connptr->send_message = FALSE;
-	connptr->simple_req = FALSE;
-
-	connptr->ssl = FALSE;
-	connptr->upstream = FALSE;
+	connptr->send_response_message = FALSE;
+	connptr->connect_method = FALSE;
 
 	connptr->protocol.major = connptr->protocol.minor = 0;
 
diff --git a/src/conns.h b/src/conns.h
index 3b9a7d8..e29b76b 100644
--- a/src/conns.h
+++ b/src/conns.h
@@ -1,4 +1,4 @@
-/* $Id: conns.h,v 1.4 2001-11-21 01:00:09 rjkaes Exp $
+/* $Id: conns.h,v 1.5 2001-11-25 22:06:20 rjkaes Exp $
  *
  * See 'conns.c' for a detailed description.
  *
@@ -18,21 +18,27 @@
 #ifndef TINYPROXY_CONNS_H
 #define TINYPROXY_CONNS_H
 
+#include "tinyproxy.h"
+
 /*
  * Connection Definition
  */
 struct conn_s {
 	int client_fd;
 	int server_fd;
+
 	struct buffer_s *cbuffer;
 	struct buffer_s *sbuffer;
-	bool_t simple_req;
-	bool_t ssl;
-	bool_t upstream;
-	bool_t send_message;
+
+	bool_t connect_method;
+	bool_t send_response_message;
+
+	/*
+	 * Store the incoming request's HTTP protocol.
+	 */
 	struct {
-		unsigned short int major;
-		unsigned short int minor;
+		unsigned int major;
+		unsigned int minor;
 	} protocol;
 };