@@ -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(); ext/curb.h @@ -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(); + } } /* ext/curb_multi.c @@ -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') ext/extconf.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 tests/helper.rb 381ade3c7df2c1ca19787a4a5e08b0fe66ca2d96 Todd A. Fisher taf2@web3.anerian.com http://github.com/taf2/curb/commit/ab4137958f0a69776e3f107435c67ebc8c98051e ab4137958f0a69776e3f107435c67ebc8c98051e 2009-03-13T05:16:45-07:00 2009-03-13T05:16:45-07:00 upgrade with support for ruby 1.9.1 aa36895a1da5de1d8d2a3c4972498f5a53228dca Todd A. Fisher taf2@web3.anerian.com