svn commit: r1361263 - in /tomcat/trunk/java/org/apache: catalina/valves/LocalStrings.properties tomcat/util/http/res/LocalStrings.properties

[rj...@apache.org]

Author: rjung
Date: Fri Jul 13 15:09:20 2012
New Revision: 1361263

URL: http://svn.apache.org/viewvc?rev=1361263&view=rev
Log:
Update list of HTTP status codes.

Current list taken from
http://www.iana.org/assignments/http-status-codes/http-status-codes.xml.

Only change of existing entries is code 302 message text changed
from "Moved Temporarily" to "Found" as per RFC 2616.

Modified:
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1361263&r1=1361262&r2=1361263&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Fri Jul 13 15:09:20 2012
@@ -51,8 +51,13 @@ stuckThreadDetectionValve.notifyStuckThr
 stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" (id={3}) was previously reported to be stuck but has completed. It was active for approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s) that are monitored by this Valve and may be stuck.}
 
 # HTTP status reports
+# All status codes registered with IANA can be found at
+# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
+# The list might be kept in sync with the one in
+# org/apache/tomcat/util/http/res/LocalStrings.properties.
 http.100=The client may continue ({0}).
 http.101=The server is switching protocols according to the "Upgrade" header ({0}).
+http.102=The server has accepted the complete request, but has not yet completed it ({0}).
 http.201=The request succeeded and a new resource ({0}) has been created on the server.
 http.202=This request was accepted for processing, but has not been completed ({0}).
 http.203=The meta information presented by the client did not originate from the server ({0}).
@@ -60,12 +65,16 @@ http.204=The request succeeded but there
 http.205=The client should reset the document view which caused this request to be sent ({0}).
 http.206=The server has fulfilled a partial GET request for this resource ({0}).
 http.207=Multiple status values have been returned ({0}).
+http.208=This collection binding was already reported ({0}).
+http.226=The response is a representation of the result of one or more instance-manipulations applied to the current instance ({0}).
 http.300=The requested resource ({0}) corresponds to any one of a set of representations, each with its own specific location.
 http.301=The requested resource ({0}) has moved permanently to a new location.
 http.302=The requested resource ({0}) has moved temporarily to a new location.
 http.303=The response to this request can be found under a different URI ({0}).
 http.304=The requested resource ({0}) is available and has not been modified.
 http.305=The requested resource ({0}) must be accessed through the proxy given by the "Location" header.
+http.307=The requested resource resides temporarily under a different URI ({0}).
+http.308=The target resource has been assigned a new permanent URI and any future references to this resource SHOULD use one of the returned URIs ({0}).
 http.400=The request sent by the client was syntactically incorrect ({0}).
 http.401=This request requires HTTP authentication ({0}).
 http.402=Payment is required for access to this resource ({0}).
@@ -86,10 +95,19 @@ http.416=The requested byte range cannot
 http.417=The expectation given in the "Expect" request header ({0}) could not be fulfilled.
 http.422=The server understood the content type and syntax of the request but was unable to process the contained instructions ({0}).
 http.423=The source or destination resource of a method is locked ({0}).
+http.424=The method could not be performed on the resource because the requested action depended on another action and that action failed ({0}).
+http.426=The request can only be completed after a protocol upgrade ({0}).
+http.428=The request is required to be conditional ({0}).
+http.429=The user has sent too many requests in a given amount of time ({0}).
+http.431=The server refused this request because the request header fields are too large ({0}).
 http.500=The server encountered an internal error ({0}) that prevented it from fulfilling this request.
 http.501=The server does not support the functionality needed to fulfill this request ({0}).
 http.502=This server received an invalid response from a server it consulted when acting as a proxy or gateway ({0}).
 http.503=The requested service ({0}) is not currently available.
 http.504=The server received a timeout from an upstream server while acting as a gateway or proxy ({0}).
 http.505=The server does not support the requested HTTP protocol version ({0}).
+http.506=The chosen variant resource is configured to engage in transparent content negotiation itself, and is therefore not a proper end point in the negotiation process ({0}).
 http.507=The resource does not have sufficient space to record the state of the resource after execution of this method ({0}).
+http.508=The server terminated an operation because it encountered an infinite loop ({0}).
+http.510=The policy for accessing the resource has not been met in the request ({0}).
+http.511=The client needs to authenticate to gain network access ({0}).

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties?rev=1361263&r1=1361262&r2=1361263&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties Fri Jul 13 15:09:20 2012
@@ -15,8 +15,13 @@
 
 # HttpMessages. The values in this file will be used in HTTP headers and as such
 # may only contain TEXT as defined by RFC 2616
+# All status codes registered with IANA can be found at
+# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
+# The list might be kept in sync with the one in
+# java/org/apache/catalina/valves/LocalStrings.properties
 sc.100=Continue
 sc.101=Switching Protocols
+sc.102=Processing
 sc.200=OK
 sc.201=Created
 sc.202=Accepted
@@ -25,13 +30,16 @@ sc.204=No Content
 sc.205=Reset Content
 sc.206=Partial Content
 sc.207=Multi-Status
+sc.208=Already Reported
+sc.226=IM Used
 sc.300=Multiple Choices
 sc.301=Moved Permanently
-sc.302=Moved Temporarily
+sc.302=Found
 sc.303=See Other
 sc.304=Not Modified
 sc.305=Use Proxy
 sc.307=Temporary Redirect
+sc.308=Permanent Redirect
 sc.400=Bad Request
 sc.401=Unauthorized
 sc.402=Payment Required
@@ -53,10 +61,18 @@ sc.417=Expectation Failed
 sc.422=Unprocessable Entity
 sc.423=Locked
 sc.424=Failed Dependency
+sc.426=Upgrade Required
+sc.428=Precondition Required
+sc.429=Too Many Requests
+sc.431=Request Header Fields Too Large
 sc.500=Internal Server Error
 sc.501=Not Implemented
 sc.502=Bad Gateway
 sc.503=Service Unavailable
 sc.504=Gateway Timeout
 sc.505=HTTP Version Not Supported
+sc.506=Variant Also Negotiates (Experimental)
 sc.507=Insufficient Storage
+sc.508=Loop Detected
+sc.510=Not Extended
+sc.511=Network Authentication Required



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org