← Back to branch summary

~chtsanti/squid/icap-max-connections

~chtsanti/squid/icap-max-connections

« back to all changes in this revision

Viewing changes to src/adaptation/AccessRule.cc

Committer: Christos Tsantilas
Date: 2009-04-11 09:00:59 UTC
mfrom: (9294.1.333 trunk)
Revision ID: chtsanti@users.sourceforge.net-20090411090059-8n47p1kyy1cqfqkn

Merge From trunk

files added:
src/AclRegs.cc

src/AuthReg.cc

src/acl

src/acl/FilledChecklist.cc

src/acl/FilledChecklist.h

src/acl/Gadgets.h

src/acl/Makefile.am

src/auth/Acl.cc

src/auth/Acl.h

src/esi

src/esi/Makefile.am

src/esi/Module.cc

src/esi/Module.h

src/fs/Module.cc

src/fs/Module.h

files removed:
lib/inet_ntoa.c

src/ACLChecklist.cci

files renamed:
src/acl.cc => src/acl/Acl.cc

src/ACL.h => src/acl/Acl.h

src/ACLARP.cc => src/acl/Arp.cc

src/ACLARP.h => src/acl/Arp.h

src/ACLASN.cc => src/acl/Asn.cc

src/ACLASN.h => src/acl/Asn.h

src/ACLBrowser.cc => src/acl/Browser.cc

src/ACLBrowser.h => src/acl/Browser.h

src/ACLCertificate.cc => src/acl/Certificate.cc

src/ACLCertificate.h => src/acl/Certificate.h

src/ACLCertificateData.cc => src/acl/CertificateData.cc

src/ACLCertificateData.h => src/acl/CertificateData.h

src/ACLChecklist.cc => src/acl/Checklist.cc

src/ACLChecklist.h => src/acl/Checklist.h

src/ACLData.h => src/acl/Data.h

src/ACLDestinationASN.h => src/acl/DestinationAsn.h

src/ACLDestinationDomain.cc => src/acl/DestinationDomain.cc

src/ACLDestinationDomain.h => src/acl/DestinationDomain.h

src/ACLDestinationIP.cc => src/acl/DestinationIp.cc

src/ACLDestinationIP.h => src/acl/DestinationIp.h

src/ACLDomainData.cc => src/acl/DomainData.cc

src/ACLDomainData.h => src/acl/DomainData.h

src/ACLExtUser.cc => src/acl/ExtUser.cc

src/ACLExtUser.h => src/acl/ExtUser.h

src/acl_noncore.cc => src/acl/Gadgets.cc

src/ACLHTTPHeaderData.cc => src/acl/HttpHeaderData.cc

src/ACLHTTPHeaderData.h => src/acl/HttpHeaderData.h

src/ACLHTTPRepHeader.cc => src/acl/HttpRepHeader.cc

src/ACLHTTPRepHeader.h => src/acl/HttpRepHeader.h

src/ACLHTTPReqHeader.cc => src/acl/HttpReqHeader.cc

src/ACLHTTPReqHeader.h => src/acl/HttpReqHeader.h

src/ACLHTTPStatus.cc => src/acl/HttpStatus.cc

src/ACLHTTPStatus.h => src/acl/HttpStatus.h

src/ACLIdent.cc => src/acl/Ident.cc

src/ACLIdent.h => src/acl/Ident.h

src/ACLIntRange.cc => src/acl/IntRange.cc

src/ACLIntRange.h => src/acl/IntRange.h

src/ACLIP.cc => src/acl/Ip.cc

src/ACLIP.h => src/acl/Ip.h

src/ACLMaxConnection.cc => src/acl/MaxConnection.cc

src/ACLMaxConnection.h => src/acl/MaxConnection.h

src/ACLMethod.cc => src/acl/Method.cc

src/ACLMethod.h => src/acl/Method.h

src/ACLMethodData.cc => src/acl/MethodData.cc

src/ACLMethodData.h => src/acl/MethodData.h

