diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-03-12 12:56:01 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-03-13 10:13:29 -0700 |
| commit | 50489570e5d0843c7ada6b4ac7f01f7594db78dd (patch) | |
| tree | 810bfd0c05c4b98844da3522a17d291817c823ee | |
| parent | 4384e59ad046afc9ec53a2d2f1fff6a86e645505 (diff) | |
| download | ceph-wip-4425-next.tar.gz | |
rgw: set up curl with CURL_NOSIGNALwip-4425-next
Fixes: #4425
Backport: bobtail
Apparently, libcurl needs that in order to be thread safe. Side
effect is that if libcurl is not compiled with c-ares support,
domain name lookups are not going to time out.
Issue affected keystone.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | src/rgw/rgw_http_client.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc index 4c7b99c17c3..f9e5a8260fc 100644 --- a/src/rgw/rgw_http_client.cc +++ b/src/rgw/rgw_http_client.cc @@ -54,6 +54,7 @@ int RGWHTTPClient::process(const string& url) curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1L); + curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, read_http_header); curl_easy_setopt(curl_handle, CURLOPT_WRITEHEADER, (void *)this); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, read_http_data); |