Changeset 1948
- Timestamp:
- 04/26/08 17:47:54
- Files:
-
- trunk/cherrypy/_cplogging.py (modified) (1 diff)
- trunk/cherrypy/wsgiserver/__init__.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cplogging.py
r1938 r1948 62 62 63 63 def access(self): 64 """Write to the access log ."""64 """Write to the access log (in Apache/NCSA Combined Log format).""" 65 65 request = cherrypy.request 66 66 inheaders = request.headers trunk/cherrypy/wsgiserver/__init__.py
r1937 r1948 1058 1058 1059 1059 class ThreadPool(object): 1060 """A Request Queue for the CherryPyWSGIServer which pools threads.""" 1060 """A Request Queue for the CherryPyWSGIServer which pools threads. 1061 1062 ThreadPool objects must provide min, get(), put(obj), start() 1063 and stop(timeout) attributes. 1064 """ 1061 1065 1062 1066 def __init__(self, server, min=10, max=-1): … … 1488 1492 def populate_ssl_environ(self): 1489 1493 """Create WSGI environ entries to be merged into each request.""" 1490 cert = open(self.ssl_certificate ).read()1494 cert = open(self.ssl_certificate, 'rb').read() 1491 1495 cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert) 1492 1496 ssl_environ = {

