diff --git a/swift/common/middleware/container_quotas.py b/swift/common/middleware/container_quotas.py
index 34643a7bbc..d8d3df0316 100644
--- a/swift/common/middleware/container_quotas.py
+++ b/swift/common/middleware/container_quotas.py
@@ -64,12 +64,12 @@ class ContainerQuotaMiddleware(object):
 @wsgify
 def __call__(self, req):
 try:
- (version, account, container, obj) = req.split_path(2, 4, True)
+ (version, account, container, obj) = req.split_path(3, 4, True)
 except ValueError:
 return self.app
 
 # verify new quota headers are properly formatted
- if container and not obj and req.method in ('PUT', 'POST'):
+ if not obj and req.method in ('PUT', 'POST'):
 val = req.headers.get('X-Container-Meta-Quota-Bytes')
 if val and not val.isdigit():
 return HTTPBadRequest(body='Invalid bytes quota.')
diff --git a/test/unit/common/middleware/test_quotas.py b/test/unit/common/middleware/test_quotas.py
index 89e2204f54..0d9147d8b7 100644
--- a/test/unit/common/middleware/test_quotas.py
+++ b/test/unit/common/middleware/test_quotas.py
@@ -48,6 +48,14 @@ def start_response(*args):
 
 class TestContainerQuotas(unittest.TestCase):
 
+ def test_split_path_empty_container_path_segment(self):
+ app = container_quotas.ContainerQuotaMiddleware(FakeApp(), {})
+ req = Request.blank('/v1/a//something/something_else',
+ environ={'REQUEST_METHOD': 'PUT',
+ 'swift.cache': {'key':'value'}})
+ res = req.get_response(app)
+ self.assertEquals(res.status_int, 200)
+
 def test_not_handled(self):
 app = container_quotas.ContainerQuotaMiddleware(FakeApp(), {})
 req = Request.blank('/v1/a/c', environ={'REQUEST_METHOD': 'PUT'})
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/swift/commit/884b7bb8f8cd4e20be2bac221adde6c162a2bf89.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/swift/commit/884b7bb8f8cd4e20be2bac221adde6c162a2bf89.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>