/*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
{
public:
- virtual int match (ACLData<char const *> * &, ACLFilledChecklist *, ACLFlags &);
+ virtual int match (ACLData<char const *> * &, ACLFilledChecklist *);
virtual bool requiresRequest() const {return true;}
-
- static ACLRequestHeaderStrategy *Instance();
- /* Not implemented to prevent copies of the instance. */
- /* Not private to prevent brain dead g+++ warnings about
- * private constructors with no friends */
- ACLRequestHeaderStrategy(ACLRequestHeaderStrategy const &);
-
-private:
- static ACLRequestHeaderStrategy *Instance_;
- ACLRequestHeaderStrategy() {}
-
- ACLRequestHeaderStrategy&operator=(ACLRequestHeaderStrategy const &);
};
template <Http::HdrType header>
int
-ACLRequestHeaderStrategy<header>::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist, ACLFlags &)
+ACLRequestHeaderStrategy<header>::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)
{
char const *theHeader = checklist->request->header.getStr(header);
return data->match(theHeader);
}
-template <Http::HdrType header>
-ACLRequestHeaderStrategy<header> *
-ACLRequestHeaderStrategy<header>::Instance()
-{
- if (!Instance_)
- Instance_ = new ACLRequestHeaderStrategy<header>;
-
- return Instance_;
-}
-
-template <Http::HdrType header>
-ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ = NULL;
-
#endif /* SQUID_REQUESTHEADERSTRATEGY_H */