RubyGems - mongrel - Versions diffs - 0.3.13.4 → 1.0 - Mend

mongrel 0.3.13.4 → 1.0

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

data/doc/rdoc/classes/Mongrel/HttpParser.src/M000044.html CHANGED

@@ -5,25 +5,24 @@
 <html>
 <head>
-  <title>finish (Mongrel::HttpParser)</title>
+  <title>new (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.finish -&gt; true/false
+ *    parser.new -&gt; parser
  *
- * Finishes a parser early which could put in a &quot;good&quot; or bad state.
- * You should call reset after finish it or bad things will happen.
+ * Creates a new parser.
  */
-VALUE HttpParser_finish(VALUE self)
+VALUE HttpParser_init(VALUE self)
 {
   http_parser *http = NULL;
   DATA_GET(self, http_parser, http);
-  http_parser_finish(http);
+  http_parser_init(http);
-  return http_parser_is_finished(http) ? Qtrue : Qfalse;
+  return self;
 }</pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpParser.src/M000045.html CHANGED

@@ -5,55 +5,25 @@
 <html>
 <head>
-  <title>execute (Mongrel::HttpParser)</title>
+  <title>reset (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.execute(req_hash, data, start) -&gt; Integer
+ *    parser.reset -&gt; nil
  *
- * Takes a Hash and a String of data, parses the String of data filling in the Hash
- * returning an Integer to indicate how much of the data has been read.  No matter
- * what the return value, you should call HttpParser#finished? and HttpParser#error?
- * to figure out if it's done parsing or there was an error.
- *
- * This function now throws an exception when there is a parsing error.  This makes
- * the logic for working with the parser much easier.  You can still test for an
- * error, but now you need to wrap the parser with an exception handling block.
- *
- * The third argument allows for parsing a partial request and then continuing
- * the parsing from that position.  It needs all of the original data as well
- * so you have to append to the data buffer as you read.
+ * Resets the parser to it's initial state so that you can reuse it
+ * rather than making new ones.
  */
-VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
+VALUE HttpParser_reset(VALUE self)
 {
   http_parser *http = NULL;
-  int from = 0;
-  char *dptr = NULL;
-  long dlen = 0;
   DATA_GET(self, http_parser, http);
+  http_parser_init(http);
-  from = FIX2INT(start);
-  dptr = RSTRING(data)-&gt;ptr;
-  dlen = RSTRING(data)-&gt;len;
-  if(from &gt;= dlen) {
-    rb_raise(eHttpParserError, &quot;Requested start is after data buffer end.&quot;);
-  } else {
-    http-&gt;data = (void *)req_hash;
-    http_parser_execute(http, dptr, dlen, from);
-    VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
-    if(http_parser_has_error(http)) {
-      rb_raise(eHttpParserError, &quot;Invalid HTTP format, parsing fails.&quot;);
-    } else {
-      return INT2FIX(http_parser_nread(http));
-    }
-  }
+  return Qnil;
 }</pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpParser.src/M000046.html CHANGED

@@ -5,23 +5,25 @@
 <html>
 <head>
-  <title>error? (Mongrel::HttpParser)</title>
+  <title>finish (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.error? -&gt; true/false
+ *    parser.finish -&gt; true/false
  *
- * Tells you whether the parser is in an error state.
+ * Finishes a parser early which could put in a &quot;good&quot; or bad state.
+ * You should call reset after finish it or bad things will happen.
  */
-VALUE HttpParser_has_error(VALUE self)
+VALUE HttpParser_finish(VALUE self)
 {
   http_parser *http = NULL;
   DATA_GET(self, http_parser, http);
+  http_parser_finish(http);
-  return http_parser_has_error(http) ? Qtrue : Qfalse;
+  return http_parser_is_finished(http) ? Qtrue : Qfalse;
 }</pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpParser.src/M000047.html CHANGED

@@ -5,23 +5,55 @@
 <html>
 <head>
-  <title>finished? (Mongrel::HttpParser)</title>
+  <title>execute (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.finished? -&gt; true/false
+ *    parser.execute(req_hash, data, start) -&gt; Integer
  *
- * Tells you whether the parser is finished or not and in a good state.
+ * Takes a Hash and a String of data, parses the String of data filling in the Hash
+ * returning an Integer to indicate how much of the data has been read.  No matter
+ * what the return value, you should call HttpParser#finished? and HttpParser#error?
+ * to figure out if it's done parsing or there was an error.
+ *
+ * This function now throws an exception when there is a parsing error.  This makes
+ * the logic for working with the parser much easier.  You can still test for an
+ * error, but now you need to wrap the parser with an exception handling block.
+ *
+ * The third argument allows for parsing a partial request and then continuing
+ * the parsing from that position.  It needs all of the original data as well
+ * so you have to append to the data buffer as you read.
  */
-VALUE HttpParser_is_finished(VALUE self)
+VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
 {
   http_parser *http = NULL;
+  int from = 0;
+  char *dptr = NULL;
+  long dlen = 0;
   DATA_GET(self, http_parser, http);
-  return http_parser_is_finished(http) ? Qtrue : Qfalse;
+  from = FIX2INT(start);
+  dptr = RSTRING(data)-&gt;ptr;
+  dlen = RSTRING(data)-&gt;len;
+  if(from &gt;= dlen) {
+    rb_raise(eHttpParserError, &quot;Requested start is after data buffer end.&quot;);
+  } else {
+    http-&gt;data = (void *)req_hash;
+    http_parser_execute(http, dptr, dlen, from);
+    VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
+    if(http_parser_has_error(http)) {
+      rb_raise(eHttpParserError, &quot;Invalid HTTP format, parsing fails.&quot;);
+    } else {
+      return INT2FIX(http_parser_nread(http));
+    }
+  }
 }</pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpParser.src/M000048.html CHANGED

@@ -5,24 +5,23 @@
 <html>
 <head>
-  <title>nread (Mongrel::HttpParser)</title>
+  <title>error? (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.nread -&gt; Integer
+ *    parser.error? -&gt; true/false
  *
- * Returns the amount of data processed so far during this processing cycle.  It is
- * set to 0 on initialize or reset calls and is incremented each time execute is called.
+ * Tells you whether the parser is in an error state.
  */
-VALUE HttpParser_nread(VALUE self)
+VALUE HttpParser_has_error(VALUE self)
 {
   http_parser *http = NULL;
   DATA_GET(self, http_parser, http);
-  return INT2FIX(http-&gt;nread);
+  return http_parser_has_error(http) ? Qtrue : Qfalse;
 }</pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpParser.src/{M000042.html → M000049.html} RENAMED

@@ -5,24 +5,23 @@
 <html>
 <head>
-  <title>new (Mongrel::HttpParser)</title>
+  <title>finished? (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.new -&gt; parser
+ *    parser.finished? -&gt; true/false
  *
- * Creates a new parser.
+ * Tells you whether the parser is finished or not and in a good state.
  */
-VALUE HttpParser_init(VALUE self)
+VALUE HttpParser_is_finished(VALUE self)
 {
   http_parser *http = NULL;
   DATA_GET(self, http_parser, http);
-  http_parser_init(http);
-  return self;
+  return http_parser_is_finished(http) ? Qtrue : Qfalse;
 }</pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpParser.src/{M000043.html → M000050.html} RENAMED

@@ -5,25 +5,24 @@
 <html>
 <head>
-  <title>reset (Mongrel::HttpParser)</title>
+  <title>nread (Mongrel::HttpParser)</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>/**
  * call-seq:
- *    parser.reset -&gt; nil
+ *    parser.nread -&gt; Integer
  *
- * Resets the parser to it's initial state so that you can reuse it
- * rather than making new ones.
+ * Returns the amount of data processed so far during this processing cycle.  It is
+ * set to 0 on initialize or reset calls and is incremented each time execute is called.
  */
-VALUE HttpParser_reset(VALUE self)
+VALUE HttpParser_nread(VALUE self)
 {
   http_parser *http = NULL;
   DATA_GET(self, http_parser, http);
-  http_parser_init(http);
-  return Qnil;
+  return INT2FIX(http-&gt;nread);
 }</pre>
 </body>
 </html>

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

@@ -95,9 +95,9 @@ uses a StringIO object. To be safe, you should assume it works like a file.
 <p>
 The HttpHandler.request_notify system is implemented by having <a
 href="HttpRequest.html">HttpRequest</a> call <a
-href="HttpHandler.html#M000070">HttpHandler.request_begins</a>, <a
-href="HttpHandler.html#M000071">HttpHandler.request_progress</a>, <a
-href="HttpHandler.html#M000072">HttpHandler.process</a> during the <a
+href="HttpHandler.html#M000072">HttpHandler.request_begins</a>, <a
+href="HttpHandler.html#M000073">HttpHandler.request_progress</a>, <a
+href="HttpHandler.html#M000074">HttpHandler.process</a> during the <a
 href="../IO.html">IO</a> processing. This adds a small amount of overhead
 but lets you implement finer controlled handlers and filters.
 </p>
@@ -111,12 +111,12 @@ but lets you implement finer controlled handlers and filters.
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000133">escape</a>&nbsp;&nbsp;
-      <a href="#M000130">new</a>&nbsp;&nbsp;
-      <a href="#M000135">query_parse</a>&nbsp;&nbsp;
-      <a href="#M000131">read_body</a>&nbsp;&nbsp;
-      <a href="#M000132">read_socket</a>&nbsp;&nbsp;
-      <a href="#M000134">unescape</a>&nbsp;&nbsp;
+      <a href="#M000136">escape</a>&nbsp;&nbsp;
+      <a href="#M000133">new</a>&nbsp;&nbsp;
+      <a href="#M000138">query_parse</a>&nbsp;&nbsp;
+      <a href="#M000134">read_body</a>&nbsp;&nbsp;
+      <a href="#M000135">read_socket</a>&nbsp;&nbsp;
+      <a href="#M000137">unescape</a>&nbsp;&nbsp;
       </div>
     </div>
@@ -156,12 +156,12 @@ but lets you implement finer controlled handlers and filters.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000133" class="method-detail">
-        <a name="M000133"></a>
+      <div id="method-M000136" class="method-detail">
+        <a name="M000136"></a>
         <div class="method-heading">
-          <a href="HttpRequest.src/M000133.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000133.html');return false;">
+          <a href="HttpRequest.src/M000136.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000136.html');return false;">
           <span class="method-name">escape</span><span class="method-args">(s)</span>
           </a>
         </div>
@@ -169,40 +169,37 @@ but lets you implement finer controlled handlers and filters.
         <div class="method-description">
           <p>
 Performs URI escaping so that you can construct proper query strings
-faster. Use this rather than the cgi.rb version since it&#8217;s faster.
+faster. Use this rather than the cgi.rb version since it&#8216;s faster.
 (Stolen from <a href="Camping.html">Camping</a>).
 </p>
         </div>
       </div>
-      <div id="method-M000130" class="method-detail">
-        <a name="M000130"></a>
+      <div id="method-M000133" class="method-detail">
+        <a name="M000133"></a>
         <div class="method-heading">
-          <a href="HttpRequest.src/M000130.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000130.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(params, socket, dispatcher)</span>
+          <a href="HttpRequest.src/M000133.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000133.html');return false;">
+          <span class="method-name">new</span><span class="method-args">(params, socket, dispatchers)</span>
           </a>
         </div>
         <div class="method-description">
           <p>
-You don&#8217;t really call this. It&#8217;s made for you. Main thing it
+You don&#8216;t really call this. It&#8216;s made for you. Main thing it
 does is hook up the params, and store any remaining body data into the
 HttpRequest.body attribute.
-</p>
-<p>
-TODO: Implement tempfile removal when the request is done.
 </p>
         </div>
       </div>
-      <div id="method-M000135" class="method-detail">
-        <a name="M000135"></a>
+      <div id="method-M000138" class="method-detail">
+        <a name="M000138"></a>
         <div class="method-heading">
-          <a href="HttpRequest.src/M000135.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000135.html');return false;">
+          <a href="HttpRequest.src/M000138.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000138.html');return false;">
           <span class="method-name">query_parse</span><span class="method-args">(qs, d = '&amp;;')</span>
           </a>
         </div>
@@ -217,12 +214,12 @@ changing the characters used in the second parameter (which defaults to
         </div>
       </div>
-      <div id="method-M000134" class="method-detail">
-        <a name="M000134"></a>
+      <div id="method-M000137" class="method-detail">
+        <a name="M000137"></a>
         <div class="method-heading">
-          <a href="HttpRequest.src/M000134.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000134.html');return false;">
+          <a href="HttpRequest.src/M000137.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000137.html');return false;">
           <span class="method-name">unescape</span><span class="method-args">(s)</span>
           </a>
         </div>
@@ -237,13 +234,13 @@ href="Camping.html">Camping</a>).
       <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000131" class="method-detail">
-        <a name="M000131"></a>
+      <div id="method-M000134" class="method-detail">
+        <a name="M000134"></a>
         <div class="method-heading">
-          <a href="HttpRequest.src/M000131.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000131.html');return false;">
-          <span class="method-name">read_body</span><span class="method-args">(remain, total, dispatcher)</span>
+          <a href="HttpRequest.src/M000134.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000134.html');return false;">
+          <span class="method-name">read_body</span><span class="method-args">(remain, total)</span>
           </a>
         </div>
@@ -258,12 +255,12 @@ already.
         </div>
       </div>
-      <div id="method-M000132" class="method-detail">
-        <a name="M000132"></a>
+      <div id="method-M000135" class="method-detail">
+        <a name="M000135"></a>
         <div class="method-heading">
-          <a href="HttpRequest.src/M000132.html" target="Code" class="method-signature"
-            onclick="popupCode('HttpRequest.src/M000132.html');return false;">
+          <a href="HttpRequest.src/M000135.html" target="Code" class="method-signature"
+            onclick="popupCode('HttpRequest.src/M000135.html');return false;">
           <span class="method-name">read_socket</span><span class="method-args">(len)</span>
           </a>
         </div>

data/doc/rdoc/classes/Mongrel/HttpRequest.src/M000133.html CHANGED

@@ -5,16 +5,46 @@
 <html>
 <head>
-  <title>escape (Mongrel::HttpRequest)</title>
+  <title>new (Mongrel::HttpRequest)</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 269</span>
-269:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">escape</span>(<span class="ruby-identifier">s</span>)
-270:       <span class="ruby-identifier">s</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/([^ a-zA-Z0-9_.-]+)/n</span>) {
-271:         <span class="ruby-value str">'%'</span><span class="ruby-operator">+</span><span class="ruby-identifier">$1</span>.<span class="ruby-identifier">unpack</span>(<span class="ruby-value str">'H2'</span><span class="ruby-operator">*</span><span class="ruby-identifier">$1</span>.<span class="ruby-identifier">size</span>).<span class="ruby-identifier">join</span>(<span class="ruby-value str">'%'</span>).<span class="ruby-identifier">upcase</span>
-272:       }.<span class="ruby-identifier">tr</span>(<span class="ruby-value str">' '</span>, <span class="ruby-value str">'+'</span>)
-273:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 198</span>
+198:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">params</span>, <span class="ruby-identifier">socket</span>, <span class="ruby-identifier">dispatchers</span>)
+199:       <span class="ruby-ivar">@params</span> = <span class="ruby-identifier">params</span>
+200:       <span class="ruby-ivar">@socket</span> = <span class="ruby-identifier">socket</span>
+201:       <span class="ruby-ivar">@dispatchers</span> = <span class="ruby-identifier">dispatchers</span>
+202:       <span class="ruby-identifier">content_length</span> = <span class="ruby-ivar">@params</span>[<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">CONTENT_LENGTH</span>].<span class="ruby-identifier">to_i</span>
+203:       <span class="ruby-identifier">remain</span> = <span class="ruby-identifier">content_length</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@params</span>.<span class="ruby-identifier">http_body</span>.<span class="ruby-identifier">length</span>
+204:
+205:       <span class="ruby-comment cmt"># tell all dispatchers the request has begun</span>
+206:       <span class="ruby-ivar">@dispatchers</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">dispatcher</span><span class="ruby-operator">|</span>
+207:         <span class="ruby-identifier">dispatcher</span>.<span class="ruby-identifier">request_begins</span>(<span class="ruby-ivar">@params</span>)
+208:       <span class="ruby-keyword kw">end</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@dispatchers</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@dispatchers</span>.<span class="ruby-identifier">empty?</span>
+209:
+210:       <span class="ruby-comment cmt"># Some clients (like FF1.0) report 0 for body and then send a body.  This will probably truncate them but at least the request goes through usually.</span>
+211:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">remain</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value">0</span>
+212:         <span class="ruby-comment cmt"># we've got everything, pack it up</span>
+213:         <span class="ruby-ivar">@body</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>
+214:         <span class="ruby-ivar">@body</span>.<span class="ruby-identifier">write</span> <span class="ruby-ivar">@params</span>.<span class="ruby-identifier">http_body</span>
+215:         <span class="ruby-identifier">update_request_progress</span>(<span class="ruby-value">0</span>, <span class="ruby-identifier">content_length</span>)
+216:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">remain</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+217:         <span class="ruby-comment cmt"># must read more data to complete body</span>
+218:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">remain</span> <span class="ruby-operator">&gt;</span> <span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">MAX_BODY</span>
+219:           <span class="ruby-comment cmt"># huge body, put it in a tempfile</span>
+220:           <span class="ruby-ivar">@body</span> = <span class="ruby-constant">Tempfile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">MONGREL_TMP_BASE</span>)
+221:           <span class="ruby-ivar">@body</span>.<span class="ruby-identifier">binmode</span>
+222:         <span class="ruby-keyword kw">else</span>
+223:           <span class="ruby-comment cmt"># small body, just use that</span>
+224:           <span class="ruby-ivar">@body</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>
+225:         <span class="ruby-keyword kw">end</span>
+226:
+227:         <span class="ruby-ivar">@body</span>.<span class="ruby-identifier">write</span> <span class="ruby-ivar">@params</span>.<span class="ruby-identifier">http_body</span>
+228:         <span class="ruby-identifier">read_body</span>(<span class="ruby-identifier">remain</span>, <span class="ruby-identifier">content_length</span>)
+229:       <span class="ruby-keyword kw">end</span>
+230:
+231:       <span class="ruby-ivar">@body</span>.<span class="ruby-identifier">rewind</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@body</span>
+232:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>