taf2-curb 0.2.7.4 → 0.2.8.0

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.2.7.4"
-#define CURB_VER_NUM   224
+#define CURB_VERSION   "0.2.8.0"
+#define CURB_VER_NUM   280
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   2
-#define CURB_VER_MIC   7
-#define CURB_VER_PATCH 4
+#define CURB_VER_MIC   8
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby
@@ -33,6 +33,12 @@
 #define RSTRING_LEN(x) RSTRING(x)->len 
 #endif
 
+#ifdef HAVE_RUBY19_HASH
+  #define RHASH_LEN(hash) RHASH(hash)->ntbl->num_entries
+#else
+  #define RHASH_LEN(hash) RHASH(hash)->tbl->num_entries
+#endif
+
 extern VALUE mCurl;
 
 extern void Init_curb_core();

data/ext/curb_multi.c

@@ -41,9 +41,13 @@ static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm)
 
 static void curl_multi_free(ruby_curl_multi *rbcm) {
   //printf("hash entries: %d\n", RHASH(rbcm->requests)->tbl->num_entries );
-  rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );
+  if (RHASH_LEN(rbcm->requests) > 0) {
+    rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );
 
-  curl_multi_cleanup(rbcm->handle);
+    curl_multi_cleanup(rbcm->handle);
+    //rb_hash_clear(rbcm->requests)
+    rbcm->requests = rb_hash_new();
+  }
 }
 
 /*

data/ext/extconf.rb

@@ -35,7 +35,7 @@ def have_constant(name)
     end
   end
 end
-  
+
 have_constant "curlinfo_redirect_time"
 have_constant "curlinfo_response_code"
 have_constant "curlinfo_filetime"
@@ -75,5 +75,27 @@ if try_compile('int main() { return 0; }','-Wall')
   $CFLAGS << ' -Wall'
 end
 
+# do some checking to detect ruby 1.8 hash.c vs ruby 1.9 hash.c
+def test_for(name, const, src)
+  checking_for "Ruby 1.9" do
+    if try_compile(src,"#{$CFLAGS} #{$LIBS}")
+      define const
+      true
+    else
+      false
+    end
+  end
+end
+test_for("Ruby 1.9", "RUBY19_HASH", %{
+  #include <ruby.h>
+  int main() {
+    VALUE hash = rb_hash_new();
+    if( RHASH(hash)->ntbl->num_entries ) {
+      return 0;
+    }
+    return 1;
+  }
+})
+
 create_header('curb_config.h')
 create_makefile('curb_core')

data/tests/helper.rb

@@ -93,8 +93,16 @@ module TestServerMethods
       @server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
       @server.mount(servlet.path, servlet)
+      queue = Queue.new # synchronize the thread startup to the main thread
 
-      @test_thread = Thread.new { @server.start }
+      @test_thread = Thread.new { queue << 1; @server.start }
+
+      # wait for the queue
+      value = queue.pop
+      if !value
+        STDERR.puts "Failed to startup test server!"
+        exit(1)
+      end
 
       exit_code = lambda do
         begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.2.7.4
+  version: 0.2.8.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 -08:00
+date: 2009-03-13 00:00:00 -07:00
 default_executable: 
 dependencies: []