From: hno <>
Date: Wed, 18 Apr 2001 04:43:10 +0000 (+0000)
Subject: Oops. My cleanup of "httpd_accel_port virtual" broke IP-Filter support for
X-Git-Tag: SQUID_3_0_PRE1~1533
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52ee8bdd861cc1ee7705a2d87bbb6c124349c472;p=thirdparty%2Fsquid.git

Oops. My cleanup of "httpd_accel_port virtual" broke IP-Filter support for
some requests. Code was missing the important brakets around a else statement..
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 8dc5262c5e..7a3cf8df9e 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.535 2001/04/14 00:25:17 hno Exp $
+ * $Id: client_side.cc,v 1.536 2001/04/17 22:43:10 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2637,11 +2637,13 @@ parseHttpRequest(ConnStateData * conn, method_t * method_p, int *status,
 		    snprintf(http->uri, url_sz, "http://%s:%d%s",
 			inet_ntoa(http->conn->me.sin_addr),
 			vport, url);
-	    } else if (vport_mode)
-		vport = natLookup.nl_realport;
-	    snprintf(http->uri, url_sz, "http://%s:%d%s",
-		inet_ntoa(natLookup.nl_realip),
-		vport, url);
+	    } else {
+		if (vport_mode)
+		    vport = natLookup.nl_realport;
+		snprintf(http->uri, url_sz, "http://%s:%d%s",
+		    inet_ntoa(natLookup.nl_realip),
+		    vport, url);
+	    }
 #else
 #if LINUX_NETFILTER
 	    /* If the call fails the address structure will be unchanged */