src/ACLMyIP.cc => src/acl/MyIp.cc

src/ACLMyIP.h => src/acl/MyIp.h

src/ACLMyPort.cc => src/acl/MyPort.cc

src/ACLMyPort.h => src/acl/MyPort.h

src/ACLMyPortName.cc => src/acl/MyPortName.cc

src/ACLMyPortName.h => src/acl/MyPortName.h

src/ACLPeerName.cc => src/acl/PeerName.cc

src/ACLPeerName.h => src/acl/PeerName.h

src/ACLProtocol.cc => src/acl/Protocol.cc

src/ACLProtocol.h => src/acl/Protocol.h

src/ACLProtocolData.cc => src/acl/ProtocolData.cc

src/ACLProtocolData.h => src/acl/ProtocolData.h

src/ACLReferer.cc => src/acl/Referer.cc

src/ACLReferer.h => src/acl/Referer.h

src/ACLRegexData.cc => src/acl/RegexData.cc

src/ACLRegexData.h => src/acl/RegexData.h

src/ACLReplyHeaderStrategy.h => src/acl/ReplyHeaderStrategy.h

src/ACLReplyMIMEType.cc => src/acl/ReplyMimeType.cc

src/ACLReplyMIMEType.h => src/acl/ReplyMimeType.h

src/ACLRequestHeaderStrategy.h => src/acl/RequestHeaderStrategy.h

src/ACLRequestMIMEType.cc => src/acl/RequestMimeType.cc

src/ACLRequestMIMEType.h => src/acl/RequestMimeType.h

src/ACLSourceASN.h => src/acl/SourceAsn.h

src/ACLSourceDomain.cc => src/acl/SourceDomain.cc

src/ACLSourceDomain.h => src/acl/SourceDomain.h

src/ACLSourceIP.cc => src/acl/SourceIp.cc

src/ACLSourceIP.h => src/acl/SourceIp.h

src/ACLSslError.cc => src/acl/SslError.cc

src/ACLSslError.h => src/acl/SslError.h

src/ACLSslErrorData.cc => src/acl/SslErrorData.cc

src/ACLSslErrorData.h => src/acl/SslErrorData.h

src/ACLStrategised.cc => src/acl/Strategised.cc

src/ACLStrategised.h => src/acl/Strategised.h

src/ACLStrategy.h => src/acl/Strategy.h

src/ACLStringData.cc => src/acl/StringData.cc

src/ACLStringData.h => src/acl/StringData.h

src/ACLTime.cc => src/acl/Time.cc

src/ACLTime.h => src/acl/Time.h

src/ACLTimeData.cc => src/acl/TimeData.cc

src/ACLTimeData.h => src/acl/TimeData.h

src/ACLUrl.cc => src/acl/Url.cc

src/ACLUrl.h => src/acl/Url.h

src/ACLUrlPath.cc => src/acl/UrlPath.cc

src/ACLUrlPath.h => src/acl/UrlPath.h

src/ACLUrlPort.cc => src/acl/UrlPort.cc

src/ACLUrlPort.h => src/acl/UrlPort.h

src/ACLUserData.cc => src/acl/UserData.cc

src/ACLUserData.h => src/acl/UserData.h

src/ACLMaxUserIP.cc => src/auth/AclMaxUserIp.cc

src/ACLMaxUserIP.h => src/auth/AclMaxUserIp.h

src/ACLProxyAuth.cc => src/auth/AclProxyAuth.cc

src/ACLProxyAuth.h => src/auth/AclProxyAuth.h

src/authenticate.cc => src/auth/Gadgets.cc

src/authenticate.h => src/auth/Gadgets.h

src/AsyncCall.cc => src/base/AsyncCall.cc

src/AsyncCall.h => src/base/AsyncCall.h

src/AsyncCallQueue.cc => src/base/AsyncCallQueue.cc

src/AsyncCallQueue.h => src/base/AsyncCallQueue.h

