[Checkins] SVN: zope.server/branches/3.4/ Port Adam's fix to the 3.4 branch.

[Stephan Richter]

Log message for revision 83404:
  Port Adam's fix to the 3.4 branch.
  

Changed:
  U   zope.server/branches/3.4/README.txt
  U   zope.server/branches/3.4/setup.py
  U   zope.server/branches/3.4/src/zope/server/ftp/publisher.py

-=-
Modified: zope.server/branches/3.4/README.txt
===================================================================
--- zope.server/branches/3.4/README.txt	2008-02-02 10:24:29 UTC (rev 83403)
+++ zope.server/branches/3.4/README.txt	2008-02-02 11:10:41 UTC (rev 83404)
@@ -8,3 +8,34 @@
 
 This package contains generic base classes for channel-based servers, the
 servers themselves and helper objects, such as tasks and requests.
+
+Changes
+=======
+
+3.4.2 (2008-02-02)
+------------------
+
+- Fix of 599 error on conflict error in request
+  see: http://mail.zope.org/pipermail/zope-dev/2008-January/030844.html
+
+3.4.1 and 3.5.0a2 (2007-06-02)
+------------------------------
+
+Made WSGI server really WSGI-compliant by adding variables to the
+environment that are required by the spec.
+
+3.5.0a1 (2007-06-02)
+--------------------
+
+Added a factory and entry point for PasteDeploy.
+
+3.4.0 (2007-06-02)
+------------------
+
+Removed an unused import. Unchanged otherwise.
+
+3.4.0a1 (2007-04-22)
+--------------------
+
+Initial release as a separate project, corresponds to zope.server
+from Zope 3.4.0a1

Modified: zope.server/branches/3.4/setup.py
===================================================================
--- zope.server/branches/3.4/setup.py	2008-02-02 10:24:29 UTC (rev 83403)
+++ zope.server/branches/3.4/setup.py	2008-02-02 11:10:41 UTC (rev 83404)
@@ -32,10 +32,10 @@
                        "helper objects, such as tasks and requests.",
 
       packages=find_packages('src'),
-	  package_dir = {'': 'src'},
+      package_dir = {'': 'src'},
 
       namespace_packages=['zope',],
-      
+
       tests_require = ['zope.testing',
                        'zope.i18n',
                        'zope.component'],
@@ -43,7 +43,8 @@
                           'zope.interface',
                           'zope.publisher',
                           'zope.security',
-                          'zope.deprecation'],
+                          'zope.deprecation',
+                          'ZODB3'],
       include_package_data = True,
 
       zip_safe = False,

Modified: zope.server/branches/3.4/src/zope/server/ftp/publisher.py
===================================================================
--- zope.server/branches/3.4/src/zope/server/ftp/publisher.py	2008-02-02 10:24:29 UTC (rev 83403)
+++ zope.server/branches/3.4/src/zope/server/ftp/publisher.py	2008-02-02 11:10:41 UTC (rev 83404)
@@ -51,7 +51,7 @@
         return self._execute(path, 'ls', split=False, filter=filter)
 
     def readfile(self, path, outstream, start=0, end=None):
-        return self._execute(path, 'readfile', 
+        return self._execute(path, 'readfile',
                              outstream=outstream, start=start, end=end)
 
     def lsinfo(self, path):
@@ -108,9 +108,12 @@
 
         # Note that publish() calls close() on request, which deletes the
         # response from the request, so that we need to keep track of it.
-        response = request.response
-        publish(request)
-        return response.getResult()
+        # agroszer: 2008.feb.1.: currently the above seems not to be true
+        # request will KEEP the response on close()
+        # even more if a retry occurs in the publisher,
+        # the response will be LOST, so we must accept the returned request
+        request = publish(request)
+        return request.response.getResult()
 
     def _translate (self, path):
         # Normalize
@@ -144,4 +147,3 @@
 
     def open(self, credentials):
         return PublisherFileSystem(credentials, self.request_factory)
-