aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/status_codes.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-11 01:44:37 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-11 01:44:37 +0000
commit73cc10305ea286d164d68c07af3ad7941097f1ec (patch)
treeb30d6db2bfe312a680816f155d6168709ddf011e /actionpack/lib/action_controller/status_codes.rb
parentc0bce43e903fe42645c16a8062ce1cd970217f40 (diff)
downloadrails-73cc10305ea286d164d68c07af3ad7941097f1ec.tar.gz
rails-73cc10305ea286d164d68c07af3ad7941097f1ec.tar.bz2
rails-73cc10305ea286d164d68c07af3ad7941097f1ec.zip
Sync ActionController::StatusCodes::STATUS_CODES with http://www.iana.org/assignments/http-status-codes. Closes #6586.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5482 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/status_codes.rb')
-rw-r--r--actionpack/lib/action_controller/status_codes.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/status_codes.rb b/actionpack/lib/action_controller/status_codes.rb
index c6461914ae..d08c811b31 100644
--- a/actionpack/lib/action_controller/status_codes.rb
+++ b/actionpack/lib/action_controller/status_codes.rb
@@ -3,9 +3,11 @@ module ActionController
# Defines the standard HTTP status codes, by integer, with their
# corresponding default message texts.
+ # Source: http://www.iana.org/assignments/http-status-codes
STATUS_CODES = {
100 => "Continue",
101 => "Switching Protocols",
+ 102 => "Processing",
200 => "OK",
201 => "Created",
@@ -14,6 +16,8 @@ module ActionController
204 => "No Content",
205 => "Reset Content",
206 => "Partial Content",
+ 207 => "Multi-Status",
+ 226 => "IM Used",
300 => "Multiple Choices",
301 => "Moved Permanently",
@@ -41,13 +45,19 @@ module ActionController
415 => "Unsupported Media Type",
416 => "Requested Range Not Satisfiable",
417 => "Expectation Failed",
+ 422 => "Unprocessable Entity",
+ 423 => "Locked",
+ 424 => "Failed Dependency",
+ 426 => "Upgrade Required",
500 => "Internal Server Error",
501 => "Not Implemented",
502 => "Bad Gateway",
503 => "Service Unavailable",
504 => "Gateway Timeout",
- 505 => "HTTP Version Not Supported"
+ 505 => "HTTP Version Not Supported",
+ 507 => "Insufficient Storage",
+ 510 => "Not Extended"
}
# Provides a symbol-to-fixnum lookup for converting a symbol (like