libuv 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea51b45a867a16573c8877ad159ced1c14067310
-  data.tar.gz: 2ca964fb717356ba949e0b243175463e504d2a33
+  metadata.gz: 92b6998b59e0b62ec3f3b0d480d462cf27e49a7c
+  data.tar.gz: 765ec08ee8b2671c4eecb803a675d423e473f258
 SHA512:
-  metadata.gz: 6669991e246dc052b424384603d17f832096bdb2d21f6deae978b0e764d3da3b15a389246c2f421d5575ddc067ac30e85ca95de04b20bb040b8007596f09c89b
-  data.tar.gz: 3e2cb67395b0c3d9b86bcdede83d5c86d2e8bc07d10683e0a9fae2816f267f17960e7f7c53e84697018c071987597e5cb74ae27fb2a2230d91dde8dc55139c34
+  metadata.gz: c868aa873424adc30707451529efc8922a0b0dc4521f738b47fbea99e536565e231bb4a4624c03a0beeb0320270d5b716584de527f84d37d0643c7f2e6f106a9
+  data.tar.gz: e357deaf8a7d560632c358f84df00f27c54c3fc1bce954562a8946e82309a2d48f3986db221c6423765a7f0704841009979d050d6812fd8cbfcd929ddb98995b

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ext/libuv"]
 	path = ext/libuv
-	url = https://github.com/joyent/libuv.git
+	url = https://github.com/libuv/libuv.git

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+  - "2.1"
+  - "2.2"
   - ruby-head
   - rbx-2
-  - jruby-19mode
+  - jruby-20mode
 branches:
   only:
     - master

data/README.md

@@ -86,7 +86,6 @@ Windows users will additionally require:
 
 - A copy of Visual Studio 2010 or later. [Visual Studio Express](http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products) works fine.
 - A copy of [OpenSSL](http://slproweb.com/products/Win32OpenSSL.html) matching the installed ruby (x86 / x64)
-  - with the environmental variable `OPENSSL_CONF` Set `OPENSSL_CONF=X:\path_to\OpenSSL\bin\openssl.cfg`
 - If using jRuby then [GCC](http://win-builds.org/stable/) is also required
   - Setup the paths as described on the gcc page
   - Add required environmental variable `set LIBRARY_PATH=X:\win-builds-64\lib;X:\win-builds-64\x86_64-w64-mingw32\lib`

data/lib/libuv/ext/types.rb

@@ -45,7 +45,8 @@ module Libuv
             :udp_send,
             :fs,
             :work,
-            :getaddrinfo, # end UV_REQ_TYPE_MAP
+            :getaddrinfo, 
+            :getnameinfo, # end UV_REQ_TYPE_MAP
             :req_type_private,
             :req_type_max
         ]

data/lib/libuv/tcp.rb

@@ -39,10 +39,12 @@ module Libuv
         def start_tls(args = {})
             return unless @connected && @tls.nil?
 
+            args[:verify_peer] = true if @on_verify
+
             @handshake = false
             @pending_writes = []
-            @tls = ::RubyTls::Connection.new(self)
-            @tls.start(args)
+            @tls = ::RubyTls::SSL::Box.new(args[:server], self, args)
+            @tls.start
         end
 
         # Push through any pending writes when handshake has completed
@@ -69,7 +71,7 @@ module Libuv
         # We resolve the existing tls write promise with a the
         #  real writes promise (a close may have occurred)
         def transmit_cb(data)
-            if not @pending_write.nil?
+            if @pending_write
                 @pending_write.resolve(direct_write(data))
                 @pending_write = nil
             else
@@ -79,7 +81,7 @@ module Libuv
 
         # Close can be called multiple times
         def close_cb
-            if not @pending_write.nil?
+            if @pending_write
                 @pending_write.reject(TLS_ERROR)
                 @pending_write = nil
             end
@@ -88,6 +90,19 @@ module Libuv
             close
         end
 
+        def verify_cb(cert)
+            if @on_verify
+                begin
+                    return @on_verify.call cert
+                rescue => e
+                    @loop.log :warn, :tls_verify_callback_failed, e
+                    return false
+                end
+            end
+
+            true
+        end
+
         # overwrite the default close to ensure
         # pending writes are rejected
         def close
@@ -102,7 +117,7 @@ module Libuv
             end
             @connected = false
 
-            if not @pending_writes.nil?
+            if @pending_writes
                 @pending_writes.each do |deferred, data|
                     deferred.reject(TLS_ERROR)
                 end
@@ -113,8 +128,8 @@ module Libuv
         end
 
         # Verify peers will be called for each cert in the chain
-        def verify_peer(&block)
-            @tls.verify_cb &block
+        def verify_peer(callback = nil, &blk)
+            @on_verify = callback || blk
         end
 
         alias_method :direct_write, :write

data/lib/libuv/version.rb

@@ -1,3 +1,3 @@
 module Libuv
-    VERSION = '1.1.3'
+    VERSION = '1.2.0'
 end

data/libuv.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
     gem.add_runtime_dependency     'ffi', '>= 1.9'
     gem.add_runtime_dependency     'thread_safe'
-    gem.add_runtime_dependency     'ruby-tls', '>= 1.0.3'
+    gem.add_runtime_dependency     'ruby-tls', '>= 2.0.0'
 
     gem.add_development_dependency 'rspec', '>= 2.14'
     gem.add_development_dependency 'rake', '>= 10.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libuv
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Bulat Shakirzyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,6 @@ files:
 - ext/libuv/src/unix/timer.c
 - ext/libuv/src/unix/tty.c
 - ext/libuv/src/unix/udp.c
-- ext/libuv/src/unix/uv-dtrace.d
 - ext/libuv/src/uv-common.c
 - ext/libuv/src/uv-common.h
 - ext/libuv/src/version.c
@@ -353,6 +352,7 @@ files:
 - ext/libuv/test/test-list.h
 - ext/libuv/test/test-loop-alive.c
 - ext/libuv/test/test-loop-close.c
+- ext/libuv/test/test-loop-configure.c
 - ext/libuv/test/test-loop-handles.c
 - ext/libuv/test/test-loop-stop.c
 - ext/libuv/test/test-loop-time.c
@@ -368,6 +368,7 @@ files:
 - ext/libuv/test/test-pipe-sendmsg.c
 - ext/libuv/test/test-pipe-server-close.c
 - ext/libuv/test/test-platform-output.c
+- ext/libuv/test/test-poll-close-doesnt-corrupt-stack.c
 - ext/libuv/test/test-poll-close.c
 - ext/libuv/test/test-poll-closesocket.c
 - ext/libuv/test/test-poll.c