RubyGems - mongrel - Versions diffs - 0.3.5 → 0.3.6 - Mend

mongrel 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

data/doc/rdoc/classes/Mongrel/HttpResponse.src/M000040.html CHANGED

@@ -5,17 +5,16 @@
 <html>
 <head>
-  <title>new (Mongrel::HttpResponse)</title>
+  <title>finished (Mongrel::HttpResponse)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 223</span>
-223:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">socket</span>)
-224:       <span class="ruby-ivar">@socket</span> = <span class="ruby-identifier">socket</span>
-225:       <span class="ruby-ivar">@body</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>
-226:       <span class="ruby-ivar">@status</span> = <span class="ruby-value">404</span>
-227:       <span class="ruby-ivar">@header</span> = <span class="ruby-constant">HeaderOut</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>)
-228:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 280</span>
+280:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">finished</span>
+281:       <span class="ruby-identifier">send_status</span>
+282:       <span class="ruby-identifier">send_header</span>
+283:       <span class="ruby-identifier">send_body</span>
+284:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpServer.html CHANGED

@@ -85,7 +85,7 @@ Mognrel::HttpParser and <a
 href="URIClassifier.html">Mongrel::URIClassifier</a> make up the majority
 of how the server functions. It&#8217;s a very simple class that just has a
 thread accepting connections and a simple <a
-href="HttpServer.html#M000029">HttpServer.process_client</a> function to do
+href="HttpServer.html#M000023">HttpServer.process_client</a> function to do
 the heavy lifting with the IO and Ruby.
 </p>
 <p>
@@ -119,11 +119,12 @@ finally useful.
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000028">new</a>&nbsp;&nbsp;
-      <a href="#M000029">process_client</a>&nbsp;&nbsp;
-      <a href="#M000031">register</a>&nbsp;&nbsp;
-      <a href="#M000030">run</a>&nbsp;&nbsp;
-      <a href="#M000032">unregister</a>&nbsp;&nbsp;
+      <a href="#M000022">new</a>&nbsp;&nbsp;
+      <a href="#M000023">process_client</a>&nbsp;&nbsp;
+      <a href="#M000025">register</a>&nbsp;&nbsp;
+      <a href="#M000024">run</a>&nbsp;&nbsp;
+      <a href="#M000027">stop</a>&nbsp;&nbsp;
+      <a href="#M000026">unregister</a>&nbsp;&nbsp;
       </div>
     </div>
@@ -158,12 +159,12 @@ finally useful.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000028" class="method-detail">
-        <a name="M000028"></a>
+      <div id="method-M000022" class="method-detail">
+        <a name="M000022"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000028.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000028.html');return false;">
+          <a href="HttpServer.src/M000022.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000022.html');return false;">
           <span class="method-name">new</span><span class="method-args">(host, port, num_processors=20, timeout=120)</span>
           </a>
         </div>
@@ -195,12 +196,12 @@ href="../Mongrel.html">Mongrel</a> will make this more dynamic (hopefully).
       <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000029" class="method-detail">
-        <a name="M000029"></a>
+      <div id="method-M000023" class="method-detail">
+        <a name="M000023"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000029.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000029.html');return false;">
+          <a href="HttpServer.src/M000023.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000023.html');return false;">
           <span class="method-name">process_client</span><span class="method-args">(client)</span>
           </a>
         </div>
@@ -217,12 +218,12 @@ crack at it.
         </div>
       </div>
-      <div id="method-M000031" class="method-detail">
-        <a name="M000031"></a>
+      <div id="method-M000025" class="method-detail">
+        <a name="M000025"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000031.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000031.html');return false;">
+          <a href="HttpServer.src/M000025.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000025.html');return false;">
           <span class="method-name">register</span><span class="method-args">(uri, handler)</span>
           </a>
         </div>
@@ -233,18 +234,18 @@ Simply registers a handler with the internal <a
 href="URIClassifier.html">URIClassifier</a>. When the URI is found in the
 prefix of a request then your handler&#8217;s HttpHandler::process method
 is called. See <a
-href="URIClassifier.html#M000036">Mongrel::URIClassifier#register</a> for
+href="URIClassifier.html#M000031">Mongrel::URIClassifier#register</a> for
 more information.
 </p>
         </div>
       </div>