src/AsyncCalls.dox => src/base/AsyncCalls.dox

src/AsyncJobCalls.h => src/base/AsyncJobCalls.h

src/ESIAssign.cc => src/esi/Assign.cc

src/ESIAssign.h => src/esi/Assign.h

src/ESIAttempt.h => src/esi/Attempt.h

src/ESIContext.cc => src/esi/Context.cc

src/ESIContext.h => src/esi/Context.h

src/ESICustomParser.cc => src/esi/CustomParser.cc

src/ESICustomParser.h => src/esi/CustomParser.h

src/ESIElement.h => src/esi/Element.h

src/ElementList.h => src/esi/ElementList.h

src/ESI.cc => src/esi/Esi.cc

src/ESI.h => src/esi/Esi.h

src/ESIExcept.h => src/esi/Except.h

src/ESIExpatParser.cc => src/esi/ExpatParser.cc

src/ESIExpatParser.h => src/esi/ExpatParser.h

src/ESIExpression.cc => src/esi/Expression.cc

src/ESIExpression.h => src/esi/Expression.h

src/ESIInclude.cc => src/esi/Include.cc

src/ESIInclude.h => src/esi/Include.h

src/ESILibxml2Parser.cc => src/esi/Libxml2Parser.cc

src/ESILibxml2Parser.h => src/esi/Libxml2Parser.h

src/ESILiteral.h => src/esi/Literal.h

src/ESIParser.cc => src/esi/Parser.cc

src/ESIParser.h => src/esi/Parser.h

src/ESISegment.cc => src/esi/Segment.cc

src/ESISegment.h => src/esi/Segment.h

src/ESISequence.cc => src/esi/Sequence.cc

src/ESISequence.h => src/esi/Sequence.h

src/ESIVar.h => src/esi/Var.h

src/ESIVarState.cc => src/esi/VarState.cc

src/ESIVarState.h => src/esi/VarState.h

files modified:
CREDITS

ChangeLog

compat/GnuRegex.h

compat/assert.h

compat/compat.h

compat/compat_shared.h

compat/os/next.h

compat/os/solaris.h

configure.in

doc/Programming-Guide/02_CodingConventions.dox

doc/Programming-Guide/Makefile

doc/release-notes/release-3.0.sgml

doc/release-notes/release-3.1.html

doc/release-notes/release-3.1.sgml

errors/TRANSLATORS

errors/es.po

errors/fa.po

errors/fr.po

errors/nl.po

errors/ru.po

errors/uz.po

helpers/basic_auth/LDAP/squid_ldap_auth.c

helpers/basic_auth/MSNT/smblib-priv.h

helpers/external_acl/ldap_group/squid_ldap_group.c

helpers/ntlm_auth/smb_lm/libntlmssp.c

helpers/ntlm_auth/smb_lm/smbval/smblib-priv.h

include/snmp_error.h

lib/Makefile.am

lib/rfc1035.c

lib/rfc2617.c

lib/rfc3596.c

scripts/testbed.sh

snmplib/snmp_error.c

snmplib/snmplib_debug.c

squid3.dox

src/BodyPipe.h

src/CacheManager.h

src/CommCalls.h

src/DelayBucket.cc

src/DelayConfig.cc

src/DelayId.cc

src/DelayPool.cc

src/DelayTagged.cc

src/DelayTagged.h

src/DelayUser.h

src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc

src/EventLoop.cc

src/ExternalACL.h

src/HttpHdrCc.cc

src/HttpHdrSc.cc

src/HttpHeader.h

src/HttpHeaderRange.h

src/HttpHeaderTools.cc

src/HttpReply.cc

src/HttpRequest.h

src/HttpStatusLine.cc

src/ICP.h

src/Makefile.am

src/MemBuf.cc

src/MemObject.h

src/SquidString.h

src/Store.h

src/StoreSwapLogData.h

src/WinSvc.cc

src/access_log.cc

src/adaptation/AccessCheck.cc

src/adaptation/AccessCheck.h

