summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-23 18:17:28 -0600
committerLuke Kanies <luke@madstop.com>2008-02-23 18:17:28 -0600
commit07cd482863dbfd396d9b2c19df67d103e111287d (patch)
treeac83707a5443e963d9087961bab8a44ff4d10ef1
parent0323986acd3a288e77c54b5fde20b280fa92b90a (diff)
downloadpuppet-07cd482863dbfd396d9b2c19df67d103e111287d.tar.gz
puppet-07cd482863dbfd396d9b2c19df67d103e111287d.tar.xz
puppet-07cd482863dbfd396d9b2c19df67d103e111287d.zip
Making a couple of other small fixes, requiring
classes that were not being required in the right order.
-rw-r--r--lib/puppet/network/http_pool.rb3
-rw-r--r--lib/puppet/network/http_server/mongrel.rb1
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 99f09a90c..69574d8fd 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -1,6 +1,9 @@
require 'puppet/sslcertificates/support'
require 'net/https'
+module Puppet::Network
+end
+
# Manage Net::HTTP instances for keep-alive.
module Puppet::Network::HttpPool
# This handles reading in the key and such-like.
diff --git a/lib/puppet/network/http_server/mongrel.rb b/lib/puppet/network/http_server/mongrel.rb
index d340f3d63..6b2325d29 100644
--- a/lib/puppet/network/http_server/mongrel.rb
+++ b/lib/puppet/network/http_server/mongrel.rb
@@ -33,6 +33,7 @@ require 'xmlrpc/server'
require 'puppet/network/xmlrpc/server'
require 'puppet/network/http_server'
require 'puppet/network/client_request'
+require 'puppet/network/handler'
require 'puppet/daemon'
require 'resolv'