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:55:01 UTC
svn commit: r1037074 - in /trafficserver/traffic/trunk/proxy/mgmt2:
html2/english.dict web2/WebConfig.cc web2/WebConfigRender.cc
web2/WebGlobals.h web2/WebHttpRender.h
Author: zwoop
Date: Fri Nov 19 22:55:01 2010
New Revision: 1037074
URL: http://svn.apache.org/viewvc?rev=1037074&view=rev
Log:
Cleanup of old MIXT stuff.
Modified:
trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict?rev=1037074&r1=1037073&r2=1037074&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict Fri Nov 19 22:55:01 2010
@@ -151,8 +151,6 @@ s_text_633=Method
s_text_634=Specifies the method of a requested URL
s_text_635=Scheme
s_text_636=Specifies the protocol of a requested URL.
-s_text_637=MIXT Scheme
-s_text_638=Specifies the media protocol type of a requested URL.
s_text_640=Time Period
s_text_641=Specifies the amount of time that applies to the selected rule type. (Only applies to 'revalidate', 'pin-in-cache', and 'ttl-in-cache' rule types.)
s_text_642=Example: 2h or 5d10h15m30s (d:days, h:hours, m:minutes, s:secs)
@@ -211,7 +209,6 @@ s_text_710=To Port (Optional)
s_text_711=Specifies the port number of the url to map to.
s_text_712=To Path Prefix (Optional)
s_text_713=Specifies the path prefix of the url to map to.
-s_text_714=Specifies the media protocol type of the mapping rule.
s_text_715=From Scheme
s_text_716=To Scheme
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc?rev=1037074&r1=1037073&r2=1037074&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc Fri Nov 19 22:55:01 2010
@@ -243,9 +243,6 @@ formatCacheRule(char *rule)
if (strlen(tokens[9]) > 0) {
snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "Scheme=%s%s", tokens[9], HTML_DELIM);
}
- if (strlen(tokens[11]) > 0) {
- snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "MIXT Scheme=%s", tokens[11]);
- }
return xstrdup(buf);
}
@@ -474,9 +471,6 @@ formatParentRule(char *rule)
if (strlen(tokens[8]) > 0) {
snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "Scheme=%s%s", tokens[8], HTML_DELIM);
}
- if (strlen(tokens[9]) > 0) {
- snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "MIXT Scheme=%s", tokens[9]);
- }
return xstrdup(buf);
}
@@ -560,9 +554,6 @@ formatRemapRule(char *rule)
snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "/%s", tokens[7]);
}
- if (strlen(tokens[8]) > 0) {
- snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "MIXT Scheme=%s", tokens[8]);
- }
return xstrdup(buf);
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=1037074&r1=1037073&r2=1037074&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Fri Nov 19 22:55:01 2010
@@ -861,10 +861,6 @@ writeRemapConfigTable(WebHttpContext * w
HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_TO_PATH);
HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_MIXT_SCHEME);
- HtmlRndrTdClose(output);
-
HtmlRndrTrClose(output);
count = INKCfgContextGetCount(ctx);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h?rev=1037074&r1=1037073&r2=1037074&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h Fri Nov 19 22:55:01 2010
@@ -147,7 +147,6 @@ extern WebContext autoconfContext;
#define WEB_HTTP_SERVER_STATE_WIN32 0x01
#define WEB_HTTP_SERVER_STATE_UNIX 0x02
-#define WEB_HTTP_SERVER_STATE_MIXT_ENABLED 0x04
#define WEB_HTTP_SERVER_STATE_AUTH_ENABLED 0x08
#define WEB_HTTP_SERVER_STATE_SSL_ENABLED 0x10
#define WEB_HTTP_SERVER_STATE_AUTOCONF 0x20
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h?rev=1037074&r1=1037073&r2=1037074&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h Fri Nov 19 22:55:01 2010
@@ -171,8 +171,6 @@
#define HTML_ID_CFG_EDIT_METHOD_HELP "s_text_634"
#define HTML_ID_CFG_EDIT_SCHEME "s_text_635"
#define HTML_ID_CFG_EDIT_SCHEME_HELP "s_text_636"
-#define HTML_ID_CFG_EDIT_MIXT_SCHEME "s_text_637"
-#define HTML_ID_CFG_EDIT_MIXT_SCHEME_HELP "s_text_638"
#define HTML_ID_CFG_EDIT_TIME_PERIOD "s_text_640"
#define HTML_ID_CFG_EDIT_TIME_PERIOD_HELP "s_text_641"
#define HTML_ID_CFG_EDIT_TIME_PERIOD_EG "s_text_642"
@@ -234,7 +232,6 @@
#define HTML_ID_CFG_EDIT_TO_PORT_HELP "s_text_711"
#define HTML_ID_CFG_EDIT_TO_PATH "s_text_712"
#define HTML_ID_CFG_EDIT_TO_PATH_HELP "s_text_713"
-#define HTML_ID_CFG_EDIT_MIXT_SCHEME_HELP_2 "s_text_714"
#define HTML_ID_CFG_EDIT_FROM_SCHEME "s_text_715"
#define HTML_ID_CFG_EDIT_TO_SCHEME "s_text_716"