Bug #822: cache_peer originserver connects to wrong port

The patch to work around origin servers not liking persistent connections
crossing hostnames accidently broke how Squid selects the port number to
connect to on a origin server class peer.

diff --git a/src/forward.cc b/src/forward.cc
index 326b3c5d5feb6793c1dcfea9756d336bda5908af..6b276f659f56d68ca047b30716ca023c686471dc 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.114 2003/09/21 00:30:47 robertc Exp $
+ * $Id: forward.cc,v 1.115 2003/11/09 11:05:24 hno Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -576,10 +576,8 @@ fwdConnectStart(void *data)
         ctimeout = fs->_peer->connect_timeout > 0 ? fs->_peer->connect_timeout
                    : Config.Timeout.peer_connect;
 
-        if (fs->_peer->options.originserver) {
+        if (fs->_peer->options.originserver)
             domain = fwdState->request->host;
-            port = fwdState->request->port;
-        }
     } else {
         host = fwdState->request->host;
         port = fwdState->request->port;