From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 16 Feb 2013 11:42:53 +0000 (+1300)
Subject: Bug 3781: Proxy Authentication not sent to cache_peer
X-Git-Tag: SQUID_3_4_0_1~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5656c29b93c4a4c86b98e3f946d53e4db6677cd;p=thirdparty%2Fsquid.git

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

diff --git a/src/http.cc b/src/http.cc
index 0cf313a58b..df6fd91600 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -2119,18 +2119,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?