Commit 250a4b84 authored by Amos Latteier's avatar Amos Latteier

Changed Response.write so that it starts streaming regardless of whether

or not </head> had been written yet. This could cause some problems for
pople who expect the base to be automatically interpolated. Also removed
extra blank lines written between headers and body, writing the headers
already adds \n\n.
parent ee1ee3a5
'''CGI Response Output formatter '''CGI Response Output formatter
$Id: Response.py,v 1.40 1998/09/24 14:43:11 jim Exp $''' $Id: Response.py,v 1.41 1998/11/10 21:45:13 amos Exp $'''
# #
# Copyright (c) 1996-1998, Digital Creations, Fredericksburg, VA, USA. # Copyright (c) 1996-1998, Digital Creations, Fredericksburg, VA, USA.
# All rights reserved. # All rights reserved.
...@@ -51,7 +51,7 @@ $Id: Response.py,v 1.40 1998/09/24 14:43:11 jim Exp $''' ...@@ -51,7 +51,7 @@ $Id: Response.py,v 1.40 1998/09/24 14:43:11 jim Exp $'''
# #
# (540) 371-6909 # (540) 371-6909
# #
__version__='$Revision: 1.40 $'[11:-2] __version__='$Revision: 1.41 $'[11:-2]
import string, types, sys, regex import string, types, sys, regex
from string import find, rfind, lower, upper, strip, split, join, translate from string import find, rfind, lower, upper, strip, split, join, translate
...@@ -621,19 +621,17 @@ class Response: ...@@ -621,19 +621,17 @@ class Response:
""" """
self.body=self.body+data self.body=self.body+data
if end_of_header_search(self.body) >= 0: headers=self.headers
headers=self.headers if headers.has_key('content-length'):
if headers.has_key('content-length'): del headers['content-length']
del headers['content-length'] if not self.headers.has_key('content-type'):
if not self.headers.has_key('content-type'): self.setHeader('content-type', 'text/html')
self.setHeader('content-type', 'text/html') self.insertBase()
self.insertBase() body=self.body
body=self.body self.body=''
self.body='' self.write=write=self.stdout.write
self.write=write=self.stdout.write try: self.flush=self.stdout.flush
try: self.flush=self.stdout.flush except: pass
except: pass write(str(self))
write(str(self)) self._wrote=1
self._wrote=1 write(body)
write('\n\n')
write(body)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment