RubyGems - mongrel - Versions diffs - 0.3.13 → 0.3.13.1 - Mend

mongrel 0.3.13 → 0.3.13.1

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 (179) hide show

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

@@ -5,16 +5,17 @@
 <html>
 <head>
-  <title>finished (Mongrel::HttpResponse)</title>
+  <title>socket_error (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 436</span>
-436:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">finished</span>
-437:       <span class="ruby-identifier">send_status</span>
-438:       <span class="ruby-identifier">send_header</span>
-439:       <span class="ruby-identifier">send_body</span>
-440:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 422</span>
+422:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">socket_error</span>(<span class="ruby-identifier">details</span>)
+423:       <span class="ruby-comment cmt"># ignore these since it means the client closed off early</span>
+424:       <span class="ruby-ivar">@socket</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@socket</span>.<span class="ruby-identifier">closed?</span>
+425:       <span class="ruby-identifier">done</span> = <span class="ruby-keyword kw">true</span>
+426:       <span class="ruby-identifier">raise</span> <span class="ruby-identifier">details</span>
+427:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

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

@@ -5,16 +5,16 @@
 <html>
 <head>
-  <title>done= (Mongrel::HttpResponse)</title>
+  <title>write (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 444</span>
-444:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">done=</span>(<span class="ruby-identifier">val</span>)
-445:       <span class="ruby-ivar">@status_sent</span> = <span class="ruby-keyword kw">true</span>
-446:       <span class="ruby-ivar">@header_sent</span> = <span class="ruby-keyword kw">true</span>
-447:       <span class="ruby-ivar">@body_sent</span> = <span class="ruby-keyword kw">true</span>
-448:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 429</span>
+429:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">write</span>(<span class="ruby-identifier">data</span>)
+430:       <span class="ruby-ivar">@socket</span>.<span class="ruby-identifier">write</span>(<span class="ruby-identifier">data</span>)
+431:     <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">details</span>
+432:       <span class="ruby-identifier">socket_error</span>(<span class="ruby-identifier">details</span>)
+433:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

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

@@ -5,14 +5,16 @@
 <html>
 <head>
-  <title>done (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 450</span>
-450:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">done</span>
-451:       (<span class="ruby-ivar">@status_sent</span> <span class="ruby-keyword kw">and</span> <span class="ruby-ivar">@header_sent</span> <span class="ruby-keyword kw">and</span> <span class="ruby-ivar">@body_sent</span>)
-452:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 437</span>
+437:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">finished</span>
+438:       <span class="ruby-identifier">send_status</span>
+439:       <span class="ruby-identifier">send_header</span>
+440:       <span class="ruby-identifier">send_body</span>
+441:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpResponse.src/M000088.html ADDED

@@ -0,0 +1,20 @@
+<?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>done= (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 445</span>
+445:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">done=</span>(<span class="ruby-identifier">val</span>)
+446:       <span class="ruby-ivar">@status_sent</span> = <span class="ruby-keyword kw">true</span>
+447:       <span class="ruby-ivar">@header_sent</span> = <span class="ruby-keyword kw">true</span>
+448:       <span class="ruby-ivar">@body_sent</span> = <span class="ruby-keyword kw">true</span>
+449:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/{HeaderOut.src/M000069.html → HttpResponse.src/M000089.html} RENAMED

@@ -5,14 +5,14 @@
 <html>
 <head>
-  <title>new (Mongrel::HeaderOut)</title>
+  <title>done (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 283</span>
-283:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">out</span>)
-284:       <span class="ruby-ivar">@out</span> = <span class="ruby-identifier">out</span>
-285:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 451</span>
+451:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">done</span>
+452:       (<span class="ruby-ivar">@status_sent</span> <span class="ruby-keyword kw">and</span> <span class="ruby-ivar">@header_sent</span> <span class="ruby-keyword kw">and</span> <span class="ruby-ivar">@body_sent</span>)
+453:     <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#M000063">HttpServer.process_client</a> function to do
+href="HttpServer.html#M000064">HttpServer.process_client</a> function to do
 the heavy lifting with the <a href="../IO.html">IO</a> and Ruby.
 </p>
 <p>
@@ -119,13 +119,13 @@ ways to make threads faster, but don&#8217;t hold your breath until Ruby
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000062">new</a>&nbsp;&nbsp;
-      <a href="#M000063">process_client</a>&nbsp;&nbsp;
-      <a href="#M000064">reap_dead_workers</a>&nbsp;&nbsp;
-      <a href="#M000066">register</a>&nbsp;&nbsp;
-      <a href="#M000065">run</a>&nbsp;&nbsp;
-      <a href="#M000068">stop</a>&nbsp;&nbsp;
-      <a href="#M000067">unregister</a>&nbsp;&nbsp;
+      <a href="#M000063">new</a>&nbsp;&nbsp;
+      <a href="#M000064">process_client</a>&nbsp;&nbsp;
+      <a href="#M000065">reap_dead_workers</a>&nbsp;&nbsp;
+      <a href="#M000067">register</a>&nbsp;&nbsp;
+      <a href="#M000066">run</a>&nbsp;&nbsp;
+      <a href="#M000069">stop</a>&nbsp;&nbsp;
+      <a href="#M000068">unregister</a>&nbsp;&nbsp;
       </div>
     </div>
@@ -190,12 +190,12 @@ ways to make threads faster, but don&#8217;t hold your breath until Ruby
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000062" class="method-detail">
-        <a name="M000062"></a>
+      <div id="method-M000063" class="method-detail">
+        <a name="M000063"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000062.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000062.html');return false;">
+          <a href="HttpServer.src/M000063.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000063.html');return false;">
           <span class="method-name">new</span><span class="method-args">(host, port, num_processors=(2**30-1), timeout=0)</span>
           </a>
         </div>
@@ -230,12 +230,12 @@ cause problems on FBSD.
       <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000063" class="method-detail">
-        <a name="M000063"></a>
+      <div id="method-M000064" class="method-detail">
+        <a name="M000064"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000063.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000063.html');return false;">
+          <a href="HttpServer.src/M000064.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000064.html');return false;">
           <span class="method-name">process_client</span><span class="method-args">(client)</span>
           </a>
         </div>
@@ -252,12 +252,12 @@ make it faster is more than welcome to take a crack at it.
         </div>
       </div>
-      <div id="method-M000064" class="method-detail">
-        <a name="M000064"></a>
+      <div id="method-M000065" class="method-detail">
+        <a name="M000065"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000064.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000064.html');return false;">
+          <a href="HttpServer.src/M000065.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000065.html');return false;">
           <span class="method-name">reap_dead_workers</span><span class="method-args">(worker_list)</span>
           </a>
         </div>
@@ -271,12 +271,12 @@ servicing.
         </div>
       </div>
-      <div id="method-M000066" class="method-detail">
-        <a name="M000066"></a>
+      <div id="method-M000067" class="method-detail">
+        <a name="M000067"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000066.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000066.html');return false;">
+          <a href="HttpServer.src/M000067.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000067.html');return false;">
           <span class="method-name">register</span><span class="method-args">(uri, handler, in_front=false)</span>
           </a>
         </div>
@@ -287,7 +287,7 @@ 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#M000091">Mongrel::URIClassifier#register</a> for
+href="URIClassifier.html#M000093">Mongrel::URIClassifier#register</a> for
 more information.
 </p>
 <p>
@@ -297,12 +297,12 @@ the list. Otherwise it&#8217;s placed at the end of the list.
         </div>
       </div>
-      <div id="method-M000065" class="method-detail">
-        <a name="M000065"></a>
+      <div id="method-M000066" class="method-detail">
+        <a name="M000066"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000065.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000065.html');return false;">
+          <a href="HttpServer.src/M000066.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000066.html');return false;">
           <span class="method-name">run</span><span class="method-args">()</span>
           </a>
         </div>
@@ -316,12 +316,12 @@ later.
         </div>
       </div>
-      <div id="method-M000068" class="method-detail">
-        <a name="M000068"></a>
+      <div id="method-M000069" class="method-detail">
+        <a name="M000069"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000068.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000068.html');return false;">
+          <a href="HttpServer.src/M000069.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000069.html');return false;">
           <span class="method-name">stop</span><span class="method-args">()</span>
           </a>
         </div>
@@ -334,12 +334,12 @@ the request queue before finally exiting.
         </div>
       </div>
-      <div id="method-M000067" class="method-detail">
-        <a name="M000067"></a>
+      <div id="method-M000068" class="method-detail">
+        <a name="M000068"></a>
         <div class="method-heading">
-          <a href="HttpServer.src/M000067.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpServer.src/M000067.html');return false;">
+          <a href="HttpServer.src/M000068.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpServer.src/M000068.html');return false;">
           <span class="method-name">unregister</span><span class="method-args">(uri)</span>
           </a>
         </div>
@@ -347,7 +347,7 @@ the request queue before finally exiting.
         <div class="method-description">
           <p>
 Removes any handlers registered at the given URI. See <a
-href="URIClassifier.html#M000092">Mongrel::URIClassifier#unregister</a> for
+href="URIClassifier.html#M000094">Mongrel::URIClassifier#unregister</a> for
 more information. Remember this removes them <b>all</b> so the entire
 processing chain goes away.
 </p>

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

@@ -5,79 +5,21 @@
 <html>
 <head>
-  <title>process_client (Mongrel::HttpServer)</title>
+  <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 515</span>
-515:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">process_client</span>(<span class="ruby-identifier">client</span>)
-516:       <span class="ruby-keyword kw">begin</span>
-517:         <span class="ruby-identifier">parser</span> = <span class="ruby-constant">HttpParser</span>.<span class="ruby-identifier">new</span>
-518:         <span class="ruby-identifier">params</span> = {}
-519:
-520:         <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>)
-521:         <span class="ruby-identifier">nparsed</span> = <span class="ruby-value">0</span>
-522:
-523:         <span class="ruby-comment cmt"># Assumption: nparsed will always be less since data will get filled with more</span>
-524:         <span class="ruby-comment cmt"># after each parsing.  If it doesn't get more then there was a problem</span>
-525:         <span class="ruby-comment cmt"># with the read operation on the client socket.  Effect is to stop processing when the</span>
-526:         <span class="ruby-comment cmt"># socket can't fill the buffer for further parsing.</span>
-527:         <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">nparsed</span> <span class="ruby-operator">&lt;</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span>
-528:           <span class="ruby-identifier">nparsed</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>, <span class="ruby-identifier">nparsed</span>)
-529:
-530:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">finished?</span>
-531:             <span class="ruby-identifier">script_name</span>, <span class="ruby-identifier">path_info</span>, <span class="ruby-identifier">handlers</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>])
-532:
-533:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">handlers</span>
-534:               <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>
-535:               <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>
-536:               <span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">REMOTE_ADDR</span>] = <span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP_X_FORWARDED_FOR</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">peeraddr</span>.<span class="ruby-identifier">last</span>
-537:
-538:               <span class="ruby-comment cmt"># TODO: Find a faster/better way to carve out the range, preferably without copying.</span>
-539:               <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">nparsed</span> <span class="ruby-operator">...</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;&quot;</span>, <span class="ruby-identifier">client</span>)
-540:
-541:               <span class="ruby-comment cmt"># in the case of large file uploads the user could close the socket, so skip those requests</span>
-542:               <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request</span>.<span class="ruby-identifier">body</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>  <span class="ruby-comment cmt"># nil signals from HttpRequest::initialize that the request was aborted</span>
-543:
-544:               <span class="ruby-comment cmt"># request is good so far, continue processing the response</span>
-545:               <span class="ruby-identifier">response</span> = <span class="ruby-constant">HttpResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">client</span>)
-546:
-547:               <span class="ruby-comment cmt"># Process each handler in registered order until we run out or one finalizes the response.</span>
-548:               <span class="ruby-identifier">handlers</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">handler</span><span class="ruby-operator">|</span>
-549:                 <span class="ruby-identifier">handler</span>.<span class="ruby-identifier">process</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>)
-550:                 <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">done</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">closed?</span>
-551:               <span class="ruby-keyword kw">end</span>
-552:
-553:               <span class="ruby-comment cmt"># And finally, if nobody closed the response off, we finalize it.</span>
-554:               <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">done</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">closed?</span>
-555:                 <span class="ruby-identifier">response</span>.<span class="ruby-identifier">finished</span>
-556:               <span class="ruby-keyword kw">end</span>
-557:             <span class="ruby-keyword kw">else</span>
-558:               <span class="ruby-comment cmt"># Didn't find it, return a stock 404 response.</span>
-559:               <span class="ruby-comment cmt"># TODO: Implement customer 404 files (but really they should use a real web server).</span>
-560:               <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>)
-561:             <span class="ruby-keyword kw">end</span>
-562:
-563:             <span class="ruby-keyword kw">break</span> <span class="ruby-comment cmt">#done</span>
-564:           <span class="ruby-keyword kw">else</span>
-565:             <span class="ruby-comment cmt"># Parser is not done, queue up more data to read and continue parsing</span>
-566:             <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>)
-567:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">MAX_HEADER</span>
-568:               <span class="ruby-identifier">raise</span> <span class="ruby-constant">HttpParserError</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;HEADER is longer than allowed, aborting client early.&quot;</span>)
-569:             <span class="ruby-keyword kw">end</span>
-570:           <span class="ruby-keyword kw">end</span>
-571:         <span class="ruby-keyword kw">end</span>
-572:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">EOFError</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ECONNRESET</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EPIPE</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EINVAL</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EBADF</span>
-573:         <span class="ruby-comment cmt"># ignored</span>
-574:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">HttpParserError</span>
-575:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{Time.now}: BAD CLIENT (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!&quot;</span>
-576:       <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">details</span>
-577:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{Time.now}: ERROR: #$!&quot;</span>
-578:         <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>)
-579:       <span class="ruby-keyword kw">ensure</span>
-580:         <span class="ruby-identifier">client</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">closed?</span>
-581:       <span class="ruby-keyword kw">end</span>
-582:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 499</span>
+499:     <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">2</span><span class="ruby-operator">**</span><span class="ruby-value">30</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>), <span class="ruby-identifier">timeout</span>=<span class="ruby-value">0</span>)
+500:       <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>)
+501:       <span class="ruby-ivar">@classifier</span> = <span class="ruby-constant">URIClassifier</span>.<span class="ruby-identifier">new</span>
+502:       <span class="ruby-ivar">@host</span> = <span class="ruby-identifier">host</span>
+503:       <span class="ruby-ivar">@port</span> = <span class="ruby-identifier">port</span>
+504:       <span class="ruby-ivar">@workers</span> = <span class="ruby-constant">ThreadGroup</span>.<span class="ruby-identifier">new</span>
+505:       <span class="ruby-ivar">@timeout</span> = <span class="ruby-identifier">timeout</span>
+506:       <span class="ruby-ivar">@num_processors</span> = <span class="ruby-identifier">num_processors</span>
+507:       <span class="ruby-ivar">@death_time</span> = <span class="ruby-value">60</span>
+508:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

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

