Merged r77042 from the 2.10 branch.

doc/CHANGES.txt

@@ -97,6 +97,10 @@ Zope Changes
 
     Bugs Fixed
 
+      - Fixed bug in ZPublisher.BaseRequest with persistent site managers.
+        An EndRequestEvent was thrown after the ZODB connection was already
+        closed and thus the site manager not being available anymore.
+
       - Collector #2295: Comments in PythonScripts could lead to syntax
         errors
 

lib/python/ZPublisher/BaseRequest.py

@@ -202,8 +202,8 @@ class BaseRequest:
 
     def close(self):
         self.other.clear()
-        self._held=None
         notify(EndRequestEvent(None, self))
+        self._held=None
 
     def processInputs(self):
         """Do any input processing that could raise errors