Don't try to fix user HTML.

131a4ee2 · Evan Simpson · 5eb1539a · 131a4ee2 · 131a4ee2
Commit 131a4ee2 authored Dec 18, 2000 by Evan Simpson
Show whitespace changes
Inline Side-by-side

Showing with 36 additions and 32 deletions

ZServer/HTTPResponse.py ZServer/HTTPResponse.py +18 -16

lib/python/ZServer/HTTPResponse.py lib/python/ZServer/HTTPResponse.py +18 -16

No files found.
--- a/ZServer/HTTPResponse.py
+++ b/ZServer/HTTPResponse.py
@@ -92,7 +92,7 @@ and logging duties.
 import time, regex, string, sys, tempfile
 from cStringIO import StringIO
 import thread
-from ZPublisher.HTTPResponse import HTTPResponse, end_of_header_search
+from ZPublisher.HTTPResponse import HTTPResponse
 from medusa.http_date import build_http_date
 from PubCore.ZEvent import Wakeup
 from medusa.producers import hooked_producer
@@ -140,21 +140,23 @@ class ZServerHTTPResponse(HTTPResponse):
                else:
                    c='text/plain'
                self.setHeader('content-type',c)
-            else:
-                isHTML = string.split(headers.get('content-type', ''),
+            # Don't try to fix user HTML
-                                      ';')[0] == 'text/html'
+            #else:
-            if isHTML and end_of_header_search(self.body) < 0:
+            #    isHTML = string.split(headers.get('content-type', ''),
-                lhtml=html_search(body)
+            #                          ';')[0] == 'text/html'
-                if lhtml >= 0:
+            #if isHTML and end_of_header_search(self.body) < 0:
-                    lhtml=lhtml+6
+            #    lhtml=html_search(body)
-                    body='%s<head></head>\n%s' % (body[:lhtml],body[lhtml:])
+            #    if lhtml >= 0:
-                elif contHTML:
+            #        lhtml=lhtml+6
-                    body='<html><head></head>\n' + body
+            #        body='%s<head></head>\n%s' % (body[:lhtml],body[lhtml:])
-                else:
+            #    elif contHTML:
-                    body='<html><head></head>\n' + body + '\n</html>\n'
+            #        body='<html><head></head>\n' + body
-                self.setBody(body)
+            #    else:
-                body=self.body
+            #        body='<html><head></head>\n' + body + '\n</html>\n'
+            #    self.setBody(body)
+            #    body=self.body
        # set 204 (no content) status if 200 and response is empty
        # and not streaming

--- a/lib/python/ZServer/HTTPResponse.py
+++ b/lib/python/ZServer/HTTPResponse.py
@@ -92,7 +92,7 @@ and logging duties.
 import time, regex, string, sys, tempfile
 from cStringIO import StringIO
 import thread
-from ZPublisher.HTTPResponse import HTTPResponse, end_of_header_search
+from ZPublisher.HTTPResponse import HTTPResponse
 from medusa.http_date import build_http_date
 from PubCore.ZEvent import Wakeup
 from medusa.producers import hooked_producer
@@ -140,21 +140,23 @@ class ZServerHTTPResponse(HTTPResponse):
                else:
                    c='text/plain'
                self.setHeader('content-type',c)
-            else:
-                isHTML = string.split(headers.get('content-type', ''),
+            # Don't try to fix user HTML
-                                      ';')[0] == 'text/html'
+            #else:
-            if isHTML and end_of_header_search(self.body) < 0:
+            #    isHTML = string.split(headers.get('content-type', ''),
-                lhtml=html_search(body)
+            #                          ';')[0] == 'text/html'
-                if lhtml >= 0:
+            #if isHTML and end_of_header_search(self.body) < 0:
-                    lhtml=lhtml+6
+            #    lhtml=html_search(body)
-                    body='%s<head></head>\n%s' % (body[:lhtml],body[lhtml:])
+            #    if lhtml >= 0:
-                elif contHTML:
+            #        lhtml=lhtml+6
-                    body='<html><head></head>\n' + body
+            #        body='%s<head></head>\n%s' % (body[:lhtml],body[lhtml:])
-                else:
+            #    elif contHTML:
-                    body='<html><head></head>\n' + body + '\n</html>\n'
+            #        body='<html><head></head>\n' + body
-                self.setBody(body)
+            #    else:
-                body=self.body
+            #        body='<html><head></head>\n' + body + '\n</html>\n'
+            #    self.setBody(body)
+            #    body=self.body
        # set 204 (no content) status if 200 and response is empty
        # and not streaming