You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2013/12/03 19:48:24 UTC
[1/4] git commit: transaction diagram was remade using graphviz
Updated Branches:
refs/heads/master 1a2f7f448 -> 12b687f4d
transaction diagram was remade using graphviz
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/36352042
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/36352042
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/36352042
Branch: refs/heads/master
Commit: 36352042726a9d9b5dc9d864673c8b923c51f4a6
Parents: 1a2f7f4
Author: heitorganzeli <he...@gmail.com>
Authored: Mon Dec 2 15:36:03 2013 -0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Tue Dec 3 19:14:59 2013 +0100
----------------------------------------------------------------------
doc/sdk/http-hooks-and-transactions.en.rst | 67 ++++++++++++++++++++++---
1 file changed, 60 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36352042/doc/sdk/http-hooks-and-transactions.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-hooks-and-transactions.en.rst b/doc/sdk/http-hooks-and-transactions.en.rst
index 98191cb..90cf8a8 100644
--- a/doc/sdk/http-hooks-and-transactions.en.rst
+++ b/doc/sdk/http-hooks-and-transactions.en.rst
@@ -72,12 +72,65 @@ it may consist of a single transaction or several transactions in
succession. The session starts when the client connection opens and ends
when the connection closes.
-**HTTP Transaction State Diagram (*not yet updated*)**
-{#HHTTPTxStateDiag}
-
-.. figure:: /static/images/sdk/http_state2.jpg
- :alt: HTTP Transaction State Diagram
-
- HTTP Transaction State Diagram
+**HTTP Transaction State Diagram**
+
+
+.. graphviz::
+digraph g{
+ accept -> TS_HTTP_TXN_START_HOOK;
+ TS_HTTP_TXN_START_HOOK -> "read req hdrs";
+ "read req hdrs" -> TS_HTTP_READ_REQUEST_HDR_HOOK;
+ TS_HTTP_READ_REQUEST_HDR_HOOK -> "cache lookup";
+ "cache lookup" -> DNS [label = "miss"];
+ DNS -> TS_HTTP_OS_DNS_HOOK;
+ TS_HTTP_OS_DNS_HOOK -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
+ "cache lookup" -> TS_HTTP_SELECT_ALT_HOOK [label = "hit"];
+ TS_HTTP_SELECT_ALT_HOOK -> "cache match";
+ "cache match" -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK [label="no match"];
+ "cache match" -> TS_HTTP_READ_CACHE_HDR_HOOK [label = "cache fresh"];
+ TS_HTTP_READ_CACHE_HDR_HOOK -> "cache fresh";
+ "cache fresh" -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "miss"];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "no match "];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "stale"];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "send cached hdrs" [label = "fresh"];
+ "send cached hdrs" -> "set up transform";
+ "lock URL in cache" -> "pick address";
+ "pick address" -> "try connect" [label = " "];
+ "try connect" -> "pick address" [label = "fail"];
+ "try connect" -> TS_HTTP_SEND_REQUEST_HDR_HOOK [label = "success"];
+ TS_HTTP_SEND_REQUEST_HDR_HOOK -> "send req hdrs";
+ "send req hdrs" -> "set up POST/PUT read" [label = "POST/PUT"];
+ "send req hdrs" -> "read reply hdrs" [label = "GET"];
+ "set up POST/PUT read" -> "set up req transform";
+ "set up req transform" -> "tunnel req body";
+ "tunnel req body" -> "read reply hdrs";
+ "read reply hdrs" -> TS_HTTP_READ_RESPONSE_HDR_HOOK;
+ TS_HTTP_READ_RESPONSE_HDR_HOOK -> "check valid";
+ "check valid" -> "setup server read" [label = "yes"];
+ "check valid" -> "pick address" [label = "no"];
+ "setup server read" -> "set up cache write" [label = "cacheable"];
+ "setup server read" -> "set up transform" [label = "uncacheable"];
+ "set up cache write" -> "set up transform";
+ "set up transform" -> TS_HTTP_SEND_RESPONSE_HDR_HOOK;
+ TS_HTTP_SEND_RESPONSE_HDR_HOOK -> "send reply hdrs";
+ "send reply hdrs" -> "tunnel response";
+ "tunnel response" -> TS_HTTP_TXN_CLOSE_HOOK;
+ TS_HTTP_TXN_CLOSE_HOOK -> accept;
+
+ TS_HTTP_TXN_START_HOOK [shape=box];
+ TS_HTTP_READ_REQUEST_HDR_HOOK [shape = box];
+ TS_HTTP_OS_DNS_HOOK [shape = box];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK[shape = box];
+ TS_HTTP_SELECT_ALT_HOOK [shape = box];
+ TS_HTTP_READ_CACHE_HDR_HOOK [shape = box];
+ TS_HTTP_SEND_REQUEST_HDR_HOOK [shape = box];
+ "set up req transform" [tooltip = "req transform takes place here"];
+ TS_HTTP_READ_RESPONSE_HDR_HOOK [shape = box];
+ "set up transform" [tooltip = "response transform takes place here"];
+ TS_HTTP_SEND_RESPONSE_HDR_HOOK [shape = box];
+ TS_HTTP_TXN_CLOSE_HOOK [shape = box];
+}
+
[2/4] git commit: removing trailing spaces
Posted by ig...@apache.org.
removing trailing spaces
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fe022ca0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fe022ca0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fe022ca0
Branch: refs/heads/master
Commit: fe022ca0d6e8e9f0e0fbcf3269c22cffd020e097
Parents: 3635204
Author: heitorganzeli <he...@gmail.com>
Authored: Mon Dec 2 16:34:39 2013 -0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Tue Dec 3 19:17:43 2013 +0100
----------------------------------------------------------------------
doc/sdk/http-hooks-and-transactions.en.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe022ca0/doc/sdk/http-hooks-and-transactions.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-hooks-and-transactions.en.rst b/doc/sdk/http-hooks-and-transactions.en.rst
index 90cf8a8..97c20c6 100644
--- a/doc/sdk/http-hooks-and-transactions.en.rst
+++ b/doc/sdk/http-hooks-and-transactions.en.rst
@@ -118,7 +118,7 @@ digraph g{
"tunnel response" -> TS_HTTP_TXN_CLOSE_HOOK;
TS_HTTP_TXN_CLOSE_HOOK -> accept;
- TS_HTTP_TXN_START_HOOK [shape=box];
+ TS_HTTP_TXN_START_HOOK [shape=box];
TS_HTTP_READ_REQUEST_HDR_HOOK [shape = box];
TS_HTTP_OS_DNS_HOOK [shape = box];
TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK[shape = box];
@@ -126,7 +126,7 @@ digraph g{
TS_HTTP_READ_CACHE_HDR_HOOK [shape = box];
TS_HTTP_SEND_REQUEST_HDR_HOOK [shape = box];
"set up req transform" [tooltip = "req transform takes place here"];
- TS_HTTP_READ_RESPONSE_HDR_HOOK [shape = box];
+ TS_HTTP_READ_RESPONSE_HDR_HOOK [shape = box];
"set up transform" [tooltip = "response transform takes place here"];
TS_HTTP_SEND_RESPONSE_HDR_HOOK [shape = box];
TS_HTTP_TXN_CLOSE_HOOK [shape = box];
[4/4] git commit: TS-2397: correct formatting and fix links
Posted by ig...@apache.org.
TS-2397: correct formatting and fix links
add the graphviz extension to conf.py
indent the digraph so it is actually picked up by sphinx
give it a nicer name, 'g' is too generic! Give it a nicer alt text,
because otherwise we end up with the digraph code.
Consistent formatting & links.
Outstanding: TS_HTTP_REQUEST_TRANSFORM_HOOK and
TS_HTTP_RESPONSE_TRANSFORM_HOOK still need to link to the correct
constants in doc/reference
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/12b687f4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/12b687f4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/12b687f4
Branch: refs/heads/master
Commit: 12b687f4d92b21b9584a68970d5ef2fa087857cd
Parents: b977ca5
Author: Igor Galić <i....@brainsware.org>
Authored: Tue Dec 3 19:44:19 2013 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Tue Dec 3 19:44:19 2013 +0100
----------------------------------------------------------------------
doc/conf.py | 2 +-
doc/sdk/http-hooks-and-transactions.en.rst | 143 ++++++++++++------------
2 files changed, 74 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/12b687f4/doc/conf.py
----------------------------------------------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index d04c26a..6b19426 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -42,7 +42,7 @@ sys.path.insert(0, os.path.abspath('ext'))
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'traffic-server' ]
+extensions = ['sphinx.ext.graphviz', 'sphinx.ext.intersphinx', 'sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'traffic-server' ]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/12b687f4/doc/sdk/http-hooks-and-transactions.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-hooks-and-transactions.en.rst b/doc/sdk/http-hooks-and-transactions.en.rst
index d23227d..916a8af 100644
--- a/doc/sdk/http-hooks-and-transactions.en.rst
+++ b/doc/sdk/http-hooks-and-transactions.en.rst
@@ -42,7 +42,8 @@ The Set of Hooks
To understand hooks and transactions, you should be familiar with the
following terminology:
-***HTTP Transaction***
+HTTP Transaction
+----------------
A **transaction** consists of a single HTTP request from a client and
the response Traffic Server sends to that client. Thus, a transaction
@@ -54,88 +55,90 @@ state machines follow a complex set of states involved in sophisticated
caching and document retrieval (taking into account, for example,
alternate selection, freshness criteria, and hierarchical caching). The
Traffic Server API provides hooks to a subset of these states, as
-illustrated in the `HTTP Transaction State
-Diagram <#HHTTPTxStateDiag>`__ below.
+illustrated in the :ref:`http-txn-state-diagram` below.
-***Transform hooks***
+Transform hooks
+---------------
The two **transform hooks**, ``TS_HTTP_REQUEST_TRANSFORM_HOOK`` and
``TS_HTTP_RESPONSE_TRANSFORM_HOOK``, are called in the course of an HTTP
transform. To see where in the HTTP transaction they are called, look
-for the "set up transform" ovals in the `HTTP Transaction State
-Diagram <#HHTTPTxStateDiag>`__ below.
+for the "set up transform" ovals in the :ref:`http-txn-state-diagram` below.
-***HTTP session***
+HTTP session
+------------
A **session** consists of a single client connection to Traffic Server;
it may consist of a single transaction or several transactions in
succession. The session starts when the client connection opens and ends
when the connection closes.
-**HTTP Transaction State Diagram**
+.. _http-txn-state-diagram:
+HTTP Transaction State Diagram
+------------------------------
.. graphviz::
-digraph g{
- accept -> TS_HTTP_TXN_START_HOOK;
- TS_HTTP_TXN_START_HOOK -> "read req hdrs";
- "read req hdrs" -> TS_HTTP_READ_REQUEST_HDR_HOOK;
- TS_HTTP_READ_REQUEST_HDR_HOOK -> TS_HTTP_PRE_REMAP_HOOK;
- TS_HTTP_PRE_REMAP_HOOK -> "remap request";
- "remap request" -> TS_HTTP_POST_REMAP_HOOK;
- TS_HTTP_POST_REMAP_HOOK -> "cache lookup";
- "cache lookup" -> DNS [label = "miss"];
- DNS -> TS_HTTP_OS_DNS_HOOK;
- TS_HTTP_OS_DNS_HOOK -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
- "cache lookup" -> TS_HTTP_SELECT_ALT_HOOK [label = "hit"];
- TS_HTTP_SELECT_ALT_HOOK -> "cache match";
- "cache match" -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK [label="no match"];
- "cache match" -> TS_HTTP_READ_CACHE_HDR_HOOK [label = "cache fresh"];
- TS_HTTP_READ_CACHE_HDR_HOOK -> "cache fresh";
- "cache fresh" -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
- TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "miss"];
- TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "no match "];
- TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "stale"];
- TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "send cached hdrs" [label = "fresh"];
- "send cached hdrs" -> "set up transform";
- "lock URL in cache" -> "pick address";
- "pick address" -> "try connect" [label = " "];
- "try connect" -> "pick address" [label = "fail"];
- "try connect" -> TS_HTTP_SEND_REQUEST_HDR_HOOK [label = "success"];
- TS_HTTP_SEND_REQUEST_HDR_HOOK -> "send req hdrs";
- "send req hdrs" -> "set up POST/PUT read" [label = "POST/PUT"];
- "send req hdrs" -> "read reply hdrs" [label = "GET"];
- "set up POST/PUT read" -> "set up req transform";
- "set up req transform" -> "tunnel req body";
- "tunnel req body" -> "read reply hdrs";
- "read reply hdrs" -> TS_HTTP_READ_RESPONSE_HDR_HOOK;
- TS_HTTP_READ_RESPONSE_HDR_HOOK -> "check valid";
- "check valid" -> "setup server read" [label = "yes"];
- "check valid" -> "pick address" [label = "no"];
- "setup server read" -> "set up cache write" [label = "cacheable"];
- "setup server read" -> "set up transform" [label = "uncacheable"];
- "set up cache write" -> "set up transform";
- "set up transform" -> TS_HTTP_SEND_RESPONSE_HDR_HOOK;
- TS_HTTP_SEND_RESPONSE_HDR_HOOK -> "send reply hdrs";
- "send reply hdrs" -> "tunnel response";
- "tunnel response" -> TS_HTTP_TXN_CLOSE_HOOK;
- TS_HTTP_TXN_CLOSE_HOOK -> accept;
-
- TS_HTTP_TXN_START_HOOK [shape=box];
- TS_HTTP_READ_REQUEST_HDR_HOOK [shape = box];
- TS_HTTP_PRE_REMAP_HOOK [shape = box];
- TS_HTTP_POST_REMAP_HOOK [shape = box];
- TS_HTTP_OS_DNS_HOOK [shape = box];
- TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK[shape = box];
- TS_HTTP_SELECT_ALT_HOOK [shape = box];
- TS_HTTP_READ_CACHE_HDR_HOOK [shape = box];
- TS_HTTP_SEND_REQUEST_HDR_HOOK [shape = box];
- "set up req transform" [tooltip = "req transform takes place here"];
- TS_HTTP_READ_RESPONSE_HDR_HOOK [shape = box];
- "set up transform" [tooltip = "response transform takes place here"];
- TS_HTTP_SEND_RESPONSE_HDR_HOOK [shape = box];
- TS_HTTP_TXN_CLOSE_HOOK [shape = box];
-}
-
-
+ :alt: HTTP Transaction State Diagram
+
+ digraph http_txn_state_diagram{
+ accept -> TS_HTTP_TXN_START_HOOK;
+ TS_HTTP_TXN_START_HOOK -> "read req hdrs";
+ "read req hdrs" -> TS_HTTP_READ_REQUEST_HDR_HOOK;
+ TS_HTTP_READ_REQUEST_HDR_HOOK -> TS_HTTP_PRE_REMAP_HOOK;
+ TS_HTTP_PRE_REMAP_HOOK -> "remap request";
+ "remap request" -> TS_HTTP_POST_REMAP_HOOK;
+ TS_HTTP_POST_REMAP_HOOK -> "cache lookup";
+ "cache lookup" -> DNS [label = "miss"];
+ DNS -> TS_HTTP_OS_DNS_HOOK;
+ TS_HTTP_OS_DNS_HOOK -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
+ "cache lookup" -> TS_HTTP_SELECT_ALT_HOOK [label = "hit"];
+ TS_HTTP_SELECT_ALT_HOOK -> "cache match";
+ "cache match" -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK [label="no match"];
+ "cache match" -> TS_HTTP_READ_CACHE_HDR_HOOK [label = "cache fresh"];
+ TS_HTTP_READ_CACHE_HDR_HOOK -> "cache fresh";
+ "cache fresh" -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "miss"];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "no match "];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "lock URL in cache" [label = "stale"];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK -> "send cached hdrs" [label = "fresh"];
+ "send cached hdrs" -> "set up transform";
+ "lock URL in cache" -> "pick address";
+ "pick address" -> "try connect" [label = " "];
+ "try connect" -> "pick address" [label = "fail"];
+ "try connect" -> TS_HTTP_SEND_REQUEST_HDR_HOOK [label = "success"];
+ TS_HTTP_SEND_REQUEST_HDR_HOOK -> "send req hdrs";
+ "send req hdrs" -> "set up POST/PUT read" [label = "POST/PUT"];
+ "send req hdrs" -> "read reply hdrs" [label = "GET"];
+ "set up POST/PUT read" -> "set up req transform";
+ "set up req transform" -> "tunnel req body";
+ "tunnel req body" -> "read reply hdrs";
+ "read reply hdrs" -> TS_HTTP_READ_RESPONSE_HDR_HOOK;
+ TS_HTTP_READ_RESPONSE_HDR_HOOK -> "check valid";
+ "check valid" -> "setup server read" [label = "yes"];
+ "check valid" -> "pick address" [label = "no"];
+ "setup server read" -> "set up cache write" [label = "cacheable"];
+ "setup server read" -> "set up transform" [label = "uncacheable"];
+ "set up cache write" -> "set up transform";
+ "set up transform" -> TS_HTTP_SEND_RESPONSE_HDR_HOOK;
+ TS_HTTP_SEND_RESPONSE_HDR_HOOK -> "send reply hdrs";
+ "send reply hdrs" -> "tunnel response";
+ "tunnel response" -> TS_HTTP_TXN_CLOSE_HOOK;
+ TS_HTTP_TXN_CLOSE_HOOK -> accept;
+
+ TS_HTTP_TXN_START_HOOK [shape=box];
+ TS_HTTP_READ_REQUEST_HDR_HOOK [shape = box];
+ TS_HTTP_PRE_REMAP_HOOK [shape = box];
+ TS_HTTP_POST_REMAP_HOOK [shape = box];
+ TS_HTTP_OS_DNS_HOOK [shape = box];
+ TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK[shape = box];
+ TS_HTTP_SELECT_ALT_HOOK [shape = box];
+ TS_HTTP_READ_CACHE_HDR_HOOK [shape = box];
+ TS_HTTP_SEND_REQUEST_HDR_HOOK [shape = box];
+ "set up req transform" [tooltip = "req transform takes place here"];
+ TS_HTTP_READ_RESPONSE_HDR_HOOK [shape = box];
+ "set up transform" [tooltip = "response transform takes place here"];
+ TS_HTTP_SEND_RESPONSE_HDR_HOOK [shape = box];
+ TS_HTTP_TXN_CLOSE_HOOK [shape = box];
+ }
[3/4] git commit: Update Transaction State Diagram
Posted by ig...@apache.org.
Update Transaction State Diagram
add 2 more API hooks, TS_HTTP_POST_REMAP_HOOK & TS_HTTP_PRE_REMAP_HOOK,
into state diagram.
TS_HTTP_PRE_REMAP_HOOK is new name of
TS_HTTP_READ_REQUEST_PRE_REMAP_HOOK since v2.1.5
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b977ca50
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b977ca50
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b977ca50
Branch: refs/heads/master
Commit: b977ca50d7123b1bf096b2f4c136a623b9b2eda6
Parents: fe022ca
Author: Ethan Lai <yz...@yahoo.com>
Authored: Tue Dec 3 19:18:12 2013 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Tue Dec 3 19:18:12 2013 +0100
----------------------------------------------------------------------
doc/sdk/http-hooks-and-transactions.en.rst | 7 ++++++-
.../http-hooks-and-transactions/adding-hooks.en.rst | 14 +++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b977ca50/doc/sdk/http-hooks-and-transactions.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-hooks-and-transactions.en.rst b/doc/sdk/http-hooks-and-transactions.en.rst
index 97c20c6..d23227d 100644
--- a/doc/sdk/http-hooks-and-transactions.en.rst
+++ b/doc/sdk/http-hooks-and-transactions.en.rst
@@ -80,7 +80,10 @@ digraph g{
accept -> TS_HTTP_TXN_START_HOOK;
TS_HTTP_TXN_START_HOOK -> "read req hdrs";
"read req hdrs" -> TS_HTTP_READ_REQUEST_HDR_HOOK;
- TS_HTTP_READ_REQUEST_HDR_HOOK -> "cache lookup";
+ TS_HTTP_READ_REQUEST_HDR_HOOK -> TS_HTTP_PRE_REMAP_HOOK;
+ TS_HTTP_PRE_REMAP_HOOK -> "remap request";
+ "remap request" -> TS_HTTP_POST_REMAP_HOOK;
+ TS_HTTP_POST_REMAP_HOOK -> "cache lookup";
"cache lookup" -> DNS [label = "miss"];
DNS -> TS_HTTP_OS_DNS_HOOK;
TS_HTTP_OS_DNS_HOOK -> TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK;
@@ -120,6 +123,8 @@ digraph g{
TS_HTTP_TXN_START_HOOK [shape=box];
TS_HTTP_READ_REQUEST_HDR_HOOK [shape = box];
+ TS_HTTP_PRE_REMAP_HOOK [shape = box];
+ TS_HTTP_POST_REMAP_HOOK [shape = box];
TS_HTTP_OS_DNS_HOOK [shape = box];
TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK[shape = box];
TS_HTTP_SELECT_ALT_HOOK [shape = box];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b977ca50/doc/sdk/http-hooks-and-transactions/adding-hooks.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-hooks-and-transactions/adding-hooks.en.rst b/doc/sdk/http-hooks-and-transactions/adding-hooks.en.rst
index 3de9dc6..2f862e2 100644
--- a/doc/sdk/http-hooks-and-transactions/adding-hooks.en.rst
+++ b/doc/sdk/http-hooks-and-transactions/adding-hooks.en.rst
@@ -80,6 +80,15 @@ values for ``TSHttpHookID`` are:
performing both authentication and blacklisting. Corresponds to the
event ``TS_EVENT_HTTP_OS_DNS``.
+``TS_HTTP_POST_REMAP_HOOK``
+ Called immediately after remapping occurs, before cache lookup.
+ Corresponds to the event ``TS_EVENT_HTTP_POST_REMAP``.
+
+``TS_HTTP_PRE_REMAP_HOOK``
+ Called after the request header is read from the client, before any
+ remapping of the headers occurs. Corresponds to the event
+ ``TS_EVENT_HTTP_PRE_REMAP``.
+
``TS_HTTP_READ_CACHE_HDR_HOOK``
Called immediately after the request and response header of a
previously-cached object is read from cache. This hook is only
@@ -100,11 +109,6 @@ values for ``TSHttpHookID`` are:
Called immediately after the request header is read from the client.
Corresponds to the event ``TS_EVENT_HTTP_READ_REQUEST_HDR``.
-``TS_HTTP_READ_REQUEST_PRE_REMAP_HOOK``
- Called after the request header is read from the client, before any
- remapping of the headers occurs. Corresponds to the event
- ``TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP``.
-
``TS_HTTP_REQUEST_TRANSFORM_HOOK``
See
"`"Transformations" <../http-transformation-plugin#Transformations>`__