You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/11/19 23:01:51 UTC
svn commit: r1037046 - in /trafficserver/traffic/trunk: iocore/eventsystem/
proxy/ proxy/config/ proxy/mgmt2/api2/ proxy/mgmt2/api2/include/
proxy/mgmt2/api2/remote/ proxy/mgmt2/cli2/ proxy/mgmt2/html2/
proxy/mgmt2/web2/ test/deft/ test/deft/docs/
Author: zwoop
Date: Fri Nov 19 22:01:50 2010
New Revision: 1037046
URL: http://svn.apache.org/viewvc?rev=1037046&view=rev
Log:
TS-181 More cleanup for "auth" and "acl".
Added:
trafficserver/traffic/trunk/test/deft/ts-instantiate.pl
- copied, changed from r1037034, trafficserver/traffic/trunk/proxy/ts-instantiate.pl
Removed:
trafficserver/traffic/trunk/proxy/ts-instantiate.pl
Modified:
trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
trafficserver/traffic/trunk/proxy/DynamicStats.h
trafficserver/traffic/trunk/proxy/config/cache.config
trafficserver/traffic/trunk/proxy/config/congestion.config
trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh
trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl
trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h Fri Nov 19 22:01:50 2010
@@ -79,19 +79,13 @@
#define NT_ASYNC_IO_EVENT_EVENTS_START 3100
#define RAFT_EVENT_EVENTS_START 3200
#define SIMPLE_EVENT_EVENTS_START 3300
-#define LDAP_EVENT_EVENTS_START 3400
#define UPDATE_EVENT_EVENTS_START 3500
-#define NTLM_EVENT_EVENTS_START 3700
#define LOG_COLLATION_EVENT_EVENTS_START 3800
#define AIO_EVENT_EVENTS_START 3900
#define BLOCK_CACHE_EVENT_EVENTS_START 4000
#define UTILS_EVENT_EVENTS_START 5000
#define CONGESTION_EVENT_EVENTS_START 5100
-#define MIXT_API_EVENT_EVENTS_START 50000
-#define QT_EVENT_EVENTS_START 58000
-#define WMT_EVENT_EVENTS_START 59000
#define INK_API_EVENT_EVENTS_START 60000
-#define RADIUS_EVENT_EVENTS_START 61000
#define SRV_EVENT_EVENTS_START 62000
#define REMAP_EVENT_EVENTS_START 63000
Modified: trafficserver/traffic/trunk/proxy/DynamicStats.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/DynamicStats.h?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/DynamicStats.h (original)
+++ trafficserver/traffic/trunk/proxy/DynamicStats.h Fri Nov 19 22:01:50 2010
@@ -102,14 +102,6 @@ _D(cpu_metric_fds_ready_per_loop_stat)
//
// Dynamic Scheduled Update Stats
//
- //
- // Dynamic WMT stats
- //
-#define WMT_STATS_1
- //
- // Dynamic QT stats
- //
-#define QT_STATS_1
#ifdef TS_MICRO
//
// Prefetch Stuffer Stats
Modified: trafficserver/traffic/trunk/proxy/config/cache.config
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/cache.config?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/cache.config (original)
+++ trafficserver/traffic/trunk/proxy/config/cache.config Fri Nov 19 22:01:50 2010
@@ -33,7 +33,7 @@
# 2. tag is an OPTIONAL directive which specifies a unique identifier
# for the current record. This is needed for MIXT, since we may want
# to select a record that is not necessarily the first one
-# that matches. Valid values for tag are 'RNI' and 'QT'.
+# that matches.
#
# Each line must include exactly one cache directive
# Cache directives are
Modified: trafficserver/traffic/trunk/proxy/config/congestion.config
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/congestion.config?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/congestion.config (original)
+++ trafficserver/traffic/trunk/proxy/config/congestion.config Fri Nov 19 22:01:50 2010
@@ -2,7 +2,6 @@
# congestion.config
#
# The purpose of this file is to specify the congestion control rules.
-# The syntax is similar to filter.config.
#
# Each line consists of a set of tag value pairs. The pairs
# are in the format <tag>=<value>
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc Fri Nov 19 22:01:50 2010
@@ -379,18 +379,6 @@ INKIcpEleDestory(INKIcpEle * ele)
return;
}
-inkapi INKLdapSrvrEle *
-INKLdapSrvrEleCreate()
-{
- return NULL;
-}
-
-inkapi void
-INKLdapSrvrEleDestroy(INKLdapSrvrEle * ele)
-{
- return;
-}
-
inkapi INKLogFilterEle *
INKLogFilterEleCreate()
{
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Fri Nov 19 22:01:50 2010
@@ -347,7 +347,7 @@ typedef enum
INK_METHOD_POST,
INK_METHOD_PUT,
INK_METHOD_TRACE,
- INK_METHOD_PUSH, /* only valid with filter.config */
+ INK_METHOD_PUSH,
INK_METHOD_UNDEFINED
} INKMethodT;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc Fri Nov 19 22:01:50 2010
@@ -1533,7 +1533,7 @@ test_read_url(bool valid)
/* ------------------------------------------------------------------------
* test_read_file
* ------------------------------------------------------------------------
- * reads filter.config file and prints it out
+ * reads hosting.config file and prints it out
*/
void
test_read_file()
@@ -1555,7 +1555,7 @@ test_read_file()
/* ------------------------------------------------------------------------
* test_write_file
* ------------------------------------------------------------------------
- * writes filter.config with some garbage text then reads the file and
+ * writes hosting.config with some garbage text then reads the file and
* prints the new file to stdout
*/
void
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh Fri Nov 19 22:01:50 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl Fri Nov 19 22:01:50 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict Fri Nov 19 22:01:50 2010
@@ -275,35 +275,6 @@ s_text_795=Proxy Hostname
s_text_796=Specifies the hostname or IP address assigned to <@record proxy.config.product_name>.
s_text_797=Proxy Port
-s_text_809=Authentication and Authorization Specifiers
-s_text_810=Specifies the rule action to define how <@record proxy.config.product_name> denies or allows particular URL requests, keeps or strips header information from client requests, and authenticates users.
-s_text_811=Specifies the primary destination type of the rule.
-s_text_812=Specifies the primary destination value that the rule applies to.
-s_text_813=Header Type
-s_text_814=Specifies the client request header information that you want to keep/strip. (Only applies to 'keep_hdr' or 'strip_hdr' rule types)
-s_text_815=Server Name
-s_text_816=Specifies the server.
-s_text_817=Example: ldap.foo.com:12345 or ldap.foo.com
-s_text_818=Base Distinguished Name
-s_text_819=Specifies the base distinguished name.
-s_text_820=UID Filter
-s_text_821=Specifies the UID filter.
-s_text_822=Attribute Name
-s_text_823=Specifies the attribute name.
-s_text_824=Attribute Value
-s_text_825=Specifies the attribute value.
-s_text_826=Realm (Optional)
-s_text_827=Specifies the realm.
-s_text_828=LDAP and NTLM Group Authorization Specifiers (Optional)
-s_text_829=Bind DN
-s_text_830=Specifies the DN of an authorized user.
-s_text_831=Bind Password
-s_text_832=Specifies the password to use when binding to the server or Domain Controller. Please hit "Apply Password" to commit a new password rule based on the values currently entered on the form.
-s_text_833=Bind Password File
-s_text_834=Specifies the password file to use when binding to the LDAP or NTLM server.
-s_text_835=Redirect URL (Optional)
-s_text_836=Specifies the url to redirect to when an error occurs.
-
s_text_837=Client Group Value
s_text_838=Specifies the value of the client group.
s_text_839=Example: 0.0.0.0 or 0.0.0.0-255.255.255.255 (IP) or domain.com (domain) or x.y.com (hostname)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h Fri Nov 19 22:01:50 2010
@@ -302,36 +302,6 @@
#define HTML_ID_CFG_EDIT_SEARCH_LIST_HELP "s_text_788"
#define HTML_ID_CFG_EDIT_SEARCH_LIST_EG "s_text_789"
-// filter.config
-#define HTML_ID_CFG_EDIT_AUTH_SPEC "s_text_809"
-#define HTML_ID_CFG_EDIT_RULE_TYPE_HELP_5 "s_text_810"
-#define HTML_ID_CFG_EDIT_PDEST_TYPE_HELP_4 "s_text_811"
-#define HTML_ID_CFG_EDIT_PDEST_VALUE_HELP_4 "s_text_812"
-#define HTML_ID_CFG_EDIT_HEADER_TYPE "s_text_813"
-#define HTML_ID_CFG_EDIT_HEADER_TYPE_HELP "s_text_814"
-#define HTML_ID_CFG_EDIT_LDAP_SERVER "s_text_815"
-#define HTML_ID_CFG_EDIT_LDAP_SERVER_HELP "s_text_816"
-#define HTML_ID_CFG_EDIT_LDAP_SERVER_EG "s_text_817"
-#define HTML_ID_CFG_EDIT_LDAP_BASE_DN "s_text_818"
-#define HTML_ID_CFG_EDIT_LDAP_BASE_DN_HELP "s_text_819"
-#define HTML_ID_CFG_EDIT_LDAP_UID "s_text_820"
-#define HTML_ID_CFG_EDIT_LDAP_UID_HELP "s_text_821"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_NAME "s_text_822"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_NAME_HELP "s_text_823"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_VALUE "s_text_824"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_VALUE_HELP "s_text_825"
-#define HTML_ID_CFG_EDIT_LDAP_REALM "s_text_826"
-#define HTML_ID_CFG_EDIT_LDAP_REALM_HELP "s_text_827"
-#define HTML_ID_CFG_EDIT_LDAP_OPTIONS "s_text_828"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_DN "s_text_829"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_DN_HELP "s_text_830"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD "s_text_831"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD_HELP "s_text_832"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD_FILE "s_text_833"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD_FILE_HELP "s_text_834"
-#define HTML_ID_CFG_EDIT_LDAP_RDR_URL "s_text_835"
-#define HTML_ID_CFG_EDIT_LDAP_RDR_URL_HELP "s_text_836"
-
#define HTML_ID_CFG_EDIT_USER "s_text_844"
#define HTML_ID_CFG_EDIT_USER_HELP "s_text_845"
#define HTML_ID_CFG_EDIT_PASSWORD "s_text_846"
Modified: trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html?rev=1037046&r1=1037045&r2=1037046&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html (original)
+++ trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html Fri Nov 19 22:01:50 2010
@@ -51,7 +51,7 @@ to create
<pre>[storage.config]</pre>
<p> With exception of <code>[records.config]</code>,
<code>[remap.config]</code>,
- <code>[filter.config]</code>, and <code>[meta]</code>
+ and <code>[meta]</code>
the contents between that tag and next
file tag (or end of file) are written verbatim
to a file of that name in that <b>run_dir</b>/config for that
@@ -78,14 +78,6 @@ to create
Example:</p>
<pre>map http://%%(ts1):&&(proxy.config.http.server_port)/ \
http://%%(load1):%%(load1:server)/ </pre>
- <p> <code>[filter.config]</code> section allows for the evaluation
- of perl expressions in writing the config file.
- The syntax is <pre>&&(eval|< perl expression >|)</pre>
- One use is to specify time based access control scheme.
- Example:</p>
- <pre>dest_ip=0.0.0.0-255.255.255.255 \
-time=&&(eval|{my \$t=time; my (\$s1,\$m1,\$h1)=localtime(\$t-3600); my (\$s2,\$m2,\$h2)=localtime(\$t+3600); "\$h1:\$m1-\$h2:\$m2"}|) \
-action=deny </pre>
<p> The <code>[meta]</code> sections is where the instantiator is
told about attributes that affect its work. The there is only
currently one option which is tell the instantiator to start up
Copied: trafficserver/traffic/trunk/test/deft/ts-instantiate.pl (from r1037034, trafficserver/traffic/trunk/proxy/ts-instantiate.pl)
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/ts-instantiate.pl?p2=trafficserver/traffic/trunk/test/deft/ts-instantiate.pl&p1=trafficserver/traffic/trunk/proxy/ts-instantiate.pl&r1=1037034&r2=1037046&rev=1037046&view=diff
==============================================================================
(empty)