Fixed a bug in the detection on HTML error messages which could mess up error message formatting.

afc624a5 · Amos Latteier · 25a82bf4 · afc624a5
Commit afc624a5 authored Aug 18, 1999 by Amos Latteier
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

lib/python/ZPublisher/HTTPResponse.py lib/python/ZPublisher/HTTPResponse.py +3 -3

No files found.
--- a/lib/python/ZPublisher/HTTPResponse.py
+++ b/lib/python/ZPublisher/HTTPResponse.py
@@ -84,8 +84,8 @@
 ##############################################################################
 '''CGI Response Output formatter

-$Id: HTTPResponse.py,v 1.18 1999/08/04 20:50:22 jim Exp $'''
-__version__='$Revision: 1.18 $'[11:-2]
+$Id: HTTPResponse.py,v 1.19 1999/08/18 00:23:50 amos Exp $'''
+__version__='$Revision: 1.19 $'[11:-2]

 import string, types, sys, regex
 from string import find, rfind, lower, upper, strip, split, join, translate
@@ -625,7 +625,7 @@ class HTTPResponse(BaseResponse):
                 self._traceback(t,v,tb)),
                 is_error=1)

-        elif lower(strip(b))[:6]=='<html>':
+        elif lower(strip(b))[:6]=='<html>' or lower(strip(b))[:14]=='<!doctype html':
            # error is an HTML document, not just a snippet of html
            tb=self.setBody(b + self._traceback(t,'(see above)',tb),
                is_error=1)