Changeset 477
- Timestamp:
- 07/18/05 01:03:12
- Files:
-
- trunk/cherrypy/test/helper.py (modified) (1 diff)
- trunk/cherrypy/test/webtest.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/helper.py
r476 r477 85 85 def _getRequest(self, url, headers, method, body): 86 86 # Like getPage, but for serverless requests. 87 webtest.ServerError.on = False 87 88 self.url = url 89 88 90 requestLine = "%s %s HTTP/1.0" % (method.upper(), url) 89 headers = webtest.cleanHeaders(headers, method, body) 90 91 found = False 92 for k, v in headers: 93 if k.lower() == 'host': 94 found = True 95 break 96 if not found: 97 headers.append(("Host", "%s:%s" % (HOST, PORT))) 98 91 headers = webtest.cleanHeaders(headers, method, body, HOST, PORT) 99 92 if body is not None: 100 93 body = StringIO.StringIO(body) 101 94 102 webtest.ServerError.on = False103 95 cherrypy.server.request(HOST, HOST, requestLine, headers, body, "http") 96 104 97 self.status = cherrypy.response.status 105 98 self.headers = cherrypy.response.headers trunk/cherrypy/test/webtest.py
r476 r477 274 274 275 275 276 def cleanHeaders(headers, method, body ):276 def cleanHeaders(headers, method, body, host, port): 277 277 if headers is None: 278 278 headers = [] 279 280 # Add the required Host header if not present 281 found = False 282 for k, v in headers: 283 if k.lower() == 'host': 284 found = True 285 break 286 if not found: 287 headers.append(("Host", "%s:%s" % (host, port))) 279 288 280 289 if method in ("POST", "PUT"): … … 295 304 host="127.0.0.1", port=8000): 296 305 297 headers = cleanHeaders(headers, method, body )306 headers = cleanHeaders(headers, method, body, host, port) 298 307 299 308 # Trying 10 times is simply in case of socket errors.