@@ -5,22 +5,85 @@
 <html>
 <head>
-  <title>reap_dead_workers (Mongrel::HttpServer)</title>
+  <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 587</span>
-587:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reap_dead_workers</span>(<span class="ruby-identifier">worker_list</span>)
-588:       <span class="ruby-identifier">mark</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-589:       <span class="ruby-identifier">worker_list</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">w</span><span class="ruby-operator">|</span>
-590:         <span class="ruby-identifier">w</span>[<span class="ruby-identifier">:started_on</span>] = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span> <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">not</span> <span class="ruby-identifier">w</span>[<span class="ruby-identifier">:started_on</span>]
-591:
-592:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">mark</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">w</span>[<span class="ruby-identifier">:started_on</span>] <span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@death_time</span> <span class="ruby-operator">+</span> <span class="ruby-ivar">@timeout</span>
-593:           <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Thread #{w.inspect} is too old, killing.&quot;</span>
-594:           <span class="ruby-identifier">w</span>.<span class="ruby-identifier">raise</span>(<span class="ruby-constant">StopServer</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;Timed out thread.&quot;</span>))
-595:         <span class="ruby-keyword kw">end</span>
-596:       <span class="ruby-keyword kw">end</span>
-597:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 516</span>
+516:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">process_client</span>(<span class="ruby-identifier">client</span>)
+517:       <span class="ruby-keyword kw">begin</span>
+518:         <span class="ruby-identifier">parser</span> = <span class="ruby-constant">HttpParser</span>.<span class="ruby-identifier">new</span>
+519:         <span class="ruby-identifier">params</span> = {}
+520:
+521:         <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>)
+522:         <span class="ruby-identifier">nparsed</span> = <span class="ruby-value">0</span>
+523:
+524:         <span class="ruby-comment cmt"># Assumption: nparsed will always be less since data will get filled with more</span>
+525:         <span class="ruby-comment cmt"># after each parsing.  If it doesn't get more then there was a problem</span>
+526:         <span class="ruby-comment cmt"># with the read operation on the client socket.  Effect is to stop processing when the</span>
+527:         <span class="ruby-comment cmt"># socket can't fill the buffer for further parsing.</span>
+528:         <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">nparsed</span> <span class="ruby-operator">&lt;</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span>
+529:           <span class="ruby-identifier">nparsed</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>, <span class="ruby-identifier">nparsed</span>)
+530:
+531:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">finished?</span>
+532:             <span class="ruby-identifier">script_name</span>, <span class="ruby-identifier">path_info</span>, <span class="ruby-identifier">handlers</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>])
+533:
+534:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">handlers</span>
+535:               <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>
+536:               <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>
+537:               <span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">REMOTE_ADDR</span>] = <span class="ruby-identifier">params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP_X_FORWARDED_FOR</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">peeraddr</span>.<span class="ruby-identifier">last</span>
+538:               <span class="ruby-identifier">data</span> = <span class="ruby-identifier">data</span>[<span class="ruby-identifier">nparsed</span> <span class="ruby-operator">...</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;&quot;</span>
+539:
+540:               <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">handlers</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">request_notify</span>
+541:                 <span class="ruby-comment cmt"># this first handler wants to be notified when the process starts</span>
+542:                 <span class="ruby-identifier">handlers</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">request_begins</span>(<span class="ruby-identifier">params</span>)
+543:               <span class="ruby-keyword kw">end</span>
+544:
+545:               <span class="ruby-comment cmt"># TODO: Find a faster/better way to carve out the range, preferably without copying.</span>
+546:               <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">client</span>)
+547:
+548:               <span class="ruby-comment cmt"># in the case of large file uploads the user could close the socket, so skip those requests</span>
+549:               <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request</span>.<span class="ruby-identifier">body</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>  <span class="ruby-comment cmt"># nil signals from HttpRequest::initialize that the request was aborted</span>
+550:
+551:               <span class="ruby-comment cmt"># request is good so far, continue processing the response</span>
+552:               <span class="ruby-identifier">response</span> = <span class="ruby-constant">HttpResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">client</span>)
+553:
+554:               <span class="ruby-comment cmt"># Process each handler in registered order until we run out or one finalizes the response.</span>
+555:               <span class="ruby-identifier">handlers</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">handler</span><span class="ruby-operator">|</span>
+556:                 <span class="ruby-identifier">handler</span>.<span class="ruby-identifier">process</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>)
+557:                 <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">done</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">closed?</span>
+558:               <span class="ruby-keyword kw">end</span>
+559:
+560:               <span class="ruby-comment cmt"># And finally, if nobody closed the response off, we finalize it.</span>
+561:               <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">done</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">closed?</span>
+562:                 <span class="ruby-identifier">response</span>.<span class="ruby-identifier">finished</span>
+563:               <span class="ruby-keyword kw">end</span>
+564:             <span class="ruby-keyword kw">else</span>
+565:               <span class="ruby-comment cmt"># Didn't find it, return a stock 404 response.</span>
+566:               <span class="ruby-comment cmt"># TODO: Implement customer 404 files (but really they should use a real web server).</span>
+567:               <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>)
+568:             <span class="ruby-keyword kw">end</span>
+569:
+570:             <span class="ruby-keyword kw">break</span> <span class="ruby-comment cmt">#done</span>
+571:           <span class="ruby-keyword kw">else</span>
+572:             <span class="ruby-comment cmt"># Parser is not done, queue up more data to read and continue parsing</span>
+573:             <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>)
+574:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">data</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">MAX_HEADER</span>
+575:               <span class="ruby-identifier">raise</span> <span class="ruby-constant">HttpParserError</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;HEADER is longer than allowed, aborting client early.&quot;</span>)
+576:             <span class="ruby-keyword kw">end</span>
+577:           <span class="ruby-keyword kw">end</span>
+578:         <span class="ruby-keyword kw">end</span>
+579:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">EOFError</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ECONNRESET</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EPIPE</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EINVAL</span>,<span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EBADF</span>
+580:         <span class="ruby-comment cmt"># ignored</span>
+581:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">HttpParserError</span>
+582:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{Time.now}: BAD CLIENT (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!&quot;</span>
+583:       <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">details</span>
+584:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{Time.now}: ERROR: #$!&quot;</span>
+585:         <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>)
+586:       <span class="ruby-keyword kw">ensure</span>
+587:         <span class="ruby-identifier">client</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">client</span>.<span class="ruby-identifier">closed?</span>
+588:       <span class="ruby-keyword kw">end</span>
+589:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>