From: wessels <>
Date: Tue, 16 Apr 1996 07:51:17 +0000 (+0000)
Subject: make SSL work without connect:// hack
X-Git-Tag: SQUID_3_0_PRE1~6160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af35a090844c1d2a685ca6832ed69358fa290f94;p=thirdparty%2Fsquid.git

make SSL work without connect:// hack
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 1e055761d7..11e559ae32 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,4 +1,4 @@
-/* $Id: cache_cf.cc,v 1.42 1996/04/15 23:02:25 wessels Exp $ */
+/* $Id: cache_cf.cc,v 1.43 1996/04/16 01:51:17 wessels Exp $ */
 
 /* DEBUG: Section 3             cache_cf: Configuration file parsing */
 
@@ -154,12 +154,12 @@ extern char *config_file;
 intlist snews =
 {
     563,
-    NULL,
+    NULL
 };
 intlist https =
 {
     443,
-    &snews,
+    &snews
 };
 intlist *connect_port_list = &https;
 
diff --git a/src/url.cc b/src/url.cc
index 73e9f1c624..1e95be1c49 100644
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,4 +1,4 @@
-/* $Id: url.cc,v 1.15 1996/04/15 23:02:28 wessels Exp $ */
+/* $Id: url.cc,v 1.16 1996/04/16 01:51:20 wessels Exp $ */
 
 /* 
  * DEBUG: Section 23          url
@@ -22,6 +22,9 @@ char *ProtocolStr[] =
     "ftp",
     "wais",
     "cache_object",
+#ifdef NEED_PROTO_CONNECT
+    "connect",
+#endif
     "TOTAL"
 };
 
@@ -131,8 +134,10 @@ protocol_t urlParseProtocol(s)
 	return PROTO_CACHEOBJ;
     if (strncasecmp(s, "file", 4) == 0)
 	return PROTO_FTP;
+#ifdef NEED_PROTO_CONNECT
     if (strncasecmp(s, "connect", 7) == 0)
 	return PROTO_CONNECT;
+#endif
     return PROTO_NONE;
 }
 
@@ -149,6 +154,10 @@ int urlDefaultPort(p)
 	return 70;
     case PROTO_CACHEOBJ:
 	return CACHE_HTTP_PORT;
+#ifdef NEED_PROTO_CONNECT
+    case PROTO_CONNECT:
+	return 443;
+#endif
     default:
 	return 0;
     }