You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/03/25 18:54:06 UTC

[1/2] git commit: Remaporder

Repository: trafficserver
Updated Branches:
  refs/heads/master 80156aece -> 8dd20f5b6


Remaporder

Clear up some of the ordering questions (how they work) and clear out some trailing whitespace


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/622157c9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/622157c9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/622157c9

Branch: refs/heads/master
Commit: 622157c9fd6d36e377b2c672b1680ae9a014c65d
Parents: 7d3f9c8
Author: Thomas Jackson <ja...@gmail.com>
Authored: Mon Mar 24 17:47:33 2014 -0700
Committer: Thomas Jackson <ja...@gmail.com>
Committed: Mon Mar 24 17:51:27 2014 -0700

----------------------------------------------------------------------
 doc/reference/configuration/remap.config.en.rst | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/622157c9/doc/reference/configuration/remap.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/remap.config.en.rst b/doc/reference/configuration/remap.config.en.rst
index 52cf77e..fd430a8 100644
--- a/doc/reference/configuration/remap.config.en.rst
+++ b/doc/reference/configuration/remap.config.en.rst
@@ -5,9 +5,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
- 
+
    http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,11 +21,11 @@ remap.config
 
 .. configfile:: remap.config
 
-.. toctree::                                                                                                                                                                                      
+.. toctree::
    :maxdepth: 2
 
 
-The :file:`remap.config` file (by default, located in 
+The :file:`remap.config` file (by default, located in
 ``/opt/trafficserver/etc/trafficserver/``) contains mapping rules that Traffic Server
 uses to perform the following actions:
 
@@ -64,14 +64,14 @@ Traffic Server recognizes three space-delimited fields: ``type``,
     -  ``map`` --translates an incoming request URL to the appropriate
        origin server URL.
 
-    -  ``map_with_recv_port`` --exactly like 'map' except that it uses the port at 
-       which the request was received to perform the mapping instead of the port present 
-       in the request. The regex qualifier can also be used for this type. When present, 
-       'map_with_recv_port' mappings are checked first. If there is a match, then it is 
+    -  ``map_with_recv_port`` --exactly like 'map' except that it uses the port at
+       which the request was received to perform the mapping instead of the port present
+       in the request. The regex qualifier can also be used for this type. When present,
+       'map_with_recv_port' mappings are checked first. If there is a match, then it is
        chosen without evaluating the "regular" forward mapping rules.
 
-    -  ``map_with_referer`` -- extended version of 'map', which can be used to activate 
-       "deep linking protection", where target URLs are only accessible when the Referer 
+    -  ``map_with_referer`` -- extended version of 'map', which can be used to activate
+       "deep linking protection", where target URLs are only accessible when the Referer
        header is set to a URL that is allowed to link to the target.
 
     -  ``reverse_map`` --translates the URL in origin server redirect
@@ -113,12 +113,12 @@ Traffic Server recognizes three space-delimited fields: ``type``,
 Precedence
 ==========
 
-Remap rules are not processed top-down, but based on an internal
-priority
+Remap rules are not processed top-down, but based on an internal priority. Once
+these rules are executed we pick the lowest line number as the match (which
+replicates first-match-wins).
 
-1. ``map_with_recv_port``
-#. ``map`` and ``reverse_map``
-#. ``regex_map``
+1. ``map_with_recv_port`` and ```regex_map_with_recv_port```
+#. ``map`` and ``regex_map`` and ``reverse_map``
 #. ``redirect`` and ``redirect_temporary``
 #. ``regex_redirect`` and ``regex_redirect_temporary``
 
@@ -328,7 +328,7 @@ will be redirected to redirectURL. It can be used to create a so-called
 negative referer list.  If "*" was used as a referer regular expression -
 all referers are allowed.  Various combinations of "*" and "~" in a referer
 list can be used to create different filtering rules.
-    
+
 map_with_referer Examples
 -------------------------
 


[2/2] git commit: Merge branch 'remaporder' of https://github.com/jacksontj/trafficserver

Posted by br...@apache.org.
Merge branch 'remaporder' of https://github.com/jacksontj/trafficserver


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8dd20f5b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8dd20f5b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8dd20f5b

Branch: refs/heads/master
Commit: 8dd20f5b622003594c6cd46c0883a1f02a2b9e51
Parents: 80156ae 622157c
Author: Brian Geffon <br...@apache.org>
Authored: Tue Mar 25 10:53:55 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Mar 25 10:53:55 2014 -0700

----------------------------------------------------------------------
 doc/reference/configuration/remap.config.en.rst | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------