curb 0.7.0 → 0.7.1

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.7.0"
-#define CURB_VER_NUM   700
+#define CURB_VERSION   "0.7.1"
+#define CURB_VER_NUM   701
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   0
+#define CURB_VER_MIC   1
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -2330,13 +2330,14 @@ static VALUE ruby_curl_easy_response_code_get(VALUE self) {
   return LONG2NUM(code);
 }
 
+#if defined(HAVE_CURLINFO_PRIMARY_IP)
 /*
  * call-seq:
  *   easy.primary_ip                                  => "xx.xx.xx.xx" or nil
  *
  *   Retrieve the resolved IP of the most recent connection
  *   done with this curl handle. This string may be  IPv6 if
- *   that's enabled.
+ *   that's enabled. This feature requires curl 7.19.x and above
  */
 static VALUE ruby_curl_easy_primary_ip_get(VALUE self) {
   ruby_curl_easy *rbce;
@@ -2351,6 +2352,7 @@ static VALUE ruby_curl_easy_primary_ip_get(VALUE self) {
     return Qnil;
   }
 }
+#endif
 
 /*
  * call-seq:
@@ -3172,7 +3174,9 @@ void init_curb_easy() {
 
   rb_define_method(cCurlEasy, "last_effective_url", ruby_curl_easy_last_effective_url_get, 0);
   rb_define_method(cCurlEasy, "response_code", ruby_curl_easy_response_code_get, 0);
+#if defined(HAVE_CURLINFO_PRIMARY_IP)
   rb_define_method(cCurlEasy, "primary_ip", ruby_curl_easy_primary_ip_get, 0);
+#endif
   rb_define_method(cCurlEasy, "http_connect_code", ruby_curl_easy_http_connect_code_get, 0);
   rb_define_method(cCurlEasy, "file_time", ruby_curl_easy_file_time_get, 0);
   rb_define_method(cCurlEasy, "total_time", ruby_curl_easy_total_time_get, 0);

data/ext/extconf.rb

@@ -114,6 +114,7 @@ have_constant "curle_ssl_issuer_error"
 # username/password added in 7.19.1
 have_constant "curlopt_username"
 have_constant "curlopt_password"
+have_constant "curlinfo_primary_ip"
 
 # ie quirk added in 7.19.3
 have_constant "curlauth_digest_ie"

data/tests/tc_curl_easy.rb

@@ -690,6 +690,14 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=', $auth_header
   end
 
+  def test_primary_ip
+    curl = Curl::Easy.new(TestServlet.url)
+    if curl.respond_to?(:primary_ip)
+      curl.perform
+      assert_equal '127.0.0.1', curl.primary_ip
+    end
+  end
+
   include TestServerMethods 
 
   def setup

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Ross Bamford
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -04:00
+date: 2010-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: []