From: Senthil Kumaran Date: Mon, 22 Feb 2010 10:57:29 +0000 (+0000) Subject: Merged revisions 78299 via svnmerge from X-Git-Tag: v2.6.5rc1~53 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38bcf8115138d95543388a1556d4dc8d1260b4be;p=thirdparty%2FPython%2Fcpython.git 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/BaseHTTPServer.py b/Lib/BaseHTTPServer.py index acd839410e0a..6c0cf46b13c2 100644 --- a/Lib/BaseHTTPServer.py +++ b/Lib/BaseHTTPServer.py @@ -535,7 +535,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.'),