[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2

Thu Mar 17 09:48:39 CET 2011

http://hg.python.org/cpython/rev/71300ca11b85
changeset:   68645:71300ca11b85
parent:      68637:2b3fb2398f45
parent:      68644:db4967095f10
user:        Senthil Kumaran <orsenthil at gmail.com>
date:        Thu Mar 17 16:48:26 2011 +0800
summary:
  Merge from 3.2

files:
  Lib/http/server.py

diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -103,15 +103,20 @@
 
 # Default error message template
 DEFAULT_ERROR_MESSAGE = """\
-<head>
-<title>Error response</title>
-</head>
-<body>
-<h1>Error response</h1>
-<p>Error code %(code)d.
-<p>Message: %(message)s.
-<p>Error code explanation: %(code)s = %(explain)s.
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <title>Error response</title>
+    </head>
+    <body>
+        <h1>Error response</h1>
+        <p>Error code: %(code)d</p>
+        <p>Message: %(message)s.</p>
+        <p>Error code explanation: %(code)s - %(explain)s.</p>
+    </body>
+</html>
 """
 
 DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8"

-- 
Repository URL: http://hg.python.org/cpython
