------------------------------------------------------------
revno: 12498
revision-id: squid3@treenet.co.nz-20130217100012-tu02gbwangmrqvrx
parent: squid3@treenet.co.nz-20130214091437-0kf8k09qf1sg8ker
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3781
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sun 2013-02-17 03:00:12 -0700
message:
  Bug 3781: Proxy Authentication not sent to cache_peer
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130217100012-tu02gbwangmrqvrx
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: b340e171102abeb69b5c14026fc26ba710517906
# timestamp: 2013-02-17 11:01:00 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130214091437-\
#   0kf8k09qf1sg8ker
# 
# Begin patch
=== modified file 'src/http.cc'
--- src/http.cc	2013-01-28 04:11:25 +0000
+++ src/http.cc	2013-02-17 10:00:12 +0000
@@ -2131,18 +2131,8 @@
                                     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?