eventmachine 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,12 @@
+script: rake compile test
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - jruby
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 1.0.1 (February 27, 2013)
+* use rb_wait_for_single_fd() on ruby 2.0 to fix rb_thread_select() deprecation
+* fix epoll/kqueue mode in ruby 2.0 by removing calls to rb_enable_interrupt() [#248, #389]
+* fix memory leak when verifying ssl cerificates [#403]
+* fix initial connection delay [#393, #374]

data/Gemfile

@@ -1,3 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
-

data/eventmachine.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
 
-  s.add_development_dependency 'rake-compiler', '~> 0.8.1'
-  s.add_development_dependency 'yard', ">= 0.7.2"
-  s.add_development_dependency 'bluecloth'
+  s.add_development_dependency 'rake-compiler', '~> 0.8.3'
+  s.add_development_dependency 'yard', ">= 0.8.5.2"
+  s.add_development_dependency 'bluecloth' unless RUBY_PLATFORM =~ /java/
 
   s.summary = 'Ruby/EventMachine library'
   s.description = "EventMachine implements a fast, single-threaded engine for arbitrary network

data/ext/ed.cpp

@@ -460,6 +460,8 @@ ConnectionDescriptor::SetConnectPending
 void ConnectionDescriptor::SetConnectPending(bool f)
 {
 	bConnectPending = f;
+	if (f == false && NextHeartbeat)
+		MyEventMachine->ClearHeartbeat(NextHeartbeat, this);
 	_UpdateEvents();
 }
 

data/ext/em.cpp

@@ -524,12 +524,17 @@ bool EventMachine_t::_RunEpollOnce()
 
 	#ifdef BUILD_FOR_RUBY
 	int ret = 0;
+
+	#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
+	if ((ret = rb_wait_for_single_fd(epfd, RB_WAITFD_IN|RB_WAITFD_PRI, &tv)) < 1) {
+	#else
 	fd_set fdreads;
 
 	FD_ZERO(&fdreads);
 	FD_SET(epfd, &fdreads);
 
 	if ((ret = rb_thread_select(epfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+	#endif
 		if (ret == -1) {
 			assert(errno != EINVAL);
 			assert(errno != EBADF);
@@ -598,12 +603,17 @@ bool EventMachine_t::_RunKqueueOnce()
 
 	#ifdef BUILD_FOR_RUBY
 	int ret = 0;
+
+	#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
+	if ((ret = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN|RB_WAITFD_PRI, &tv)) < 1) {
+	#else
 	fd_set fdreads;
 
 	FD_ZERO(&fdreads);
 	FD_SET(kqfd, &fdreads);
 
 	if ((ret = rb_thread_select(kqfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+	#endif
 		if (ret == -1) {
 			assert(errno != EINVAL);
 			assert(errno != EBADF);

data/ext/em.h

@@ -24,9 +24,13 @@ See the file COPYING for complete licensing information.
   #include <ruby.h>
   #define EmSelect rb_thread_select
 
+  #ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
+    #include <ruby/io.h>
+  #endif
+
   #if defined(HAVE_RBTRAP)
     #include <rubysig.h>
-  #elif defined(HAVE_RB_THREAD_CHECK_INTS)
+  #elif defined(HAVE_RB_ENABLE_INTERRUPT)
     extern "C" {
       void rb_enable_interrupt(void);
       void rb_disable_interrupt(void);

data/ext/extconf.rb

@@ -71,13 +71,14 @@ add_define "HAVE_INOTIFY" if inotify = have_func('inotify_init', 'sys/inotify.h'
 add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sys/syscall.h')
 add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
 
-have_func('rb_thread_check_ints')
+have_func('rb_wait_for_single_fd')
+have_func('rb_enable_interrupt')
 have_func('rb_time_new')
 
 # Minor platform details between *nix and Windows:
 
 if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
-  GNU_CHAIN = ENV['CROSS_COMPILING'] or $1 == 'mingw'
+  GNU_CHAIN = ENV['CROSS_COMPILING'] || $1 == 'mingw'
   OS_WIN32 = true
   add_define "OS_WIN32"
 else

data/ext/fastfilereader/extconf.rb

@@ -17,7 +17,7 @@ add_define 'BUILD_FOR_RUBY'
 # Minor platform details between *nix and Windows:
 
 if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
-  GNU_CHAIN = ENV['CROSS_COMPILING'] or $1 == 'mingw'
+  GNU_CHAIN = ENV['CROSS_COMPILING'] || $1 == 'mingw'
   OS_WIN32 = true
   add_define "OS_WIN32"
 else

data/ext/rubymain.cpp

@@ -332,7 +332,7 @@ static VALUE t_get_peer_cert (VALUE self, VALUE signature)
 		BIO_get_mem_ptr(out, &buf);
 		ret = rb_str_new(buf->data, buf->length);
 		X509_free(cert);
-		BUF_MEM_free(buf);
+		BIO_free(out);
 	}
 	#endif
 

data/ext/ssl.cpp

@@ -459,7 +459,7 @@ extern "C" int ssl_verify_wrapper(int preverify_ok, X509_STORE_CTX *ctx)
 
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject(binding));
 	result = (cd->VerifySslPeer(buf->data) == true ? 1 : 0);
-	BUF_MEM_free(buf);
+	BIO_free(out);
 
 	return result;
 }

data/lib/em/protocols/smtpclient.rb

@@ -271,7 +271,7 @@ module EventMachine
               psw = psw.call
             end
             #str = Base64::encode64("\0#{@args[:auth][:username]}\0#{psw}").chomp
-            str = ["\0#{@args[:auth][:username]}\0#{psw}"].pack("m").chomp
+            str = ["\0#{@args[:auth][:username]}\0#{psw}"].pack("m").gsub(/\n/, '')
             send_data "AUTH PLAIN #{str}\r\n"
             @responder = :receive_auth_response
           else

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/eventmachine.rb

@@ -1,8 +1,8 @@
-if RUBY_PLATFORM =~ /java/
+if defined?(EventMachine.library_type) and EventMachine.library_type == :pure_ruby
+  # assume 'em/pure_ruby' was loaded already
+elsif RUBY_PLATFORM =~ /java/
   require 'java'
   require 'jeventmachine'
-elsif defined?(EventMachine.library_type) and EventMachine.library_type == :pure_ruby
-  # assume 'em/pure_ruby' was loaded already
 else
   begin
     require 'rubyeventmachine'

data/rakelib/package.rake

@@ -1,4 +1,6 @@
-require 'rake/gempackagetask'
+require 'rubygems'
+require 'rubygems/package_task'
+
 begin
   require 'rake/extensiontask'
   require 'rake/javaextensiontask'
@@ -12,7 +14,7 @@ rake-compiler gem seems to be missing. Please install it with
   MSG
 end
 
-Rake::GemPackageTask.new(GEMSPEC) do |pkg|
+Gem::PackageTask.new(GEMSPEC) do |pkg|
 end
 
 if RUBY_PLATFORM =~ /java/
@@ -84,15 +86,3 @@ def gem_cmd(action, name, *args)
 end
 
 Rake::Task[:clean].enhance [:clobber_package]
-
-namespace :gem do
-  desc 'Install gem (and sudo if required)'
-  task :install => :package do
-    gem_cmd(:install, "pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem")
-  end
-
-  desc 'Uninstall gem (and sudo if required)'
-  task :uninstall do
-    gem_cmd(:uninstall, "#{GEMSPEC.name}", "-v=#{GEMSPEC.version}")
-  end
-end

data/tests/test_set_sock_opt.rb

@@ -19,7 +19,7 @@ class TestSetSockOpt < Test::Unit::TestCase
       EM.run do
         EM.connect 'google.com', 80, Module.new {
           define_method :post_init do
-            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_DEBUG, true
+            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
             test.assert_equal 0, val
             EM.stop
           end

metadata

@@ -1,69 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: eventmachine
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Francis Cianfrocca
 - Aman Gupta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-09-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
-        version: 0.8.1
+  prerelease: false
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+      - !ruby/object:Gem::Version
+        version: 0.8.5.2
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: 0.8.5.2
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id003
 description: |-
   EventMachine implements a fast, single-threaded engine for arbitrary network
   communications. It's extremely easy to use in Ruby. EventMachine wraps all
@@ -75,15 +55,14 @@ description: |-
   are provided with the package, primarily to serve as examples. The real goal
   of EventMachine is to enable programs to easily interface with other programs
   using TCP/IP, especially if custom protocols are required.
-email: 
+email:
 - garbagecat10@gmail.com
 - aman@tmm1.net
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 - ext/fastfilereader/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - docs/DocumentationGuidesIndex.md
 - docs/GettingStarted.md
@@ -99,9 +78,11 @@ extra_rdoc_files:
 - docs/old/SMTP
 - docs/old/SPAWNED_PROCESSES
 - docs/old/TODO
-files: 
-- .gitignore
-- .yardopts
+files:
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
 - GNU
 - Gemfile
 - LICENSE
@@ -262,43 +243,42 @@ files:
 - tests/test_unbind_reason.rb
 homepage: http://rubyeventmachine.com
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --title
+post_install_message:
+rdoc_options:
+- "--title"
 - EventMachine
-- --main
+- "--main"
 - README.md
-- -x
+- "-x"
 - lib/em/version
-- -x
+- "-x"
 - lib/jeventmachine
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
 rubyforge_project: eventmachine
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Ruby/EventMachine library
 test_files: []
-