src/adaptation/AccessRule.cc

src/adaptation/Config.cc

src/adaptation/Config.h

src/adaptation/Initiate.h

src/adaptation/ecap/Config.h

src/adaptation/ecap/Host.h

src/adaptation/ecap/MessageRep.h

src/adaptation/ecap/ServiceRep.cc

src/adaptation/ecap/ServiceRep.h

src/adaptation/ecap/XactionRep.cc

src/adaptation/ecap/XactionRep.h

src/adaptation/icap/Client.h

src/adaptation/icap/Config.cc

src/adaptation/icap/Config.h

src/adaptation/icap/Elements.h

src/adaptation/icap/InOut.h

src/adaptation/icap/Launcher.cc

src/adaptation/icap/Launcher.h

src/adaptation/icap/ModXact.cc

src/adaptation/icap/ModXact.h

src/adaptation/icap/OptXact.h

src/adaptation/icap/Options.h

src/adaptation/icap/ServiceRep.cc

src/adaptation/icap/ServiceRep.h

src/adaptation/icap/Xaction.h

src/asn.cc

src/auth/Makefile.am

src/auth/Scheme.cc

src/auth/User.cc

src/auth/UserRequest.cc

src/auth/basic/auth_basic.cc

src/auth/basic/auth_basic.h

src/auth/digest/auth_digest.cc

src/auth/digest/auth_digest.h

src/auth/negotiate/auth_negotiate.cc

src/auth/negotiate/auth_negotiate.h

src/auth/ntlm/auth_ntlm.cc

src/auth/ntlm/auth_ntlm.h

src/base/AsyncJob.cc

src/base/AsyncJob.h

src/base/Makefile.am

src/cache_cf.cc

src/cache_manager.cc

src/client_db.cc

src/client_side.cc

src/client_side_reply.cc

src/client_side_request.cc

src/client_side_request.h

src/comm.cc

src/comm.h

src/debug.cc

src/dns_internal.cc

src/enums.h

src/external_acl.cc

src/forward.cc

src/forward.h

src/fs/Makefile.am

src/fs/aufs/StoreFSaufs.cc

src/fs/coss/store_coss.h

src/fs/diskd/StoreFSdiskd.cc

src/fs/ufs/StoreFSufs.cc

src/ftp.cc

src/helper.h

src/htcp.cc

src/http.cc

src/icp_v2.cc

src/ip/IpAddress.cc

src/ip/IpAddress.h

src/ip/IpIntercept.cc

src/ip/IpIntercept.h

src/ip/QosConfig.cc

src/ip/stubQosConfig.cc

src/ipc.cc

src/ipcache.cc

src/logfile.cc

src/main.cc

src/mem_node.h

src/neighbors.cc

src/pconn.cc

src/peer_select.cc

src/recv-announce.cc

src/redirect.cc

src/snmp_core.cc

src/ssl_support.cc

src/tests/stub_store.cc

src/tests/testACLMaxUserIP.cc

src/tests/testAuth.cc

src/tests/testEvent.cc

src/tests/testEventLoop.cc

src/tests/test_http_range.cc

src/tools.cc

src/tunnel.cc

src/ufsdump.cc

src/url.cc

src/urn.cc

src/wccp2.cc

src/win32.cc

test-builds.sh

test-suite/ESIExpressions.cc

test-suite/Makefile.am

test-suite/buildtest.sh

test-suite/buildtests/layer-02-maximus.opts

test-suite/tcp-banger3.c

test-suite/test_tools.cc

tools/squidclient.cc

Show diffs side-by-side

added added

removed removed

src/adaptation/AccessRule.cc

2

2

#include "structs.h"

3

3

4

4

#include "ConfigParser.h"

5

#include "ACL.h"

5

#include "acl/Gadgets.h"

6

6

#include "adaptation/AccessRule.h"

7

7

#include "adaptation/Service.h"

8

8

#include "adaptation/ServiceGroups.h"

Older »