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 2012/03/30 19:24:06 UTC
git commit: TS-1173 Speling errors and added CHANGES comment
Updated Branches:
refs/heads/master b0c93d11e -> 0f19fb8fe
TS-1173 Speling errors and added CHANGES comment
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0f19fb8f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0f19fb8f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0f19fb8f
Branch: refs/heads/master
Commit: 0f19fb8fec9efee2e3add2eda15be5c956ee285b
Parents: b0c93d1
Author: Leif Hedstrom <le...@ogre.com>
Authored: Fri Mar 30 11:23:48 2012 -0600
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Fri Mar 30 11:23:48 2012 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/config/remap.config.default | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f19fb8f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4d1cc86..65e0cff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.4
+ *) [TS-1173] Improve the comments in remap.config.
+
*) [TS-981] Remove the support for libev (for now at least).
*) [TS-1172] Remove remap/StringHash.{cc,h}, they are not used.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f19fb8f/proxy/config/remap.config.default
----------------------------------------------------------------------
diff --git a/proxy/config/remap.config.default b/proxy/config/remap.config.default
index c077377..91b8cbb 100644
--- a/proxy/config/remap.config.default
+++ b/proxy/config/remap.config.default
@@ -21,7 +21,7 @@
#
# The <tag_value> directive is optional and can be different for different
# types of <map_type>. The <filtering arguments> are optional ACL-like
-# argumens unique for each remap rule
+# arguments unique for each remap rule
#
# Six different types of mappings are possible:
# map
@@ -41,7 +41,7 @@
# change.
#
# The 'map_with_referer' is an extended version of 'map', which can be used to
-# activate the so-called "deep linking protection" feature avaialble in
+# activate the so-called "deep linking protection" feature available in
# Apache Traffic Server.
#
# The 'map_with_recv_port' is exactly like 'map' except that it uses the port
@@ -80,11 +80,11 @@
# 'map_with_referer' mapping scheme must be used. In general, the format of is
# the following:
#
-# map_with_referer client-URL origin-serverURL redirect-URL regex1 [regex2 ...]
+# map_with_referer client-URL origin-server-URL redirect-URL regex1 [regex2 ...]
#
-# 'redirect-URL' is a redirection URL specifed according to RFC 2616 and can
+# 'redirect-URL' is a redirection URL specified according to RFC 2616 and can
# contain special formatting instructions for run-time modifications of the
-# resulting redirection URL. refererRegExp is a POSIX regular expression,
+# resulting redirection URL. All regexes Perl compatible regular expressions,
# which describes the content of the "Referer" header which must be
# verified. In case an actual request does not have "Referer" header or it
# does not match with referer regular expression, the HTTP request will be
@@ -101,7 +101,7 @@
#
# CONFIG proxy.config.http.referer_format_redirect INT 1
#
-# When run-time formatting for redirectURL was enabled the following format
+# When run-time formatting for redirect-URL was enabled the following format
# symbols can be used:
#
# %r - to substitute original "Referer" header string
@@ -134,7 +134,7 @@
# map_with_referer http://y.foo.bar.com/x/yy/ http://foo.bar.com/x/yy/ http://games.bar.com/error ~* * ~.*\.evil\.com
#
# Explanation: Referer header is optional. However, if Referer header exists,
-# only request from ".*\.evil\.com" will be redirected to redirectURL.
+# only request from ".*\.evil\.com" will be redirected to redirect-URL.
#
# There are optional filtering arguments that can be specified at the end of the mapping definition line:
#