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>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/rgw/rgw_http_client.h b/src/rgw/rgw_http_client.h
index d55230095fb..cc69383b62d 100644
--- a/src/rgw/rgw_http_client.h
+++ b/src/rgw/rgw_http_client.h
@@ -10,10 +10,12 @@ class RGWHTTPClient
   size_t send_len;
   bool has_send_len;
 protected:
+  CephContext *cct;
+
   list<pair<string, string> > headers;
 public:
   virtual ~RGWHTTPClient() {}
-  RGWHTTPClient(): send_len (0), has_send_len(false) {}
+  RGWHTTPClient(CephContext *_cct): send_len (0), has_send_len(false), cct(_cct) {}
 
   void append_header(const string& name, const string& val) {
     headers.push_back(pair<string, string>(name, val));