Cleanup: replace urlCanonical() with HttpRequest::effectiveReuqestUri()

[thirdparty/squid.git] / src / acl / Url.cc

diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index e145e44ddf6250aac77d9d93bf1b693ee75064f7..5a83c8cfb365d13e0cd679aba8f5bc01f726e88c 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -12,16 +12,18 @@
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
 #include "acl/Url.h"
+#include "HttpRequest.h"
 #include "rfc1738.h"
 #include "src/URL.h"
 
 int
 ACLUrlStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist, ACLFlags &)
 {
-    char *esc_buf = xstrdup(urlCanonical(checklist->request));
+    const SBuf &tmp = checklist->request->effectiveRequestUri();
+    char *esc_buf = xstrndup(tmp.rawContent(), tmp.length()+1);
     rfc1738_unescape(esc_buf);
     int result = data->match(esc_buf);
-    safe_free(esc_buf);
+    xfree(esc_buf);
     return result;
 }