fix error with setting max age and incorrect tests

Code Issues Proposed changes

Change-Id: I3f0db3b70ea5df323597b556682c2d1fb28afe53

This commit is contained in:

John Dickinson

2012年11月09日 14:39:39 -08:00

parent ee42e6fc72

commit 8a8ea8f22a

2 changed files with 6 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
swift/proxy/controllers/base.py

View File

@@ -728,8 +728,8 @@ class Controller(object):

resp.status = HTTP_UNAUTHORIZED

return resp # CORS preflight request that isn't valid

headers['access-control-allow-origin'] = req_origin_value

if cors.get('max_age', None) is not None:

headers['access-control-max-age'] = '%d' % cors.get('max_age')

if cors.get('max_age') is not None:

headers['access-control-max-age'] = cors.get('max_age')

headers['access-control-allow-methods'] = ', '.join(

self.allowed_methods)

if cors.get('allow_headers'):

8
test/unit/proxy/test_server.py

View File

@@ -3535,7 +3535,7 @@ class TestObjectController(unittest.TestCase):

'cors': {

'allow_origin': 'http://foo.bar:8080 https://foo.bar',

'allow_headers': 'x-foo',

'max_age': 999,

'max_age': '999',

}

controller.container_info = my_container_info

@@ -3595,7 +3595,7 @@ class TestObjectController(unittest.TestCase):

'cors': {

'allow_origin': '*',

'allow_headers': 'x-foo',

'max_age': 999,

'max_age': '999',

}

controller.container_info = my_container_info_wildcard

@@ -4141,7 +4141,7 @@ class TestContainerController(unittest.TestCase):

'cors': {

'allow_origin': 'http://foo.bar:8080 https://foo.bar',

'allow_headers': 'x-foo',

'max_age': 999,

'max_age': '999',

}

controller.container_info = my_container_info

@@ -4202,7 +4202,7 @@ class TestContainerController(unittest.TestCase):

'cors': {

'allow_origin': '*',

'allow_headers': 'x-foo',

'max_age': 999,

'max_age': '999',

}

controller.container_info = my_container_info_wildcard