Fixed the conflict error retry logic.

ZServer/HTTPResponse.py

@@ -261,7 +261,15 @@ class ZServerHTTPResponse(HTTPResponse):
             self._tempstart=e
             stdout.write(file_part_producer(t,self._templock,b,e), l)
     
+    _retried_response = None
+
     def _finish(self):
+        if self._retried_response:
+            try:
+                self._retried_response._finish()
+            finally:
+                self._retried_response = None
+            return
         stdout=self.stdout
 
         t=self._tempfile
@@ -275,6 +283,20 @@ class ZServerHTTPResponse(HTTPResponse):
         self.stdout=None # need to break cycle?
         self._request=None
 
+    def retry(self):
+        """Return a request object to be used in a retry attempt
+        """
+        # This implementation is a bit lame, because it assumes that
+        # only stdout stderr were passed to the constructor. OTOH, I
+        # think that that's all that is ever passed.
+
+        response=self.__class__(stdout=self.stdout, stderr=self.stderr)
+        response._http_version=self._http_version
+        response._http_connection=self._http_connection
+        response._server_version=self._server_version
+        self._retried_response = response
+        return response
+
 
 class ChannelPipe:
     """Experimental pipe from ZPublisher to a ZServer Channel.
@@ -346,21 +368,6 @@ class ChannelPipe:
             self._close=1
         self._request.reply_code=response.status
         
-    def retry(self):
-        """Return a request object to be used in a retry attempt
-        """
-        
-        # This implementation is a bit lame, because it assumes that
-        # only stdout stderr were passed to the constructor. OTOH, I
-        # think that that's all that is ever passed.
-
-        response=self.__class__(stdout=self.stdout, stderr=self.stderr)
-        response._http_version=self._http_version
-        response._http_connection=self._http_connection
-        response._server_version=self._server_version
-        return response
-        
-    
         
 def make_response(request, headers):
     "Simple http response factory"

lib/python/ZServer/HTTPResponse.py

@@ -261,7 +261,15 @@ class ZServerHTTPResponse(HTTPResponse):
             self._tempstart=e
             stdout.write(file_part_producer(t,self._templock,b,e), l)
     
+    _retried_response = None
+
     def _finish(self):
+        if self._retried_response:
+            try:
+                self._retried_response._finish()
+            finally:
+                self._retried_response = None
+            return
         stdout=self.stdout
 
         t=self._tempfile
@@ -275,6 +283,20 @@ class ZServerHTTPResponse(HTTPResponse):
         self.stdout=None # need to break cycle?
         self._request=None
 
+    def retry(self):
+        """Return a request object to be used in a retry attempt
+        """
+        # This implementation is a bit lame, because it assumes that
+        # only stdout stderr were passed to the constructor. OTOH, I
+        # think that that's all that is ever passed.
+
+        response=self.__class__(stdout=self.stdout, stderr=self.stderr)
+        response._http_version=self._http_version
+        response._http_connection=self._http_connection
+        response._server_version=self._server_version
+        self._retried_response = response
+        return response
+
 
 class ChannelPipe:
     """Experimental pipe from ZPublisher to a ZServer Channel.
@@ -346,21 +368,6 @@ class ChannelPipe:
             self._close=1
         self._request.reply_code=response.status
         
-    def retry(self):
-        """Return a request object to be used in a retry attempt
-        """
-        
-        # This implementation is a bit lame, because it assumes that
-        # only stdout stderr were passed to the constructor. OTOH, I
-        # think that that's all that is ever passed.
-
-        response=self.__class__(stdout=self.stdout, stderr=self.stderr)
-        response._http_version=self._http_version
-        response._http_connection=self._http_connection
-        response._server_version=self._server_version
-        return response
-        
-    
         
 def make_response(request, headers):
     "Simple http response factory"