diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-15 15:33:31 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-15 15:33:31 +0200 |
| commit | a1eac64a926aeeec8babac775aa689dab4a598d3 (patch) | |
| tree | 89f1f780149b6a8649f10f20e23d88635996fc6c /net | |
| parent | 6b32fb12b118afd85c6efbf35187a9298ace9167 (diff) | |
| parent | 0ee5b781b852a955144f4c04f732ae0de19ed174 (diff) | |
| download | prosody-a1eac64a926aeeec8babac775aa689dab4a598d3.tar.gz prosody-a1eac64a926aeeec8babac775aa689dab4a598d3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/codes.lua | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/http/codes.lua b/net/http/codes.lua index 0cadd079..bc31c7dd 100644 --- a/net/http/codes.lua +++ b/net/http/codes.lua @@ -25,6 +25,7 @@ local response_codes = { [305] = "Use Proxy"; -- The 306 status code was used in a previous version of [RFC2616], is no longer used, and the code is reserved. [307] = "Temporary Redirect"; + [308] = "Permanent Redirect"; [400] = "Bad Request"; [401] = "Unauthorized"; @@ -39,17 +40,21 @@ local response_codes = { [410] = "Gone"; [411] = "Length Required"; [412] = "Precondition Failed"; - [413] = "Request Entity Too Large"; - [414] = "Request-URI Too Long"; + [413] = "Payload Too Large"; + [414] = "URI Too Long"; [415] = "Unsupported Media Type"; - [416] = "Requested Range Not Satisfiable"; + [416] = "Range Not Satisfiable"; [417] = "Expectation Failed"; [418] = "I'm a teapot"; + [421] = "Misdirected Request"; [422] = "Unprocessable Entity"; [423] = "Locked"; [424] = "Failed Dependency"; -- The 425 status code is reserved for the WebDAV advanced collections expired proposal [RFC2817] [426] = "Upgrade Required"; + [428] = "Precondition Required"; + [429] = "Too Many Requests"; + [431] = "Request Header Fields Too Large"; [500] = "Internal Server Error"; [501] = "Not Implemented"; @@ -61,6 +66,7 @@ local response_codes = { [507] = "Insufficient Storage"; [508] = "Loop Detected"; [510] = "Not Extended"; + [511] = "Network Authentication Required"; }; for k,v in pairs(response_codes) do response_codes[k] = k.." "..v; end |