Changeset 1680
- Timestamp:
- 06/22/07 09:57:46
- Files:
-
- trunk/cherrypy/test/test.py (modified) (1 diff)
- trunk/cherrypy/wsgiserver/__init__.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/test.py
r1678 r1680 175 175 print """CherryPy Test Program 176 176 Usage: 177 test.py --server=* --host=%s --port=%s --1.0 --cover --basedir=path --profile --validate --conquer --dumb --tests** 177 test.py --help --server=* --host=%s --port=%s --1.0 --ssl --cover 178 --basedir=path --profile --validate --conquer --dumb --tests** 178 179 179 180 """ % (self.__class__.host, self.__class__.port) trunk/cherrypy/wsgiserver/__init__.py
r1679 r1680 125 125 A single HTTP connection may consist of multiple request/response pairs. 126 126 127 rfile: the 'read' fileobject from the connection's socket.128 127 sendall: the 'sendall' method from the connection's fileobject. 129 128 wsgi_app: the WSGI application to call. 130 129 environ: a partial WSGI environ (server and connection entries). 131 130 The caller MUST set the following entries: 132 * All wsgi.* entries 131 * All wsgi.* entries, including .input 133 132 * SERVER_NAME and SERVER_PORT 134 133 * Any SSL_* entries … … 156 155 """ 157 156 158 def __init__(self, rfile,sendall, environ, wsgi_app):159 self.rfile = rfile157 def __init__(self, sendall, environ, wsgi_app): 158 self.rfile = environ['wsgi.input'] 160 159 self.sendall = sendall 161 160 self.environ = environ.copy() … … 623 622 # get written to the previous request. 624 623 req = None 625 req = self.RequestHandlerClass(self. rfile, self.sendall,626 self. environ, self.wsgi_app)624 req = self.RequestHandlerClass(self.sendall, self.environ, 625 self.wsgi_app) 627 626 # This order of operations should guarantee correct pipelining. 628 627 req.parse_request()
