Changeset 990
- Timestamp:
- 03/02/06 03:07:36
- Files:
-
- trunk/cherrypy/_cpwsgi.py (modified) (3 diffs)
- trunk/cherrypy/test/benchmark.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpwsgi.py
r965 r990 129 129 mhs = int(cherrypy.config.get('server.max_request_header_size', 130 130 500 * 1024)) 131 self.rfile = httptools.SizeCheckWrapper(self.rfile, mhs) 131 if mhs > 0: 132 self.rfile = httptools.SizeCheckWrapper(self.rfile, mhs) 132 133 133 134 def parse_request(self): … … 148 149 # Request header is parsed 149 150 # We prepare the SizeCheckWrapper for the request body 150 self.rfile.bytes_read = 0151 151 script_name = self.environ.get('SCRIPT_NAME', '') 152 152 path_info = self.environ.get('PATH_INFO', '') … … 156 156 mbs = int(cherrypy.config.get('server.max_request_body_size', 157 157 100 * 1024 * 1024, path=path)) 158 self.rfile.maxlen = mbs 158 if mbs > 0: 159 if isinstance(self.rfile, httptools.SizeCheckWrapper): 160 self.rfile.bytes_read = 0 161 self.rfile.maxlen = mbs 162 else: 163 self.rfile = httptools.SizeCheckWrapper(self.rfile, mbs) 159 164 160 165 trunk/cherrypy/test/benchmark.py
r989 r990 24 24 class Root: 25 25 def index(self): 26 return r"Hello, world\r\n"26 return "Hello, world\r\n" 27 27 index.exposed = True 28 28 … … 42 42 'server.socket_host': 'localhost', 43 43 'server.socket_port': 8080, 44 'server.max_request_header_size': 0, 45 'server.max_request_body_size': 0, 44 46 }, 45 47 '/static': { … … 261 263 # Return without stopping the server, so that the pages 262 264 # can be tested from a standard web browser. 263 run = lambda x: x265 run = lambda: None 264 266 else: 265 267 def run():

