Commits

Robert Brewer  committed 07ee4ae

New version string, and fix for ticket #99.

  • Participants
  • Parent commits c5607f6
  • Tags cherrypy-2.1.0-alpha

Comments (0)

Files changed (2)

File cherrypy/__init__.py

-__version__ = '2.0.0'
+__version__ = '2.1.0 alpha'

File cherrypy/lib/filter/cachefilter.py

 
     def expireCache(self):
         while True:
-            expirationTime, objSize, objKey = self.expirationQueue.get(block=True, timeout=None)
-            while (time.time() < expirationTime):
+            expirationTime, objSize, objKey = self.expirationQueue.get(block=True, timeout=None)
+            # expireCache runs in a separate thread which the servers are
+            # not aware of. It's possible that "time" will be set to None
+            # arbitrarily, so we check "while time" to avoid exceptions.
+            # See tickets #99 and #180 for more information.
+            while time and (time.time() < expirationTime):
                 time.sleep(0.1)
             try:
                 del self.cache[objKey]