maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Better handling for test_request_context don't just append the port.

Browse source 
Also implemented a proper initial environment to use with
`Flask.test_app()` based on the application's configuration.

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
This commit is contained in:
Pedro Algarvio 2010-10-22 16:13:35 +01:00 • committed by Armin Ronacher
parent 1f6321a1cb
commit a327452540
3 changed files with 132 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/app.py
View file

@ -704,7 +704,7 @@ class Flask(_PackageBoundObject):
raise req.routing_exception
rule = req.url_rule
# if we provide automatic options for this URL and the
# request came with the OPTIONS method, reply automatically
# request came with the OPTIONS method, reply automatically
if rule.provide_automatic_options and req.method == 'OPTIONS':
return self.make_default_options_response()
# otherwise dispatch to the handler for that endpoint
@ -867,8 +867,10 @@ class Flask(_PackageBoundObject):
if self.config.get('SERVER_NAME'):
server_name = self.config.get('SERVER_NAME')
if ':' not in server_name:
server_name += ':80'
http_host, http_port = server_name.split(':')
http_host, http_port = server_name, '80'
else:
http_host, http_port = server_name.split(':', 1)
environ_overrides.setdefault('SERVER_NAME', server_name)
environ_overrides.setdefault('HTTP_HOST', server_name)
environ_overrides.setdefault('SERVER_PORT', http_port)