From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 15 Mar 2019 20:47:19 +0000 (-0400)
Subject: rgw: don't crash on missing /etc/mime.types
X-Git-Tag: v14.2.1~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b825870f2c9ff98a937bf21e90ec7d99ed1f254c;p=ceph.git

rgw: don't crash on missing /etc/mime.types

lack of mime types is not a fatal error. when a Content-Type header
is not provided in swift's PutObj, it uses this mime type mapping
to guess a content type based on the object's suffix

Fixes: http://tracker.ceph.com/issues/38328

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 89dc5a6df4503d70555bcd80af0e2f6ee896e28a)
---

diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc
index 5670ee1eabd..11645dabb39 100644
--- a/src/rgw/rgw_tools.cc
+++ b/src/rgw/rgw_tools.cc
@@ -450,10 +450,8 @@ void RGWDataAccess::Object::set_policy(const RGWAccessControlPolicy& policy)
 int rgw_tools_init(CephContext *cct)
 {
   ext_mime_map = new std::map<std::string, std::string>;
-  int ret = ext_mime_map_init(cct, cct->_conf->rgw_mime_types_file.c_str());
-  if (ret < 0)
-    return ret;
-
+  ext_mime_map_init(cct, cct->_conf->rgw_mime_types_file.c_str());
+  // ignore errors; missing mime.types is not fatal
   return 0;
 }