ovirt-engine-sdk 4.1.6 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d3c58ff70eecb169d5103a4eeb2f7f9fed5a77
-  data.tar.gz: 302c8ab4c8c915eac19558b9813f91831d634687
+  metadata.gz: 27913e03ff0dc57c90c99d86c48c049f1551757d
+  data.tar.gz: dc4ac1d281d2e5a7f810478604d98786b409164a
 SHA512:
-  metadata.gz: 508ab6b1baa739ef1837e0ca7548075d2874d98b4ba887ab1e2ffcc85c60370516d4a7e7e7c67ffd2a49bc669eeaa5a8581c98989d0611ad7a0d3372eefaac0a
-  data.tar.gz: 098cec88d486935c3b5aecb9b2435cd669f9369a700ca197824d7ce81e211d249335919aa87ad9144aff21e41bb752e785139fbd837cb422589133b868ea83f1
+  metadata.gz: d05904f538cca1dace00f332714350d72e23e53fe33f6ecf9b4dbfae1d7cc524a7618b2a5c876a1cbc7c9ac649ee279087e3ca5dca0f93a2e658ed12dfbf3cc7
+  data.tar.gz: bdeed8e97cc3da5204bc382cf43ad51d6ae95b8e8f67f08a689cb28de3616d5e42220cab07b9db48fb10dae542226ed66e958c093cc0b715ccae4542ab0c81d3

data/CHANGES.adoc

@@ -2,6 +2,13 @@
 
 This document describes the relevant changes between releases of the SDK.
 
+== 4.1.7 / Jun 2 2017
+
+Bug fixes:
+
+* Fix missing `curl_multi_wait` symbol when using libcurl older
+  than 7.28.0.
+
 == 4.1.6 / May 31 2017
 
 Update to model 4.1.35:

data/ext/ovirtsdk4c/ov_http_client.c

@@ -23,6 +23,8 @@ limitations under the License.
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <sys/select.h>
 
 #include "ov_module.h"
 #include "ov_error.h"
@@ -630,21 +632,43 @@ static void* ov_http_client_wait_task(void* data) {
     int pending;
     long timeout;
     ov_http_client_wait_context* context_ptr;
+#if LIBCURL_VERSION_NUM < 0x071c00
+    fd_set fd_read;
+    fd_set fd_write;
+    fd_set fd_error;
+    int fd_count;
+    struct timeval tv;
+#endif
 
     /* The passed data is the wait context: */
     context_ptr = data;
 
-    /* Get the timeout preferred by libcurl, or one second by default: */
+    /* Get the timeout preferred by libcurl, or one 100 ms by default: */
     curl_multi_timeout(context_ptr->handle, &timeout);
     if (timeout < 0) {
-        timeout = 1000;
+        timeout = 100;
     }
 
+#if LIBCURL_VERSION_NUM >= 0x071c00
     /* Wait till there is activity: */
     context_ptr->code = curl_multi_wait(context_ptr->handle, NULL, 0, timeout, NULL);
     if (context_ptr->code != CURLE_OK) {
         return NULL;
     }
+#else
+    /* Versions of libcurl older than 7.28.0 don't provide the 'curl_multi_wait' function, so we need to get the file
+       descriptors used by libcurl, and explicitly use the 'select' system call: */
+    FD_ZERO(&fd_read);
+    FD_ZERO(&fd_write);
+    FD_ZERO(&fd_error);
+    context_ptr->code = curl_multi_fdset(context_ptr->handle, &fd_read, &fd_write, &fd_error, &fd_count);
+    if (context_ptr->code != CURLE_OK) {
+        return NULL;
+    }
+    tv.tv_sec = timeout / 1000;
+    tv.tv_usec = (timeout % 1000) * 1000;
+    select(fd_count + 1, &fd_read, &fd_write, &fd_error, &tv);
+#endif
 
     /* Let libcurl do its work, even if no file descriptor needs attention. This is necessary because some of its
        activities can't be monitored using file descriptors. */

data/lib/ovirtsdk4/version.rb

@@ -16,5 +16,5 @@
 
 
 module OvirtSDK4
-  VERSION = '4.1.6'.freeze
+  VERSION = '4.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovirt-engine-sdk
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.7
 platform: ruby
 authors:
 - Juan Hernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake