]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: rgw_admin also inits curl
authorAbhishek Lekshmanan <abhishek@suse.com>
Fri, 2 Mar 2018 09:41:51 +0000 (10:41 +0100)
committerAbhishek Lekshmanan <abhishek@suse.com>
Mon, 5 Mar 2018 16:14:12 +0000 (17:14 +0100)
commit6da2232e9909f10176008ec00fd38d374a68f181
tree94b5756ebd4cae41cdbfad0dbcf76a4b7928fd0d
parent0cc4fedf1758fadb7c541b6737f0f616eece2323
rgw: rgw_admin also inits curl

since we use http manager which in turn uses curl and uses curl multi
interfaces. While curl is initialized at the first call of curl_easy_init() this
method isn't guaranteed to be safe when multiple threads may call the function
since curl_global_init isn't reentrant. Calling curl_global_init via
rgw::curl::setup_curl which additionally sets up ssl interfaces etc. when
openssl is used as curl's ssl backend. Similarly moving rgw target link to
accomodate this change.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 112ba0b4dae5972b520aec39fe99275a6dfa899d)

 Conflicts:
  src/rgw/CMakeLists.txt
  beast submodule related changes which are not a part of this patchset
  src/rgw/rgw_admin.cc
  trivial whitespace conflicts #
CMakeLists.txt
src/rgw/CMakeLists.txt
src/rgw/rgw_admin.cc