about summary refs log tree commit homepage
path: root/lib/mongrel/camping.rb
diff options
context:
space:
mode:
authorzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-03-09 06:11:21 +0000
committerzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-03-09 06:11:21 +0000
commit08b408b8f9e09613ee404088678702c4054e7a72 (patch)
tree21b2dd0154501a80f130b841cccf249c7c9f7179 /lib/mongrel/camping.rb
parentdb1ec5f513fabff9b8edcaf15548e93c35fc96d5 (diff)
downloadunicorn-08b408b8f9e09613ee404088678702c4054e7a72.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@90 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel/camping.rb')
-rw-r--r--lib/mongrel/camping.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mongrel/camping.rb b/lib/mongrel/camping.rb
index 3a19960..d997a3b 100644
--- a/lib/mongrel/camping.rb
+++ b/lib/mongrel/camping.rb
@@ -49,14 +49,16 @@ module Mongrel
     # for your application on a given port and uri.  It's pretty
     # much all you need for a camping application to work right.
     #
-    # It returns the server thread which you should either
+    # It returns the Mongrel::HttpServer which you should either
     # join or somehow manage.  The thread is running when
     # returned.
+
     def Camping.start(server, port, uri, klass)
       h = Mongrel::HttpServer.new(server, port)
       h.register(uri, CampingHandler.new(klass))
       h.register("/favicon.ico", Mongrel::Error404Handler.new(""))
-      return h.run
+      h.run
+      return h
     end
   end
 end