From ef00ff6c96cf7ef5ea6d67275a64291edfd83a32 Mon Sep 17 00:00:00 2001
From: "gaurav@gluster.com" <>
Date: Wed, 27 Jul 2011 14:51:34 +0530
Subject: [PATCH 1/3] Change content type to application/xml for GET
service/bucket.
---
swift/common/middleware/swift3.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py
index 95952bc3eb..aab8dde0d8 100644
--- a/swift/common/middleware/swift3.py
+++ b/swift/common/middleware/swift3.py
@@ -199,7 +199,7 @@ class ServiceController(Controller):
% ("".join(['%s' \
'2009-02-03T16:45:09.000Z' %
xml_escape(i['name']) for i in containers]))
- resp = Response(status=200, content_type='text/xml', body=body)
+ resp = Response(status=200, content_type='application/xml', body=body)
return resp
@@ -276,7 +276,7 @@ class BucketController(Controller):
"".join(['%s'
% xml_escape(i['subdir'])
for i in objects[:max_keys] if 'subdir' in i])))
- return Response(body=body, content_type='text/xml')
+ return Response(body=body, content_type='application/xml')
def PUT(self, env, start_response):
"""
From 4cf1042b3ec38c00c4215090980ba06a7df824dc Mon Sep 17 00:00:00 2001
From: "gaurav@gluster.com" <>
Date: Thu, 28 Jul 2011 22:02:28 +0530
Subject: [PATCH 2/3] Updated Authors list for this merge.
---
AUTHORS | 1 +
1 file changed, 1 insertion(+)
diff --git a/AUTHORS b/AUTHORS
index ea0e8ce34f..d9b8160f39 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,3 +36,4 @@ Kapil Thangavelu
Conrad Weidenkeller
Chris Wedgwood
Cory Wright
+Gaurav B. Gangalwar
From 970aa1a39590f3bff54c9e3f32d8f45620afb2b8 Mon Sep 17 00:00:00 2001
From: "gaurav@gluster.com" <>
Date: Fri, 29 Jul 2011 21:39:06 +0530
Subject: [PATCH 3/3] Revert AUTHORS.
---
AUTHORS | 1 -
1 file changed, 1 deletion(-)
diff --git a/AUTHORS b/AUTHORS
index d9b8160f39..ea0e8ce34f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,4 +36,3 @@ Kapil Thangavelu
Conrad Weidenkeller
Chris Wedgwood
Cory Wright
-Gaurav B. Gangalwar