Changeset 1564
- Timestamp:
- 12/23/06 16:09:29
- Files:
-
- trunk/cherrypy/_cplogging.py (modified) (2 diffs)
- trunk/cherrypy/test/benchmark.py (modified) (1 diff)
- trunk/cherrypy/wsgiserver.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cplogging.py
r1458 r1564 46 46 """Write to the access log.""" 47 47 request = cherrypy.request 48 remote = request.remote 48 49 response = cherrypy.response 50 outheaders = response.headers 49 51 tmpl = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"' 50 s = tmpl % {'h': re quest.remote.name or request.remote.ip,52 s = tmpl % {'h': remote.name or remote.ip, 51 53 'l': '-', 52 54 'u': getattr(request, "login", None) or "-", … … 54 56 'r': request.request_line, 55 57 's': response.status.split(" ", 1)[0], 56 'b': response.headers.get('Content-Length', '') or "-",57 'f': request.headers.get('referer', ''),58 'a': request.headers.get('user-agent', ''),58 'b': outheaders.get('Content-Length', '') or "-", 59 'f': outheaders.get('referer', ''), 60 'a': outheaders.get('user-agent', ''), 59 61 } 60 62 try: trunk/cherrypy/test/benchmark.py
r1563 r1564 86 86 'server.max_request_body_size': 0, 87 87 'engine.deadlock_poll_freq': 0, 88 # Cheat mode on ;)89 'tools.log_tracebacks.on': False,90 'tools.log_headers.on': False,91 'tools.trailing_slash.on': False,92 88 }) 89 90 # Cheat mode on ;) 91 del cherrypy.config['tools.log_tracebacks.on'] 92 del cherrypy.config['tools.log_headers.on'] 93 del cherrypy.config['tools.trailing_slash.on'] 93 94 94 95 appconf = { trunk/cherrypy/wsgiserver.py
r1563 r1564 418 418 def send_headers(self): 419 419 """Assert, process, and send the HTTP response message-headers.""" 420 hkeys = [key.lower() for (key, value)in self.outheaders]420 hkeys = [key.lower() for key, value in self.outheaders] 421 421 status = int(self.status[:3]) 422 422 … … 449 449 buf = [server.protocol, " ", self.status, "\r\n"] 450 450 try: 451 for k, v in self.outheaders: 452 buf.append(k + ": " + v + "\r\n") 451 buf += [k + ": " + v + "\r\n" for k, v in self.outheaders] 453 452 except TypeError: 454 453 if not isinstance(k, str):
