2 diff -c squid/src/acl.c:1.270.2.18 squid/src/acl.c:1.270.2.19
3 *** squid/src/acl.c:1.270.2.18 Sat Nov 29 01:59:23 2003
4 --- squid/src/acl.c Fri Dec 19 09:34:22 2003
8 return ACL_MAX_USER_IP;
9 if (!strcmp(s, "external"))
11 + if (!strcmp(s, "urllogin"))
12 + return ACL_URLLOGIN;
20 if (type == ACL_EXTERNAL)
22 + if (type == ACL_URLLOGIN)
30 aclParseTimeSpec(&A->data);
34 case ACL_URLPATH_REGEX:
36 case ACL_REFERER_REGEX:
40 case ACL_URLPATH_REGEX:
44 /* These ACL types require checklist->request */
46 debug(28, 1) ("WARNING: '%s' ACL is used but there is no"
50 k = aclMatchRegex(ae->data, esc_buf);
54 + esc_buf = xstrdup(r->login);
55 + rfc1738_unescape(esc_buf);
56 + k = aclMatchRegex(ae->data, esc_buf);
61 k = clientdbEstablished(checklist->src_addr, 0);
66 case ACL_PROXY_AUTH_REGEX:
69 case ACL_URLPATH_REGEX:
71 case ACL_REFERER_REGEX:
75 return aclDumpTimeSpecList(a->data);
76 case ACL_PROXY_AUTH_REGEX:
79 case ACL_URLPATH_REGEX:
81 case ACL_REFERER_REGEX:
82 Index: squid/src/cf.data.pre
83 diff -c squid/src/cf.data.pre:1.245.2.56 squid/src/cf.data.pre:1.245.2.57
84 *** squid/src/cf.data.pre:1.245.2.56 Sun Dec 14 06:33:44 2003
85 --- squid/src/cf.data.pre Fri Dec 19 09:34:22 2003
89 h1:m1 must be less than h2:m2
90 acl aclname url_regex [-i] ^http:// ... # regex matching on whole URL
91 acl aclname urlpath_regex [-i] \.gif$ ... # regex matching on URL path
92 + acl aclname urllogin [-i] [^a-zA-Z0-9] ... # regex matching on URL login field
93 acl aclname port 80 70 21 ...
94 acl aclname port 0-1024 ... # ranges allowed
95 acl aclname myport 3128 ... # (local socket TCP port)
96 Index: squid/src/enums.h
97 diff -c squid/src/enums.h:1.203.2.8 squid/src/enums.h:1.203.2.9
98 *** squid/src/enums.h:1.203.2.8 Mon Jan 20 17:06:39 2003
99 --- squid/src/enums.h Fri Dec 19 09:34:23 2003