merged toby-retry-header-branch: collector 266: retried request loses headers

ZServer/HTTPResponse.py

@@ -219,6 +219,7 @@ class ZServerHTTPResponse(HTTPResponse):
         # think that that's all that is ever passed.
 
         response=self.__class__(stdout=self.stdout, stderr=self.stderr)
+        response.headers=self.headers
         response._http_version=self._http_version
         response._http_connection=self._http_connection
         response._server_version=self._server_version

doc/CHANGES.txt

@@ -108,6 +108,9 @@ Zope Changes
 
       - Collector #291: ZCatalog not unindexing deleted properties
 
+      - Collector #266: Retried requests losing track of http request
+        headers, causing Connection:Close requests to stall
+
   Zope 2.5.1 beta 1
     
     Bugs Fixed

lib/python/ZServer/HTTPResponse.py

@@ -219,6 +219,7 @@ class ZServerHTTPResponse(HTTPResponse):
         # think that that's all that is ever passed.
 
         response=self.__class__(stdout=self.stdout, stderr=self.stderr)
+        response.headers=self.headers
         response._http_version=self._http_version
         response._http_connection=self._http_connection
         response._server_version=self._server_version