From: hno <>
Date: Fri, 12 Apr 2002 03:34:03 +0000 (+0000)
Subject: Bugzilla #297, icons not working in Squid-2.5.
X-Git-Tag: SQUID_3_0_PRE1~1097
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8edce87f80439824c27a26c0dfc8c7469acbc2db;p=thirdparty%2Fsquid.git

Bugzilla #297, icons not working in Squid-2.5.
---

diff --git a/src/internal.cc b/src/internal.cc
index 92024ca5b7..ac309bb90b 100644
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: internal.cc,v 1.24 2002/04/04 21:33:26 hno Exp $
+ * $Id: internal.cc,v 1.25 2002/04/11 21:34:03 hno Exp $
  *
  * DEBUG: section 76    Internal Squid Object handling
  * AUTHOR: Duane, Alex, Henrik
@@ -127,7 +127,7 @@ char *
 internalLocalUri(const char *dir, const char *name)
 {
     return internalRemoteUri(getMyHostname(),
-	0, dir, name);
+	getMyPort(), dir, name);
 }
 
 const char *
diff --git a/src/tools.cc b/src/tools.cc
index 49c18e59fb..20065db654 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.217 2002/04/11 17:05:31 hno Exp $
+ * $Id: tools.cc,v 1.218 2002/04/11 21:34:03 hno Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -998,10 +998,10 @@ getMyPort(void)
 {
 #if USE_SSL
     if (Config.Sockaddr.http)
-	return Config.Sockaddr.http->s.sin_port;
+	return ntohs(Config.Sockaddr.http->s.sin_port);
     else
-	return Config.Sockaddr.https->s.sin_port;
+	return ntohs(Config.Sockaddr.https->s.sin_port);
 #else
-    return Config.Sockaddr.http->s.sin_port;
+    return ntohs(Config.Sockaddr.http->s.sin_port);
 #endif
 }