eventmachine 1.2.1-java → 1.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be66d61e7eedc6649efe83ddf97e0b882ea2db46
-  data.tar.gz: 8e9d4fb43b042017a906782c85f0d41078edf86f
+  metadata.gz: dda1851dda6b43b1cdab3099c9027cbf44ebc3c4
+  data.tar.gz: 836c4e645e1a05ba2f3c0dc1cb2c6c2013208559
 SHA512:
-  metadata.gz: df4e147c0727e7aee2126d95dc727b872785ca862431beddc90686c1e715b1961d523605a332efc9bce1fc52f54b50a9f4c7221ce8606fcccc9d93a5778b3df9
-  data.tar.gz: 96482944f6219252400b3b4eb4c8f943494e772173b2b00ce6758dd2069e723d9c8ed05946dd4db3375d0e3c1aceaa1f753dd90b12f04ff7f9779a8887b20fa5
+  metadata.gz: 3605cfbee0486eb0d38647ff0def7c015eef30ef10cf1127df340d280c50d395160b1c28972ee3a4abdb61f22507614a8eb68d568620edac4a7c8036bebff916
+  data.tar.gz: eb103b538060cc26095c74a284b1b07465b5544a738aeda3f78acf046c016deda7fe62f959f617401c4ff3e7f1d227d3205900d867b3ac7abe5ffe60d5a4838a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.2.2 (January 23, 2016)
+* Java: Fix Fixnum deprecated warning in Ruby 2.4+ [#759]
+* Fix uncaught C++ exception in file watcher and raise InvalidSignature [#512, #757]
+* Fix connection count off-by-one for epoll and kqueue [#750]
+* Fix uninitialized variable warning in EM::P::HttpClient [#749]
+* Fix missing initial value for EventableDescriptor NextHeartbeat [#748]
+* Fix hostname resolution on Solaris, Ilumos, SmartOS, et al [#745, #746]
+* Improve reliability of tests, reduce public Internet accesses in tests [#656, #666, #749]
+
 ## 1.2.1 (November 15, 2016)
 * Throw strerror(errno) when getsockname or getpeername fail [#683]
 * Use a single concrete implementation of getpeername/getsockname, the rest pure virtuals [#683]

data/ext/ed.cpp

@@ -84,6 +84,7 @@ EventableDescriptor::EventableDescriptor (SOCKET sd, EventMachine_t *em):
 	MyEventMachine (em),
 	PendingConnectTimeout(20000000),
 	InactivityTimeout (0),
+	NextHeartbeat (0),
 	bPaused (false)
 {
 	/* There are three ways to close a socket, all of which should
@@ -112,12 +113,12 @@ EventableDescriptor::EventableDescriptor (SOCKET sd, EventMachine_t *em):
 	if (MyEventMachine == NULL)
 		throw std::runtime_error ("bad em in eventable descriptor");
 	CreatedAt = MyEventMachine->GetCurrentLoopTime();
+	LastActivity = MyEventMachine->GetCurrentLoopTime();
 
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = 0;
 	EpollEvent.data.ptr = this;
 	#endif
-	LastActivity = MyEventMachine->GetCurrentLoopTime();
 }
 
 
@@ -1944,7 +1945,7 @@ int DatagramDescriptor::SendOutboundDatagram (const char *data, unsigned long le
 
 	struct sockaddr_in6 addr_here;
 	size_t addr_here_len = sizeof addr_here;
-	if (0 != EventMachine_t::name2address (address, port, (struct sockaddr *)&addr_here, &addr_here_len))
+	if (0 != EventMachine_t::name2address (address, port, SOCK_DGRAM, (struct sockaddr *)&addr_here, &addr_here_len))
 		return -1;
 
 	if (!data && (length > 0))

data/ext/em.cpp

@@ -1194,7 +1194,7 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 
 	struct sockaddr_storage bind_as;
 	size_t bind_as_len = sizeof bind_as;
-	int gai = name2address (server, port, (struct sockaddr *)&bind_as, &bind_as_len);
+	int gai = name2address (server, port, SOCK_STREAM, (struct sockaddr *)&bind_as, &bind_as_len);
 	if (gai != 0) {
 		char buf [200];
 		snprintf (buf, sizeof(buf)-1, "unable to resolve address: %s", gai_strerror(gai));
@@ -1223,7 +1223,7 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 	if (bind_addr) {
 		struct sockaddr_storage bind_to;
 		size_t bind_to_len = sizeof bind_to;
-		gai = name2address (bind_addr, bind_port, (struct sockaddr *)&bind_to, &bind_to_len);
+		gai = name2address (bind_addr, bind_port, SOCK_STREAM, (struct sockaddr *)&bind_to, &bind_to_len);
 		if (gai != 0) {
 			close (sd);
 			char buf [200];
@@ -1543,7 +1543,7 @@ int EventMachine_t::DetachFD (EventableDescriptor *ed)
 name2address
 ************/
 
-int EventMachine_t::name2address (const char *server, int port, struct sockaddr *addr, size_t *addr_len)
+int EventMachine_t::name2address (const char *server, int port, int socktype, struct sockaddr *addr, size_t *addr_len)
 {
 	if (!server || !*server)
 		server = "0.0.0.0";
@@ -1551,6 +1551,7 @@ int EventMachine_t::name2address (const char *server, int port, struct sockaddr
 	struct addrinfo *ai;
 	struct addrinfo hints;
 	memset (&hints, 0, sizeof(hints));
+	hints.ai_socktype = socktype;
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG;
 
@@ -1584,7 +1585,7 @@ const uintptr_t EventMachine_t::CreateTcpServer (const char *server, int port)
 
 	struct sockaddr_storage bind_here;
 	size_t bind_here_len = sizeof bind_here;
-	if (0 != name2address (server, port, (struct sockaddr *)&bind_here, &bind_here_len))
+	if (0 != name2address (server, port, SOCK_STREAM, (struct sockaddr *)&bind_here, &bind_here_len))
 		return 0;
 
 	SOCKET sd_accept = EmSocket (bind_here.ss_family, SOCK_STREAM, 0);
@@ -1639,7 +1640,7 @@ const uintptr_t EventMachine_t::OpenDatagramSocket (const char *address, int por
 
 	struct sockaddr_storage bind_here;
 	size_t bind_here_len = sizeof bind_here;
-	if (0 != name2address (address, port, (struct sockaddr *)&bind_here, &bind_here_len))
+	if (0 != name2address (address, port, SOCK_DGRAM, (struct sockaddr *)&bind_here, &bind_here_len))
 		return 0;
 
 	// from here on, early returns must close the socket!
@@ -2087,7 +2088,12 @@ EventMachine_t::GetConnectionCount
 
 int EventMachine_t::GetConnectionCount ()
 {
-	return Descriptors.size() + NewDescriptors.size();
+	int i = 0;
+	// Subtract one for epoll or kqueue because of the LoopbreakDescriptor
+	if (Poller == Poller_Epoll || Poller == Poller_Kqueue)
+		i = 1;
+
+	return Descriptors.size() + NewDescriptors.size() - i;
 }
 
 

data/ext/em.h

@@ -201,7 +201,7 @@ class EventMachine_t
 
 		Poller_t GetPoller() { return Poller; }
 
-		static int name2address (const char *server, int port, struct sockaddr *addr, size_t *addr_len);
+		static int name2address (const char *server, int port, int socktype, struct sockaddr *addr, size_t *addr_len);
 
 	private:
 		void _RunTimers();

data/ext/extconf.rb

@@ -70,7 +70,7 @@ def pkg_config_wrapper(pretty_name, name)
 end
 
 if ENV['CROSS_COMPILING']
-  openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.2e")
+  openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.2j")
   openssl_dir = File.expand_path("~/.rake-compiler/builds/openssl-#{openssl_version}/")
   if File.exist?(openssl_dir)
     FileUtils.mkdir_p Dir.pwd+"/openssl/"

data/ext/rubymain.cpp

@@ -58,6 +58,7 @@ static VALUE EM_eConnectionError;
 static VALUE EM_eUnknownTimerFired;
 static VALUE EM_eConnectionNotBound;
 static VALUE EM_eUnsupported;
+static VALUE EM_eInvalidSignature;
 
 static VALUE Intern_at_signature;
 static VALUE Intern_at_timers;
@@ -1036,7 +1037,12 @@ t_unwatch_filename
 
 static VALUE t_unwatch_filename (VALUE self UNUSED, VALUE sig)
 {
-	evma_unwatch_filename(NUM2BSIG (sig));
+	try {
+		evma_unwatch_filename(NUM2BSIG (sig));
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eInvalidSignature, "%s", e.what());
+	}
+	
 	return Qnil;
 }
 
@@ -1389,6 +1395,7 @@ extern "C" void Init_rubyeventmachine()
 	EM_eConnectionNotBound = rb_define_class_under (EmModule, "ConnectionNotBound", rb_eRuntimeError);
 	EM_eUnknownTimerFired = rb_define_class_under (EmModule, "UnknownTimerFired", rb_eRuntimeError);
 	EM_eUnsupported = rb_define_class_under (EmModule, "Unsupported", rb_eRuntimeError);
+	EM_eInvalidSignature = rb_define_class_under (EmModule, "InvalidSignature", rb_eRuntimeError);
 
 	rb_define_module_function (EmModule, "initialize_event_machine", (VALUE(*)(...))t_initialize_event_machine, 0);
 	rb_define_module_function (EmModule, "run_machine_once", (VALUE(*)(...))t_run_machine_once, 0);

data/lib/em/protocols/httpclient.rb

@@ -62,6 +62,7 @@ module EventMachine
 
       def initialize
         warn "HttpClient is deprecated and will be removed. EM-Http-Request should be used instead."
+        @connected = false
       end
 
       # @param args [Hash] The request arguments

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/jeventmachine.rb

@@ -226,12 +226,12 @@ module EventMachine
       field.setAccessible(true)
       fileno = field.get(fileno)
     else
-      raise ArgumentError, 'attach_fd requires Java Channel or POSIX fileno' unless fileno.is_a? Fixnum
+      raise ArgumentError, 'attach_fd requires Java Channel or POSIX fileno' unless fileno.is_a? Integer
     end
 
     if fileno == 0
       raise "can't open STDIN as selectable in Java =("
-    elsif fileno.is_a? Fixnum
+    elsif fileno.is_a? Integer
       # 8Aug09: The following code is specific to the sun jvm's SocketChannelImpl. Is there a cross-platform
       # way of implementing this? If so, also remember to update EventableSocketChannel#close and #cleanup
       fd = FileDescriptor.new

data/tests/test_basic.rb

@@ -146,7 +146,7 @@ class TestBasic < Test::Unit::TestCase
   def test_bind_connect
     pend('FIXME: this test is broken on Windows') if windows?
 
-    local_ip = UDPSocket.open {|s| s.connect('google.com', 80); s.addr.last }
+    local_ip = UDPSocket.open {|s| s.connect('localhost', 80); s.addr.last }
 
     bind_port = next_port
 

data/tests/test_connection_count.rb

@@ -1,13 +1,42 @@
 require 'em_test_helper'
 
 class TestConnectionCount < Test::Unit::TestCase
+  def teardown
+    EM.epoll = false
+    EM.kqueue = false
+  end
+
   def test_idle_connection_count
+    count = nil
     EM.run {
-      $count = EM.connection_count
+      count = EM.connection_count
       EM.stop_event_loop
     }
+    assert_equal(0, count)
+  end
+
+  # Run this again with epoll enabled (if available)
+  def test_idle_connection_count_epoll
+    EM.epoll if EM.epoll?
 
-    assert_equal(0, $count)
+    count = nil
+    EM.run {
+      count = EM.connection_count
+      EM.stop_event_loop
+    }
+    assert_equal(0, count)
+  end
+
+  # Run this again with kqueue enabled (if available)
+  def test_idle_connection_count_kqueue
+    EM.kqueue if EM.kqueue?
+
+    count = nil
+    EM.run {
+      count = EM.connection_count
+      EM.stop_event_loop
+    }
+    assert_equal(0, count)
   end
 
   module Client

data/tests/test_file_watch.rb

@@ -55,6 +55,25 @@ class TestFileWatch < Test::Unit::TestCase
       assert($deleted)
       assert($unbind)
     end
+
+    # Refer: https://github.com/eventmachine/eventmachine/issues/512
+    def test_invalid_signature
+      # This works fine with kqueue, only fails with linux inotify.
+      omit_if(EM.kqueue?)
+
+      EM.run {
+        file = Tempfile.new('foo')
+
+        w1 = EventMachine.watch_file(file.path)
+        w2 = EventMachine.watch_file(file.path)
+
+        assert_raise EventMachine::InvalidSignature do
+          w2.stop_watching
+        end
+
+        EM.stop
+      }
+    end
   else
     warn "EM.watch_file not implemented, skipping tests in #{__FILE__}"
 

data/tests/test_httpclient.rb

@@ -2,13 +2,8 @@ require 'em_test_helper'
 
 class TestHttpClient < Test::Unit::TestCase
 
-    Localhost = "127.0.0.1"
-    Localport = 9801
-
   def setup
-  end
-
-  def teardown
+    @port = next_port
   end
 
   #-------------------------------------
@@ -19,6 +14,7 @@ class TestHttpClient < Test::Unit::TestCase
       c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
       c.callback {
         ok = true
+        c.close_connection
         EM.stop
       }
       c.errback {EM.stop} # necessary, otherwise a failure blocks the test suite forever.
@@ -32,7 +28,11 @@ class TestHttpClient < Test::Unit::TestCase
     ok = false
     EM.run {
       c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
-      c.callback {ok = true; EM.stop}
+      c.callback {
+        ok = true
+        c.close_connection
+        EM.stop
+      }
       c.errback {EM.stop}
     }
     assert ok
@@ -44,8 +44,9 @@ class TestHttpClient < Test::Unit::TestCase
     ok = false
     EM.run {
       c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
-      c.callback {|result|
-        ok = true;
+      c.callback {
+        ok = true
+        c.close_connection
         EM.stop
       }
       c.errback {EM.stop}
@@ -74,10 +75,11 @@ class TestHttpClient < Test::Unit::TestCase
   def test_http_empty_content
       ok = false
       EM.run {
-        EM.start_server "127.0.0.1", 9701, EmptyContent
-        c = silent { EM::P::HttpClient.send :request, :host => "127.0.0.1", :port => 9701 }
-        c.callback {|result|
+        EM.start_server "127.0.0.1", @port, EmptyContent
+        c = silent { EM::P::HttpClient.send :request, :host => "127.0.0.1", :port => @port }
+        c.callback {
           ok = true
+          c.close_connection
           EM.stop
         }
       }
@@ -132,15 +134,15 @@ class TestHttpClient < Test::Unit::TestCase
   def test_post
       response = nil
       EM.run {
-        EM.start_server Localhost, Localport, PostContent
+        EM.start_server '127.0.0.1', @port, PostContent
         setup_timeout(2)
         c = silent { EM::P::HttpClient.request(
-          :host=>Localhost,
-          :port=>Localport,
-          :method=>:post,
-          :request=>"/aaa",
-          :content=>"XYZ",
-          :content_type=>"text/plain"
+          :host         => '127.0.0.1',
+          :port         => @port,
+          :method       => :post,
+          :request      => "/aaa",
+          :content      => "XYZ",
+          :content_type => "text/plain"
         )}
         c.callback {|r|
           response = r
@@ -159,8 +161,9 @@ class TestHttpClient < Test::Unit::TestCase
     ok = false
     EM.run {
       c = silent { EM::Protocols::HttpClient.send :request, :host => "www.google.com", :port => 80, :cookie=>"aaa=bbb" }
-      c.callback {|result|
-        ok = true;
+      c.callback {
+        ok = true
+        c.close_connection
         EM.stop
       }
       c.errback {EM.stop}
@@ -178,8 +181,9 @@ class TestHttpClient < Test::Unit::TestCase
         :port => 80,
         :version => "1.0"
       )}
-      c.callback {|result|
-        ok = true;
+      c.callback {
+        ok = true
+        c.close_connection
         EM.stop
       }
       c.errback {EM.stop}
@@ -215,14 +219,15 @@ class TestHttpClient < Test::Unit::TestCase
 
   def test_http_chunked_encoding_content
     ok = false
-    EventMachine.run {
-      EventMachine.start_server "127.0.0.1", 9701, ChunkedEncodingContent
-      c = EventMachine::Protocols::HttpClient.send :request, :host => "127.0.0.1", :port => 9701
-      c.callback {|result|
+    EM.run {
+      EM.start_server "127.0.0.1", @port, ChunkedEncodingContent
+      c = silent { EM::P::HttpClient.send :request, :host => "127.0.0.1", :port => @port }
+      c.callback { |result|
         if result[:content] == "chunk1" * 1024 + "chunk2" * 15
           ok = true
         end
-        EventMachine.stop
+        c.close_connection
+        EM.stop
       }
     }
     assert ok

data/tests/test_httpclient2.rb

@@ -1,17 +1,11 @@
 require 'em_test_helper'
 
 class TestHttpClient2 < Test::Unit::TestCase
-  Localhost = "127.0.0.1"
-  Localport = 9801
-
-  def setup
-  end
-
-  def teardown
+  class TestServer < EM::Connection
   end
 
-
-  class TestServer < EM::Connection
+  def setup
+    @port = next_port
   end
 
   # #connect returns an object which has made a connection to an HTTP server
@@ -21,21 +15,22 @@ class TestHttpClient2 < Test::Unit::TestCase
   #
   def test_connect
     EM.run {
-      EM.start_server Localhost, Localport, TestServer
+      setup_timeout(1)
+      EM.start_server '127.0.0.1', @port, TestServer
       silent do
-        EM::P::HttpClient2.connect Localhost, Localport
-        EM::P::HttpClient2.connect( :host=>Localhost, :port=>Localport )
+        EM::P::HttpClient2.connect '127.0.0.1', @port
+        EM::P::HttpClient2.connect( :host=>'127.0.0.1', :port=>@port )
       end
       EM.stop
     }
   end
 
-
   def test_bad_port
     EM.run {
-      EM.start_server Localhost, Localport, TestServer
+      setup_timeout(1)
+      EM.start_server '127.0.0.1', @port, TestServer
       assert_raises( ArgumentError ) {
-        silent { EM::P::HttpClient2.connect Localhost, "xxx" }
+        silent { EM::P::HttpClient2.connect '127.0.0.1', "xxx" }
       }
       EM.stop
     }
@@ -44,7 +39,8 @@ class TestHttpClient2 < Test::Unit::TestCase
   def test_bad_server
     err = nil
     EM.run {
-      http = silent { EM::P::HttpClient2.connect Localhost, 9999 }
+      setup_timeout(1)
+      http = silent { EM::P::HttpClient2.connect '127.0.0.1', 9999 }
       d = http.get "/"
       d.errback { err = true; d.internal_error; EM.stop }
     }
@@ -54,7 +50,8 @@ class TestHttpClient2 < Test::Unit::TestCase
   def test_get
     content = nil
     EM.run {
-      http = silent { EM::P::HttpClient2.connect "google.com", 80 }
+      setup_timeout(1)
+      http = silent { EM::P::HttpClient2.connect :host => "google.com", :port => 80, :version => '1.0' }
       d = http.get "/"
       d.callback {
         content = d.content
@@ -70,7 +67,8 @@ class TestHttpClient2 < Test::Unit::TestCase
   def _test_get_multiple
     content = nil
     EM.run {
-      http = silent { EM::P::HttpClient2.connect "google.com", 80 }
+      setup_timeout(1)
+      http = silent { EM::P::HttpClient2.connect "google.com", :version => '1.0' }
       d = http.get "/"
       d.callback {
         e = http.get "/"
@@ -86,6 +84,7 @@ class TestHttpClient2 < Test::Unit::TestCase
   def test_get_pipeline
     headers, headers2 = nil, nil
     EM.run {
+      setup_timeout(1)
       http = silent { EM::P::HttpClient2.connect "google.com", 80 }
       d = http.get("/")
       d.callback {
@@ -102,11 +101,11 @@ class TestHttpClient2 < Test::Unit::TestCase
     assert(headers2)
   end
 
-
   def test_authheader
     EM.run {
-      EM.start_server Localhost, Localport, TestServer
-      http = silent { EM::P::HttpClient2.connect Localhost, 18842 }
+      setup_timeout(1)
+      EM.start_server '127.0.0.1', @port, TestServer
+      http = silent { EM::P::HttpClient2.connect '127.0.0.1', 18842 }
       d = http.get :url=>"/", :authorization=>"Basic xxx"
       d.callback {EM.stop}
       d.errback {EM.stop}
@@ -114,15 +113,16 @@ class TestHttpClient2 < Test::Unit::TestCase
   end
 
   def test_https_get
+    omit_unless(EM.ssl?)
     d = nil
     EM.run {
-      http = silent { EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true }
+      setup_timeout(1)
+      http = silent { EM::P::HttpClient2.connect :host => 'www.google.com', :port => 443, :ssl => true, :version => '1.0' }
       d = http.get "/"
-      d.callback {
-        EM.stop
-      }
+      d.callback {EM.stop}
+      d.errback {EM.stop}
     }
     assert_equal(200, d.status)
-  end if EM.ssl?
+  end
 
 end