Author: hno

New myportname ACL for matching the accepting port name

- also documents the name= port option which was previously implemented but unused
- Mention the new myportname acl in the acl section
- Document the addition of myportname acl

diff --git a/doc/release-notes/release-3.0.sgml b/doc/release-notes/release-3.0.sgml
index aed752ba9bdb45070758e39df6cf8f96679471f5..2f174b81ae3e11fe43bead4422e63584c86c3c2b 100644 (file)
--- a/doc/release-notes/release-3.0.sgml
+++ b/doc/release-notes/release-3.0.sgml
@@ -2,7 +2,7 @@
 <article>\r
 <title>Squid 3.0.RC1 release notes</title>\r
 <author>Squid Developers</author>\r
-<date>$Id: release-3.0.sgml,v 1.30.2.2 2008/02/25 23:25:24 amosjeffries Exp $</date>\r
+<date>$Id: release-3.0.sgml,v 1.30.2.3 2008/02/27 05:51:04 amosjeffries Exp $</date>\r
 \r
 <abstract>\r
 This document contains the release notes for version 3.0 of Squid.\r
@@ -341,6 +341,12 @@ See the accf_http(9) man page.
                include /path/to/file1 /path/to/file2\r
        </verb>\r
 \r
+       <tag>acl myportname</tag>\r
+       <p>New acl type myportname, matching the name of the http(s)_port where the request was accepted\r
+       <verb>\r
+        acl aclname myportname 3128 ...         # http(s)_port name\r
+       </verb>\r
+\r
 </descrip>\r
 \r
 \r

diff --git a/src/Makefile.am b/src/Makefile.am
index d4775064a9513753034e1a81d62cc76dc31b89d7..f637bb5e3310d589fb87180c4f3b992e263a5332 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.193 2007/10/31 04:52:15 amosjeffries Exp $
+#  $Id: Makefile.am,v 1.193.2.1 2008/02/27 05:51:04 amosjeffries Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -329,6 +329,8 @@ squid_ACLSOURCES = \
        ACLMyIP.h \
        ACLMyPort.cc \
        ACLMyPort.h \
+       ACLMyPortName.cc \
+       ACLMyPortName.h \
        ACLProtocol.cc \
        ACLProtocol.h \
        ACLProtocolData.cc \

diff --git a/src/Makefile.in b/src/Makefile.in
index 52dce950d038faeaf54cad9bd3bc0248c471401b..616b88b48782f7218a5cf00bdf9b1f2ec057c983 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.447 2007/12/05 01:11:21 hno Exp $
+#  $Id: Makefile.in,v 1.447.2.1 2008/02/27 05:51:06 amosjeffries Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -186,10 +186,10 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        ACLMaxConnection.cc ACLMaxConnection.h ACLMaxUserIP.cc \
        ACLMaxUserIP.h ACLMethod.cc ACLMethod.h ACLMethodData.cc \
        ACLMethodData.h ACLMyIP.cc ACLMyIP.h ACLMyPort.cc ACLMyPort.h \
-       ACLProtocol.cc ACLProtocol.h ACLProtocolData.cc \
-       ACLProtocolData.h ACLProxyAuth.cc ACLProxyAuth.h ACLReferer.cc \
-       ACLReferer.h ACLRegexData.cc ACLRegexData.h \
-       ACLReplyHeaderStrategy.h ACLReplyMIMEType.cc \
+       ACLMyPortName.cc ACLMyPortName.h ACLProtocol.cc ACLProtocol.h \
+       ACLProtocolData.cc ACLProtocolData.h ACLProxyAuth.cc \
+       ACLProxyAuth.h ACLReferer.cc ACLReferer.h ACLRegexData.cc \
+       ACLRegexData.h ACLReplyHeaderStrategy.h ACLReplyMIMEType.cc \
        ACLReplyMIMEType.h ACLHTTPRepHeader.cc ACLHTTPRepHeader.h \
        ACLHTTPReqHeader.cc ACLHTTPReqHeader.h \
        ACLRequestHeaderStrategy.h ACLRequestMIMEType.cc \
@@ -277,16 +277,16 @@ am__objects_6 = $(am__objects_5) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \
        ACLIntRange.$(OBJEXT) ACLIP.$(OBJEXT) \
        ACLMaxConnection.$(OBJEXT) ACLMaxUserIP.$(OBJEXT) \
        ACLMethod.$(OBJEXT) ACLMethodData.$(OBJEXT) ACLMyIP.$(OBJEXT) \
