fixup for URI decoration with port when not wanted

[Matt Benjamin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Affects store keys and cache peering lookups.

Matt

- --

Matt Benjamin

The Linux Box
206 South Fifth Ave. Suite 150
Ann Arbor, MI  48104

http://linuxbox.com

tel. 734-761-4689
fax. 734-769-8938
cel. 734-216-5309

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFJLYbwJiSUUSaRdSURCD8oAJ4m5aa3dY95qVsNN4ociDuI2375EgCeOANb
HAtw5ccxyMiICF/ShN0bg3Q=
=6WMf
-----END PGP SIGNATURE-----

diff --git a/src/cf.data.pre b/src/cf.data.pre
index b9dc4c9..7d19ba4 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -3921,6 +3921,16 @@ DOC_START
 	sporadically hang or never complete requests set this to on.
 DOC_END
 
+NAME: httpd_accel_no_append_port
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: off
+LOC: Config.onoff.accel_no_append_port
+DOC_START
+	Do not append the accelerator port to request URI.  This
+	is intended for clustered accelerator setups.
+DOC_END
+
 COMMENT_START
  DELAY POOL PARAMETERS
  -----------------------------------------------------------------------------
diff --git a/src/client_side.c b/src/client_side.c
index 23c4274..09899c9 100644
--- a/src/client_side.c
+++ b/src/client_side.c
@@ -3842,9 +3842,13 @@ parseHttpRequest(ConnStateData * conn, HttpMsgBuf * hmsg, method_t * method_p, i
 	    if (strchr(host, ':'))
 		snprintf(http->uri, url_sz, "%s://%s%s",
 		    conn->port->protocol, host, url);
-	    else
+	    else if(Config.onoff.accel_no_append_port) {
+		snprintf(http->uri, url_sz, "%s://%s%s",
+			 conn->port->protocol, host, url);
+	    } else {
 		snprintf(http->uri, url_sz, "%s://%s:%d%s",
-		    conn->port->protocol, host, port, url);
+			 conn->port->protocol, host, port, url);
+	    }
 	    debug(33, 5) ("VHOST REWRITE: '%s'\n", http->uri);
 	} else if (internalCheck(url)) {
 	    goto internal;
diff --git a/src/structs.h b/src/structs.h
index 12652ab..33c7185 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -688,6 +688,7 @@ struct _SquidConfig {
 	int collapsed_forwarding;
 	int relaxed_header_parser;
 	int accel_no_pmtu_disc;
+	int accel_no_append_port;
 	int global_internal_static;
 	int httpd_suppress_version_string;
 	int via;