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

Sun Mar 20 03:45:58 CET 2011

http://hg.python.org/cpython/rev/1e2b35af7a87
changeset:   68707:1e2b35af7a87
parent:      68704:9d1b1a95bc8f
parent:      68706:ff3b462fbfc4
user:        Senthil Kumaran <orsenthil at gmail.com>
date:        Sun Mar 20 10:45:41 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,11 +103,10 @@
 
 # Default error message template
 DEFAULT_ERROR_MESSAGE = """\
-<!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">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
     <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
         <title>Error response</title>
     </head>
     <body>

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