try to be more compatible :(

godfat · Dec 11, 2015 · 4ed0636 · 4ed0636
1 parent 8b85837
commit 4ed0636
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,13 @@
 # CHANGES
 
+## rest-core 3.5.91 -- 2015-12-11
+
+### Bugs fixed
+
+* Instead of forcing to load `http/cookie_jar/hash_store.rb`, which is only
+  available when _http-cookie_ is available, we just initialize httpclient
+  and throw it away. Hopefully this would be more compatible between versions.
+
 ## rest-core 3.5.9 -- 2015-12-11
 
 ### Bugs fixed

diff --git a/lib/rest-core/engine/http-client.rb b/lib/rest-core/engine/http-client.rb
@@ -1,7 +1,8 @@
 
 require 'httpclient'
-# httpclient could require this in a thread causing deadlock, load it first!
-require 'http/cookie_jar/hash_store'
+# httpclient would require something (cookie manager) while initialized,
+# so we should try to force requiring them to avoid require deadlock!
+HTTPClient.new
 
 require 'rest-core/engine'
 

diff --git a/lib/rest-core/version.rb b/lib/rest-core/version.rb
@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '3.5.9'
+  VERSION = '3.5.91'
 end
diff --git a/rest-core.gemspec b/rest-core.gemspec
@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-core 3.5.9 ruby lib
+# stub: rest-core 3.5.91 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "3.5.9"
+  s.version = "3.5.91"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]