Changeset 1491
- Timestamp:
- 12/09/06 13:50:06
- Files:
-
- branches/cherrypy-2.x/cherrypy/_cpengine.py (modified) (1 diff)
- branches/cherrypy-2.x/cherrypy/_cphttptools.py (modified) (2 diffs)
- branches/cherrypy-2.x/cherrypy/_cpwsgi.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/cherrypy-2.x/cherrypy/_cpengine.py
r1487 r1491 154 154 155 155 clientAddress: the (IP address, port) of the client 156 remoteHost: the IP address of the client 156 remoteHost: should be the client's host name. If not available 157 (because no reverse DNS lookup is performed), the client 158 IP should be provided. 157 159 scheme: either "http" or "https"; defaults to "http" 158 160 """ branches/cherrypy-2.x/cherrypy/_cphttptools.py
r1487 r1491 20 20 remoteAddr should be the client IP address 21 21 remotePort should be the client Port 22 remoteHost should be string of the client's IP address. 22 remoteHost: should be the client's host name. If not available 23 (because no reverse DNS lookup is performed), the client 24 IP should be provided. 23 25 scheme should be a string, either "http" or "https". 24 26 """ … … 46 48 requestLine should be of the form "GET /path HTTP/1.0". 47 49 headers should be a list of (name, value) tuples. 48 rfile should be a file-like object containing the HTTP request 49 entity. 50 rfile should be a file-like object containing the HTTP request entity. 50 51 51 52 When run() is done, the returned object should have 3 attributes: branches/cherrypy-2.x/cherrypy/_cpwsgi.py
r1486 r1491 60 60 request = None 61 61 try: 62 env = environ.get 63 clientAddr = (env('REMOTE_ADDR', ''), int(env('REMOTE_PORT', -1))) 64 request = cherrypy.server.request(clientAddr, '', environ['wsgi.url_scheme']) 65 62 66 # LOGON_USER is served by IIS, and is the name of the 63 67 # user after having been mapped to a local account. 64 68 # Both IIS and Apache set REMOTE_USER, when possible. 65 env = environ.get66 clientAddr = (env('REMOTE_ADDR', ''), int(env('REMOTE_PORT', -1)))67 request = cherrypy.server.request(clientAddr, '', environ['wsgi.url_scheme'])68 69 request.login = (env('LOGON_USER') or env('REMOTE_USER') or None) 70 69 71 request.multithread = environ['wsgi.multithread'] 70 72 request.multiprocess = environ['wsgi.multiprocess']
