Merge remote-tracking branch 'upstream/master'

thoughtbot · Oct 10, 2011 · 93847f7 · 93847f7
2 parents 6e41bad + 7e56285
commit 93847f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/capybara-webkit.gemspec b/capybara-webkit.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capybara-webkit"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
   s.authors = ["thoughtbot", "Joe Ferris", "Jason Morrison", "Tristan Dunn",
                "Joshua Clayton", "Yuichi Tateno", "Aaron Gibralter",
                "Vasily Reys", "petrushka", "John Bintz", "Chad Pytel",

diff --git a/lib/capybara/driver/webkit/browser.rb b/lib/capybara/driver/webkit/browser.rb
@@ -169,7 +169,7 @@ def connect
     end
 
     def attempt_connect
-      @socket = @socket_class.open("localhost", @server_port)
+      @socket = @socket_class.open("127.0.0.1", @server_port)
     rescue Errno::ECONNREFUSED
     end