eventmachine 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c795c80fc92f16416a7a88c0f81047d0d016ed60
-  data.tar.gz: 53eef8509e66f01d28dcb5a19a52893bcec527cf
+  metadata.gz: 9bbf7706d51492b350b6fd9129a08fc21b935656
+  data.tar.gz: 4d0148fb3dd9c072383b0df0376dcbe755b87115
 SHA512:
-  metadata.gz: 83002fd70bd092a2b57b4ff6e1c451e6ad30a7e5d7dc29365139ad517ef417c09b1aa4655a8c220def9a0ffa32594c510ec2a547f195c1066aa610a4c515ee29
-  data.tar.gz: a9efa0f099ef1ec3d0ae7a87da91a1f768cc5f7995e9df7f5cce529018217e6a6277a263a42bf294dfa61625780a89afb613d3a08646e90d8391442b09e1148f
+  metadata.gz: 9395c7a5a3adcce10e2552bafebc1ed6d8023b6fcd3cfd3c95afc8871ab5f3ef4c694c35484a160ac25b684be48cbd65216e6a4f6a1b4210b6671dd4e3e89f00
+  data.tar.gz: 042dcb41e20266c6aa74c9e94e09f3edc67c7802247e900f51fb6c753f2d5016ffe8b6ab27c722b893145a35341ae618985f9adad0d2c05082996599e3eda08c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.2.5 (July 27, 2017)
+* Java: Use long for larger values in oneshot timer intervals [#784, #794]
+
+## 1.2.4 (July 27, 2017)
+* Java: Add EM_PROTO_SSL/TLS definitions [#773, #791]
+* Fix IPv6 UDP get_peername [#788]
+* Allow for larger values in oneshot timer intervals [#784, #793]
+* Update extconf.rb to allow MinGW builds with OpenSSL 1.1.0 [#785]
+
 ## 1.2.3 (February 22, 2017)
 * Pure Ruby: Add get_sockname [#308, #772]
 * Fix segfault when an Exception is raised from unbind callback [#765, #766]

data/ext/cmain.cpp

@@ -100,10 +100,10 @@ extern "C" void evma_run_machine()
 evma_install_oneshot_timer
 **************************/
 
-extern "C" const uintptr_t evma_install_oneshot_timer (int seconds)
+extern "C" const uintptr_t evma_install_oneshot_timer (uint64_t milliseconds)
 {
 	ensure_eventmachine("evma_install_oneshot_timer");
-	return EventMachine->InstallOneshotTimer (seconds);
+	return EventMachine->InstallOneshotTimer (milliseconds);
 }
 
 

data/ext/ed.cpp

@@ -2002,8 +2002,8 @@ bool DatagramDescriptor::GetPeername (struct sockaddr *s, socklen_t *len)
 {
 	bool ok = false;
 	if (s) {
-		*len = sizeof(struct sockaddr);
-		memset (s, 0, sizeof(struct sockaddr));
+		*len = sizeof(ReturnAddress);
+		memset (s, 0, sizeof(ReturnAddress));
 		memcpy (s, &ReturnAddress, sizeof(ReturnAddress));
 		ok = true;
 	}

data/ext/em.cpp

@@ -1151,7 +1151,7 @@ void EventMachine_t::_RunTimers()
 EventMachine_t::InstallOneshotTimer
 ***********************************/
 
-const uintptr_t EventMachine_t::InstallOneshotTimer (int milliseconds)
+const uintptr_t EventMachine_t::InstallOneshotTimer (uint64_t milliseconds)
 {
 	if (Timers.size() > MaxOutstandingTimers)
 		return false;

data/ext/em.h

@@ -142,7 +142,7 @@ class EventMachine_t
 		void ScheduleHalt();
 		bool Stopping();
 		void SignalLoopBreaker();
-		const uintptr_t InstallOneshotTimer (int);
+		const uintptr_t InstallOneshotTimer (uint64_t);
 		const uintptr_t ConnectToServer (const char *, int, const char *, int);
 		const uintptr_t ConnectToUnixServer (const char *);
 

data/ext/eventmachine.h

@@ -51,7 +51,7 @@ extern "C" {
 	bool evma_run_machine_once();
 	void evma_run_machine();
 	void evma_release_library();
-	const uintptr_t evma_install_oneshot_timer (int seconds);
+	const uintptr_t evma_install_oneshot_timer (uint64_t milliseconds);
 	const uintptr_t evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
 	const uintptr_t evma_connect_to_unix_server (const char *server);
 

data/ext/extconf.rb

@@ -26,10 +26,10 @@ def append_library(libs, lib)
 end
 
 SSL_HEADS = %w(openssl/ssl.h openssl/err.h)
-SSL_LIBS = case RUBY_PLATFORM
-when /mswin|mingw|bccwin/ ; %w(ssleay32 libeay32)
-else                      ; %w(crypto ssl)
-end
+SSL_LIBS = %w(crypto ssl)
+# OpenSSL 1.1.0 and above for Windows use the Unix library names
+# OpenSSL 0.9.8 and 1.0.x for Windows use the *eay32 library names
+SSL_LIBS_WIN = RUBY_PLATFORM =~ /mswin|mingw|bccwin/ ? %w(ssleay32 libeay32) : []
 
 def dir_config_wrapper(pretty_name, name, idefault=nil, ldefault=nil)
   inc, lib = dir_config(name, idefault, ldefault)
@@ -88,15 +88,15 @@ if ENV['CROSS_COMPILING']
   end
 elsif dir_config_wrapper('OpenSSL', 'ssl')
   # If the user has provided a --with-ssl-dir argument, we must respect it or fail.
-  add_define 'WITH_SSL' if check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
+  add_define 'WITH_SSL' if (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN)) && check_heads(SSL_HEADS)
 elsif pkg_config_wrapper('OpenSSL', 'openssl')
   # If we can detect OpenSSL by pkg-config, use it as the next-best option
-  add_define 'WITH_SSL' if check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
-elsif check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
+  add_define 'WITH_SSL' if (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN)) && check_heads(SSL_HEADS)
+elsif (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN)) && check_heads(SSL_HEADS)
   # If we don't even need any options to find a usable OpenSSL, go with it
   add_define 'WITH_SSL'
 elsif dir_config_search('OpenSSL', 'ssl', ['/usr/local', '/opt/local', '/usr/local/opt/openssl']) do
-    check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
+    (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN)) && check_heads(SSL_HEADS)
   end
   # Finally, look for OpenSSL in alternate locations including MacPorts and HomeBrew
   add_define 'WITH_SSL'

data/ext/rubymain.cpp

@@ -262,7 +262,7 @@ t_add_oneshot_timer
 
 static VALUE t_add_oneshot_timer (VALUE self UNUSED, VALUE interval)
 {
-	const uintptr_t f = evma_install_oneshot_timer (FIX2INT (interval));
+	const uintptr_t f = evma_install_oneshot_timer (FIX2LONG (interval));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "ran out of timers; use #set_max_timers to increase limit");
 	return BSIG2NUM (f);

data/java/src/com/rubyeventmachine/EmReactor.java

@@ -48,7 +48,13 @@ public class EmReactor {
 	public final int EM_SSL_HANDSHAKE_COMPLETED = 108;
 	public final int EM_SSL_VERIFY = 109;
 	public final int EM_PROXY_TARGET_UNBOUND = 110;
-    public final int EM_PROXY_COMPLETED = 111;
+	public final int EM_PROXY_COMPLETED = 111;
+
+	public final int EM_PROTO_SSLv2 = 2;
+	public final int EM_PROTO_SSLv3 = 4;
+	public final int EM_PROTO_TLSv1 = 8;
+	public final int EM_PROTO_TLSv1_1 = 16;
+	public final int EM_PROTO_TLSv1_2 = 32;
 
 	private Selector mySelector;
 	private TreeMap<Long, ArrayList<Long>> Timers;
@@ -373,7 +379,7 @@ public class EmReactor {
 		}
 	}
 
-	public long installOneshotTimer (int milliseconds) {
+	public long installOneshotTimer (long milliseconds) {
 		long s = createBinding();
 		long deadline = new Date().getTime() + milliseconds;
 

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.2.3"
+  VERSION = "1.2.5"
 end

data/tests/test_ipv6.rb

@@ -35,11 +35,13 @@ class TestIPv6 < Test::Unit::TestCase
     def test_ipv6_udp_local_server
       @@received_data = nil
       @local_port = next_port
+      @@remote_ip = nil
       setup_timeout(2)
 
       EM.run do
         EM.open_datagram_socket(@@public_ipv6, @local_port) do |s|
           def s.receive_data data
+            _port, @@remote_ip = Socket.unpack_sockaddr_in(s.get_peername)
             @@received_data = data
             EM.stop
           end
@@ -49,7 +51,7 @@ class TestIPv6 < Test::Unit::TestCase
           c.send_datagram "ipv6/udp", @@public_ipv6, @local_port
         end
       end
-
+      assert_equal @@remote_ip, @@public_ipv6
       assert_equal "ipv6/udp", @@received_data
     end
 

data/tests/test_threaded_resource.rb

@@ -1,3 +1,5 @@
+require 'em_test_helper'
+
 class TestThreadedResource < Test::Unit::TestCase
   def object
     @object ||= {}

data/tests/test_timers.rb

@@ -93,6 +93,13 @@ class TestTimers < Test::Unit::TestCase
     assert_equal 4, x
   end
 
+  def test_oneshot_timer_large_future_value
+    large_value = 11948602000
+    EM.run {
+      EM.add_timer(large_value) { EM.stop }
+      EM.add_timer(0.02) { EM.stop }
+    }
+  end
 
   # This test is only applicable to compiled versions of the reactor.
   # Pure ruby and java versions have no built-in limit on the number of outstanding timers.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement