From 4408a63ca2779a6ae80d87ca846712c234c1b9b6 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Tue, 16 Aug 2016 14:07:33 -0700 Subject: [PATCH 1/3] docs: route matching details --- .../http_conn_man/route_config/route_config.rst | 1 + .../http_conn_man/route_config/route_matching.rst | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 docs/configuration/http_conn_man/route_config/route_matching.rst diff --git a/docs/configuration/http_conn_man/route_config/route_config.rst b/docs/configuration/http_conn_man/route_config/route_config.rst index 628844f26557..928eb2990284 100644 --- a/docs/configuration/http_conn_man/route_config/route_config.rst +++ b/docs/configuration/http_conn_man/route_config/route_config.rst @@ -53,3 +53,4 @@ response_headers_to_remove vhost route vcluster + route_matching diff --git a/docs/configuration/http_conn_man/route_config/route_matching.rst b/docs/configuration/http_conn_man/route_config/route_matching.rst new file mode 100644 index 000000000000..d44ba9f29e4a --- /dev/null +++ b/docs/configuration/http_conn_man/route_config/route_matching.rst @@ -0,0 +1,12 @@ +Route matching +============== + +When Envoy matches a route, it uses the following procedure: + +#. The HTTP request's *host* or *:authority* header is matched to a :ref:`virtual host + `. +#. Each :ref:`route entry ` in the virtual host is checked, + *in order*. If there is a match, the route is is used and no further route checks are made. +#. Independently, each :ref:`virtual cluster ` in the + virtual host is checked, *in order*. If there is a match, the virtual cluster is used no further + virtual cluster checks are made. From b9ff0f8b4808563edb1e7ae2103fe6ef57aa8b44 Mon Sep 17 00:00:00 2001 From: RomanDzhabarov Date: Tue, 16 Aug 2016 15:19:21 -0700 Subject: [PATCH 2/3] typo --- .../configuration/http_conn_man/route_config/route_matching.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/http_conn_man/route_config/route_matching.rst b/docs/configuration/http_conn_man/route_config/route_matching.rst index d44ba9f29e4a..e90e50e48e66 100644 --- a/docs/configuration/http_conn_man/route_config/route_matching.rst +++ b/docs/configuration/http_conn_man/route_config/route_matching.rst @@ -6,7 +6,7 @@ When Envoy matches a route, it uses the following procedure: #. The HTTP request's *host* or *:authority* header is matched to a :ref:`virtual host `. #. Each :ref:`route entry ` in the virtual host is checked, - *in order*. If there is a match, the route is is used and no further route checks are made. + *in order*. If there is a match, the route is used and no further route checks are made. #. Independently, each :ref:`virtual cluster ` in the virtual host is checked, *in order*. If there is a match, the virtual cluster is used no further virtual cluster checks are made. From 253401c8d1b20e589808075d540403246f6d16e2 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Tue, 16 Aug 2016 15:21:14 -0700 Subject: [PATCH 3/3] Update route_matching.rst --- .../http_conn_man/route_config/route_matching.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuration/http_conn_man/route_config/route_matching.rst b/docs/configuration/http_conn_man/route_config/route_matching.rst index e90e50e48e66..2cda7e1c5e5e 100644 --- a/docs/configuration/http_conn_man/route_config/route_matching.rst +++ b/docs/configuration/http_conn_man/route_config/route_matching.rst @@ -8,5 +8,5 @@ When Envoy matches a route, it uses the following procedure: #. Each :ref:`route entry ` in the virtual host is checked, *in order*. If there is a match, the route is used and no further route checks are made. #. Independently, each :ref:`virtual cluster ` in the - virtual host is checked, *in order*. If there is a match, the virtual cluster is used no further - virtual cluster checks are made. + virtual host is checked, *in order*. If there is a match, the virtual cluster is used and no + further virtual cluster checks are made.