Author: zwoop
Date: Sun May 15 04:27:48 2011
New Revision: 1103269
URL: http://svn.apache.org/viewvc?rev=1103269&view=rev
Log:
TS-781 Cleanup of unusual configs, and better defaults making records.config
leaner
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/cop/TrafficCop.cc
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/config/records.config.default.in
trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http/HttpConfig.h
trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
trafficserver/traffic/trunk/proxy/http/HttpTransact.h
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
---
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
(original)
+++
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
Sun May 15 04:27:48 2011
@@ -526,7 +526,6 @@ The Apache Traffic Server Administration
proxy.config.http.session_auth_cache_keep_alive_enabled
proxy.config.http.share_server_sessions
proxy.config.http.slow.log.threshold
- proxy.config.http.snarf_username_from_authorization
proxy.config.http.connect_ports
proxy.config.http.transaction_active_timeout_in
proxy.config.http.transaction_active_timeout_out
Modified: trafficserver/traffic/trunk/cop/TrafficCop.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/TrafficCop.cc?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/cop/TrafficCop.cc Sun May 15 04:27:48 2011
@@ -74,18 +74,18 @@ static int check_memory_min_swapfree_kb
static int check_memory_min_memfree_kb = 10240;
static int syslog_facility = LOG_DAEMON;
-static char syslog_fac_str[PATH_MAX];
+static char syslog_fac_str[PATH_MAX] = "LOG_DAEMON";
static int killsig = SIGKILL;
static int coresig = 0;
-static char admin_user[80] = TS_PKGSYSUSER;
+static char admin_user[80];
static char manager_binary[PATH_MAX] = "traffic_manager";
static char server_binary[PATH_MAX] = "traffic_server";
static char manager_options[OPTIONS_LEN_MAX] = "";
static char log_file[PATH_MAX] = "traffic.out";
-static char bin_path[PATH_MAX];
+static char bin_path[PATH_MAX] = "bin";
static int autoconf_port = 8083;
static int rs_port = 8088;
@@ -121,7 +121,7 @@ static const int kill_timeout = 1 * 60;
static int child_pid = 0;
static int child_status = 0;
-static int sem_id = -1;
+static int sem_id = 11452;
AppVersionInfo appVersionInfo;
static InkHashTable *configTable = NULL;
@@ -528,13 +528,16 @@ build_config_table(FILE * fp)
}
static void
-read_config_string(const char *str, char *val, size_t val_len)
+read_config_string(const char *str, char *val, size_t val_len, bool miss_ok =
false)
{
InkHashTableValue hval;
char *p, *buf;
if (!ink_hash_table_lookup(configTable, str, &hval)) {
- goto ConfigStrFatalError;
+ if (miss_ok)
+ return;
+ else
+ goto ConfigStrFatalError;
}
buf = (char *) hval;
@@ -569,11 +572,10 @@ read_config_int(const char *str, int *va
char *p, *buf;
if (!ink_hash_table_lookup(configTable, str, &hval)) {
- if (miss_ok) {
+ if (miss_ok)
return;
- } else {
+ else
goto ConfigIntFatalError;
- }
}
buf = (char *) hval;
@@ -638,10 +640,11 @@ read_config()
build_config_table(fp);
fclose(fp);
+ read_config_string("proxy.config.manager_binary", manager_binary,
sizeof(manager_binary), true);
read_config_string("proxy.config.admin.user_id", admin_user,
sizeof(admin_user));
- read_config_string("proxy.config.manager_binary", manager_binary,
sizeof(manager_binary));
- read_config_string("proxy.config.proxy_binary", server_binary,
sizeof(server_binary));
- read_config_string("proxy.config.bin_path", bin_path, sizeof(bin_path));
+ read_config_string("proxy.config.proxy_binary", server_binary,
sizeof(server_binary), true);
+
+ read_config_string("proxy.config.bin_path", bin_path, sizeof(bin_path),
true);
Layout::get()->relative(bin_path, sizeof(bin_path), bin_path);
if (access(bin_path, R_OK) == -1) {
ink_strlcpy(bin_path, Layout::get()->bindir, sizeof(bin_path));
@@ -661,20 +664,20 @@ read_config()
}
read_config_string("proxy.config.output.logfile", log_filename,
sizeof(log_filename));
Layout::relative_to(log_file, sizeof(log_file), log_dir, log_filename);
- read_config_int("proxy.config.process_manager.mgmt_port",
&http_backdoor_port);
- read_config_int("proxy.config.admin.autoconf_port", &autoconf_port);
- read_config_int("proxy.config.cluster.rsport", &rs_port);
- read_config_int("proxy.config.lm.sem_id", &sem_id);
+ read_config_int("proxy.config.process_manager.mgmt_port",
&http_backdoor_port, true);
+ read_config_int("proxy.config.admin.autoconf_port", &autoconf_port, true);
+ read_config_int("proxy.config.cluster.rsport", &rs_port, true);
+ read_config_int("proxy.config.lm.sem_id", &sem_id, true);
read_config_int("proxy.local.cluster.type", &tmp_int);
cluster_type = static_cast<MgmtClusterType>(tmp_int);
- read_config_string("proxy.config.syslog_facility", syslog_fac_str,
sizeof(syslog_fac_str));
+ read_config_string("proxy.config.syslog_facility", syslog_fac_str,
sizeof(syslog_fac_str), true);
process_syslog_config();
- read_config_int("proxy.config.cop.core_signal", &coresig);
+ read_config_int("proxy.config.cop.core_signal", &coresig, true);
- read_config_int("proxy.config.cop.linux_min_swapfree_kb",
&check_memory_min_swapfree_kb);
- read_config_int("proxy.config.cop.linux_min_memfree_kb",
&check_memory_min_memfree_kb);
+ read_config_int("proxy.config.cop.linux_min_swapfree_kb",
&check_memory_min_swapfree_kb, true);
+ read_config_int("proxy.config.cop.linux_min_memfree_kb",
&check_memory_min_memfree_kb, true);
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Leaving read_config()\n");
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Sun May 15 04:27:48 2011
@@ -66,10 +66,10 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.env_prep", RECD_STRING, "example_prep.sh",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.config_dir", RECD_STRING, "etc/trafficserver",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.config_dir", RECD_STRING, TS_BUILD_SYSCONFDIR,
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
// Jira TS-21
- {RECT_CONFIG, "proxy.config.local_state_dir", RECD_STRING,
"var/trafficserver", RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.local_state_dir", RECD_STRING,
TS_BUILD_RUNTIMEDIR, RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.temp_dir", RECD_STRING, "/tmp", RECU_NULL,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
@@ -248,7 +248,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.admin.autoconf_port", RECD_INT, "8083",
RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.admin.autoconf.doc_root", RECD_STRING,
"etc/trafficserver", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.admin.autoconf.doc_root", RECD_STRING,
TS_BUILD_SYSCONFDIR, RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.autoconf.localhost_only", RECD_INT, "0",
RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
@@ -379,7 +379,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.username.cache.size", RECD_INT, "5000",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.username.cache.storage_path", RECD_STRING,
"var/trafficserver", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.username.cache.storage_path", RECD_STRING,
TS_BUILD_CACHEDIR, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.username.cache.storage_size", RECD_INT,
"15728640", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
@@ -633,8 +633,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.http.anonymize_other_header_list", RECD_STRING,
NULL, RECU_DYNAMIC, RR_NULL, RECC_STR, ".*", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.snarf_username_from_authorization",
RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.http.insert_squid_x_forwarded_for", RECD_INT,
"1", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.insert_age_in_response", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
@@ -778,7 +776,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.body_factory.enable_logging", RECD_INT, "0",
RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.body_factory.template_sets_dir", RECD_STRING,
"etc/trafficserver/body_factory", RECU_RESTART_TS, RR_NULL, RECC_STR,
"^[^[:space:]]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.body_factory.template_sets_dir", RECD_STRING,
TS_BUILD_SYSCONFDIR "/body_factory", RECU_RESTART_TS, RR_NULL, RECC_STR,
"^[^[:space:]]+$", RECA_NULL}
,
//# 0 - never suppress generated responses
//# 1 - always suppress generated responses
@@ -1059,7 +1057,7 @@ RecordElement RecordsConfig[] = {
// # in entries, may not be changed while running
{RECT_CONFIG, "proxy.config.hostdb.size", RECD_INT, "200000", RECU_DYNAMIC,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.hostdb.storage_path", RECD_STRING,
"var/trafficserver", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.hostdb.storage_path", RECD_STRING,
TS_BUILD_CACHEDIR, RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.hostdb.storage_size", RECD_INT, "33554432",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
@@ -1147,7 +1145,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.log.hostname", RECD_STRING, "localhost",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.log.logfile_dir", RECD_STRING,
"var/log/trafficserver", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[^[:space:]]+$",
RECA_NULL}
+ {RECT_CONFIG, "proxy.config.log.logfile_dir", RECD_STRING, TS_BUILD_LOGDIR,
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[^[:space:]]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.log.logfile_perm", RECD_STRING, "rw-r--r--",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
@@ -1305,7 +1303,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.ssl.server.cert.filename", RECD_STRING,
"server.pem", RECU_RESTART_TS, RR_NULL, RECC_STR, "^[^[:space:]]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.ssl.server.cert.path", RECD_STRING,
"etc/trafficserver", RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.ssl.server.cert.path", RECD_STRING,
TS_BUILD_SYSCONFDIR, RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.ssl.server.cert_chain.filename", RECD_STRING,
NULL, RECU_RESTART_TS, RR_NULL, RECC_STR, NULL, RECA_NULL}
,
@@ -1323,7 +1321,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.ssl.client.cert.filename", RECD_STRING, NULL,
RECU_RESTART_TS, RR_NULL, RECC_STR, "^[^[:space:]]*$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.ssl.client.cert.path", RECD_STRING,
"etc/trafficserver", RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.ssl.client.cert.path", RECD_STRING,
TS_BUILD_SYSCONFDIR, RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.ssl.client.private_key.filename", RECD_STRING,
NULL, RECU_RESTART_TS, RR_NULL, RECC_STR, "^[^[:space:]]*$", RECA_NULL}
,
@@ -1400,11 +1398,11 @@ RecordElement RecordsConfig[] = {
//# Plug-in Configuration
//##############################################################################
//# Directory in which to find plugins
- {RECT_CONFIG, "proxy.config.plugin.plugin_dir", RECD_STRING,
"libexec/trafficserver", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.plugin.plugin_dir", RECD_STRING,
TS_BUILD_LIBEXECDIR, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.plugin.plugin_mgmt_dir", RECD_STRING,
"etc/trafficserver/plugins_mgmt", RECU_NULL, RR_NULL, RECC_NULL, NULL,
RECA_NULL}
+ {RECT_CONFIG, "proxy.config.plugin.plugin_mgmt_dir", RECD_STRING,
TS_BUILD_SYSCONFDIR "/plugins_mgmt", RECU_NULL, RR_NULL, RECC_NULL, NULL,
RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.plugin.extensions_dir", RECD_STRING,
"var/trafficserver", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.plugin.extensions_dir", RECD_STRING,
TS_BUILD_RUNTIMEDIR, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
//##############################################################################
Modified: trafficserver/traffic/trunk/proxy/config/records.config.default.in
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.default.in?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.default.in
(original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.default.in Sun May
15 04:27:48 2011
@@ -20,23 +20,21 @@
#
##############################################################################
CONFIG proxy.config.proxy_name STRING @build_machine@
-CONFIG proxy.config.bin_path STRING @rel_bindir@
-CONFIG proxy.config.proxy_binary STRING traffic_server
+CONFIG proxy.config.config_dir STRING @rel_sysconfdir@
CONFIG proxy.config.proxy_binary_opts STRING -M
-CONFIG proxy.config.manager_binary STRING traffic_manager
-CONFIG proxy.config.cli_binary STRING traffic_line
-CONFIG proxy.config.watch_script STRING traffic_cop
CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.config_dir STRING @rel_sysconfdir@
CONFIG proxy.config.temp_dir STRING /tmp
CONFIG proxy.config.alarm_email STRING @pkgsysuser@
CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
-CONFIG proxy.config.cop.core_signal INT 0
CONFIG proxy.config.output.logfile STRING traffic.out
-CONFIG proxy.config.cop.linux_min_swapfree_kb INT 10240
-CONFIG proxy.config.cop.linux_min_memfree_kb INT 10240
CONFIG proxy.config.snapshot_dir STRING snapshots
CONFIG proxy.config.system.mmap_max INT 2097152
+##############################################################################
+#
+# Main threads configuration (worker threads). Also see configurations for
+# SSL threads, disk I/O threads and task threads in their respective areas.
+#
+##############################################################################
CONFIG proxy.config.exec_thread.autoconfig INT 1
CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5
CONFIG proxy.config.exec_thread.limit INT 2
@@ -46,16 +44,6 @@ CONFIG proxy.config.accept_threads INT 1
# Local Manager
#
##############################################################################
-CONFIG proxy.config.lm.sem_id INT 11452
- # cluster type requires restart to change
- # 1 is full clustering, 2 is mgmt only, 3 is no clustering
-LOCAL proxy.local.cluster.type INT 3
-CONFIG proxy.config.cluster.rsport INT 8088
-CONFIG proxy.config.cluster.mcport INT 8089
-CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
-CONFIG proxy.config.cluster.mc_ttl INT 1
-CONFIG proxy.config.cluster.log_bogus_mc_msgs INT 1
-CONFIG proxy.config.admin.autoconf_port INT 8083
CONFIG proxy.config.admin.admin_user STRING admin
CONFIG proxy.config.admin.number_config_bak INT 3
CONFIG proxy.config.admin.user_id STRING @pkgsysuser@
@@ -64,15 +52,10 @@ CONFIG proxy.config.admin.user_id STRING
# Process Manager
#
##############################################################################
+CONFIG proxy.config.admin.autoconf_port INT 8083
CONFIG proxy.config.process_manager.mgmt_port INT 8084
##############################################################################
#
-# Virtual IP Manager
-#
-##############################################################################
-CONFIG proxy.config.vmap.enabled INT 0
-##############################################################################
-#
# In order to only bind a specific IP, use the following config, as in
# the example below. Note
#
@@ -122,7 +105,6 @@ CONFIG proxy.config.http.chunking_enable
# has returned 1.1 before
CONFIG proxy.config.http.send_http11_requests INT 1
CONFIG proxy.config.http.share_server_sessions INT 1
-CONFIG proxy.config.http.record_heartbeat INT 0
CONFIG proxy.config.http.origin_server_pipeline INT 1
CONFIG proxy.config.http.user_agent_pipeline INT 8
##########################
@@ -186,9 +168,8 @@ CONFIG proxy.config.http.anonymize_remov
CONFIG proxy.config.http.anonymize_remove_cookie INT 0
CONFIG proxy.config.http.anonymize_remove_client_ip INT 0
CONFIG proxy.config.http.anonymize_insert_client_ip INT 1
-CONFIG proxy.config.http.append_xforwards_header INT 0
CONFIG proxy.config.http.anonymize_other_header_list STRING NULL
-CONFIG proxy.config.http.snarf_username_from_authorization INT 0
+CONFIG proxy.config.http.append_xforwards_header INT 0
CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 1
############
# security #
@@ -248,7 +229,7 @@ CONFIG proxy.config.http.cache.enable_de
# 3 - never stale
# 4 - always revalidate if request is conditional, else default is used
CONFIG proxy.config.http.cache.when_to_revalidate INT 0
- # MSIE browsers currently don't send no-cache headers to
+ # Some old MSIE browsers don't send no-cache headers to
# reverse proxies or transparent caches, this variable controls
# when to add no-cache headers to MSIE requests:
# -1 - no-cache is never added, stats are not updated
@@ -277,6 +258,11 @@ CONFIG proxy.config.http.cache.fuzz.prob
CONFIG proxy.config.http.cache.vary_default_text STRING NULL
CONFIG proxy.config.http.cache.vary_default_images STRING NULL
CONFIG proxy.config.http.cache.vary_default_other STRING NULL
+ ##############################################################
+ # The HTTP stats are expensive, turn off you don't need them #
+ ##############################################################
+CONFIG proxy.config.http.enable_http_stats INT 1
+
##############################################################################
#
# Customizable User Response Pages
@@ -287,7 +273,6 @@ CONFIG proxy.config.http.cache.vary_defa
# 2 - enable language-targeted user response pages
CONFIG proxy.config.body_factory.enable_customizations INT 0
CONFIG proxy.config.body_factory.enable_logging INT 0
-CONFIG proxy.config.body_factory.template_sets_dir STRING
@rel_sysconfdir@/body_factory
# 0 - never suppress generated responses
# 1 - always suppress generated responses
# 2 - suppress responses for intercepted traffic
@@ -305,7 +290,15 @@ CONFIG proxy.config.net.defer_accept INT
# Cluster Subsystem
#
##############################################################################
+ # cluster type requires restart to change
+ # 1 is full clustering, 2 is mgmt only, 3 is no clustering
+LOCAL proxy.local.cluster.type INT 3
CONFIG proxy.config.cluster.cluster_port INT 8086
+CONFIG proxy.config.cluster.rsport INT 8088
+CONFIG proxy.config.cluster.mcport INT 8089
+CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
+CONFIG proxy.config.cluster.mc_ttl INT 1
+CONFIG proxy.config.cluster.log_bogus_mc_msgs INT 1
CONFIG proxy.config.cluster.ethernet_interface STRING @default_net_iface@
##############################################################################
#
@@ -430,6 +423,7 @@ CONFIG proxy.config.log.extended2_log_na
CONFIG proxy.config.log.extended2_log_header STRING NULL
CONFIG proxy.config.log.separate_icp_logs INT 0
CONFIG proxy.config.log.separate_host_logs INT 0
+ # Log collation allows you to do "remote logging"
LOCAL proxy.local.log.collation_mode INT 0
CONFIG proxy.config.log.collation_host STRING NULL
CONFIG proxy.config.log.collation_port INT 8085
@@ -456,7 +450,10 @@ CONFIG proxy.config.header.parse.no_host
##############################################################################
CONFIG proxy.config.url_remap.default_to_server_pac INT 0
CONFIG proxy.config.url_remap.default_to_server_pac_port INT -1
+ # To enable forward proxy, you must turn off remap_required
CONFIG proxy.config.url_remap.remap_required INT 1
+ # Pristine host header is the "original" (request) header. Make sure your
+ # origin expects them in reverse proxy.
CONFIG proxy.config.url_remap.pristine_host_hdr INT 1
##############################################################################
#
@@ -471,29 +468,12 @@ CONFIG proxy.config.ssl.enabled INT 0
# proxy.config.exec_thread.autoconfig.scale by default. You can
# override that here (set it to a non-zero value).
CONFIG proxy.config.ssl.number.threads INT 0
- # proxy.config.ssl.accelerator_required should be:
- # 0 - not required
- # 1 - required for SSL; won't start SSL if card not present
- # 2 - required for SSL; won't start TS if card not present
-CONFIG proxy.config.ssl.accelerator_required INT 0
# The following three variables can be
# set to 0 to disable SSLv2, SSLv3,
# and/or TLSv1
CONFIG proxy.config.ssl.SSLv2 INT 1
CONFIG proxy.config.ssl.SSLv3 INT 1
CONFIG proxy.config.ssl.TLSv1 INT 1
- # proxy.config.ssl.accelerator.type should be:
- # 0 - none (software algorithms)
- # 1 - NCipher Nfast accelerator card
- # 2 - Rainbow Crypto Swift accelerator card
- # 3 - Compaq Atalla accelerator card
-CONFIG proxy.config.ssl.accelerator.type INT 0
- # the following accelerator library paths only need
- # to be changed if the default path was not used
- # while installing the accelerator card.
-CONFIG proxy.config.ssl.atalla.lib.path STRING /opt/atalla/lib
-CONFIG proxy.config.ssl.ncipher.lib.path STRING /opt/nfast/toolkits/hwcrhk
-CONFIG proxy.config.ssl.cswift.lib.path STRING /usr/lib
CONFIG proxy.config.ssl.server_port INT 443
# Client certification level should be:
# 0 no client certificates
@@ -538,7 +518,7 @@ CONFIG proxy.config.ssl.client.CA.cert.f
CONFIG proxy.config.ssl.client.CA.cert.path STRING NULL
##############################################################################
#
-# ICP Configuration
+# ICP Configuration. NOTE! ICP is currently broken NOTE!
#
##############################################################################
# icp modes
@@ -562,13 +542,6 @@ CONFIG proxy.config.update.retry_interva
CONFIG proxy.config.update.concurrent_updates INT 100
##############################################################################
#
-# Plug-in Configuration
-#
-##############################################################################
- # Directory in which to find plugins
-CONFIG proxy.config.plugin.plugin_dir STRING @rel_libexecdir@
-##############################################################################
-#
# Socket send/recv buffer sizes (0 == don't call setsockopt() )
#
##############################################################################
@@ -584,7 +557,6 @@ CONFIG proxy.config.net.sock_recv_buffer
#
##############################################################################
CONFIG proxy.config.core_limit INT -1
-CONFIG proxy.config.auth.enabled INT 0
##############################################################################
#
# Debugging
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.cc?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.cc Sun May 15 04:27:48
2011
@@ -1161,8 +1161,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigByte(c.use_client_target_addr,
"proxy.config.http.use_client_target_addr");
HttpEstablishStaticConfigByte(c.oride.maintain_pristine_host_hdr,
"proxy.config.url_remap.pristine_host_hdr");
- HttpEstablishStaticConfigByte(c.snarf_username_from_authorization,
"proxy.config.http.snarf_username_from_authorization");
-
HttpEstablishStaticConfigByte(c.enable_url_expandomatic,
"proxy.config.http.enable_url_expandomatic");
HttpEstablishStaticConfigByte(c.oride.insert_request_via_string,
"proxy.config.http.insert_request_via_str");
@@ -1425,8 +1423,6 @@ HttpConfig::reconfigure()
params->use_client_target_addr =
INT_TO_BOOL(m_master.use_client_target_addr);
params->oride.maintain_pristine_host_hdr =
INT_TO_BOOL(m_master.oride.maintain_pristine_host_hdr);
- params->snarf_username_from_authorization =
INT_TO_BOOL(m_master.snarf_username_from_authorization);
-
params->disable_ssl_parenting = INT_TO_BOOL(m_master.disable_ssl_parenting);
params->server_max_connections = m_master.server_max_connections;
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.h?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.h Sun May 15 04:27:48 2011
@@ -614,8 +614,6 @@ public:
MgmtByte no_origin_server_dns;
MgmtByte use_client_target_addr;
- MgmtByte snarf_username_from_authorization;
-
MgmtByte verbose_via_string;
char *proxy_request_via_string;
@@ -916,7 +914,6 @@ HttpConfigParams::HttpConfigParams()
uncacheable_requests_bypass_parent(1),
no_origin_server_dns(0),
use_client_target_addr(0),
- snarf_username_from_authorization(0),
verbose_via_string(0),
proxy_request_via_string(0),
proxy_request_via_string_len(0),
Modified: trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransact.cc?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransact.cc Sun May 15 04:27:48
2011
@@ -1215,10 +1215,7 @@ HttpTransact::HandleRequest(State* s)
setup_plugin_request_intercept(s);
return;
}
- // grab the username from the authorization header, if configured
- if (s->http_config_param->snarf_username_from_authorization) {
- //snarf_username_from_authorization_hdr(s);
- }
+
// if the request is a trace or options request, decrement the
// max-forwards value. if the incoming max-forwards value was 0,
// then we have to return a response to the client with the
Modified: trafficserver/traffic/trunk/proxy/http/HttpTransact.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransact.h?rev=1103269&r1=1103268&r2=1103269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransact.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransact.h Sun May 15 04:27:48
2011
@@ -1354,7 +1354,6 @@ public:
static HostNameExpansionError_t try_to_expand_host_name(State* s);
- static void snarf_username_from_authorization_hdr(State* s);
static bool setup_auth_lookup(State* s);
static bool will_this_request_self_loop(State* s);
static bool is_request_likely_cacheable(State* s, HTTPHdr* request);
