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 1e640faaef33d06dbc0d4f1eb132bae2b3715485..d2a685f7974055ed810764c1e7a132f67e5d22ae 100644 (file)
--- 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.'),