mongrel 0.3.4 → 0.3.5

data/Rakefile

@@ -30,7 +30,7 @@ end
 
 setup_extension("http11", "http11")
 
-version="0.3.4"
+version="0.3.5"
 summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
 test_file = "test/test_ws.rb"
 author="Zed A. Shaw"

data/doc/rdoc/classes/Mongrel/CGIWrapper.html

@@ -97,14 +97,15 @@ so I need testers to help work out the various corner cases.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000051">args</a>&nbsp;&nbsp;
-      <a href="#M000052">env_table</a>&nbsp;&nbsp;
+      <a href="#M000052">args</a>&nbsp;&nbsp;
+      <a href="#M000053">env_table</a>&nbsp;&nbsp;
       <a href="#M000048">header</a>&nbsp;&nbsp;
       <a href="#M000047">new</a>&nbsp;&nbsp;
-      <a href="#M000049">out</a>&nbsp;&nbsp;
-      <a href="#M000050">status</a>&nbsp;&nbsp;
-      <a href="#M000053">stdinput</a>&nbsp;&nbsp;
-      <a href="#M000054">stdoutput</a>&nbsp;&nbsp;
+      <a href="#M000050">out</a>&nbsp;&nbsp;
+      <a href="#M000049">send_cookies</a>&nbsp;&nbsp;
+      <a href="#M000051">status</a>&nbsp;&nbsp;
+      <a href="#M000054">stdinput</a>&nbsp;&nbsp;
+      <a href="#M000055">stdoutput</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -116,6 +117,25 @@ so I need testers to help work out the various corner cases.
     <div id="section">
 
 
+    <div id="constants-list">
+      <h3 class="section-bar">Constants</h3>
+
+      <div class="name-list">
+        <table summary="Constants">
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">REMOVED_KEYS</td>
+          <td>=</td>
+          <td class="context-item-value">[ &quot;nph&quot;,&quot;status&quot;,&quot;server&quot;,&quot;connection&quot;,&quot;type&quot;,                      &quot;charset&quot;,&quot;length&quot;,&quot;language&quot;,&quot;expires&quot;]</td>
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">
+these are stripped out of any keys passed to <a
+href="CGIWrapper.html#M000048">CGIWrapper.header</a> function
+
+</td>
+        </tr>
+        </table>
+      </div>
+    </div>
 
 
 
@@ -155,12 +175,12 @@ so I need testers to help work out the various corner cases.
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000051" class="method-detail">
-        <a name="M000051"></a>
+      <div id="method-M000052" class="method-detail">
+        <a name="M000052"></a>
 
         <div class="method-heading">
-          <a href="CGIWrapper.src/M000051.html" target="Code" class="method-signature"
-            onclick="popupCode('CGIWrapper.src/M000051.html');return false;">
+          <a href="CGIWrapper.src/M000052.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000052.html');return false;">
           <span class="method-name">args</span><span class="method-args">()</span>
           </a>
         </div>
@@ -172,19 +192,19 @@ Used to wrap the normal args variable used inside CGI.
         </div>
       </div>
 
-      <div id="method-M000052" class="method-detail">
-        <a name="M000052"></a>
+      <div id="method-M000053" class="method-detail">
+        <a name="M000053"></a>
 
         <div class="method-heading">
-          <a href="CGIWrapper.src/M000052.html" target="Code" class="method-signature"
-            onclick="popupCode('CGIWrapper.src/M000052.html');return false;">
+          <a href="CGIWrapper.src/M000053.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000053.html');return false;">
           <span class="method-name">env_table</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Used to wrap the normal <a href="CGIWrapper.html#M000052">env_table</a>
+Used to wrap the normal <a href="CGIWrapper.html#M000053">env_table</a>
 variable used inside CGI.
 </p>
         </div>
@@ -203,18 +223,23 @@ variable used inside CGI.
         <div class="method-description">
           <p>
 The header is typically called to send back the header. In our case we
-collect it into a hash for later usage. Options passed to this function are
-capitalized properly (unlike CGI), sanitized and then just stored.
+collect it into a hash for later usage.
+</p>
+<p>
+nph &#8212; Mostly ignored. It&#8216;ll output the date. connection &#8212;
+Completely ignored. Why is CGI doing this? length &#8212; Ignored since <a
+href="../Mongrel.html">Mongrel</a> figures this out from what you write to
+output.
 </p>
         </div>
       </div>
 
-      <div id="method-M000049" class="method-detail">
-        <a name="M000049"></a>
+      <div id="method-M000050" class="method-detail">
+        <a name="M000050"></a>
 
         <div class="method-heading">
