From: Senthil Kumaran Date: Mon, 22 Feb 2010 11:00:50 +0000 (+0000) Subject: Merged revisions 78299 via svnmerge from X-Git-Tag: v3.2a1~1666 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aa2621720f49666240e3339b5120b35f8ea00ed;p=python Merged revisions 78299 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78299 | senthil.kumaran | 2010-02-22 16:25:08 +0530 (Mon, 22 Feb 2010) | 4 lines Fix Issue7172 - BaseHTTPServer.BaseHTTPRequestHandler.responses[405] - changing server to resource in the 405 response msg. ........ --- diff --git a/Lib/http/server.py b/Lib/http/server.py index 1e640faaef..d2a685f797 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -563,7 +563,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): 'Request forbidden -- authorization will not help'), 404: ('Not Found', 'Nothing matches the given URI'), 405: ('Method Not Allowed', - 'Specified method is invalid for this server.'), + 'Specified method is invalid for this resource.'), 406: ('Not Acceptable', 'URI not available in preferred format.'), 407: ('Proxy Authentication Required', 'You must authenticate with ' 'this proxy before proceeding.'),