The REST infrastructure now correctly the SSL certificates.

I don't think the whole thing is done, but at least the
basic flows are in place.  Now it's just a question of
doing real-world tests and fleshing out the unit tests
as necessary.

2 files changed, 5 insertions, 7 deletions

diff --git a/lib/puppet/network/http/mongrel/rest.rb b/lib/puppet/network/http/mongrel/rest.rb
index 2a3d4f143..a471a62bf 100644
--- a/lib/puppet/network/http/mongrel/rest.rb
+++ b/lib/puppet/network/http/mongrel/rest.rb
@@ -2,12 +2,12 @@ require 'puppet/network/http/handler'
 
 class Puppet::Network::HTTP::MongrelREST < Mongrel::HttpHandler
 
-  include Puppet::Network::HTTP::Handler
+    include Puppet::Network::HTTP::Handler
   
-  def initialize(args={})
-    super()
-    initialize_for_puppet(args)
-  end
+    def initialize(args={})
+        super()
+        initialize_for_puppet(args)
+    end
 
   private
  
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 8c73adba6..9dd4a576a 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -23,8 +23,6 @@ module Puppet::Network::HttpPool
         @ssl_host
     end
 
-    # This handles reading in the key and such-like.
-    extend Puppet::SSLCertificates::Support
     @http_cache = {}
 
     # Clear our http cache, closing all connections.