-          <a href="CGIWrapper.src/M000049.html" target="Code" class="method-signature"
-            onclick="popupCode('CGIWrapper.src/M000049.html');return false;">
+          <a href="CGIWrapper.src/M000050.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000050.html');return false;">
           <span class="method-name">out</span><span class="method-args">(options = &quot;text/html&quot;) {||| &quot;&quot;)| ...}</span>
           </a>
         </div>
@@ -226,17 +251,38 @@ So, we just reuse header and then finalize the <a
 href="HttpResponse.html">HttpResponse</a> the right way. Status is taken
 from the various options and converted to what <a
 href="../Mongrel.html">Mongrel</a> needs via the <a
-href="CGIWrapper.html#M000050">CGIWrapper.status</a> function.
+href="CGIWrapper.html#M000051">CGIWrapper.status</a> function.
 </p>
         </div>
       </div>
 
-      <div id="method-M000050" class="method-detail">
-        <a name="M000050"></a>
+      <div id="method-M000049" class="method-detail">
+        <a name="M000049"></a>
 
         <div class="method-heading">
-          <a href="CGIWrapper.src/M000050.html" target="Code" class="method-signature"
-            onclick="popupCode('CGIWrapper.src/M000050.html');return false;">
+          <a href="CGIWrapper.src/M000049.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000049.html');return false;">
+          <span class="method-name">send_cookies</span><span class="method-args">(to)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Takes any &#8216;cookie&#8217; setting and sends it over the <a
+href="../Mongrel.html">Mongrel</a> header, then removes the setting from
+the options. If cookie is an Array or Hash then it sends those on with
+.to_s, otherwise it just calls .to_s on it and hopefully your
+&quot;cookie&quot; can write itself correctly.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000051" class="method-detail">
+        <a name="M000051"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000051.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000051.html');return false;">
           <span class="method-name">status</span><span class="method-args">()</span>
           </a>
         </div>
@@ -250,12 +296,12 @@ status message in the status we have to do a bit of parsing.
         </div>
       </div>
 
-      <div id="method-M000053" class="method-detail">
-        <a name="M000053"></a>
+      <div id="method-M000054" class="method-detail">
+        <a name="M000054"></a>
 
         <div class="method-heading">
-          <a href="CGIWrapper.src/M000053.html" target="Code" class="method-signature"
-            onclick="popupCode('CGIWrapper.src/M000053.html');return false;">
+          <a href="CGIWrapper.src/M000054.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000054.html');return false;">
           <span class="method-name">stdinput</span><span class="method-args">()</span>
           </a>
         </div>
@@ -267,12 +313,12 @@ Used to wrap the normal stdinput variable used inside CGI.
         </div>
       </div>
 
-      <div id="method-M000054" class="method-detail">
-        <a name="M000054"></a>
+      <div id="method-M000055" class="method-detail">
+        <a name="M000055"></a>
 
         <div class="method-heading">
-          <a href="CGIWrapper.src/M000054.html" target="Code" class="method-signature"
-            onclick="popupCode('CGIWrapper.src/M000054.html');return false;">
+          <a href="CGIWrapper.src/M000055.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000055.html');return false;">
           <span class="method-name">stdoutput</span><span class="method-args">()</span>
           </a>
         </div>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000047.html

@@ -10,14 +10,15 @@
   <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 605</span>
-605:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-606:       <span class="ruby-ivar">@request</span> = <span class="ruby-identifier">request</span>
-607:       <span class="ruby-ivar">@response</span> = <span class="ruby-identifier">response</span>
-608:       <span class="ruby-ivar">@args</span> = <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
-609:       <span class="ruby-ivar">@input</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">request</span>.<span class="ruby-identifier">body</span>)
-610:       <span class="ruby-ivar">@options</span> = {}
-611:       <span class="ruby-keyword kw">super</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-612:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 608</span>
+608:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+609:       <span class="ruby-ivar">@request</span> = <span class="ruby-identifier">request</span>
+610:       <span class="ruby-ivar">@response</span> = <span class="ruby-identifier">response</span>
+611:       <span class="ruby-ivar">@args</span> = <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
+612:       <span class="ruby-ivar">@input</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">request</span>.<span class="ruby-identifier">body</span>)
+613:       <span class="ruby-ivar">@head</span> = {}
+614:       <span class="ruby-ivar">@out_called</span> = <span class="ruby-keyword kw">false</span>
+615:       <span class="ruby-keyword kw">super</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+616:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000048.html

@@ -10,18 +10,39 @@
   <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 617</span>
