From: hno <>
Date: Tue, 25 Feb 2003 22:07:53 +0000 (+0000)
Subject: Back out obviously incorrect changes (looks like incorrect merge conflict
X-Git-Tag: SQUID_3_0_PRE1~308
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbdba7c43a37ca004066422de9f8cb8426e962ff;p=thirdparty%2Fsquid.git

Back out obviously incorrect changes (looks like incorrect merge conflict
resolution) from the previous acl stage 1 commit by Robert.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index bb4d183b4e..b3a5c2f230 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.435 2003/02/25 12:24:35 robertc Exp $
+ * $Id: cache_cf.cc,v 1.436 2003/02/25 15:07:53 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -392,7 +392,6 @@ parseConfigFile(const char *file_name)
 static void
 configDoConfigure(void)
 {
-    LOCAL_ARRAY(char, buf, BUFSIZ);
     memset(&Config2, '\0', sizeof(SquidConfig2));
     /* init memory as early as possible */
     memConfigure();
@@ -430,12 +429,6 @@ configDoConfigure(void)
         }
     }
 
-    if (Config.Accel.host) {
-        snprintf(buf, BUFSIZ, "http://%s:%d", Config.Accel.host, Config.Accel.port);
-        Config2.Accel.prefix = xstrdup(buf);
-        Config2.Accel.on = 1;
-    }
-
     if (Config.appendDomain)
         if (*Config.appendDomain != '.')
             fatal("append_domain must begin with a '.'");
@@ -445,16 +438,10 @@ configDoConfigure(void)
 
     storeConfigure();
 
-    if (Config2.Accel.on && !strcmp(Config.Accel.host, "virtual")) {
-        vhost_mode = 1;
-
-        if (Config.Accel.port == 0)
-            vport_mode = 1;
-    }
-
     snprintf(ThisCache, sizeof(ThisCache), "%s (%s)",
              uniqueHostname(),
              full_appname_string);
+
     /*
      * the extra space is for loop detection in client_side.c -- we search
      * for substrings in the Via header.
diff --git a/src/structs.h b/src/structs.h
index 476d05f200..39c95a6c77 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.454 2003/02/25 12:22:34 robertc Exp $
+ * $Id: structs.h,v 1.455 2003/02/25 15:07:54 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -156,13 +156,33 @@ struct _sockaddr_in_list
     sockaddr_in_list *next;
 };
 
+struct _http_port_list
+{
+    http_port_list *next;
+
+    struct sockaddr_in s;
+    char *protocol;            /* protocol name */
+    char *name;                /* visible name */
+    char *defaultsite;         /* default web site */
+
+unsigned int transparent:
+    1; /* transparent proxy */
+
+unsigned int accel:
+    1; /* HTTP accelerator */
+
+unsigned int vhost:
+    1; /* uses host header */
+
+    int vport;                 /* virtual port support, -1 for dynamic, >0 static*/
+};
+
+
 #if USE_SSL
 
 struct _https_port_list
 {
-    https_port_list *next;
-
-    struct sockaddr_in s;
+    http_port_list http;	/* must be first */
     char *cert;
     char *key;
     int version;
diff --git a/src/typedefs.h b/src/typedefs.h
index c1ca6a54c8..0e845cac80 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.154 2003/02/25 12:22:35 robertc Exp $
+ * $Id: typedefs.h,v 1.155 2003/02/25 15:07:54 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -89,6 +89,8 @@ typedef struct _relist relist;
 
 typedef struct _sockaddr_in_list sockaddr_in_list;
 
+typedef struct _http_port_list http_port_list;
+
 typedef struct _https_port_list https_port_list;
 
 typedef struct _SquidConfig SquidConfig;