Merge branch 'next'

wordtracker · Feb 24, 2011 · a7895d0 · a7895d0
2 parents 3e4ade9 + f8544e1
commit a7895d0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,18 +1,24 @@
+== 0.6.1 / 2011-02-24
+
+*Bug fixes
+
+  * Fix a bug preventing SSL connections from working
+
 == 0.6.0 / 2011-02-17
 
 * Major enhancements
 
-    * Added support for HTTP Basic Auth with URLs containing a username and password
-    * Added support for anonymous HTTP proxies
+  * Added support for HTTP Basic Auth with URLs containing a username and password
+  * Added support for anonymous HTTP proxies
 
 * Minor enhancements
 
-    * Added read_timeout option to set the HTTP request timeout in seconds
+  * Added read_timeout option to set the HTTP request timeout in seconds
 
 * Bug fixes
 
-    * Don't fatal error if a page request times out
-    * Fix double encoding of links containing %20
+  * Don't fatal error if a page request times out
+  * Fix double encoding of links containing %20
 
 == 0.5.0 / 2010-09-01
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.0
+0.6.1
diff --git a/anemone.gemspec b/anemone.gemspec
@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = "anemone"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
   s.author = "Chris Kite"
   s.homepage = "http://anemone.rubyforge.org"
   s.rubyforge_project = "anemone"

diff --git a/lib/anemone/core.rb b/lib/anemone/core.rb
@@ -9,7 +9,7 @@
 
 module Anemone
 
-  VERSION = '0.6.0';
+  VERSION = '0.6.1';
 
   #
   # Convenience method to start a crawl

diff --git a/lib/anemone/http.rb b/lib/anemone/http.rb
@@ -160,15 +160,16 @@ def connection(url)
     end
 
     def refresh_connection(url)
-      http = Net::HTTP::Proxy(proxy_host, proxy_port)
+      http = Net::HTTP.new(url.host, url.port, proxy_host, proxy_port)
 
       http.read_timeout = read_timeout if !!read_timeout
 
       if url.scheme == 'https'
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-      @connections[url.host][url.port] = http.start(url.host, url.port)
+
+      @connections[url.host][url.port] = http.start 
     end
 
     def verbose?