-617:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">header</span>(<span class="ruby-identifier">options</span> = <span class="ruby-value str">&quot;text/html&quot;</span>)
-618:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Hash</span>
-619:         <span class="ruby-comment cmt"># passing in a header so need to keep the status around and other options</span>
-620:         <span class="ruby-ivar">@options</span> = <span class="ruby-ivar">@options</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">options</span>)
-621:       <span class="ruby-keyword kw">else</span>
-622:         <span class="ruby-ivar">@options</span>[<span class="ruby-value str">&quot;Content-Type&quot;</span>] = <span class="ruby-identifier">options</span>
-623:       <span class="ruby-keyword kw">end</span>
-624:       
-625:       <span class="ruby-comment cmt"># doing this fakes out the cgi library to think the headers are empty</span>
-626:       <span class="ruby-comment cmt"># we then do the real headers in the out function call later</span>
-627:       <span class="ruby-value str">&quot;&quot;</span>
-628:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 625</span>
+625:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">header</span>(<span class="ruby-identifier">options</span> = <span class="ruby-value str">&quot;text/html&quot;</span>)
+626:       
+627:       <span class="ruby-comment cmt"># if they pass in a string then just write the Content-Type</span>
+628:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">String</span>
+629:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-identifier">options</span>
+630:       <span class="ruby-keyword kw">else</span>
+631:         <span class="ruby-comment cmt"># convert the given options into what Mongrel wants</span>
+632:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-value str">'type'</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;text/html&quot;</span>
+633:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Content-Type'</span>] <span class="ruby-operator">+=</span> <span class="ruby-value str">&quot;; charset=&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">'charset'</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">has_key?</span> <span class="ruby-value str">&quot;charset&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">'charset'</span>]
+634:         
+635:         <span class="ruby-comment cmt"># setup date only if they use nph</span>
+636:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Date'</span>] = <span class="ruby-constant">CGI</span><span class="ruby-operator">::</span><span class="ruby-identifier">rfc1123_date</span>(<span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">'nph'</span>]
+637: 
+638:         <span class="ruby-comment cmt"># setup the server to use the default or what they set</span>
+639:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Server'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-value str">'server'</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">env_table</span>[<span class="ruby-value str">'SERVER_SOFTWARE'</span>]
+640: 
+641:         <span class="ruby-comment cmt"># remaining possible options they can give</span>
+642:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Status'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-value str">'status'</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">'status'</span>]
+643:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Content-Language'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-value str">'language'</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">'language'</span>]
+644:         <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'Expires'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-value str">'expires'</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">'expires'</span>]
+645: 
+646:         <span class="ruby-comment cmt"># drop the keys we don't want anymore</span>
+647:         <span class="ruby-constant">REMOVED_KEYS</span>.<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">k</span><span class="ruby-operator">|</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">k</span>) }
+648: 
+649:         <span class="ruby-comment cmt"># finally just convert the rest raw (which puts 'cookie' directly)</span>
+650:         <span class="ruby-comment cmt"># 'cookie' is translated later as we write the header out</span>
+651:         <span class="ruby-identifier">options</span>.<span class="ruby-identifier">each</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-ivar">@head</span>[<span class="ruby-identifier">k</span>] = <span class="ruby-identifier">v</span>}
+652:       <span class="ruby-keyword kw">end</span>
+653: 
+654:       <span class="ruby-comment cmt"># doing this fakes out the cgi library to think the headers are empty</span>
+655:       <span class="ruby-comment cmt"># we then do the real headers in the out function call later</span>
+656:       <span class="ruby-value str">&quot;&quot;</span>
+657:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000049.html

@@ -5,18 +5,30 @@
 
 <html>
 <head>