-      <div id="method-M000030" class="method-detail">
-        <a name="M000030"></a>
+      <div id="method-M000024" class="method-detail">
+        <a name="M000024"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000030.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000030.html');return false;">
+          <a href="HttpServer.src/M000024.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000024.html');return false;">
           <span class="method-name">run</span><span class="method-args">()</span>
           </a>
         </div>
@@ -258,12 +259,30 @@ later.
         </div>
       </div>
-      <div id="method-M000032" class="method-detail">
-        <a name="M000032"></a>
+      <div id="method-M000027" class="method-detail">
+        <a name="M000027"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000032.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000032.html');return false;">
+          <a href="HttpServer.src/M000027.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000027.html');return false;">
+          <span class="method-name">stop</span><span class="method-args">()</span>
+          </a>
+        </div>
+        <div class="method-description">
+          <p>
+Stops the acceptor thread and then causes the worker threads to finish off
+the request queue before finally exiting.
+</p>
+        </div>
+      </div>
+      <div id="method-M000026" class="method-detail">
+        <a name="M000026"></a>
+        <div class="method-heading">
+          <a href="HttpServer.src/M000026.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000026.html');return false;">
           <span class="method-name">unregister</span><span class="method-args">(uri)</span>
           </a>
         </div>
@@ -271,7 +290,7 @@ later.
         <div class="method-description">
           <p>
 Removes any handler registered at the given URI. See <a
-href="URIClassifier.html#M000037">Mongrel::URIClassifier#unregister</a> for
+href="URIClassifier.html#M000032">Mongrel::URIClassifier#unregister</a> for
 more information.
 </p>
         </div>

