89cca70763
- add backported patches for 1.4.22 git-svn-id: svn://svn.openwrt.org/openwrt/packages@36152 3c298f89-4303-0410-b956-a3cf2f4a3e73
48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
From 89c12b19f9e42976c9c205cd1a42bb2e148b3235 Mon Sep 17 00:00:00 2001
|
|
From: Willy Tarreau <w@1wt.eu>
|
|
Date: Fri, 29 Mar 2013 19:28:11 +0100
|
|
Subject: [PATCH 38/42] DOC: mention the new HTTP 307 and 308 redirect statues
|
|
(cherry picked from commit b67fdc4cd8bde202f2805d98683ddab929469a05)
|
|
|
|
---
|
|
doc/configuration.txt | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/doc/configuration.txt b/doc/configuration.txt
|
|
index 20b89c2..9a99267 100644
|
|
--- a/doc/configuration.txt
|
|
+++ b/doc/configuration.txt
|
|
@@ -309,6 +309,8 @@ Haproxy may emit the following status codes by itself :
|
|
301 when performing a redirection, depending on the configured code
|
|
302 when performing a redirection, depending on the configured code
|
|
303 when performing a redirection, depending on the configured code
|
|
+ 307 when performing a redirection, depending on the configured code
|
|
+ 308 when performing a redirection, depending on the configured code
|
|
400 for an invalid or too large request
|
|
401 when an authentication is required to perform the action (when
|
|
accessing the stats page)
|
|
@@ -4057,12 +4059,14 @@ redirect prefix <to> [code <code>] <option> [{if | unless} <condition>]
|
|
URL.
|
|
|
|
<code> The code is optional. It indicates which type of HTTP redirection
|
|
- is desired. Only codes 301, 302 and 303 are supported, and 302 is
|
|
- used if no code is specified. 301 means "Moved permanently", and
|
|
- a browser may cache the Location. 302 means "Moved permanently"
|
|
- and means that the browser should not cache the redirection. 303
|
|
- is equivalent to 302 except that the browser will fetch the
|
|
- location with a GET method.
|
|
+ is desired. Only codes 301, 302, 303, 307 and 308 are supported,
|
|
+ with 302 used by default if no code is specified. 301 means
|
|
+ "Moved permanently", and a browser may cache the Location. 302
|
|
+ means "Moved permanently" and means that the browser should not
|
|
+ cache the redirection. 303 is equivalent to 302 except that the
|
|
+ browser will fetch the location with a GET method. 307 is just
|
|
+ like 302 but makes it clear that the same method must be reused.
|
|
+ Likewise, 308 replaces 301 if the same method must be used.
|
|
|
|
<option> There are several options which can be specified to adjust the
|
|
expected behaviour of a redirection :
|
|
--
|
|
1.8.1.5
|
|
|