-  <title>out (Mongrel::CGIWrapper)</title>
+  <title>send_cookies (Mongrel::CGIWrapper)</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 634</span>
-634:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">out</span>(<span class="ruby-identifier">options</span> = <span class="ruby-value str">&quot;text/html&quot;</span>)
-635:       <span class="ruby-identifier">header</span>(<span class="ruby-identifier">options</span>)
-636:       <span class="ruby-ivar">@response</span>.<span class="ruby-identifier">start</span> <span class="ruby-identifier">status</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">head</span>, <span class="ruby-identifier">out</span><span class="ruby-operator">|</span>
-637:         <span class="ruby-ivar">@options</span>.<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">head</span>[<span class="ruby-identifier">k</span>.<span class="ruby-identifier">capitalize</span>] = <span class="ruby-identifier">v</span>}
-638:         <span class="ruby-identifier">out</span>.<span class="ruby-identifier">write</span>(<span class="ruby-keyword kw">yield</span> <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;&quot;</span>)
-639:       <span class="ruby-keyword kw">end</span>
-640:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 664</span>
+664:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_cookies</span>(<span class="ruby-identifier">to</span>)
+665:       <span class="ruby-comment cmt"># convert the cookies based on the myriad of possible ways to set a cookie</span>
+666:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'cookie'</span>]
+667:         <span class="ruby-identifier">cookie</span> = <span class="ruby-ivar">@head</span>[<span class="ruby-value str">'cookie'</span>]
+668:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">cookie</span>
+669:         <span class="ruby-keyword kw">when</span> <span class="ruby-constant">Array</span>
+670:           <span class="ruby-identifier">cookie</span>.<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span> <span class="ruby-identifier">to</span>[<span class="ruby-value str">'Set-Cookie'</span>] = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">to_s</span> }
+671:         <span class="ruby-keyword kw">when</span> <span class="ruby-constant">Hash</span>
+672:           <span class="ruby-identifier">cookie</span>.<span class="ruby-identifier">each_value</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span> <span class="ruby-identifier">to</span>[<span class="ruby-value str">'Set-Cookie'</span>] = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">to_s</span>}
+673:         <span class="ruby-keyword kw">else</span>
+674:           <span class="ruby-identifier">to</span>[<span class="ruby-value str">'Set-Cookie'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-value str">'cookie'</span>].<span class="ruby-identifier">to_s</span>
+675:         <span class="ruby-keyword kw">end</span>
+676:         
+677:         <span class="ruby-ivar">@head</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value str">'cookie'</span>)
+678: 
+679:         <span class="ruby-comment cmt"># @output_cookies seems to never be used, but we'll process it just in case</span>
+680:         <span class="ruby-ivar">@output_cookies</span>.<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span> <span class="ruby-identifier">to</span>[<span class="ruby-value str">'Set-Cookie'</span>] = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">to_s</span> } <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@output_cookies</span>
+681:       <span class="ruby-keyword kw">end</span>
+682:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000050.html

@@ -5,22 +5,23 @@
 
 <html>
 <head>
-  <title>status (Mongrel::CGIWrapper)</title>
+  <title>out (Mongrel::CGIWrapper)</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 645</span>
-645:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>
-646:       <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">not</span> <span class="ruby-ivar">@status</span>
-647:         <span class="ruby-ivar">@status</span> = <span class="ruby-ivar">@options</span>[<span class="ruby-value str">&quot;Status&quot;</span>] <span class="ruby-operator">||</span> <span class="ruby-ivar">@options</span>[<span class="ruby-value str">&quot;status&quot;</span>]
-648:         
-649:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@status</span>
-650:           <span class="ruby-ivar">@status</span>[<span class="ruby-value">0</span> <span class="ruby-operator">...</span> <span class="ruby-ivar">@status</span>.<span class="ruby-identifier">index</span>(<span class="ruby-value str">' '</span>)] <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;200&quot;</span>
-651:         <span class="ruby-keyword kw">else</span>
-652:           <span class="ruby-ivar">@status</span> = <span class="ruby-value str">&quot;200&quot;</span>
-653:         <span class="ruby-keyword kw">end</span>
-654:       <span class="ruby-keyword kw">end</span>
-655:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 688</span>
+688:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">out</span>(<span class="ruby-identifier">options</span> = <span class="ruby-value str">&quot;text/html&quot;</span>)
+689:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@out_called</span>  <span class="ruby-comment cmt"># don't do this more than once</span>
+690: 
+691:       <span class="ruby-identifier">header</span>(<span class="ruby-identifier">options</span>)
+692: 
+693:       <span class="ruby-ivar">@response</span>.<span class="ruby-identifier">start</span> <span class="ruby-identifier">status</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">head</span>, <span class="ruby-identifier">out</span><span class="ruby-operator">|</span>
+694:         <span class="ruby-identifier">send_cookies</span>(<span class="ruby-identifier">head</span>)
+695:         
+696:         <span class="ruby-ivar">@head</span>.<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">head</span>[<span class="ruby-identifier">k</span>] = <span class="ruby-identifier">v</span>}
+697:         <span class="ruby-identifier">out</span>.<span class="ruby-identifier">write</span>(<span class="ruby-keyword kw">yield</span> <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;&quot;</span>)
+698:       <span class="ruby-keyword kw">end</span>
+699:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000051.html

@@ -5,14 +5,22 @@
 
 <html>
 <head>
-  <title>args (Mongrel::CGIWrapper)</title>
+  <title>status (Mongrel::CGIWrapper)</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 658</span>
-658:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">args</span>
-659:       <span class="ruby-ivar">@args</span>
-660:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 704</span>
+704:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>
+705:       <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">not</span> <span class="ruby-ivar">@status</span>
+706:         <span class="ruby-ivar">@status</span> = <span class="ruby-ivar">@head</span>[<span class="ruby-value str">&quot;Status&quot;</span>] <span class="ruby-operator">||</span> <span class="ruby-ivar">@head</span>[<span class="ruby-value str">&quot;status&quot;</span>]
+707:         
+708:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@status</span>
+709:           <span class="ruby-ivar">@status</span>[<span class="ruby-value">0</span> <span class="ruby-operator">...</span> <span class="ruby-ivar">@status</span>.<span class="ruby-identifier">index</span>(<span class="ruby-value str">' '</span>)] <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;200&quot;</span>
+710:         <span class="ruby-keyword kw">else</span>
+711:           <span class="ruby-ivar">@status</span> = <span class="ruby-value str">&quot;200&quot;</span>
+712:         <span class="ruby-keyword kw">end</span>
+713:       <span class="ruby-keyword kw">end</span>
+714:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000052.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>env_table (Mongrel::CGIWrapper)</title>
+  <title>args (Mongrel::CGIWrapper)</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 663</span>
-663:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">env_table</span>
-664:       <span class="ruby-ivar">@request</span>.<span class="ruby-identifier">params</span>
-665:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 717</span>
+717:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">args</span>
+718:       <span class="ruby-ivar">@args</span>
+719:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000053.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>stdinput (Mongrel::CGIWrapper)</title>
+  <title>env_table (Mongrel::CGIWrapper)</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 668</span>
-668:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">stdinput</span>
-669:       <span class="ruby-ivar">@input</span>
-670:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 722</span>
+722:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">env_table</span>
+723:       <span class="ruby-ivar">@request</span>.<span class="ruby-identifier">params</span>
+724:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000054.html

@@ -5,15 +5,14 @@
 
 <html>
 <head>
-  <title>stdoutput (Mongrel::CGIWrapper)</title>
+  <title>stdinput (Mongrel::CGIWrapper)</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 673</span>
-673:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">stdoutput</span>
-674:       <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;WARNING: Your program is doing something not expected.  Please tell Zed that stdoutput was used and what software you are running.  Thanks.&quot;</span>
-675:       <span class="ruby-ivar">@response</span>.<span class="ruby-identifier">body</span>
-676:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 727</span>
+727:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">stdinput</span>
+728:       <span class="ruby-ivar">@input</span>
+729:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000055.html

@@ -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>stdoutput (Mongrel::CGIWrapper)</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 732</span>
+732:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">stdoutput</span>
+733:       <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;WARNING: Your program is doing something not expected.  Please tell Zed that stdoutput was used and what software you are running.  Thanks.&quot;</span>
+734:       <span class="ruby-ivar">@response</span>.<span class="ruby-identifier">body</span>
+735:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/Const.html

@@ -280,7 +280,7 @@ href="../Mongrel.html">Mongrel</a> man).
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">MONGREL_VERSION</td>
           <td>=</td>
