From ffb733879cecfe07c14fc84205cfa2b644e35c4f Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 7 Dec 2008 18:31:45 +0000 Subject: [PATCH] Switch some stuff to use ASCII mapping rather than RFC. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10855 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/commands.cpp | 2 +- src/modules/m_httpd_acl.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commands.cpp b/src/commands.cpp index 62029bd65..7efcefc6d 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -64,7 +64,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if (InspIRCd::Match(u->second->GetIPString(), ip)) + if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map)) matches++; } diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index a62bda3e0..3d152f636 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -172,7 +172,7 @@ class ModuleHTTPAccessList : public Module for (std::vector::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl) { - if (InspIRCd::Match(http->GetURI(), this_acl->path)) + if (InspIRCd::Match(http->GetURI(), this_acl->path, ascii_case_insensitive_map)) { if (!this_acl->blacklist.empty()) { @@ -182,7 +182,7 @@ class ModuleHTTPAccessList : public Module while (sep.GetToken(entry)) { - if (InspIRCd::Match(http->GetIP(), entry)) + if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map)) { ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Denying access to blacklisted resource %s (matched by pattern %s) from ip %s (matched by entry %s)", http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), entry.c_str()); @@ -200,7 +200,7 @@ class ModuleHTTPAccessList : public Module while (sep.GetToken(entry)) { - if (InspIRCd::Match(http->GetIP(), entry)) + if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map)) allow_access = true; } -- 2.39.2