typhoeus 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2YzYzcwNTg0NGRkNzIwOWM0MTJlZWM3OTU0NDU0MWFjMWIxMzY5Mw==
+    NTgwYWYyZmI1ZTkxMWMxZjM3MTQ2ZmE1OTJkMGJlMTJkNjQ1NWQ0Yg==
   data.tar.gz: !binary |-
-    MGY3YTAxZTUzNTdkYzVhZDlkZGJlZWQ0YWQwMjRmNmU5ZjBmODMzMw==
+    NjU1MTA2N2IxOGJhNWVmNWYwMGFjMTNhNjc2YTcyOWQ5MzFlMDljNw==
 SHA512:
   metadata.gz: !binary |-
-    MWYzMGQ5NzU4ODQ0MGE1MjdkMmU0NzE1N2I5Y2QwM2Q5MTA5ZDY2MzdiMWI3
-    YTNjMzZmYmMwOTQ5ZGMyNzczZDliNzQ1NzA5NTI3MWQ1MTUyODM2YjBkM2E5
-    YmU1OWZmN2EyNDI4ZTkzZTBhMzMzZGM5ZmZiZGM5MGQyMDM2MDM=
+    NzZmYjAyZTYxZDIwMjQyN2NhMmViNTE1ZjliNjI3OGU4MzEwNzYwMTMxZjEy
+    MWY1NDRjOWQyODZjMDRmYWVkMjIyOGU3ZGJiMjM5YmM5ZDI1YjFkODc1NWZm
+    YWY1YmZjYjliZWMzYzY3NDc1YzI5ZWRjYjA0Y2RmZDMxNmIzMDA=
   data.tar.gz: !binary |-
-    MjliYzk1ZWI2NGRlYmYzOWI0NmQyZmU4ZTM4YzkwZmQyMTkwNzczNTg3YTVm
-    NmZlNDcxM2MyMDVjYWNhODA0YzM5ZDYzZWEyMDY2YTRhZGYwMzMxZTc2ODAy
-    MTYwOTc5NWEzM2QzNmQwNTFhNWEzMDkzMThhM2ZjNWVkNWY5MTY=
+    ZGY3YTM2NjQyOGFkZjJiMDI4MWZlODUyYTI2YzFiMmM4MTZmYThkODAyODE3
+    OWQ0YmJkYTVhNzFiNzk4ZTdjNTNhMDFhYjAwZDg3ZGJjYzMxNzJhYTQxMjhh
+    NWMyOTBkNzM1ZTc3ZTZhZGI5ZjcwNGM5ZDM0ZmQ3NWM5MjM3OGY=

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.7.1
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.0...v0.7.1)
+
+Bugfixes:
+
+* Forking may cause libcurl sockets to be shared with child processes, causing HTTP requests to be interleaved
+  ([Rolf Timmermans](https://github.com/rolftimmermans), [\#436](https://github.com/typhoeus/typhoeus/pull/426))
+
 ## 0.7.0
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.0.pre1...v0.7.0)

data/lib/typhoeus/pool.rb

@@ -9,6 +9,7 @@ module Typhoeus
   # @api private
   module Pool
     @mutex = Mutex.new
+    @pid = Process.pid
 
     # Releases easy into the pool. The easy handle is
     # reset before it gets back in.
@@ -27,7 +28,17 @@ module Typhoeus
     #
     # @return [ Ethon::Easy ] The easy.
     def self.get
-      @mutex.synchronize { easies.pop } || Ethon::Easy.new
+      @mutex.synchronize do
+        if @pid == Process.pid
+          easies.pop
+        else
+          # Process has forked. Clear all easies to avoid sockets being
+          # shared between processes.
+          @pid = Process.pid
+          easies.clear
+          nil
+        end
+      end || Ethon::Easy.new
     end
 
     # Clear the pool

data/lib/typhoeus/request/callbacks.rb

@@ -2,7 +2,6 @@ module Typhoeus
   class Request
 
     # This module contains the logic for the response callbacks.
-    # The on_complete callback is the only one at the moment.
     #
     # You can set multiple callbacks, which are then executed
     # in the same order.

data/lib/typhoeus/version.rb

@@ -1,5 +1,5 @@
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/typhoeus/pool_spec.rb

@@ -59,6 +59,23 @@ describe Typhoeus::Pool do
         end
       end
     end
+
+    context "when forked" do
+      before do
+        allow(Process).to receive(:pid).and_return(1)
+        Typhoeus::Pool.send(:easies) << easy
+        allow(Process).to receive(:pid).and_return(2)
+      end
+
+      after do
+        allow(Process).to receive(:pid).and_call_original
+        Typhoeus::Pool.instance_variable_set(:@pid, Process.pid)
+      end
+
+      it "creates" do
+        expect(Typhoeus::Pool.get).to_not eq(easy)
+      end
+    end
   end
 
   describe "#with" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon