Merge branch '0.24.x'

Also added the fixes to make the certhandler tests pass
even when certs exist; I'll deal with the conflict later.

Conflicts:

	CHANGELOG
	bin/puppetd
	lib/puppet/network/http/handler.rb
	lib/puppet/network/http/mongrel/rest.rb
	spec/integration/indirector/rest.rb
	spec/integration/network/server/mongrel.rb
	spec/integration/network/server/webrick.rb
	spec/unit/network/http/webrick.rb

2 files changed, 41 insertions, 39 deletions

diff --git a/spec/integration/network/server/mongrel.rb b/spec/integration/network/server/mongrel.rb
index 08fd49b17..180fdf7ad 100755
--- a/spec/integration/network/server/mongrel.rb
+++ b/spec/integration/network/server/mongrel.rb
@@ -1,46 +1,48 @@
+#!/usr/bin/env ruby
+
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/network/server'
 require 'socket'
 
 describe Puppet::Network::Server do
-  describe "when using mongrel" do
-    confine "Mongrel is not available" => Puppet.features.mongrel?
-    
-    before :each do
-      Puppet[:servertype] = 'mongrel'
-      @params = { :address => "127.0.0.1", :port => 34346, :handlers => [ :node ], :xmlrpc_handlers => [ :status ] }
-      @server = Puppet::Network::Server.new(@params)      
-    end
+    describe "when using mongrel" do
+        confine "Mongrel is not available" => Puppet.features.mongrel?
+        
+        before :each do
+            Puppet[:servertype] = 'mongrel'
+            @params = { :address => "127.0.0.1", :port => 34346, :handlers => [ :node ] }
+            @server = Puppet::Network::Server.new(@params)            
+        end
 
-    describe "before listening" do
-      it "should not be reachable at the specified address and port" do
-        lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)
-      end
-    end
+        describe "before listening" do
+            it "should not be reachable at the specified address and port" do
+                lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)
+            end
+        end
 
-    describe "when listening" do
-      it "should be reachable on the specified address and port" do
-        @server.listen
-        lambda { TCPSocket.new('127.0.0.1', 34346) }.should_not raise_error      
-      end
+        describe "when listening" do
+            it "should be reachable on the specified address and port" do
+                @server.listen
+                lambda { TCPSocket.new('127.0.0.1', 34346) }.should_not raise_error            
+            end
 
-      it "should not allow multiple servers to listen on the same address and port" do
-        @server.listen
-        @server2 = Puppet::Network::Server.new(@params)
-        lambda { @server2.listen }.should raise_error
-      end
-    end
-    
-    describe "after unlistening" do
-      it "should not be reachable on the port and address assigned" do
-        @server.listen
-        @server.unlisten
-        lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)        
-      end
+            it "should not allow multiple servers to listen on the same address and port" do
+                @server.listen
+                @server2 = Puppet::Network::Server.new(@params)
+                lambda { @server2.listen }.should raise_error
+            end
+        end
+        
+        describe "after unlistening" do
+            it "should not be reachable on the port and address assigned" do
+                @server.listen
+                @server.unlisten
+                lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)                
+            end
+        end
+            
+        after :each do
+            @server.unlisten if @server.listening?
+        end    
     end
-      
-    after :each do
-      @server.unlisten if @server.listening?
-    end  
-  end
 end
diff --git a/spec/integration/network/server/webrick.rb b/spec/integration/network/server/webrick.rb
index 0e66ee955..e74920782 100755
--- a/spec/integration/network/server/webrick.rb
+++ b/spec/integration/network/server/webrick.rb
@@ -41,13 +41,13 @@ describe Puppet::Network::Server do
 
         describe "when listening" do
             it "should be reachable on the specified address and port" do
-                @server = Puppet::Network::Server.new(@params.merge(:port => 34343))      
+                @server = Puppet::Network::Server.new(@params.merge(:port => 34343))            
                 @server.listen
-                lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error      
+                lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error            
             end
 
             it "should not allow multiple servers to listen on the same address and port" do
-                @server = Puppet::Network::Server.new(@params.merge(:port => 34343))      
+                @server = Puppet::Network::Server.new(@params.merge(:port => 34343))            
                 @server.listen
                 @server2 = Puppet::Network::Server.new(@params.merge(:port => 34343))
                 lambda { @server2.listen }.should raise_error