]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20635 from mdw-at-linuxbox/wip-master-rgw-openssl
authorYuri Weinstein <yweinste@redhat.com>
Fri, 2 Mar 2018 16:21:22 +0000 (08:21 -0800)
committerGitHub <noreply@github.com>
Fri, 2 Mar 2018 16:21:22 +0000 (08:21 -0800)
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>
1  2 
src/rgw/rgw_common.h
src/rgw/rgw_main.cc

Simple merge
index a70827d3ce20215fc2fd923cf0f2943171bdaf31,60053635fc4ae825487b95962f4783ba9a1ed0ca..97b3354b30a1191df6622721536cb37af341fef9
@@@ -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);