Robert Brewer avatar Robert Brewer committed 07ee4ae

New version string, and fix for ticket #99.

Comments (0)

Files changed (2)

cherrypy/__init__.py

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

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]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.