-          <td class="context-item-value">'Mongrel 0.3.4'</td>
+          <td class="context-item-value">'Mongrel 0.3.5'</td>
           <td width="3em">&nbsp;</td>
           <td class="context-item-desc">
 Current <a href="../Mongrel.html">Mongrel</a> version (used for

data/doc/rdoc/classes/Mongrel/DirHandler.src/M000023.html

@@ -22,7 +22,7 @@
 488:           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span> <span class="ruby-identifier">index</span>
 489:             <span class="ruby-comment cmt"># serve the index</span>
 490:             <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">index</span>
-491:           <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@listing_allows</span>
+491:           <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@listing_allowed</span>
 492:             <span class="ruby-comment cmt"># serve the directory</span>
 493:             <span class="ruby-identifier">req</span>
 494:           <span class="ruby-keyword kw">else</span>

data/doc/rdoc/classes/Mongrel/Error404Handler.html

@@ -96,8 +96,8 @@ custom message for special URIs.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000055">new</a>&nbsp;&nbsp;
-      <a href="#M000056">process</a>&nbsp;&nbsp;
+      <a href="#M000056">new</a>&nbsp;&nbsp;
+      <a href="#M000057">process</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -119,12 +119,12 @@ custom message for special URIs.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000055" class="method-detail">
-        <a name="M000055"></a>
+      <div id="method-M000056" class="method-detail">
+        <a name="M000056"></a>
 
         <div class="method-heading">
-          <a href="Error404Handler.src/M000055.html" target="Code" class="method-signature"
-            onclick="popupCode('Error404Handler.src/M000055.html');return false;">
+          <a href="Error404Handler.src/M000056.html" target="Code" class="method-signature"
+            onclick="popupCode('Error404Handler.src/M000056.html');return false;">
           <span class="method-name">new</span><span class="method-args">(msg)</span>
           </a>
         </div>
@@ -139,12 +139,12 @@ it&#8217;s pretty efficient.
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000056" class="method-detail">
-        <a name="M000056"></a>
+      <div id="method-M000057" class="method-detail">
+        <a name="M000057"></a>
 
         <div class="method-heading">
-          <a href="Error404Handler.src/M000056.html" target="Code" class="method-signature"
-            onclick="popupCode('Error404Handler.src/M000056.html');return false;">
+          <a href="Error404Handler.src/M000057.html" target="Code" class="method-signature"
+            onclick="popupCode('Error404Handler.src/M000057.html');return false;">
           <span class="method-name">process</span><span class="method-args">(request, response)</span>
           </a>
         </div>

data/doc/rdoc/classes/Mongrel/Error404Handler.src/M000056.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>process (Mongrel::Error404Handler)</title>
+  <title>new (Mongrel::Error404Handler)</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 439</span>
-439:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">process</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>)
-440:       <span class="ruby-identifier">response</span>.<span class="ruby-identifier">socket</span>.<span class="ruby-identifier">write</span>(<span class="ruby-ivar">@response</span>)
-441:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 434</span>
+434:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">msg</span>)
+435:       <span class="ruby-ivar">@response</span> = <span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">ERROR_404_RESPONSE</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">msg</span>
+436:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/Error404Handler.src/M000057.html

@@ -0,0 +1,18 @@
+<?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 (Mongrel::Error404Handler)</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 439</span>
+439:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">process</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>)
+440:       <span class="ruby-identifier">response</span>.<span class="ruby-identifier">socket</span>.<span class="ruby-identifier">write</span>(<span class="ruby-ivar">@response</span>)
+441:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/HttpRequest.html

@@ -103,7 +103,7 @@ efficiently handling large file uploads.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000057">new</a>&nbsp;&nbsp;
+      <a href="#M000058">new</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -143,12 +143,12 @@ efficiently handling large file uploads.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000057" class="method-detail">
-        <a name="M000057"></a>
+      <div id="method-M000058" class="method-detail">
+        <a name="M000058"></a>
 
         <div class="method-heading">
-          <a href="HttpRequest.src/M000057.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000057.html');return false;">
+          <a href="HttpRequest.src/M000058.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000058.html');return false;">
           <span class="method-name">new</span><span class="method-args">(params, initial_body, socket)</span>
           </a>
         </div>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Thu Feb 16 02:01:03 EST 2006
+Sat Feb 18 15:19:13 EST 2006

data/doc/rdoc/files/lib/mongrel_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Feb 16 01:05:45 EST 2006</td>
+      <td>Sat Feb 18 15:10:16 EST 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/fr_method_index.html

@@ -22,12 +22,12 @@
   <div id="index-entries">
     <a href="classes/Mongrel/HeaderOut.html#M000034">[]= (Mongrel::HeaderOut)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000027">add_mime_type (Mongrel::DirHandler)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000051">args (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000052">args (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000023">can_serve (Mongrel::DirHandler)</a><br />
     <a href="classes/PluginFactory.html#M000009">create (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000008">derivativeClasses (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000005">derivatives (PluginFactory)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000052">env_table (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000053">env_table (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000019">error? (Mongrel::HttpParser)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000018">execute (Mongrel::HttpParser)</a><br />
     <a href="classes/PluginFactory.html#M000004">extend_object (PluginFactory)</a><br />
@@ -45,36 +45,37 @@
     <a href="classes/PluginFactory.html#M000014">makeRequirePath (PluginFactory)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000022">new (Mongrel::DirHandler)</a><br />
     <a href="classes/Mongrel/CGIWrapper.html#M000047">new (Mongrel::CGIWrapper)</a><br />
-    <a href="classes/Mongrel/Error404Handler.html#M000055">new (Mongrel::Error404Handler)</a><br />
+    <a href="classes/Mongrel/Error404Handler.html#M000056">new (Mongrel::Error404Handler)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000015">new (Mongrel::HttpParser)</a><br />
     <a href="classes/Mongrel/HttpServer.html#M000028">new (Mongrel::HttpServer)</a><br />
-    <a href="classes/Mongrel/HeaderOut.html#M000033">new (Mongrel::HeaderOut)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000040">new (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/HeaderOut.html#M000033">new (Mongrel::HeaderOut)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000035">new (Mongrel::URIClassifier)</a><br />
     <a href="classes/FactoryError.html#M000001">new (FactoryError)</a><br />
-    <a href="classes/Mongrel/HttpRequest.html#M000057">new (Mongrel::HttpRequest)</a><br />
+    <a href="classes/Mongrel/HttpRequest.html#M000058">new (Mongrel::HttpRequest)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000021">nread (Mongrel::HttpParser)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000049">out (Mongrel::CGIWrapper)</a><br />
-    <a href="classes/Mongrel/DirHandler.html#M000026">process (Mongrel::DirHandler)</a><br />
-    <a href="classes/Mongrel/Error404Handler.html#M000056">process (Mongrel::Error404Handler)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000050">out (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/HttpHandler.html#M000039">process (Mongrel::HttpHandler)</a><br />
+    <a href="classes/Mongrel/Error404Handler.html#M000057">process (Mongrel::Error404Handler)</a><br />
+    <a href="classes/Mongrel/DirHandler.html#M000026">process (Mongrel::DirHandler)</a><br />
     <a href="classes/Mongrel/HttpServer.html#M000029">process_client (Mongrel::HttpServer)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000036">register (Mongrel::URIClassifier)</a><br />
     <a href="classes/Mongrel/HttpServer.html#M000031">register (Mongrel::HttpServer)</a><br />
     <a href="classes/PluginFactory.html#M000013">requireDerivative (PluginFactory)</a><br />
-    <a href="classes/Mongrel/HttpResponse.html#M000042">reset (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000016">reset (Mongrel::HttpParser)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000042">reset (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000038">resolve (Mongrel::URIClassifier)</a><br />
     <a href="classes/Mongrel/HttpServer.html#M000030">run (Mongrel::HttpServer)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000045">send_body (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000049">send_cookies (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000024">send_dir_listing (Mongrel::DirHandler)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000025">send_file (Mongrel::DirHandler)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000044">send_header (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000043">send_status (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000041">start (Mongrel::HttpResponse)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000050">status (Mongrel::CGIWrapper)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000053">stdinput (Mongrel::CGIWrapper)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000054">stdoutput (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000051">status (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000054">stdinput (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000055">stdoutput (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000037">unregister (Mongrel::URIClassifier)</a><br />
     <a href="classes/Mongrel/HttpServer.html#M000032">unregister (Mongrel::HttpServer)</a><br />
   </div>

data/lib/mongrel.rb

@@ -112,7 +112,7 @@ module Mongrel
     SERVER_SOFTWARE='SERVER_SOFTWARE'
     
     # Current Mongrel version (used for SERVER_SOFTWARE and other response headers).
-    MONGREL_VERSION='Mongrel 0.3.4'
+    MONGREL_VERSION='Mongrel 0.3.5'
 
     # The standard empty 404 response for bad requests.  Use Error4040Handler for custom stuff.
     ERROR_404_RESPONSE="HTTP/1.1 404 Not Found\r\nConnection: close\r\nServer: #{MONGREL_VERSION}\r\n\r\nNOT FOUND"
@@ -488,7 +488,7 @@ module Mongrel
           if File.exist? index
             # serve the index
             return index
-          elsif @listing_allows
+          elsif @listing_allowed
             # serve the directory
             req
           else
@@ -597,44 +597,103 @@ module Mongrel
   # to get existing CGI based systems working.  It should handle everything, but please
   # notify me if you see special warnings.  This work is still very alpha so I need 
   # testers to help work out the various corner cases.
-
   class CGIWrapper < ::CGI
     public :env_table
     attr_reader :options
-    
+
+    # these are stripped out of any keys passed to CGIWrapper.header function
+    REMOVED_KEYS = [ "nph","status","server","connection","type",
+                     "charset","length","language","expires"]
+
     def initialize(request, response, *args)
       @request = request
       @response = response
       @args = *args
       @input = StringIO.new(request.body)
-      @options = {}
+      @head = {}
+      @out_called = false
       super(*args)
     end
     
     # The header is typically called to send back the header.  In our case we
-    # collect it into a hash for later usage.  Options passed to this function
-    # are capitalized properly (unlike CGI), sanitized and then just stored.
+    # collect it into a hash for later usage.
+    #
+    # nph -- Mostly ignored.  It'll output the date.
+    # connection -- Completely ignored.  Why is CGI doing this?
+    # length -- Ignored since Mongrel figures this out from what you write to output.
+    # 
     def header(options = "text/html")
-      if options.class == Hash
-        # passing in a header so need to keep the status around and other options
-        @options = @options.merge(options)
+      
+      # if they pass in a string then just write the Content-Type
+      if options.class == String
+        @head['Content-Type'] = options
       else
-        @options["Content-Type"] = options
+        # convert the given options into what Mongrel wants
+        @head['Content-Type'] = options['type'] || "text/html"
+        @head['Content-Type'] += "; charset=" + options['charset'] if options.has_key? "charset" if options['charset']
+        
+        # setup date only if they use nph
+        @head['Date'] = CGI::rfc1123_date(Time.now) if options['nph']
+
+        # setup the server to use the default or what they set
+        @head['Server'] = options['server'] || env_table['SERVER_SOFTWARE']
+
+        # remaining possible options they can give
+        @head['Status'] = options['status'] if options['status']
+        @head['Content-Language'] = options['language'] if options['language']
+        @head['Expires'] = options['expires'] if options['expires']
+
+        # drop the keys we don't want anymore
+        REMOVED_KEYS.each {|k| options.delete(k) }
+
+        # finally just convert the rest raw (which puts 'cookie' directly)
+        # 'cookie' is translated later as we write the header out
+        options.each{|k,v| @head[k] = v}
       end
-      
+
       # doing this fakes out the cgi library to think the headers are empty
       # we then do the real headers in the out function call later
       ""
     end
+
+    # Takes any 'cookie' setting and sends it over the Mongrel header,
+    # then removes the setting from the options. If cookie is an 
+    # Array or Hash then it sends those on with .to_s, otherwise
+    # it just calls .to_s on it and hopefully your "cookie" can
+    # write itself correctly.
+    def send_cookies(to)
+      # convert the cookies based on the myriad of possible ways to set a cookie
+      if @head['cookie']
+        cookie = @head['cookie']
+        case cookie
+        when Array
+          cookie.each {|c| to['Set-Cookie'] = c.to_s }
+        when Hash
+          cookie.each_value {|c| to['Set-Cookie'] = c.to_s}
+        else
+          to['Set-Cookie'] = options['cookie'].to_s
+        end
+        
+        @head.delete('cookie')
+
+        # @output_cookies seems to never be used, but we'll process it just in case
+        @output_cookies.each {|c| to['Set-Cookie'] = c.to_s } if @output_cookies
+      end
+    end
     
     # The dumb thing is people can call header or this or both and in any order.
     # So, we just reuse header and then finalize the HttpResponse the right way.
     # Status is taken from the various options and converted to what Mongrel needs
     # via the CGIWrapper.status function.
     def out(options = "text/html")
+      return if @out_called  # don't do this more than once
+
       header(options)
+
       @response.start status do |head, out|
-        @options.each {|k,v| head[k.capitalize] = v}
+        send_cookies(head)
+        
+        @head.each {|k,v| head[k] = v}
         out.write(yield || "")
       end
     end
@@ -644,7 +703,7 @@ module Mongrel
     # message in the status we have to do a bit of parsing.
     def status
       if not @status
-        @status = @options["Status"] || @options["status"]
+        @status = @head["Status"] || @head["status"]
         
         if @status
           @status[0 ... @status.index(' ')] || "200"
@@ -652,7 +711,7 @@ module Mongrel
           @status = "200"
         end
       end
-    end    
+    end
     
     # Used to wrap the normal args variable used inside CGI.
     def args

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
-date: 2006-02-16 00:00:00 -05:00
+  version: 0.3.5
+date: 2006-02-18 00:00:00 -05:00
 summary: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
 require_paths: 
 - lib
@@ -79,14 +79,15 @@ files:
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000052.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000053.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000054.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000055.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000022.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000023.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000024.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000025.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000026.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000027.html
-- doc/rdoc/classes/Mongrel/Error404Handler.src/M000055.html
 - doc/rdoc/classes/Mongrel/Error404Handler.src/M000056.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000057.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src/M000033.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src/M000034.html
 - doc/rdoc/classes/Mongrel/HttpHandler.src/M000039.html
@@ -97,7 +98,7 @@ files:
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000019.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000020.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000021.html
-- doc/rdoc/classes/Mongrel/HttpRequest.src/M000057.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000058.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000040.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000041.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000042.html

data/doc/rdoc/classes/Mongrel/Error404Handler.src/M000055.html

@@ -1,18 +0,0 @@
-<?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::Error404Handler)</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 434</span>
-434:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">msg</span>)
-435:       <span class="ruby-ivar">@response</span> = <span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">ERROR_404_RESPONSE</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">msg</span>
-436:     <span class="ruby-keyword kw">end</span></pre>
-</body>
-</html>