data/doc/rdoc/classes/Mongrel/HttpServer.src/M000022.html ADDED

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+  <title>new (Mongrel::HttpServer)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 324</span>
+324:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">host</span>, <span class="ruby-identifier">port</span>, <span class="ruby-identifier">num_processors</span>=<span class="ruby-value">20</span>, <span class="ruby-identifier">timeout</span>=<span class="ruby-value">120</span>)
+325:       <span class="ruby-ivar">@socket</span> = <span class="ruby-constant">TCPServer</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">host</span>, <span class="ruby-identifier">port</span>)
+326:
+327:       <span class="ruby-ivar">@classifier</span> = <span class="ruby-constant">URIClassifier</span>.<span class="ruby-identifier">new</span>
+328:       <span class="ruby-ivar">@req_queue</span> = <span class="ruby-constant">Queue</span>.<span class="ruby-identifier">new</span>
+329:       <span class="ruby-ivar">@host</span> = <span class="ruby-identifier">host</span>
+330:       <span class="ruby-ivar">@port</span> = <span class="ruby-identifier">port</span>
+331:       <span class="ruby-ivar">@processors</span> = []
+332:       <span class="ruby-ivar">@timeout</span> = <span class="ruby-identifier">timeout</span>
+333:
+334:       <span class="ruby-identifier">num_processors</span>.<span class="ruby-identifier">times</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
+335:         <span class="ruby-ivar">@processors</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> <span class="ruby-keyword kw">do</span>
+336:           <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">client</span> = <span class="ruby-ivar">@req_queue</span>.<span class="ruby-identifier">deq</span>
+337:             <span class="ruby-identifier">process_client</span>(<span class="ruby-identifier">client</span>)
+338:           <span class="ruby-keyword kw">end</span>
+339:         <span class="ruby-keyword kw">end</span>
+340:       }
+341:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/HttpServer.src/M000023.html ADDED

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+  <title>process_client (Mongrel::HttpServer)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 349</span>
+349:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">process_client</span>(<span class="ruby-identifier">client</span>)
+350:       <span class="ruby-keyword kw">begin</span>
+351:         <span class="ruby-identifier">parser</span> = <span class="ruby-constant">HttpParser</span>.<span class="ruby-identifier">new</span>
+352:         <span class="ruby-identifier">params</span> = {}
+353:         <span class="ruby-identifier">data</span> = <span class="ruby-identifier">client</span>.<span class="ruby-identifier">readpartial</span>(<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">CHUNK_SIZE</span>)
+354:
+355:         <span class="ruby-keyword kw">while</span> <span class="ruby-keyword kw">true</span>
+356:           <span class="ruby-identifier">nread</span> = <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">execute</span>(<span class="ruby-identifier">params</span>, <span class="ruby-identifier">data</span>)
+357:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">finished?</span>
+358:             <span class="ruby-identifier">script_name</span>, <span class="ruby-identifier">path_info</span>, <span class="ruby-identifier">handler</span> = <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">resolve</span>(<span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">REQUEST_URI</span>])
+359:
+360:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">handler</span>
+361:               <span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">PATH_INFO</span>] = <span class="ruby-identifier">path_info</span>
+362:               <span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">SCRIPT_NAME</span>] = <span class="ruby-identifier">script_name</span>
+363:               <span class="ruby-identifier">request</span> = <span class="ruby-constant">HttpRequest</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">params</span>, <span class="ruby-identifier">data</span>[<span class="ruby-identifier">nread</span> <span class="ruby-operator">...</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span>], <span class="ruby-identifier">client</span>)
+364:               <span class="ruby-identifier">response</span> = <span class="ruby-constant">HttpResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">client</span>)
+365:               <span class="ruby-identifier">handler</span>.<span class="ruby-identifier">process</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>)
+366:             <span class="ruby-keyword kw">else</span>
+367:               <span class="ruby-identifier">client</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">ERROR_404_RESPONSE</span>)
+368:             <span class="ruby-keyword kw">end</span>
+369:
+370:             <span class="ruby-keyword kw">break</span> <span class="ruby-comment cmt">#done</span>
+371:           <span class="ruby-keyword kw">else</span>
+372:             <span class="ruby-comment cmt"># gotta stream and read again until we can get the parser to be character safe</span>
+373:             <span class="ruby-comment cmt"># TODO: make this more efficient since this means we're parsing a lot repeatedly</span>
+374:             <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">reset</span>
+375:             <span class="ruby-identifier">data</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">readpartial</span>(<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">CHUNK_SIZE</span>)
+376:           <span class="ruby-keyword kw">end</span>
+377:         <span class="ruby-keyword kw">end</span>
+378:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">EOFError</span>
+379:         <span class="ruby-comment cmt"># ignored</span>
+380:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ECONNRESET</span>
+381:         <span class="ruby-comment cmt"># ignored</span>
+382:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EPIPE</span>
+383:         <span class="ruby-comment cmt"># ignored</span>
+384:       <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">details</span>
+385:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;ERROR(#{details.class}): #{details}&quot;</span>
+386:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-identifier">details</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n&quot;</span>)
+387:       <span class="ruby-keyword kw">ensure</span>
+388:         <span class="ruby-identifier">client</span>.<span class="ruby-identifier">close</span>
+389:       <span class="ruby-keyword kw">end</span>
+390:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/HttpServer.src/M000024.html ADDED

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+  <title>run (Mongrel::HttpServer)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 394</span>
+394:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">run</span>
+395:       <span class="ruby-constant">BasicSocket</span>.<span class="ruby-identifier">do_not_reverse_lookup</span>=<span class="ruby-keyword kw">true</span>
+396:       <span class="ruby-ivar">@acceptor</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> <span class="ruby-keyword kw">do</span>
+397:         <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">current</span>[<span class="ruby-identifier">:stopped</span>] = <span class="ruby-keyword kw">false</span>
+398:
+399:         <span class="ruby-keyword kw">while</span> <span class="ruby-keyword kw">not</span> <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">current</span>[<span class="ruby-identifier">:stopped</span>]
+400:           <span class="ruby-keyword kw">begin</span>
+401:             <span class="ruby-ivar">@req_queue</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-ivar">@socket</span>.<span class="ruby-identifier">accept</span>
+402:           <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StopServer</span>
+403:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Server stopped.  Exiting.&quot;</span>
+404:             <span class="ruby-ivar">@socket</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">not</span> <span class="ruby-ivar">@socket</span>.<span class="ruby-identifier">closed?</span>
+405:             <span class="ruby-keyword kw">break</span>
+406:           <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EMFILE</span>
+407:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Too many open files.  Try increasing ulimits.&quot;</span>
+408:             <span class="ruby-identifier">sleep</span> <span class="ruby-value">0</span><span class="ruby-value">.5</span>
+409:           <span class="ruby-keyword kw">end</span>
+410:         <span class="ruby-keyword kw">end</span>
+411:
+412:         <span class="ruby-comment cmt"># now that processing is done we feed enough false onto the request queue to get</span>
+413:         <span class="ruby-comment cmt"># each processor to exit and stop processing.</span>
+414:         <span class="ruby-ivar">@processors</span>.<span class="ruby-identifier">length</span>.<span class="ruby-identifier">times</span> { <span class="ruby-ivar">@req_queue</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-keyword kw">false</span> }
+415:
+416:         <span class="ruby-comment cmt"># finally we wait until the queue is empty</span>
+417:         <span class="ruby-keyword kw">while</span> <span class="ruby-ivar">@req_queue</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+418:           <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Shutdown waiting for #{@req_queue.length} requests&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@req_queue</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+419:           <span class="ruby-identifier">sleep</span> <span class="ruby-value">1</span>
+420:         <span class="ruby-keyword kw">end</span>
+421:       <span class="ruby-keyword kw">end</span>
+422:
+423:       <span class="ruby-ivar">@acceptor</span>.<span class="ruby-identifier">priority</span> = <span class="ruby-value">1</span>
+424:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/HttpServer.src/{M000031.html → M000025.html} RENAMED

@@ -10,9 +10,9 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 415</span>
-415:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
-416:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
-417:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 430</span>
+430:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
+431:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
+432:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpServer.src/{M000032.html → M000026.html} RENAMED

@@ -10,9 +10,9 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 421</span>
-421:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
-422:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
-423:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 436</span>
+436:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
+437:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
+438:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpServer.src/M000027.html ADDED

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+  <title>stop (Mongrel::HttpServer)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 442</span>
+442:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">stop</span>
+443:       <span class="ruby-ivar">@acceptor</span>[<span class="ruby-identifier">:stopped</span>] = <span class="ruby-keyword kw">true</span>
+444:       <span class="ruby-ivar">@acceptor</span>.<span class="ruby-identifier">raise</span>(<span class="ruby-constant">StopServer</span>.<span class="ruby-identifier">new</span>)
+445:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/{HttpHandler.html → StopServer.html} RENAMED

@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>Class: Mongrel::HttpHandler</title>
+  <title>Class: Mongrel::StopServer</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
@@ -50,7 +50,7 @@
         <table class="header-table">
         <tr class="top-aligned-row">
           <td><strong>Class</strong></td>
-          <td class="class-name-in-header">Mongrel::HttpHandler</td>
+          <td class="class-name-in-header">Mongrel::StopServer</td>
         </tr>
         <tr class="top-aligned-row">
             <td><strong>In:</strong></td>
@@ -65,7 +65,7 @@
         <tr class="top-aligned-row">
             <td><strong>Parent:</strong></td>
             <td>
-                Object
+                Exception
             </td>
         </tr>
         </table>
@@ -80,10 +80,7 @@
     <div id="description">
       <p>
-You implement your application handler with this. It&#8217;s very light
-giving just the minimum necessary for you to handle a request and shoot
-back a response. Look at the <a href="HttpRequest.html">HttpRequest</a> and
-<a href="HttpResponse.html">HttpResponse</a> objects for how to use them.
+Used to stop the <a href="HttpServer.html">HttpServer</a> via Thread.raise.
 </p>
     </div>
@@ -91,13 +88,6 @@ back a response. Look at the <a href="HttpRequest.html">HttpRequest</a> and
    </div>
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-      <div class="name-list">
-      <a href="#M000039">process</a>&nbsp;&nbsp;
-      </div>
-    </div>
   </div>
@@ -114,25 +104,6 @@ back a response. Look at the <a href="HttpRequest.html">HttpRequest</a> and
     <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000039" class="method-detail">
-        <a name="M000039"></a>
-        <div class="method-heading">
-          <a href="HttpHandler.src/M000039.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpHandler.src/M000039.html');return false;">
-          <span class="method-name">process</span><span class="method-args">(request, response)</span>
-          </a>
-        </div>
-        <div class="method-description">
-        </div>
-      </div>
-    </div>
   </div>

data/doc/rdoc/classes/Mongrel/URIClassifier.html CHANGED

@@ -86,10 +86,10 @@
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000035">new</a>&nbsp;&nbsp;
-      <a href="#M000036">register</a>&nbsp;&nbsp;
-      <a href="#M000038">resolve</a>&nbsp;&nbsp;
-      <a href="#M000037">unregister</a>&nbsp;&nbsp;
+      <a href="#M000030">new</a>&nbsp;&nbsp;
+      <a href="#M000031">register</a>&nbsp;&nbsp;
+      <a href="#M000033">resolve</a>&nbsp;&nbsp;
+      <a href="#M000032">unregister</a>&nbsp;&nbsp;
       </div>
     </div>
@@ -111,12 +111,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000035" class="method-detail">
-        <a name="M000035"></a>
+      <div id="method-M000030" class="method-detail">
+        <a name="M000030"></a>
         <div class="method-heading">
-          <a href="URIClassifier.src/M000035.html" target="Code" class="method-signature"
-            onclick="popupCode('URIClassifier.src/M000035.html');return false;">
+          <a href="URIClassifier.src/M000030.html" target="Code" class="method-signature"
+            onclick="popupCode('URIClassifier.src/M000030.html');return false;">
           <span class="method-name">URIClassifier.new &rarr; URIClassifier<br />
 </span>
           </a>
@@ -143,12 +143,12 @@ portion.
       <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000036" class="method-detail">
-        <a name="M000036"></a>
+      <div id="method-M000031" class="method-detail">
+        <a name="M000031"></a>
         <div class="method-heading">
-          <a href="URIClassifier.src/M000036.html" target="Code" class="method-signature"
-            onclick="popupCode('URIClassifier.src/M000036.html');return false;">
+          <a href="URIClassifier.src/M000031.html" target="Code" class="method-signature"
+            onclick="popupCode('URIClassifier.src/M000031.html');return false;">
           <span class="method-name">uc.register("/someuri", SampleHandler.new) &rarr; nil<br />
 </span>
           </a>
@@ -173,12 +173,12 @@ to get right with a Hash.
         </div>
       </div>
-      <div id="method-M000038" class="method-detail">
-        <a name="M000038"></a>
+      <div id="method-M000033" class="method-detail">
+        <a name="M000033"></a>
         <div class="method-heading">
-          <a href="URIClassifier.src/M000038.html" target="Code" class="method-signature"
-            onclick="popupCode('URIClassifier.src/M000038.html');return false;">
+          <a href="URIClassifier.src/M000033.html" target="Code" class="method-signature"
+            onclick="popupCode('URIClassifier.src/M000033.html');return false;">
           <span class="method-name">uc.resolve("/someuri") &rarr; "/someuri", "", handler<br />
 uc.resolve("/someuri/pathinfo") &rarr; "/someuri", "/pathinfo", handler<br />
 uc.resolve("/notfound/orhere") &rarr; nil, nil, nil<br />
@@ -192,9 +192,8 @@ uc.resolve("/path/from/root") &rarr; "/", "/path/from/root", handler  # if uc.re
           <p>
 Attempts to resolve either the whole URI or at the longest prefix,
 returning the prefix (as script_info), path (as path_info), and registered
-handler (usually an <a href="HttpHandler.html">HttpHandler</a>). If it
-doesn&#8217;t find a handler registered at the longest match then it
-returns nil,nil,nil.
+handler (usually an HttpHandler). If it doesn&#8217;t find a handler
+registered at the longest match then it returns nil,nil,nil.
 </p>
 <p>
 Because the resolver uses a trie you are able to register a handler at
@@ -225,12 +224,12 @@ Don&#8216;t try other string-like stuff yet.
         </div>
       </div>
-      <div id="method-M000037" class="method-detail">
-        <a name="M000037"></a>
+      <div id="method-M000032" class="method-detail">
+        <a name="M000032"></a>
         <div class="method-heading">
-          <a href="URIClassifier.src/M000037.html" target="Code" class="method-signature"
-            onclick="popupCode('URIClassifier.src/M000037.html');return false;">
+          <a href="URIClassifier.src/M000032.html" target="Code" class="method-signature"
+            onclick="popupCode('URIClassifier.src/M000032.html');return false;">
           <span class="method-name">uc.unregister("/someuri")<br />
 </span>
           </a>