Commit 5b6621e7 authored by Amos Latteier's avatar Amos Latteier

Removed attribution header since it is now set by ZPublisher. Fixed a bug in...

Removed attribution header since it is now set by ZPublisher. Fixed a bug in output channel pushing which caused ZServer to break on occassion.
parent 4d8c6a9a
...@@ -158,7 +158,6 @@ class ZServerHTTPResponse(HTTPResponse): ...@@ -158,7 +158,6 @@ class ZServerHTTPResponse(HTTPResponse):
# add zserver headers # add zserver headers
append('Server: %s' % self._server_version) append('Server: %s' % self._server_version)
append('Date: %s' % build_http_date(time.time())) append('Date: %s' % build_http_date(time.time()))
append('X-Powered-By: Zope (www.zope.org), Python (www.python.org)')
chunk=0 chunk=0
if self._http_version=='1.0': if self._http_version=='1.0':
if self._http_connection=='keep alive': if self._http_connection=='keep alive':
...@@ -238,7 +237,7 @@ class ChannelPipe: ...@@ -238,7 +237,7 @@ class ChannelPipe:
def close(self): def close(self):
self._channel.push(LoggingProducer(self._request, self._bytes), 0) self._channel.push(LoggingProducer(self._request, self._bytes), 0)
self._channel.push(CallbackProducer(self._channel.done)) self._channel.push(CallbackProducer(self._channel.done), 0)
if self._shutdown: if self._shutdown:
self._channel.push(ShutdownProducer(), 0) self._channel.push(ShutdownProducer(), 0)
elif self._close: elif self._close:
......
...@@ -158,7 +158,6 @@ class ZServerHTTPResponse(HTTPResponse): ...@@ -158,7 +158,6 @@ class ZServerHTTPResponse(HTTPResponse):
# add zserver headers # add zserver headers
append('Server: %s' % self._server_version) append('Server: %s' % self._server_version)
append('Date: %s' % build_http_date(time.time())) append('Date: %s' % build_http_date(time.time()))
append('X-Powered-By: Zope (www.zope.org), Python (www.python.org)')
chunk=0 chunk=0
if self._http_version=='1.0': if self._http_version=='1.0':
if self._http_connection=='keep alive': if self._http_connection=='keep alive':
...@@ -238,7 +237,7 @@ class ChannelPipe: ...@@ -238,7 +237,7 @@ class ChannelPipe:
def close(self): def close(self):
self._channel.push(LoggingProducer(self._request, self._bytes), 0) self._channel.push(LoggingProducer(self._request, self._bytes), 0)
self._channel.push(CallbackProducer(self._channel.done)) self._channel.push(CallbackProducer(self._channel.done), 0)
if self._shutdown: if self._shutdown:
self._channel.push(ShutdownProducer(), 0) self._channel.push(ShutdownProducer(), 0)
elif self._close: elif self._close:
......
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