2 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
index fa48ebfb5..52431e227 100644
--- a/lib/puppet/network/client.rb
+++ b/lib/puppet/network/client.rb
@@ -19,6 +19,12 @@ class Net::HTTP
             false
         end
     end
+
+    # JJM: This is a "backport" of sorts to older ruby versions which
+    # do not have this accessor.  See #896 for more information.
+    unless Net::HTTP.instance_methods.include? "enable_post_connection_check"
+        attr_accessor :enable_post_connection_check
+    end
 end
 
 # The base class for all of the clients.  Many clients just directly
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index 39f149aa8..371648b61 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -147,6 +147,7 @@ module Puppet::Network
                 @http.cert = client.cert
                 @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
                 @http.key = client.key
+                @http.enable_post_connection_check = false
             end
         end