From d348e203a8ff03dae9398becc96b1371b5971fa9 Mon Sep 17 00:00:00 2001
From: Niklas Baumstark <niklas.baumstark@gmail.com>
Date: Thu, 29 Sep 2011 02:40:13 +0200
Subject: [PATCH] kill HTTPS server after usage, don't pollute STDOUT

---
 spec/browser_spec.rb | 8 ++++++--
 src/main.cpp         | 2 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/browser_spec.rb b/spec/browser_spec.rb
index f9b3754..fcf1f7b 100644
--- a/spec/browser_spec.rb
+++ b/spec/browser_spec.rb
@@ -46,7 +46,7 @@ describe Capybara::Driver::Webkit::Browser do
       # set up SSL layer
       serv = OpenSSL::SSL::SSLServer.new(serv, $openssl_self_signed_ctx)
 
-      server_thread = Thread.new(serv) do |serv|
+      @server_thread = Thread.new(serv) do |serv|
         while conn = serv.accept do
           # read request
           request = []
@@ -66,7 +66,11 @@ describe Capybara::Driver::Webkit::Browser do
       end
     end
 
-    it "doesn't accepts a self-signed certificate by default" do
+    after do
+      @server_thread.kill
+    end
+
+    it "doesn't accept a self-signed certificate by default" do
       lambda { browser.visit "https://#{@host}:#{@port}/" }.should raise_error
     end
 
diff --git a/src/main.cpp b/src/main.cpp
index f329845..7f4eb26 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,8 +25,6 @@ int main(int argc, char **argv) {
 
   if (server.start()) {
     std::cout << "Capybara-webkit server started, listening on port: " << server.server_port() << std::endl;
-    if (ignoreSslErrors)
-      std::cout << "Ignoring SSL errors" << std::endl;
     return app.exec();
   } else {
     std::cerr << "Couldn't start capybara-webkit server" << std::endl;