aboutsummaryrefslogtreecommitdiffstats
path: root/net/http/codes.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-15 15:33:31 +0200
committerKim Alvefur <zash@zash.se>2015-05-15 15:33:31 +0200
commit879862c536a5fba488307eb9e8a2f4f6523dbf09 (patch)
tree89f1f780149b6a8649f10f20e23d88635996fc6c /net/http/codes.lua
parent217aae0531fa09e57d3b324816da793a72655047 (diff)
parent2de1fd6037e68bdd0b103284ce7c94a2736d9eaa (diff)
downloadprosody-879862c536a5fba488307eb9e8a2f4f6523dbf09.tar.gz
prosody-879862c536a5fba488307eb9e8a2f4f6523dbf09.zip
Merge 0.10->trunk
Diffstat (limited to 'net/http/codes.lua')
-rw-r--r--net/http/codes.lua12
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