Removing the ability to disable http-keep alive,

since it didn't work and is now unnecessary.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index f6038f189..99f09a90c 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -51,9 +51,9 @@ module Puppet::Network::HttpPool
         # We overwrite the uninitialized @http here with a cached one.
         key = "%s:%s" % [host, port]
 
-        # Return our cached instance if keepalive is enabled and we've got
-        # a cache, as long as we're not resetting the instance.
-        return @http_cache[key] if ! reset and Puppet[:http_keepalive] and @http_cache[key]
+        # Return our cached instance if we've got a cache, as long as we're not
+        # resetting the instance.
+        return @http_cache[key] if ! reset and @http_cache[key]
 
         # Clean up old connections if we have them.
         if http = @http_cache[key]
@@ -85,7 +85,7 @@ module Puppet::Network::HttpPool
 
         cert_setup(http)
 
-        @http_cache[key] = http if Puppet[:http_keepalive]
+        @http_cache[key] = http
 
         return http
     end