curb 0.9.0 → 0.9.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/ext/curb.h +3 -3
  3. data/ext/curb_easy.c +7 -2
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 05b2aed0c904477e11533547620bc7e29a83d4fa
4
- data.tar.gz: f4dd037db2c1018f2fe5c5a281e49df1179c129b
3
+ metadata.gz: d044ba4672e19b7fadd0097e309db4675b53c785
4
+ data.tar.gz: 3b0ebdde6d818e9103dd665d1f1b33c042514f5b
5
5
  SHA512:
6
- metadata.gz: 2a604239fe8d5808d8ab3da005e1124a4bf1350038a50147e7dc27fcb4021cdfd14ed0d99a3a962c99f27f96ee81915dd520bccdcf69ac022cdafe56e1106460
7
- data.tar.gz: 3f40806f07ea74cbafa75b3b346bb37cc03a6960064950c8e95bbf39b2c71283d09091acb27036fe057718387275700e5f0bdbc13c43ccfdd68c81729353ead3
6
+ metadata.gz: a2daeabcdd2999b3ef7372c37baab4bebd0e56be7213ee82f8734f00bf798bde82de3888e02502f03e67d17bfb38f0fe49c306450eb83169287fa073ffb6b8b7
7
+ data.tar.gz: 9ef11cfaa3007ebf26247d97f1ab3f59b403ce769a30bff0c3e4be336c52fe05a5f74b19a083eb79b5660f5e3fd30c41c9a68bdd1c831a0c0223cd2a1deb62b3
data/ext/curb.h CHANGED
@@ -20,10 +20,10 @@
20
20
  #include "curb_macros.h"
21
21
 
22
22
  // These should be managed from the Rake 'release' task.
23
- #define CURB_VERSION "0.9.0"
24
- #define CURB_VER_NUM 900
23
+ #define CURB_VERSION "0.9.1"
24
+ #define CURB_VER_NUM 901
25
25
  #define CURB_VER_MAJ 0
26
- #define CURB_VER_MIN 0
26
+ #define CURB_VER_MIN 1
27
27
  #define CURB_VER_MIC 0
28
28
  #define CURB_VER_PATCH 0
29
29
 
@@ -2106,8 +2106,13 @@ VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
2106
2106
 
2107
2107
  curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, rbce->unrestricted_auth);
2108
2108
 
2109
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, rbce->timeout);
2110
- curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, rbce->timeout_ms);
2109
+ /* timeouts override each other we cannot blindly set timeout and timeout_ms */
2110
+ if (rbce->timeout && rbce->timeout > 0) {
2111
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, rbce->timeout);
2112
+ }
2113
+ if (rbce->timeout_ms && rbce->timeout_ms > 0) {
2114
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, rbce->timeout_ms);
2115
+ }
2111
2116
  curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, rbce->connect_timeout);
2112
2117
  curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, rbce->connect_timeout_ms);
2113
2118
  curl_easy_setopt(curl, CURLOPT_DNS_CACHE_TIMEOUT, rbce->dns_cache_timeout);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: curb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ross Bamford
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-12-14 00:00:00.000000000 Z
12
+ date: 2016-01-08 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
15
15
  for the libcurl(3), a fully-featured client-side URL transfer library. cURL and