From bb65f276386dd28c84d391beb8799c93621da91f Mon Sep 17 00:00:00 2001 From: Anne Gentle Date: Wed, 27 Apr 2011 08:41:07 -0500 Subject: [PATCH 1/4] Changing version links to 1.2 and 1.3 instead of 1.1 and 1.2 --- doc/source/_theme/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/_theme/layout.html b/doc/source/_theme/layout.html index f0573a3b43..75d970baa8 100644 --- a/doc/source/_theme/layout.html +++ b/doc/source/_theme/layout.html @@ -58,7 +58,7 @@

- Psst... hey. Did you know you can read Swift 1.2 docs or Swift 1.1 docs also? + Psst... hey. Did you know you can read Swift 1.3 docs or Swift 1.2 docs also?

{%- endif %} From 8218a292e83d89d5af3e0d982a02d7df695b25b2 Mon Sep 17 00:00:00 2001 From: Anne Gentle Date: Thu, 28 Apr 2011 20:17:55 -0500 Subject: [PATCH 2/4] Adds python-netifaces to the list --- doc/source/debian_package_guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/debian_package_guide.rst b/doc/source/debian_package_guide.rst index e8086adc16..eef9180a90 100644 --- a/doc/source/debian_package_guide.rst +++ b/doc/source/debian_package_guide.rst @@ -58,7 +58,7 @@ Instructions for Building Debian Packages for Swift apt-get install python-software-properties add-apt-repository ppa:swift-core/ppa apt-get update - apt-get install curl gcc bzr python-configobj python-coverage python-dev python-nose python-setuptools python-simplejson python-xattr python-webob python-eventlet python-greenlet debhelper python-sphinx python-all python-openssl python-pastedeploy bzr-builddeb + apt-get install curl gcc bzr python-configobj python-coverage python-dev python-nose python-setuptools python-simplejson python-xattr python-webob python-eventlet python-greenlet debhelper python-sphinx python-all python-openssl python-pastedeploy python-netifaces bzr-builddeb * As you From d33b791fb509192cfb414e6cf90c4a943b315bd5 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Thu, 5 May 2011 20:48:22 +0000 Subject: [PATCH 3/4] Fixed issue of swift3 middleware not accepting '/' in object names --- swift/common/middleware/swift3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py index 206cd3862a..df1ca3f755 100644 --- a/swift/common/middleware/swift3.py +++ b/swift/common/middleware/swift3.py @@ -426,7 +426,7 @@ class Swift3Middleware(object): self.app = app def get_controller(self, path): - container, obj = split_path(path, 0, 2) + container, obj = split_path(path, 0, 2, True) d = dict(container_name=container, object_name=obj) if container and obj: From 007af8f35c7cb563e71e462a8f1ba0ced1b35299 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Thu, 5 May 2011 21:02:08 +0000 Subject: [PATCH 4/4] removed test that was incorrectly testing for a bad path --- test/unit/common/middleware/test_swift3.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/unit/common/middleware/test_swift3.py b/test/unit/common/middleware/test_swift3.py index 5396ab1dd2..bca9badacb 100644 --- a/test/unit/common/middleware/test_swift3.py +++ b/test/unit/common/middleware/test_swift3.py @@ -207,16 +207,6 @@ class TestSwift3(unittest.TestCase): code = dom.getElementsByTagName('Code')[0].childNodes[0].nodeValue self.assertEquals(code, 'InvalidArgument') - def test_bad_path(self): - req = Request.blank('/bucket/object/bad', - environ={'REQUEST_METHOD': 'GET'}, - headers={'Authorization': 'AWS test:tester:hmac'}) - resp = self.app(req.environ, start_response) - dom = xml.dom.minidom.parseString("".join(resp)) - self.assertEquals(dom.firstChild.nodeName, 'Error') - code = dom.getElementsByTagName('Code')[0].childNodes[0].nodeValue - self.assertEquals(code, 'InvalidURI') - def test_bad_method(self): req = Request.blank('/', environ={'REQUEST_METHOD': 'PUT'},