diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-08 18:55:19 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-08 18:55:19 -0700 |
| commit | 9effd412acc15e7aa8c606bc1b63dded4cccc5e9 (patch) | |
| tree | cc2005abe3a4f4323f8e51e1364f468e3deee992 /src/rgw/rgw_rest_client.h | |
| parent | 45d3f852495a5e392e4841de54f115443d6f8c78 (diff) | |
| download | ceph-rgw-next-libcurl.tar.gz | |
rgw: call appropriate curl calls for waiting on socketsrgw-next-libcurl
If libcurl supports curl_multi_wait() then use it, otherwise
use select() and force a timeout, even if it has been disabled.
Otherwise we may wait forever for events that we can't wait for
as select() only uses fds < 1024.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'src/rgw/rgw_rest_client.h')
| -rw-r--r-- | src/rgw/rgw_rest_client.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rgw/rgw_rest_client.h b/src/rgw/rgw_rest_client.h index f3f9f7ff91c..82496cd304f 100644 --- a/src/rgw/rgw_rest_client.h +++ b/src/rgw/rgw_rest_client.h @@ -9,8 +9,6 @@ class RGWGetDataCB; class RGWRESTSimpleRequest : public RGWHTTPClient { protected: - CephContext *cct; - int status; string url; @@ -29,7 +27,7 @@ protected: int sign_request(RGWAccessKey& key, RGWEnv& env, req_info& info); public: RGWRESTSimpleRequest(CephContext *_cct, string& _url, list<pair<string, string> > *_headers, - list<pair<string, string> > *_params) : cct(_cct), status(0), url(_url), send_iter(NULL), + list<pair<string, string> > *_params) : RGWHTTPClient(_cct), status(0), url(_url), send_iter(NULL), max_response(0) { if (_headers) headers = *_headers; |