summaryrefslogtreecommitdiffstats
path: root/Lib/BaseHTTPServer.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-02-17 19:17:25 (GMT)
committerGeorg Brandl <georg@python.org>2006-02-17 19:17:25 (GMT)
commit6aab16e9f6df06ab68f24422dcc50579f500c0b7 (patch)
tree923ad5c91ac916fbd6c5894ae863ea4f8cec48e0 /Lib/BaseHTTPServer.py
parentdde99d2633d7d744730d4464521e936bf1b6b411 (diff)
downloadcpython-6aab16e9f6df06ab68f24422dcc50579f500c0b7.zip
cpython-6aab16e9f6df06ab68f24422dcc50579f500c0b7.tar.gz
cpython-6aab16e9f6df06ab68f24422dcc50579f500c0b7.tar.bz2
Move "httpresponses" dict from urllib2 to httplib where it belongs.
Diffstat (limited to 'Lib/BaseHTTPServer.py')
-rw-r--r--Lib/BaseHTTPServer.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index 1b3d4db..a041ef2 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -483,7 +483,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
# Table mapping response codes to messages; entries have the
# form {code: (shortmessage, longmessage)}.
- # See http://www.w3.org/hypertext/WWW/Protocols/HTTP/HTRESP.html
+ # See RFC 2616.
responses = {
100: ('Continue', 'Request received, please continue'),
101: ('Switching Protocols',
@@ -494,7 +494,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
202: ('Accepted',
'Request accepted, processing continues off-line'),
203: ('Non-Authoritative Information', 'Request fulfilled from cache'),
- 204: ('No response', 'Request fulfilled, nothing follows'),
+ 204: ('No Content', 'Request fulfilled, nothing follows'),
205: ('Reset Content', 'Clear input form for further input.'),
206: ('Partial Content', 'Partial content follows.'),
@@ -503,7 +503,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
301: ('Moved Permanently', 'Object moved permanently -- see URI list'),
302: ('Found', 'Object moved temporarily -- see URI list'),
303: ('See Other', 'Object moved -- see Method and URL list'),
- 304: ('Not modified',
+ 304: ('Not Modified',
'Document has not changed since given time'),
305: ('Use Proxy',
'You must use proxy specified in Location to access this '
@@ -511,11 +511,11 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
307: ('Temporary Redirect',
'Object moved temporarily -- see URI list'),
- 400: ('Bad request',
+ 400: ('Bad Request',
'Bad request syntax or unsupported method'),
401: ('Unauthorized',
'No permission -- see authorization schemes'),
- 402: ('Payment required',
+ 402: ('Payment Required',
'No payment -- see charging schemes'),
403: ('Forbidden',
'Request forbidden -- authorization will not help'),
@@ -525,7 +525,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
406: ('Not Acceptable', 'URI not available in preferred format.'),
407: ('Proxy Authentication Required', 'You must authenticate with '
'this proxy before proceeding.'),
- 408: ('Request Time-out', 'Request timed out; try again later.'),
+ 408: ('Request Timeout', 'Request timed out; try again later.'),
409: ('Conflict', 'Request conflict.'),
410: ('Gone',
'URI no longer exists and has been permanently removed.'),
@@ -539,15 +539,15 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
417: ('Expectation Failed',
'Expect condition could not be satisfied.'),
- 500: ('Internal error', 'Server got itself in trouble'),
+ 500: ('Internal Server Error', 'Server got itself in trouble'),
501: ('Not Implemented',
'Server does not support this operation'),
502: ('Bad Gateway', 'Invalid responses from another server/proxy.'),
- 503: ('Service temporarily overloaded',
+ 503: ('Service Unavailable',
'The server cannot process the request due to a high load'),
- 504: ('Gateway timeout',
+ 504: ('Gateway Timeout',
'The gateway server did not receive a timely response'),
- 505: ('HTTP Version not supported', 'Cannot fulfill request.'),
+ 505: ('HTTP Version Not Supported', 'Cannot fulfill request.'),
}