eventmachine 1.0.8-java → 1.0.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9407d5002e439f7bfc0290697021ba19adcb68fc
-  data.tar.gz: f7b6f83ff388375b52f5b0207d0a7bd03388ec94
+  metadata.gz: 341b481cd92457573b1d096838a492db290c2c61
+  data.tar.gz: f6f9a0c14019232e36868cc9632c6ed2a468708b
 SHA512:
-  metadata.gz: f6a7975235284f6c4ae1c9f602fbb8789d7fe46325b5a4741a99cb94d27733273172b80bb341a29a4a7a747586f821373e435c854eca1286b43de59c0b16ea18
-  data.tar.gz: a9728d5e9ea5b63cc8f20b88f0d72e73824b8a46ba764fd9d237386275961a6c879adc7bd3cb603b715c5ffd7494bc290d37209e0b369504c263602db1a3deff
+  metadata.gz: 15d1057024a3eaa1520de6881a133a1317b67f12b8a4235b2e0a29e975011a00e880c3b414bd50a8f4de114a36d9e9515e679c51aab5de54c147624bf00d8956
+  data.tar.gz: c02871a01571b8e52d4e4bd718debfb1f9d50267905e65084e602fda859483ebf9cd345e0745aec574f19c47ee5ddfd1aaebe1889d2973b80b4f469c4fd0b3e9

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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]
+* Test compiler flags with the C++ compiler and add them to CXXFLAGS [#634, #651]
+* Restore silent-fail on unsupported EM.epoll and EM.kqueue [#638, #649]
+* getDescriptorByFileno deprecated in JRuby 1.7.x, removed in JRuby 9000 [#642, #648]
+* Add -Wno-address always-true because on Windows rb_fd_select [#578]
+* Remove the WITHOUT_SSL constant [#578]
+* Fix SSL error when the server replies a TLS Alert to our ClientHello [#544, #653]
+* Use WSAStringToAddress in lieu of inet_pton for IPv6 address detection on Windows [#595, #632]
+* Fix nasty TCP/IPv6 bug [#595, #632]
+* Use select_large_fdset on Solaris [#611, #625]
+* Detect the Solaris Studio compiler [#611, #625]
+* Throw a message with strerror included [#136, #621]
+
 ## 1.0.8 (August 6, 2015)
 * fix kqueue assertion failed, postpone ArmKqueueWriter until all events are processed [#51, #176, #372, #401, #619]
 * fix Rubinius GC, crank the machine from Ruby space when running Rubinius [#201, #202, #617]
@@ -10,7 +25,7 @@
 * fix for compilation with SSL on windows [#601]
 * open file descriptors and sockets with O_CLOEXEC where possible [#298, #488, #591]
 * fix SmtpClient: send second EHLO after STARTTLS. [#589]
-* fix nul-terminated strings in C, use StringValueCStr instead of StringValuePtr 
+* fix nul-terminated strings in C, use StringValueCStr instead of StringValuePtr
 
 ## 1.0.7 (February 10, 2015)
 * fix delay in kqueue/epoll reactor shutdown when timers exist [#587]

data/ext/ed.cpp

@@ -857,9 +857,9 @@ void ConnectionDescriptor::Read()
 ConnectionDescriptor::_DispatchInboundData
 ******************************************/
 
+#ifdef WITH_SSL
 void ConnectionDescriptor::_DispatchInboundData (const char *buffer, unsigned long size)
 {
-	#ifdef WITH_SSL
 	if (SslBox) {
 		SslBox->PutCiphertext (buffer, size);
 
@@ -873,6 +873,7 @@ void ConnectionDescriptor::_DispatchInboundData (const char *buffer, unsigned lo
 
 		// If our SSL handshake had a problem, shut down the connection.
 		if (s == -2) {
+			UnbindReasonCode = EPROTO;
 			ScheduleClose(false);
 			return;
 		}
@@ -883,12 +884,13 @@ void ConnectionDescriptor::_DispatchInboundData (const char *buffer, unsigned lo
 	else {
 		_GenericInboundDispatch(buffer, size);
 	}
-	#endif
-
-	#ifdef WITHOUT_SSL
+}
+#else
+void ConnectionDescriptor::_DispatchInboundData (const char *buffer, unsigned long size)
+{
 	_GenericInboundDispatch(buffer, size);
-	#endif
 }
+#endif
 
 
 
@@ -1024,6 +1026,8 @@ void ConnectionDescriptor::_WriteOutboundData()
 	for(int i = 0; i < iovcnt; i++){
 		OutboundPage *op = &(OutboundPages[i]);
 		#ifdef CC_SUNWspro
+		// TODO: The void * cast works fine on Solaris 11, but
+		// I don't know at what point that changed from older Solaris.
 		iov[i].iov_base = (char *)(op->Buffer + op->Offset);
 		#else
 		iov[i].iov_base = (void *)(op->Buffer + op->Offset);
@@ -1165,29 +1169,31 @@ int ConnectionDescriptor::ReportErrorStatus()
 ConnectionDescriptor::StartTls
 ******************************/
 
+#ifdef WITH_SSL
 void ConnectionDescriptor::StartTls()
 {
-	#ifdef WITH_SSL
 	if (SslBox)
 		throw std::runtime_error ("SSL/TLS already running on connection");
 
 	SslBox = new SslBox_t (bIsServer, PrivateKeyFilename, CertChainFilename, bSslVerifyPeer, GetBinding());
 	_DispatchCiphertext();
-	#endif
 
-	#ifdef WITHOUT_SSL
+}
+#else
+void ConnectionDescriptor::StartTls()
+{
 	throw std::runtime_error ("Encryption not available on this event-machine");
-	#endif
 }
+#endif
 
 
 /*********************************
 ConnectionDescriptor::SetTlsParms
 *********************************/
 
+#ifdef WITH_SSL
 void ConnectionDescriptor::SetTlsParms (const char *privkey_filename, const char *certchain_filename, bool verify_peer)
 {
-	#ifdef WITH_SSL
 	if (SslBox)
 		throw std::runtime_error ("call SetTlsParms before calling StartTls");
 	if (privkey_filename && *privkey_filename)
@@ -1195,12 +1201,13 @@ void ConnectionDescriptor::SetTlsParms (const char *privkey_filename, const char
 	if (certchain_filename && *certchain_filename)
 		CertChainFilename = certchain_filename;
 	bSslVerifyPeer = verify_peer;
-	#endif
-
-	#ifdef WITHOUT_SSL
+}
+#else
+void ConnectionDescriptor::SetTlsParms (const char *privkey_filename UNUSED, const char *certchain_filename UNUSED, bool verify_peer UNUSED)
+{
 	throw std::runtime_error ("Encryption not available on this event-machine");
-	#endif
 }
+#endif
 
 
 /*********************************

data/ext/em.cpp

@@ -260,9 +260,17 @@ void EventMachine_t::SetuidString (const char *username)
 	if (!username || !*username)
 		throw std::runtime_error ("setuid_string failed: no username specified");
 
+	errno = 0;
 	struct passwd *p = getpwnam (username);
-	if (!p)
-		throw std::runtime_error ("setuid_string failed: unknown username");
+	if (!p) {
+		if (errno) {
+			char buf[200];
+			snprintf (buf, sizeof(buf)-1, "setuid_string failed: %s", strerror(errno));
+			throw std::runtime_error (buf);
+		} else {
+			throw std::runtime_error ("setuid_string failed: unknown username");
+		}
+	}
 
 	if (setuid (p->pw_uid) != 0)
 		throw std::runtime_error ("setuid_string failed: no setuid");
@@ -1187,9 +1195,12 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 		throw std::runtime_error ("invalid server or port");
 
 	int family, bind_size;
-	struct sockaddr bind_as, *bind_as_ptr = name2address (server, port, &family, &bind_size);
-	if (!bind_as_ptr)
-		throw std::runtime_error ("unable to resolve server address");
+	struct sockaddr_storage bind_as, *bind_as_ptr = (struct sockaddr_storage*)name2address (server, port, &family, &bind_size);
+	if (!bind_as_ptr) {
+		char buf [200];
+		snprintf (buf, sizeof(buf)-1, "unable to resolve server address: %s", strerror(errno));
+		throw std::runtime_error (buf);
+	}
 	bind_as = *bind_as_ptr; // copy because name2address points to a static
 
 	int sd = EmSocket (family, SOCK_STREAM, 0);
@@ -1229,7 +1240,7 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 
 	#ifdef OS_UNIX
 	//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 Linux appears
 		// never to give when the socket is nonblocking,
 		// even if the connection is intramachine or to
@@ -1420,8 +1431,13 @@ EventMachine_t::AttachFD
 const uintptr_t EventMachine_t::AttachFD (int fd, bool watch_mode)
 {
 	#ifdef OS_UNIX
-	if (fcntl(fd, F_GETFL, 0) < 0)
-		throw std::runtime_error ("invalid file descriptor");
+	if (fcntl(fd, F_GETFL, 0) < 0) {
+		if (errno) {
+			throw std::runtime_error (strerror(errno));
+		} else {
+			throw std::runtime_error ("invalid file descriptor");
+		}
+	}
 	#endif
 
 	#ifdef OS_WIN32

data/ext/em.h

@@ -93,6 +93,19 @@ typedef fd_set rb_fdset_t;
   rb_thread_select(fd_check((n)-1) ? (n) : FD_SETSIZE, (rfds), (wfds), (efds), (timeout))
 #endif
 
+
+// This Solaris fix is adapted from eval_intern.h in Ruby 1.9.3:
+// Solaris sys/select.h switches select to select_large_fdset to support larger
+// file descriptors if FD_SETSIZE is larger than 1024 on 32bit environment.
+// But Ruby doesn't change FD_SETSIZE because fd_set is allocated dynamically.
+// So following definition is required to use select_large_fdset.
+#ifdef HAVE_SELECT_LARGE_FDSET
+#define select(n, r, w, e, t) select_large_fdset((n), (r), (w), (e), (t))
+extern "C" {
+  int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+}
+#endif
+
 class EventableDescriptor;
 class InotifyDescriptor;
 struct SelectData_t;

data/ext/extconf.rb

@@ -1,6 +1,9 @@
 require 'fileutils'
 require 'mkmf'
 
+# Eager check devs tools
+have_devel? if respond_to?(:have_devel?)
+
 def check_libs libs = [], fatal = false
   libs.all? { |lib| have_library(lib) || (abort("could not find library: #{lib}") if fatal) }
 end
@@ -22,34 +25,58 @@ def append_library(libs, lib)
   libs + " " + format(LIBARG, lib)
 end
 
-def manual_ssl_config
-  ssl_libs_heads_args = {
-    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
-  }
+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
 
-  dc_flags = ['ssl']
-  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM and ENV['OPENSSL']
+def dir_config_wrapper(pretty_name, name, idefault=nil, ldefault=nil)
+  inc, lib = dir_config(name, idefault, ldefault)
+  if inc && lib
+    # TODO: Remove when 2.0.0 is the minimum supported version
+    # Ruby versions not incorporating the mkmf fix at
+    # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
+    # do not properly search for lib directories, and must be corrected
+    unless lib && lib[-3, 3] == 'lib'
+      @libdir_basename = 'lib'
+      inc, lib = dir_config(name, idefault, ldefault)
+    end
+    unless idefault && ldefault
+      abort "-----\nCannot find #{pretty_name} include path #{inc}\n-----" unless inc && inc.split(File::PATH_SEPARATOR).any? { |dir| File.directory?(dir) }
+      abort "-----\nCannot find #{pretty_name} library path #{lib}\n-----" unless lib && lib.split(File::PATH_SEPARATOR).any? { |dir| File.directory?(dir) }
+      warn "-----\nUsing #{pretty_name} in path #{File.dirname inc}\n-----"
+    end
+    true
+  end
+end
 
-  libs, heads = case RUBY_PLATFORM
-  when /mswin|mingw|bccwin/ ; ssl_libs_heads_args[:mswin]
-  else                        ssl_libs_heads_args[:unix]
+def dir_config_search(pretty_name, name, paths, &b)
+  paths.each do |p|
+    if dir_config_wrapper('OpenSSL', 'ssl', p + '/include', p + '/lib') && yield
+      warn "-----\nFound #{pretty_name} in path #{p}\n-----"
+      return true
+    end
   end
-  dir_config(*dc_flags)
-  check_libs(libs) and check_heads(heads)
 end
 
-# Eager check devs tools
-have_devel? if respond_to?(:have_devel?)
+def pkg_config_wrapper(pretty_name, name)
+  cflags, ldflags, libs = pkg_config(name)
+  unless [cflags, ldflags, libs].any?(&:nil?) || [cflags, ldflags, libs].any?(&:empty?)
+    warn "-----\nUsing #{pretty_name} from pkg-config #{cflags} && #{ldflags} && #{libs}\n-----"
+    true
+  end
+end
 
 if ENV['CROSS_COMPILING']
-  openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.1i")
+  openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.2e")
   openssl_dir = File.expand_path("~/.rake-compiler/builds/openssl-#{openssl_version}/")
   if File.exist?(openssl_dir)
     FileUtils.mkdir_p Dir.pwd+"/openssl/"
     FileUtils.cp Dir[openssl_dir+"/include/openssl/*.h"], Dir.pwd+"/openssl/", :verbose => true
     FileUtils.cp Dir[openssl_dir+"/lib*.a"], Dir.pwd, :verbose => true
     $INCFLAGS << " -I#{Dir.pwd}" # for the openssl headers
+    add_define "WITH_SSL"
   else
     STDERR.puts
     STDERR.puts "**************************************************************************************"
@@ -58,13 +85,20 @@ if ENV['CROSS_COMPILING']
     STDERR.puts "**************************************************************************************"
     STDERR.puts
   end
-end
-
-# Try to use pkg_config first, fixes #73
-if (!ENV['CROSS_COMPILING'] and pkg_config('openssl')) || manual_ssl_config
-  add_define "WITH_SSL"
-else
-  add_define "WITHOUT_SSL"
+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)
+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)
+  # 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)
+  end
+  # Finally, look for OpenSSL in alternate locations including MacPorts and HomeBrew
+  add_define 'WITH_SSL'
 end
 
 add_define 'BUILD_FOR_RUBY'
@@ -125,13 +159,21 @@ when /solaris/
   add_define 'OS_SOLARIS8'
   check_libs(%w[nsl socket], true)
 
-  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
+  # If Ruby was compiled for 32-bits, then select() can only handle 1024 fds
+  # There is an alternate function, select_large_fdset, that supports more.
+  add_define 'HAVE_SELECT_LARGE_FDSET' if have_func('select_large_fdset', 'sys/select.h')
+
+  if CONFIG['CC'] == 'cc' && (
+     `cc -flags 2>&1` =~ /Sun/ || # detect SUNWspro compiler
+     `cc -V 2>&1` =~ /Sun/        # detect Solaris Studio compiler
+    )
     # SUN CHAIN
     add_define 'CC_SUNWspro'
     $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
     $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
     CONFIG['CCDLFLAGS'] = "-KPIC"
     CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
+    CONFIG['LDSHAREDXX'] = "$(CXX) -G -KPIC -lCstd"
   else
     # GNU CHAIN
     # on Unix we need a g++ link, not gcc.
@@ -175,37 +217,39 @@ else
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 end
 
+# Platform-specific time functions
+if have_func('clock_gettime')
+  # clock_gettime is POSIX, but the monotonic clocks are not
+  have_const('CLOCK_MONOTONIC_RAW', 'time.h') # Linux
+  have_const('CLOCK_MONOTONIC', 'time.h') # Linux, Solaris, BSDs
+else
+  have_func('gethrtime') # Older Solaris and HP-UX
+end
+
+# Hack so that try_link will test with a C++ compiler instead of a C compiler
+TRY_LINK.sub!('$(CC)', '$(CXX)')
+
 # This is our wishlist. We use whichever flags work on the host.
 # In the future, add -Werror to make sure all warnings are resolved.
 # deprecated-declarations are used in OS X OpenSSL
 # ignored-qualifiers are used by the Bindings (would-be void *)
 # unused-result because GCC 4.6 no longer silences (void) ignore_this(function)
+# address because on Windows, rb_fd_select checks if &fds is non-NULL, which it cannot be
 %w(
   -Wall
   -Wextra
   -Wno-deprecated-declarations
   -Wno-ignored-qualifiers
   -Wno-unused-result
+  -Wno-address
 ).select do |flag|
   try_link('int main() {return 0;}', flag)
 end.each do |flag|
-  $CFLAGS << ' ' << flag
-  $CPPFLAGS << ' ' << flag
-end
-puts "CFLAGS=#{$CFLAGS}"
-puts "CPPFLAGS=#{$CPPFLAGS}"
-
-# Platform-specific time functions
-if have_func('clock_gettime')
-  # clock_gettime is POSIX, but the monotonic clocks are not
-  have_const('CLOCK_MONOTONIC_RAW', 'time.h') # Linux
-  have_const('CLOCK_MONOTONIC', 'time.h') # Linux, Solaris, BSDs
-else
-  have_func('gethrtime') # Older Solaris and HP-UX
+  CONFIG['CXXFLAGS'] << ' ' << flag
 end
+puts "CXXFLAGS=#{CONFIG['CXXFLAGS']}"
 
-# solaris c++ compiler doesn't have make_pair()
-TRY_LINK.sub!('$(CC)', '$(CXX)')
+# Solaris C++ compiler doesn't have make_pair()
 add_define 'HAVE_MAKE_PAIR' if try_link(<<SRC, '-lstdc++')
   #include <utility>
   using namespace std;

data/ext/fastfilereader/extconf.rb

@@ -56,13 +56,17 @@ when /solaris/
   add_define 'OS_SOLARIS8'
   check_libs(%w[nsl socket], true)
 
-  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
+  if CONFIG['CC'] == 'cc' && (
+     `cc -flags 2>&1` =~ /Sun/ || # detect SUNWspro compiler
+     `cc -V 2>&1` =~ /Sun/        # detect Solaris Studio compiler
+    )
     # SUN CHAIN
     add_define 'CC_SUNWspro'
     $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
     $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
     CONFIG['CCDLFLAGS'] = "-KPIC"
     CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
+    CONFIG['LDSHAREDXX'] = "$(CXX) -G -KPIC -lCstd"
   else
     # GNU CHAIN
     # on Unix we need a g++ link, not gcc.

data/ext/fastfilereader/mapper.cpp

@@ -89,6 +89,8 @@ void Mapper_t::Close()
 	// Calls to GetChunk are invalid after a call to Close.
 	if (MapPoint) {
 		#ifdef CC_SUNWspro
+		// TODO: The void * cast works fine on Solaris 11, but
+		// I don't know at what point that changed from older Solaris.
 		munmap ((char*)MapPoint, FileSize);
 		#else
 		munmap ((void*)MapPoint, FileSize);

data/ext/pipe.cpp

@@ -229,6 +229,11 @@ void PipeDescriptor::Write()
 
 	assert (GetSocket() != INVALID_SOCKET);
 	int bytes_written = write (GetSocket(), output_buffer, nbytes);
+#ifdef OS_WIN32
+	int e = WSAGetLastError();
+#else
+	int e = errno;
+#endif
 
 	if (bytes_written > 0) {
 		OutboundDataSize -= bytes_written;
@@ -251,10 +256,10 @@ void PipeDescriptor::Write()
 	}
 	else {
 		#ifdef OS_UNIX
-		if ((errno != EINPROGRESS) && (errno != EWOULDBLOCK) && (errno != EINTR))
+		if ((e != EINPROGRESS) && (e != EWOULDBLOCK) && (e != EINTR))
 		#endif
 		#ifdef OS_WIN32
-		if ((errno != WSAEINPROGRESS) && (errno != WSAEWOULDBLOCK))
+		if ((e != WSAEINPROGRESS) && (e != WSAEWOULDBLOCK))
 		#endif
 			Close();
 	}

data/ext/rubymain.cpp

@@ -345,11 +345,11 @@ static VALUE t_set_tls_parms (VALUE self UNUSED, VALUE signature, VALUE privkeyf
 t_get_peer_cert
 ***************/
 
+#ifdef WITH_SSL
 static VALUE t_get_peer_cert (VALUE self UNUSED, VALUE signature)
 {
 	VALUE ret = Qnil;
 
-	#ifdef WITH_SSL
 	X509 *cert = NULL;
 	BUF_MEM *buf;
 	BIO *out;
@@ -364,10 +364,15 @@ static VALUE t_get_peer_cert (VALUE self UNUSED, VALUE signature)
 		X509_free(cert);
 		BIO_free(out);
 	}
-	#endif
 
 	return ret;
 }
+#else
+static VALUE t_get_peer_cert (VALUE self UNUSED, VALUE signature UNUSED)
+{
+	return Qnil;
+}
+#endif
 
 /**************
 t_get_peername
@@ -982,10 +987,8 @@ t__epoll
 
 static VALUE t__epoll (VALUE self UNUSED)
 {
-	if (t__epoll_p(self) == Qfalse) {
-		rb_warn ("epoll is not supported on this platform");
+	if (t__epoll_p(self) == Qfalse)
 		return Qfalse;
-	}
 
 	evma_set_epoll (1);
 	return Qtrue;
@@ -997,8 +1000,8 @@ t__epoll_set
 
 static VALUE t__epoll_set (VALUE self, VALUE val)
 {
-	if (t__epoll_p(self) == Qfalse)
-		rb_warn ("epoll is not supported on this platform");
+	if (t__epoll_p(self) == Qfalse && val == Qtrue)
+		rb_raise (EM_eUnsupported, "%s", "epoll is not supported on this platform");
 
 	evma_set_epoll (val == Qtrue ? 1 : 0);
 	return val;
@@ -1024,10 +1027,8 @@ t__kqueue
 
 static VALUE t__kqueue (VALUE self UNUSED)
 {
-	if (t__kqueue_p(self) == Qfalse) {
-		rb_warn ("kqueue is not supported on this platform");
+	if (t__kqueue_p(self) == Qfalse)
 		return Qfalse;
-	}
 
 	evma_set_kqueue (1);
 	return Qtrue;
@@ -1039,8 +1040,8 @@ t__kqueue_set
 
 static VALUE t__kqueue_set (VALUE self, VALUE val)
 {
-	if (t__kqueue_p(self) == Qfalse)
-		rb_warn ("kqueue is not supported on this platform");
+	if (t__kqueue_p(self) == Qfalse && val == Qtrue)
+		rb_raise (EM_eUnsupported, "%s", "kqueue is not supported on this platform");
 
 	evma_set_kqueue (val == Qtrue ? 1 : 0);
 	return val;

data/ext/ssl.cpp

@@ -296,7 +296,7 @@ int SslBox_t::GetPlaintext (char *buf, int bufsize)
 {
 	if (!SSL_is_init_finished (pSSL)) {
 		int e = bIsServer ? SSL_accept (pSSL) : SSL_connect (pSSL);
-		if (e < 0) {
+		if (e != 1) {
 			int er = SSL_get_error (pSSL, e);
 			if (er != SSL_ERROR_WANT_READ) {
 				// Return -1 for a nonfatal error, -2 for an error that should force the connection down.
@@ -312,7 +312,7 @@ int SslBox_t::GetPlaintext (char *buf, int bufsize)
 	if (!SSL_is_init_finished (pSSL)) {
 		// We can get here if a browser abandons a handshake.
 		// The user can see a warning dialog and abort the connection.
-		cerr << "<SSL_incomp>";
+		//cerr << "<SSL_incomp>";
 		return 0;
 	}
 

data/lib/em/version.rb

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

data/lib/eventmachine.rb

@@ -754,7 +754,12 @@ module EventMachine
     end
 
     if io.respond_to?(:fileno)
-      fd = defined?(JRuby) ? JRuby.runtime.getDescriptorByFileno(io.fileno).getChannel : io.fileno
+      # getDescriptorByFileno deprecated in JRuby 1.7.x, removed in JRuby 9000
+      if defined?(JRuby) && JRuby.runtime.respond_to?(:getDescriptorByFileno)
+        fd = JRuby.runtime.getDescriptorByFileno(io.fileno).getChannel
+      else
+        fd = io.fileno
+      end
     else
       fd = io
     end

data/tests/em_test_helper.rb

@@ -41,6 +41,10 @@ class Test::Unit::TestCase
       RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
+    def solaris?
+      RUBY_PLATFORM =~ /solaris/
+    end
+
     # http://stackoverflow.com/questions/1342535/how-can-i-tell-if-im-running-from-jruby-vs-ruby/1685970#1685970
     def jruby?
       defined? JRUBY_VERSION

data/tests/test_file_watch.rb

@@ -34,6 +34,7 @@ class TestFileWatch < Test::Unit::TestCase
     end
 
     def test_events
+      omit_if(solaris?)
       EM.run{
         file = Tempfile.new('em-watch')
         $tmp_path = file.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: java
 authors:
 - Francis Cianfrocca
@@ -9,50 +9,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+  name: test-unit
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
+  name: rake-compiler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5.2
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.5.2
+  name: yard
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5.2
 description: |-
   EventMachine implements a fast, single-threaded engine for arbitrary network
   communications. It's extremely easy to use in Ruby. EventMachine wraps all
@@ -86,9 +86,9 @@ extra_rdoc_files:
 - docs/old/SPAWNED_PROCESSES
 - docs/old/TODO
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - GNU
 - Gemfile
@@ -262,24 +262,24 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --title
+- "--title"
 - EventMachine
-- --main
+- "--main"
 - README.md
-- -x
+- "-x"
 - lib/em/version
-- -x
+- "-x"
 - lib/jeventmachine
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []