From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 4 Aug 2015 16:23:20 +0000 (+0200)
Subject: Fix http_hdr_type layering constraint violations in external_acl.cc
X-Git-Tag: merge-candidate-3-v2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b921ad7145e16fed842017b0702809c6dd5f368d;p=thirdparty%2Fsquid.git

Fix http_hdr_type layering constraint violations in external_acl.cc
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 966ceef7cd..ac54b34249 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1010,7 +1010,7 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
         break;
 
         case Format::LFT_ADAPTED_REQUEST_HEADER:
-            if (format->header_id == -1)
+            if (format->header_id == HDR_BAD_HDR)
                 sb = request->header.getByName(format->header);
             else
                 sb = request->header.getStrOrList(format->header_id);
@@ -1018,7 +1018,7 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
             break;
 
         case Format::LFT_ADAPTED_REQUEST_HEADER_ELEM:
-            if (format->header_id == -1)
+            if (format->header_id == HDR_BAD_HDR)
                 sb = request->header.getByNameListMember(format->header, format->member, format->separator);
             else
                 sb = request->header.getListMember(format->header_id, format->member, format->separator);
@@ -1027,7 +1027,7 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
 
         case Format::LFT_REPLY_HEADER:
             if (reply) {
-                if (format->header_id == -1)
+                if (format->header_id == HDR_BAD_HDR)
                     sb = reply->header.getByName(format->header);
                 else
                     sb = reply->header.getStrOrList(format->header_id);
@@ -1037,7 +1037,7 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
 
         case Format::LFT_REPLY_HEADER_ELEM:
             if (reply) {
-                if (format->header_id == -1)
+                if (format->header_id == HDR_BAD_HDR)
                     sb = reply->header.getByNameListMember(format->header, format->member, format->separator);
                 else
                     sb = reply->header.getListMember(format->header_id, format->member, format->separator);