Changeset 1439
- Timestamp:
- 11/18/06 16:15:27
- Files:
-
- branches/cherrypy-2.x/cherrypy/_cputil.py (modified) (1 diff)
- branches/cherrypy-2.x/cherrypy/_cpwsgi.py (modified) (1 diff)
- branches/cherrypy-2.x/cherrypy/_cpwsgiserver.py (modified) (1 diff)
- trunk/cherrypy/_cpwsgiserver.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/cherrypy-2.x/cherrypy/_cputil.py
r1030 r1439 110 110 111 111 tmpl = '%(h)s %(l)s %(u)s [%(t)s] "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"' 112 s = tmpl % {'h': cherrypy.request.remoteHost ,112 s = tmpl % {'h': cherrypy.request.remoteHost or cherrypy.request.remoteAddr, 113 113 'l': '-', 114 114 'u': getattr(cherrypy.request, "login", None) or "-", branches/cherrypy-2.x/cherrypy/_cpwsgi.py
r1013 r1439 65 65 env = environ.get 66 66 clientAddr = (env('REMOTE_ADDR', ''), int(env('REMOTE_PORT', -1))) 67 request = cherrypy.server.request(clientAddr, env('REMOTE_ADDR', ''), 68 environ['wsgi.url_scheme']) 67 request = cherrypy.server.request(clientAddr, '', environ['wsgi.url_scheme']) 69 68 request.login = (env('LOGON_USER') or env('REMOTE_USER') or None) 70 69 request.multithread = environ['wsgi.multithread'] branches/cherrypy-2.x/cherrypy/_cpwsgiserver.py
r1283 r1439 120 120 self.environ["SERVER_PORT"] = str(self.server.bind_addr[1]) 121 121 # optional values 122 self.environ["REMOTE_HOST"] = self.addr[0]122 # Until we do DNS lookups, don't include REMOTE_HOST 123 123 self.environ["REMOTE_ADDR"] = self.addr[0] 124 124 self.environ["REMOTE_PORT"] = str(self.addr[1]) trunk/cherrypy/_cpwsgiserver.py
r1438 r1439 450 450 self.environ["SERVER_PORT"] = str(self.server.bind_addr[1]) 451 451 # optional values 452 self.environ["REMOTE_HOST"] = self.addr[0]452 # Until we do DNS lookups, omit REMOTE_HOST 453 453 self.environ["REMOTE_ADDR"] = self.addr[0] 454 454 self.environ["REMOTE_PORT"] = str(self.addr[1])
