From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 17 Feb 2013 10:00:12 +0000 (-0700)
Subject: Bug 3781: Proxy Authentication not sent to cache_peer
X-Git-Tag: SQUID_3_3_2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2607f2b8f3cdf9e3d742e874eaf62d63a95d9e28;p=thirdparty%2Fsquid.git

Bug 3781: Proxy Authentication not sent to cache_peer
---

diff --git a/src/http.cc b/src/http.cc
index 58f9467510..4b2fd8076e 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -2131,18 +2131,8 @@ HttpStateData::sendRequest()
                                     Dialer, this,  HttpStateData::wroteLast);
     }
 
-    if (_peer != NULL) {
-        if (_peer->options.originserver) {
-            flags.proxying = false;
-            flags.originpeer = true;
-        } else {
-            flags.proxying = false;
-            flags.originpeer = false;
-        }
-    } else {
-        flags.proxying = false;
-        flags.originpeer = false;
-    }
+    flags.originpeer = (_peer != NULL && _peer->options.originserver);
+    flags.proxying = (_peer != NULL && !flags.originpeer);
 
     /*
      * Is keep-alive okay for all request methods?