- Merge forward test and fix for Collector #1667.

doc/CHANGES.txt

@@ -51,6 +51,11 @@ Zope Changes
 
     Bugs fixed
 
+      - Collector #1667: allow 'max-number-of-session-objects 0' to have
+        the same effect as setting the value via the web interface (i.e.,
+        make the number of session objects unlimited, rather than falling
+        back to the default).
+
       - Collector: #1651: removed compiler warning 
 
       - Collector #1661: make 'python-check-interval' setting in zope.conf

lib/python/OFS/Application.py

@@ -380,8 +380,8 @@ class AppInitializer:
             default_period_secs = 20
             default_timeout_mins = 20
 
-            limit = (getattr(config, 'maximum_number_of_session_objects', None)
-                     or default_limit)
+            limit = getattr(config, 'maximum_number_of_session_objects', 
+                            default_limit)
             timeout_spec = getattr(config, 'session_timeout_minutes',
                                    default_timeout_mins)
             period_spec = getattr(config, 'session_resolution_seconds',

lib/python/OFS/tests/testAppInitializer.py

@@ -121,6 +121,18 @@ class TestInitialization( unittest.TestCase ):
         status = i.install_tempfolder_and_sdc()
         self.failIf(status)
 
+    def test_install_tempfolder_and_sdc_unlimited_sessions(self):
+        unlimited_cfg = good_cfg + """
+        maximum-number-of-session-objects 0
+        """
+        self.configure(unlimited_cfg)
+        i = self.getOne()
+        status = i.install_tempfolder_and_sdc()
+        self.failUnless(status)
+
+        sdc = i.getApp().temp_folder.session_data
+        self.assertEqual(sdc.getSubobjectLimit(), 0)
+
     def test_install_browser_id_manager(self):
         self.configure(good_cfg)
         i = self.getOne()