From: wessels <>
Date: Tue, 26 Aug 1997 10:21:17 +0000 (+0000)
Subject: finish getting new proxy auth working--but still untested
X-Git-Tag: SQUID_3_0_PRE1~4807
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c1517455c5a1949fe1deb3ddf3861cc2bd142e11;p=thirdparty%2Fsquid.git

finish getting new proxy auth working--but still untested
---

diff --git a/src/acl.cc b/src/acl.cc
index 2b9eddc070..a6afccad4a 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.106 1997/08/25 23:45:22 wessels Exp $
+ * $Id: acl.cc,v 1.107 1997/08/26 04:21:17 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -1141,7 +1141,7 @@ aclMatchTime(struct _acl_time_data *data, time_t when)
 int
 aclMatchAcl(struct _acl *acl, aclCheck_t * checklist)
 {
-    const request_t *r = checklist->request;
+    request_t *r = checklist->request;
     const ipcache_addrs *ia = NULL;
     const char *fqdn = NULL;
     int k;
@@ -1228,6 +1228,7 @@ aclMatchAcl(struct _acl *acl, aclCheck_t * checklist)
 	} else {
 	    /* register that we used the proxy authentication header */
 	    checklist->state[ACL_PROXY_AUTH] = ACL_LOOKUP_DONE;
+	    BIT_SET(r->flags, REQ_USED_PROXY_AUTH);
 	    return 1;
 	}
 	/* NOTREACHED */
diff --git a/src/defines.h b/src/defines.h
index 6cf05db3f1..83b21d44a9 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -196,7 +196,7 @@
 #define MAX_URL  4096
 #define MAX_LOGIN_SZ  128
 
-/* bitfields for the flags member */
+/* bitfields for request_t->flags */
 #define REQ_RANGE		0x01
 #define REQ_NOCACHE		0x02
 #define REQ_IMS			0x04
@@ -208,6 +208,7 @@
 #define REQ_PROXY_KEEPALIVE	0x100
 #define REQ_PROXYING		0x200
 #define REQ_REFRESH		0x400
+#define REQ_USED_PROXY_AUTH	0x800
 #define PEER_MAX_ADDRESSES 10
 #define RTT_AV_FACTOR      1000
 
diff --git a/src/http.cc b/src/http.cc
index afe70ac577..9b2185bd02 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: http.cc,v 1.186 1997/08/25 23:45:27 wessels Exp $
+ * $Id: http.cc,v 1.187 1997/08/26 04:21:19 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -809,7 +809,7 @@ httpBuildRequestHeader(request_t * request,
 	    continue;
 	if (strncasecmp(xbuf, "Proxy-authorization:", 20) == 0)
 	    /* If we're not going to do proxy auth, then it must be passed on */
-	    if (Config.proxyAuth.File)
+	    if (BIT_TEST(request->flags, REQ_USED_PROXY_AUTH))
 		continue;
 	if (strncasecmp(xbuf, "Connection:", 11) == 0)
 	    continue;