-       ACLMyPort.$(OBJEXT) ACLProtocol.$(OBJEXT) \
-       ACLProtocolData.$(OBJEXT) ACLProxyAuth.$(OBJEXT) \
-       ACLReferer.$(OBJEXT) ACLRegexData.$(OBJEXT) \
-       ACLReplyMIMEType.$(OBJEXT) ACLHTTPRepHeader.$(OBJEXT) \
-       ACLHTTPReqHeader.$(OBJEXT) ACLRequestMIMEType.$(OBJEXT) \
-       ACLSourceDomain.$(OBJEXT) ACLSourceIP.$(OBJEXT) \
-       ACLStrategised.$(OBJEXT) ACLStringData.$(OBJEXT) \
-       ACLTime.$(OBJEXT) ACLTimeData.$(OBJEXT) ACLUrl.$(OBJEXT) \
-       ACLUrlPath.$(OBJEXT) ACLUrlPort.$(OBJEXT) \
-       ACLUserData.$(OBJEXT)
+       ACLMyPort.$(OBJEXT) ACLMyPortName.$(OBJEXT) \
+       ACLProtocol.$(OBJEXT) ACLProtocolData.$(OBJEXT) \
+       ACLProxyAuth.$(OBJEXT) ACLReferer.$(OBJEXT) \
+       ACLRegexData.$(OBJEXT) ACLReplyMIMEType.$(OBJEXT) \
+       ACLHTTPRepHeader.$(OBJEXT) ACLHTTPReqHeader.$(OBJEXT) \
+       ACLRequestMIMEType.$(OBJEXT) ACLSourceDomain.$(OBJEXT) \
+       ACLSourceIP.$(OBJEXT) ACLStrategised.$(OBJEXT) \
+       ACLStringData.$(OBJEXT) ACLTime.$(OBJEXT) \
+       ACLTimeData.$(OBJEXT) ACLUrl.$(OBJEXT) ACLUrlPath.$(OBJEXT) \
+       ACLUrlPort.$(OBJEXT) ACLUserData.$(OBJEXT)
 am__objects_7 = comm_select.$(OBJEXT) comm_select_win32.$(OBJEXT) \
        comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) comm_kqueue.$(OBJEXT)
 am__objects_8 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \
@@ -1968,6 +1968,8 @@ squid_ACLSOURCES = \
        ACLMyIP.h \
        ACLMyPort.cc \
        ACLMyPort.h \
+       ACLMyPortName.cc \
+       ACLMyPortName.h \
        ACLProtocol.cc \
        ACLProtocol.h \
        ACLProtocolData.cc \
@@ -4628,6 +4630,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLMethodData.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLMyIP.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLMyPort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLMyPortName.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLProtocol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLProtocolData.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLProxyAuth.Po@am__quote@

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 15b917cb5c31289ac31ebc5ef9ef208a8e19c35a..73617e7ada1e325773663695959497866b53efa6 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.528.2.6 2008/02/25 23:43:05 amosjeffries Exp $
+ * $Id: cache_cf.cc,v 1.528.2.7 2008/02/27 05:51:06 amosjeffries Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -2810,6 +2810,7 @@ parse_http_port_specification(http_port_list * s, char *token)
     char *t;
 
     s->disable_pmtu_discovery = DISABLE_PMTU_OFF;
+    s->name = strdup(token);
 
     if ((t = strchr(token, ':'))) {
         /* host:port */

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2605ca122cb70cd36965badaf297c999735161d1..e9c070949254dc346413ef1acf49df9943b33f45 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.488.2.4 2008/02/25 23:41:50 amosjeffries Exp $
+# $Id: cf.data.pre,v 1.488.2.5 2008/02/27 05:51:06 amosjeffries Exp $
 #
 # SQUID Web Proxy Cache                http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -503,6 +503,7 @@ DOC_START
        acl aclname port     80 70 21 ...
        acl aclname port     0-1024 ...         # ranges allowed
        acl aclname myport   3128 ...           # (local socket TCP port)
+       acl aclname myportname 3128 ...         # http(s)_port name
        acl aclname proto    HTTP FTP ...
        acl aclname method   GET POST ...
        acl aclname browser  [-i] regexp ...
@@ -935,6 +936,9 @@ DOC_START
                        sporadically hang or never complete requests set
                        disable-pmtu-discovery option to 'transparent'.
 
+          name=        Specifies a internal name for the port. Defaults to
+                       the port specification (port or addr:port)
+
        If you run Squid on a dual-homed machine with an internal
        and an external interface we recommend you to specify the
        internal address:port in http_port. This way Squid will only be
@@ -1047,6 +1051,9 @@ DOC_START
           vport=NN     As above, but uses specified port number rather
                        than the https_port number. Implies accel.
 
+          name=        Specifies a internal name for the port. Defaults to
+                       the port specification (port or addr:port)
+
 DOC_END
 
 NAME: tcp_outgoing_tos tcp_outgoing_ds tcp_outgoing_dscp