From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 2 Mar 2018 16:21:22 +0000 (-0800)
Subject: Merge pull request #20635 from mdw-at-linuxbox/wip-master-rgw-openssl
X-Git-Tag: v13.0.2~108
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ed013a82feddbcc50aa74c8d970717a1b788309;p=ceph.git

Merge pull request #20635 from mdw-at-linuxbox/wip-master-rgw-openssl

rgw: curl* reuse and for debian, use openssl not gnutls.

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

9ed013a82feddbcc50aa74c8d970717a1b788309
diff --cc src/rgw/rgw_main.cc
index a70827d3ce20,60053635fc4a..97b3354b30a1
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -569,9 -569,10 +570,10 @@@ int main(int argc, const char **argv
    delete olog;
  
    RGWStoreManager::close_storage(store);
 -
 +  rgw::auth::s3::LDAPEngine::shutdown();
    rgw_tools_cleanup();
    rgw_shutdown_resolver();
+   rgw_release_all_curl_handles();
    curl_global_cleanup();
  
    rgw_perf_stop(g_ceph_context);