From: hno <>
Date: Thu, 21 Oct 2004 04:37:56 +0000 (+0000)
Subject: Bug #998: acl rep_mime_type broken, looking into request headers
X-Git-Tag: SQUID_3_0_PRE4~1012
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=597a941375f10265c7d4db3f1592ed8d17aca36e;p=thirdparty%2Fsquid.git

Bug #998: acl rep_mime_type broken, looking into request headers
where it should look into reply headers.

By  Gonzalo Arana
---

diff --git a/src/ACLReplyHeaderStrategy.h b/src/ACLReplyHeaderStrategy.h
index 9275244388..9c6d6adebf 100644
--- a/src/ACLReplyHeaderStrategy.h
+++ b/src/ACLReplyHeaderStrategy.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLReplyHeaderStrategy.h,v 1.4 2003/08/10 09:53:49 robertc Exp $
+ * $Id: ACLReplyHeaderStrategy.h,v 1.5 2004/10/20 22:37:56 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -65,7 +65,7 @@ template <http_hdr_type header>
 int
 ACLReplyHeaderStrategy<header>::match (ACLData<char const *> * &data, ACLChecklist *checklist)
 {
-    char const *theHeader = httpHeaderGetStr(&checklist->request->header, header);
+    char const *theHeader = httpHeaderGetStr(&checklist->reply->header, header);
 
     if (NULL == theHeader)
         return 0;
diff --git a/src/ACLReplyMIMEType.h b/src/ACLReplyMIMEType.h
index 0e03f41d3c..9fd6a9561b 100644
--- a/src/ACLReplyMIMEType.h
+++ b/src/ACLReplyMIMEType.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLReplyMIMEType.h,v 1.3 2003/07/14 14:15:55 robertc Exp $
+ * $Id: ACLReplyMIMEType.h,v 1.4 2004/10/20 22:37:56 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -40,8 +40,7 @@
 #include "ACLReplyHeaderStrategy.h"
 #include "ACLStrategised.h"
 #include "ACLChecklist.h"
-/* FIXME: TODO: this is broken - should be HttpReply checks!! */
-#include "HttpRequest.h"
+#include "HttpReply.h"
 
 class ACLReplyMIMEType
 {
@@ -55,7 +54,7 @@ private:
 int
 ACLReplyHeaderStrategy<HDR_CONTENT_TYPE>::match (ACLData<char const *> * &data, ACLChecklist *checklist)
 {
-    char const *theHeader = httpHeaderGetStr(&checklist->request->header, HDR_CONTENT_TYPE);
+    char const *theHeader = httpHeaderGetStr(&checklist->reply->header, HDR_CONTENT_TYPE);
 
     if (NULL == theHeader)
         theHeader = "";