about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/mongrel.rb2
-rw-r--r--lib/mongrel/camping.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 067e136..92eff42 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -478,5 +478,3 @@ module Mongrel
   end
 
 end
-
-
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