Changeset 1109
- Timestamp:
- 05/19/06 11:53:38
- Files:
-
- trunk/cherrypy/_cpengine.py (modified) (1 diff)
- trunk/cherrypy/_cprequest.py (modified) (3 diffs)
- trunk/cherrypy/_cpwsgi.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpengine.py
r1098 r1109 137 137 138 138 client_address: the (IP address, port) of the client 139 remote_host: the IP address of the client 139 remote_host should be the client's host name. If not available 140 (because no reverse DNS lookup is performed), the client 141 IP should be provided. 140 142 scheme: either "http" or "https"; defaults to "http" 141 143 """ trunk/cherrypy/_cprequest.py
r1107 r1109 17 17 """Populate a new Request object. 18 18 19 remote_addr should be the client IP address 20 remote_port should be the client Port 21 remote_host should be string of the client's IP address. 19 remote_addr should be the client IP address. 20 remote_port should be the client Port. 21 remote_host should be the client's host name. If not available 22 (because no reverse DNS lookup is performed), the client 23 IP should be provided. 22 24 scheme should be a string, either "http" or "https". 23 25 """ … … 49 51 request_line should be of the form "GET /path HTTP/1.0". 50 52 headers should be a list of (name, value) tuples. 51 rfile should be a file-like object containing the HTTP request 52 entity. 53 rfile should be a file-like object containing the HTTP request entity. 53 54 54 55 When run() is done, the returned object should have 3 attributes: … … 98 99 self.process_headers() 99 100 100 # path_info should be the path from the app101 # root (script_name) to the handler.101 # path_info should be the path from the 102 # app root (script_name) to the handler. 102 103 self.script_name = r = cherrypy.tree.script_name(self.path) 103 104 self.app = cherrypy.tree.apps[r] trunk/cherrypy/_cpwsgi.py
r1106 r1109 61 61 request = None 62 62 try: 63 # LOGON_USER is served by IIS, and is the name of the64 # user after having been mapped to a local account.65 # Both IIS and Apache set REMOTE_USER, when possible.66 63 env = environ.get 67 64 clientAddr = (env('REMOTE_ADDR', ''), int(env('REMOTE_PORT', -1))) 68 65 request = cherrypy.engine.request(clientAddr, env('REMOTE_ADDR', ''), 69 66 environ['wsgi.url_scheme']) 67 68 # LOGON_USER is served by IIS, and is the name of the 69 # user after having been mapped to a local account. 70 # Both IIS and Apache set REMOTE_USER, when possible. 70 71 request.login = (env('LOGON_USER') or env('REMOTE_USER') or None) 72 71 73 request.multithread = environ['wsgi.multithread'] 72 74 request.multiprocess = environ['wsgi.multiprocess']
