eventmachine 1.0.9-java → 1.0.9.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 341b481cd92457573b1d096838a492db290c2c61
-  data.tar.gz: f6f9a0c14019232e36868cc9632c6ed2a468708b
+  metadata.gz: 4118c273fcd3b36c297836c3597bb13195bd2573
+  data.tar.gz: b5efa0e90cf6f2c3d283ebfcc7ebc1196133f158
 SHA512:
-  metadata.gz: 15d1057024a3eaa1520de6881a133a1317b67f12b8a4235b2e0a29e975011a00e880c3b414bd50a8f4de114a36d9e9515e679c51aab5de54c147624bf00d8956
-  data.tar.gz: c02871a01571b8e52d4e4bd718debfb1f9d50267905e65084e602fda859483ebf9cd345e0745aec574f19c47ee5ddfd1aaebe1889d2973b80b4f469c4fd0b3e9
+  metadata.gz: 1b09b0820a8754336214eb1ecf9bfcd5917725e54e895eab7ec3085bc26bcf40c3740cff1f7de7a5f8be1de04f6b9c767bdbfb765d9130cea9194e504e1205ca
+  data.tar.gz: 290ba9e2ac331cd4f862910227e6b3e9ed44a43fdb2bbdb5e82ac701754330ca2b23ca541271da24584b521bf976673265c02baef42f5d1679a51616b56b6500

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.9.1 (January 14, 2016)
+* Fix EPROTO not defined on Windows [#676]
+* Fix missing cast to struct sockaddr * [#671]
+* Fix bug in OpenSSL path detection [#675]
+
 ## 1.0.9 (January 13, 2016)
 * Try more ways to detect OpenSSL [#602, #643, #661, #663, #668, #669]
 * Use WSAGetLastError in pipe.cpp same as ed.cpp [#659]

data/ext/ed.cpp

@@ -873,7 +873,12 @@ void ConnectionDescriptor::_DispatchInboundData (const char *buffer, unsigned lo
 
 		// If our SSL handshake had a problem, shut down the connection.
 		if (s == -2) {
+			#ifdef OS_UNIX
 			UnbindReasonCode = EPROTO;
+			#endif
+			#ifdef OS_WIN32
+			UnbindReasonCode = WSAECONNABORTED;
+			#endif
 			ScheduleClose(false);
 			return;
 		}

data/ext/em.cpp

@@ -1239,7 +1239,6 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 	int e = 0;
 
 	#ifdef OS_UNIX
-	//if (connect (sd, (sockaddr*)&pin, sizeof pin) == 0) {
 	if (connect (sd, (struct sockaddr*)&bind_as, bind_size) == 0) {
 		// This is a connect success, which Linux appears
 		// never to give when the socket is nonblocking,
@@ -1319,8 +1318,7 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 	#endif
 
 	#ifdef OS_WIN32
-	//if (connect (sd, (sockaddr*)&pin, sizeof pin) == 0) {
-	if (connect (sd, &bind_as, bind_size) == 0) {
+	if (connect (sd, (struct sockaddr*)&bind_as, bind_size) == 0) {
 		// This is a connect success, which Windows appears
 		// never to give when the socket is nonblocking,
 		// even if the connection is intramachine or to

data/ext/extconf.rb

@@ -58,6 +58,7 @@ def dir_config_search(pretty_name, name, paths, &b)
       return true
     end
   end
+  false
 end
 
 def pkg_config_wrapper(pretty_name, name)

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.9"
+  VERSION = "1.0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.9.1
 platform: java
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement