mongrel 0.3.5 → 0.3.6

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Sat Feb 18 15:19:13 EST 2006
+Wed Feb 22 12:20:19 EST 2006

data/doc/rdoc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Feb 15 08:10:57 EST 2006</td>
+      <td>Sun Feb 19 10:22:19 EST 2006</td>
     </tr>
     </table>
   </div>
@@ -84,9 +84,11 @@ portability issues.
 </p>
 <h2>Status</h2>
 <p>
-The 0.3.2 release supports Ruby On Rails much better than previously, and
-also sports the beginning of a command and plugin infrastructure. This last
-part isn&#8217;t documented yet.
+The 0.3.6 release supports Ruby On Rails much better than previously, and
+also sports the beginning of a command and plugin infrastructure. There is
+now a more complete CGIWrapper that handles most of the CGI usage, but
+still doesn&#8217;t do the MIME decoding or file upload/send (it leaves
+that to CGI).
 </p>
 <p>
 After you&#8217;ve installed (either with gem install mongrel or via
@@ -164,9 +166,9 @@ example:
 <p>
 If you run this and access port 3000 with a browser it will say
 &quot;hello!&quot;. If you access it with any url other than
-&quot;/test&quot; it will give a simple 404. Check out the <a
-href="../classes/Mongrel/Error404Handler.html">Mongrel::Error404Handler</a>
-for a basic way to give a more complex 404 message.
+&quot;/test&quot; it will give a simple 404. Check out the
+Mongrel::Error404Handler for a basic way to give a more complex 404
+message.
 </p>
 <p>
 This also shows the DirHandler with directory listings. This is still rough

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>Sat Feb 18 15:10:16 EST 2006</td>
+      <td>Mon Feb 20 19:06:43 EST 2006</td>
     </tr>
     </table>
   </div>
@@ -77,8 +77,8 @@
       http11&nbsp;&nbsp;
       thread&nbsp;&nbsp;
       stringio&nbsp;&nbsp;
-      timeout&nbsp;&nbsp;
-      cgi&nbsp;&nbsp;
+      mongrel/cgi&nbsp;&nbsp;
+      mongrel/handlers&nbsp;&nbsp;
       </div>
     </div>
 

data/doc/rdoc/fr_class_index.html

@@ -22,16 +22,13 @@
   <div id="index-entries">
     <a href="classes/FactoryError.html">FactoryError</a><br />
     <a href="classes/Mongrel.html">Mongrel</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html">Mongrel::CGIWrapper</a><br />
     <a href="classes/Mongrel/Const.html">Mongrel::Const</a><br />
-    <a href="classes/Mongrel/DirHandler.html">Mongrel::DirHandler</a><br />
-    <a href="classes/Mongrel/Error404Handler.html">Mongrel::Error404Handler</a><br />
     <a href="classes/Mongrel/HeaderOut.html">Mongrel::HeaderOut</a><br />
-    <a href="classes/Mongrel/HttpHandler.html">Mongrel::HttpHandler</a><br />
     <a href="classes/Mongrel/HttpParser.html">Mongrel::HttpParser</a><br />
     <a href="classes/Mongrel/HttpRequest.html">Mongrel::HttpRequest</a><br />
     <a href="classes/Mongrel/HttpResponse.html">Mongrel::HttpResponse</a><br />
     <a href="classes/Mongrel/HttpServer.html">Mongrel::HttpServer</a><br />
+    <a href="classes/Mongrel/StopServer.html">Mongrel::StopServer</a><br />
     <a href="classes/Mongrel/URIClassifier.html">Mongrel::URIClassifier</a><br />
     <a href="classes/PluginFactory.html">PluginFactory</a><br />
   </div>

data/doc/rdoc/fr_method_index.html

@@ -20,64 +20,47 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <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#M000052">args (Mongrel::CGIWrapper)</a><br />
-    <a href="classes/Mongrel/DirHandler.html#M000023">can_serve (Mongrel::DirHandler)</a><br />
+    <a href="classes/Mongrel/HeaderOut.html#M000029">[]= (Mongrel::HeaderOut)</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#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 />
     <a href="classes/PluginFactory.html#M000006">factoryType (PluginFactory)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000017">finish (Mongrel::HttpParser)</a><br />
-    <a href="classes/Mongrel/HttpResponse.html#M000046">finished (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000040">finished (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000020">finished? (Mongrel::HttpParser)</a><br />
     <a href="classes/PluginFactory.html#M000012">getModuleName (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000010">getSubclass (PluginFactory)</a><br />
-    <a href="classes/Mongrel/CGIWrapper.html#M000048">header (Mongrel::CGIWrapper)</a><br />
     <a href="classes/PluginFactory.html#M000003">included (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000007">inherited (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000011">loadDerivative (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000002">log (PluginFactory)</a><br />
     <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#M000056">new (Mongrel::Error404Handler)</a><br />
+    <a href="classes/Mongrel/HeaderOut.html#M000028">new (Mongrel::HeaderOut)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000034">new (Mongrel::HttpResponse)</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/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/Mongrel/HttpServer.html#M000022">new (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/URIClassifier.html#M000030">new (Mongrel::URIClassifier)</a><br />
     <a href="classes/FactoryError.html#M000001">new (FactoryError)</a><br />
-    <a href="classes/Mongrel/HttpRequest.html#M000058">new (Mongrel::HttpRequest)</a><br />
+    <a href="classes/Mongrel/HttpRequest.html#M000041">new (Mongrel::HttpRequest)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000021">nread (Mongrel::HttpParser)</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/Mongrel/HttpServer.html#M000023">process_client (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000025">register (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/URIClassifier.html#M000031">register (Mongrel::URIClassifier)</a><br />
     <a href="classes/PluginFactory.html#M000013">requireDerivative (PluginFactory)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000036">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#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 />
+    <a href="classes/Mongrel/URIClassifier.html#M000033">resolve (Mongrel::URIClassifier)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000024">run (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000039">send_body (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000038">send_header (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000037">send_status (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/HttpResponse.html#M000035">start (Mongrel::HttpResponse)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000027">stop (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/URIClassifier.html#M000032">unregister (Mongrel::URIClassifier)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000026">unregister (Mongrel::HttpServer)</a><br />
   </div>
 </div>
 </body>

data/examples/mongrel_simple_ctrl.rb

@@ -0,0 +1,92 @@
+###############################################
+# mongrel_simple_ctrl.rb
+#
+# Control script for the Mongrel server
+###############################################
+require "optparse"
+require "win32/service"
+include Win32
+
+# I start the service name with an 'A' so that it appears at the top
+SERVICE_NAME = "MongrelSvc"
+SERVICE_DISPLAYNAME = "Mongrel HTTP Server"
+SCRIPT_ROOT = File.join(File.dirname(__FILE__), '.') 
+SCRIPT_NAME = "mongrel_simple_service.rb"
+SERVICE_SCRIPT = File.expand_path(SCRIPT_ROOT + '/' + SCRIPT_NAME)
+
+OPTIONS = {}
+
+ARGV.options do |opts|
+   opts.on("-d", "--delete", "Delete the service"){ OPTIONS[:delete] = true }
+   opts.on("-u", "--uninstall","Delete the service"){ OPTIONS[:uninstall] = true }
+   opts.on("-s", "--start",  "Start the service"){ OPTIONS[:start] = true }
+   opts.on("-x", "--stop",   "Stop the service"){ OPTIONS[:stop] = true }
+   opts.on("-i", "--install","Install the service"){ OPTIONS[:install] = true }
+
+   opts.on("-h", "--help",   "Show this help message."){ puts opts; exit }
+
+   opts.parse!
+end
+
+# Install the service
+if OPTIONS[:install]  
+   require 'rbconfig'
+   
+   svc = Service.new
+   svc.create_service{ |s|
+      s.service_name     = SERVICE_NAME
+      s.display_name     = SERVICE_DISPLAYNAME
+      s.binary_path_name = Config::CONFIG['bindir'] + '/ruby ' + SERVICE_SCRIPT
+      s.dependencies     = []
+   }
+   svc.close
+   puts "#{SERVICE_DISPLAYNAME} service installed"
+end
+
+# Start the service
+if OPTIONS[:start]
+   Service.start(SERVICE_NAME)
+   started = false
+   while started == false
+      s = Service.status(SERVICE_NAME)
+      started = true if s.current_state == "running"
+      break if started == true
+      puts "One moment, " + s.current_state
+      sleep 1
+   end
+   puts "#{SERVICE_DISPLAYNAME} service started"
+end
+
+# Stop the service
+if OPTIONS[:stop]
+   Service.stop(SERVICE_NAME)
+   stopped = false
+   while stopped == false
+      s = Service.status(SERVICE_NAME)
+      stopped = true if s.current_state == "stopped"
+      break if stopped == true
+      puts "One moment, " + s.current_state
+      sleep 1
+   end
+   puts "#{SERVICE_DISPLAYNAME} service stopped"
+end
+
+# Delete the service.  Stop it first.
+if OPTIONS[:delete] || OPTIONS[:uninstall]
+   begin
+      Service.stop(SERVICE_NAME)
+   rescue
+   end
+   begin
+    Service.delete(SERVICE_NAME)
+   rescue
+   end
+   puts "#{SERVICE_DISPLAYNAME} service deleted"
+end
+# END mongrel_rails_ctrl.rb
+
+
+
+
+
+

data/examples/mongrel_simple_service.rb

@@ -0,0 +1,116 @@
+# This script emualtes script/server behavior but running webrick http server 
+require 'rubygems'
+
+require 'mongrel'
+require 'yaml'
+require 'zlib'
+
+require 'win32/service'
+
+DEBUG_LOG_FILE = File.expand_path(File.dirname(__FILE__) + '/debug.log') 
+
+class SimpleHandler < Mongrel::HttpHandler
+    def process(request, response)
+      response.start do |head,out|
+        head["Content-Type"] = "text/html"
+        results = "<html><body>Your request:<br /><pre>#{request.params.to_yaml}</pre><a href=\"/files\">View the files.</a></body></html>"
+        if request.params["HTTP_ACCEPT_ENCODING"] == "gzip,deflate"
+          head["Content-Encoding"] = "deflate"
+          # send it back deflated
+          out << Zlib::Deflate.deflate(results)
+        else
+          # no gzip supported, send it back normal
+          out << results
+        end
+      end
+    end
+end
+
+class MongrelDaemon < Win32::Daemon
+  def initialize(options)
+    @options = options
+  end
+  
+  def service_init
+    File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - service_init entered") }
+
+    File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("Mongrel running on #{@options[:ip]}:#{@options[:port]} with docroot #{@options[:server_root]}") } 
+
+    @simple = SimpleHandler.new
+    @files = Mongrel::DirHandler.new(@options[:server_root])
+
+    @http_server = Mongrel::HttpServer.new(@options[:ip], @options[:port])
+    @http_server.register("/", @simple)
+    @http_server.register("/files", @files)
+
+    File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - service_init left") }
+  end
+  
+  def service_stop
+    File.open(DEBUG_LOG_FILE,"a+"){ |f|
+      f.puts "stop signal received: " + Time.now.to_s
+      f.puts "sending stop to mongrel threads: " + Time.now.to_s
+    }
+    #@http_server.stop
+  end
+
+  def service_pause
+    File.open(DEBUG_LOG_FILE,"a+"){ |f|
+      f.puts "pause signal received: " + Time.now.to_s
+    }
+  end
+  
+  def service_resume
+    File.open(DEBUG_LOG_FILE,"a+"){ |f|
+      f.puts "continue/resume signal received: " + Time.now.to_s
+    }
+  end
+
+  def service_main
+    File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - service_main entered") }
+    
+    begin
+      File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - http_server.run") }
+      @http_server.run
+    
+      # No runner thread was needed after all!
+      #@runner = Thread.new do
+      #  @http_server.acceptor.join
+      #end
+      #File.open("d:\\test.log","a+") { |f| f.puts("#{Time.now} - runner.run") }
+      #@runner.run
+      
+      # here is where magic happens!
+      # if put blocking code here, the thread never left service_main, and the rb_func_call in service.c
+      # never exit, even if the stop signal is received.
+      #
+      # to probe my theory, just comment the while loop and remove the '1' from sleep function
+      # service start ok, but fail to stop.
+      #
+      # Even if no functional code is in service_main (because we have other working threads),
+      # we must monitor the state of the service to exit when the STOP event is received.
+      #
+      # Note: maybe not loop in 1 second intervals?
+      while state == RUNNING
+        sleep 1
+      end
+      
+    rescue StandardError, Exception, interrupt  => err
+      File.open(DEBUG_LOG_FILE,"a+"){ |f| f.puts("#{Time.now} - Error: #{err}") }
+      File.open(DEBUG_LOG_FILE,"a+"){ |f| f.puts("BACKTRACE: " + err.backtrace.join("\n")) }
+      
+    end
+    
+    File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - service_main left") }
+  end
+  
+end
+
+OPTIONS = {
+  :port            => 3000,
+  :ip              => "0.0.0.0",
+  :server_root     => File.expand_path(File.dirname(__FILE__)),
+}
+
+web_server = MongrelDaemon.new(OPTIONS)
+web_server.mainloop

data/examples/simpletest.rb

@@ -24,11 +24,13 @@ if ARGV.length != 3
   exit(1)
 end
 
-h = Mongrel::HttpServer.new(ARGV[0], ARGV[1])
+h = Mongrel::HttpServer.new(ARGV[0], ARGV[1].to_i)
 h.register("/", SimpleHandler.new)
 h.register("/files", Mongrel::DirHandler.new(ARGV[2]))
 h.run
 
+trap("INT") { h.stop }
+
 puts "Mongrel running on #{ARGV[0]}:#{ARGV[1]} with docroot #{ARGV[2]}"
 
 h.acceptor.join

data/ext/http11/http11_parser.c

@@ -17,7 +17,7 @@
 #line 18 "ext/http11/http11_parser.c"
 static int http_parser_start = 0;
 
-static int http_parser_first_final = 56;
+static int http_parser_first_final = 53;
 
 static int http_parser_error = 1;
 
@@ -162,7 +162,7 @@ tr34:
 	       	       parser->request_uri(parser->data, parser->mark, p - parser->mark);
 	}
 	goto st10;
-tr48:
+tr46:
 #line 37 "ext/http11/http11_parser.rl"
 	{ 
 	       if(parser->query_string != NULL)
@@ -249,11 +249,21 @@ tr37:
 	       	       parser->http_version(parser->data, parser->mark, p - parser->mark);
 	}
 	goto st19;
+tr49:
+#line 22 "ext/http11/http11_parser.rl"
+	{ 
+	       if(parser->http_field != NULL) {
+	       	       parser->http_field(parser->data, 
+		       		parser->field_start, parser->field_len, 
+				parser->mark+1, p - (parser->mark +1));
+		}
+	}
+	goto st19;
 st19:
 	if ( ++p == pe )
 		goto _out19;
 case 19:
-#line 257 "ext/http11/http11_parser.c"
+#line 267 "ext/http11/http11_parser.c"
 	if ( (*p) == 10 )
 		goto st20;
 	goto st1;
@@ -295,14 +305,14 @@ case 21:
 tr40:
 #line 46 "ext/http11/http11_parser.rl"
 	{ 
-	       parser->body_start = p+1; goto _out56;
+	       parser->body_start = p+1; goto _out53;
 	}
-	goto st56;
-st56:
+	goto st53;
+st53:
 	if ( ++p == pe )
-		goto _out56;
-case 56:
-#line 306 "ext/http11/http11_parser.c"
+		goto _out53;
+case 53:
+#line 316 "ext/http11/http11_parser.c"
 	goto st1;
 tr36:
 #line 16 "ext/http11/http11_parser.rl"
@@ -312,7 +322,7 @@ st22:
 	if ( ++p == pe )
 		goto _out22;
 case 22:
-#line 316 "ext/http11/http11_parser.c"
+#line 326 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
 		case 33: goto st22;
 		case 58: goto tr32;
@@ -347,11 +357,11 @@ st23:
 	if ( ++p == pe )
 		goto _out23;
 case 23:
-#line 351 "ext/http11/http11_parser.c"
+#line 361 "ext/http11/http11_parser.c"
 	if ( (*p) == 13 )
-		goto tr56;
-	goto tr55;
-tr55:
+		goto tr49;
+	goto tr52;
+tr52:
 #line 21 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
 	goto st24;
@@ -359,141 +369,47 @@ st24:
 	if ( ++p == pe )
 		goto _out24;
 case 24:
-#line 363 "ext/http11/http11_parser.c"
+#line 373 "ext/http11/http11_parser.c"
 	if ( (*p) == 13 )
-		goto tr51;
+		goto tr49;
 	goto st24;
-tr51:
-#line 22 "ext/http11/http11_parser.rl"
-	{ 
-	       if(parser->http_field != NULL) {
-	       	       parser->http_field(parser->data, 
-		       		parser->field_start, parser->field_len, 
-				parser->mark+1, p - (parser->mark +1));
-		}
-	}
-	goto st25;
-tr56:
-#line 21 "ext/http11/http11_parser.rl"
+tr28:
+#line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
-#line 22 "ext/http11/http11_parser.rl"
-	{ 
-	       if(parser->http_field != NULL) {
-	       	       parser->http_field(parser->data, 
-		       		parser->field_start, parser->field_len, 
-				parser->mark+1, p - (parser->mark +1));
-		}
-	}
 	goto st25;
 st25:
 	if ( ++p == pe )
 		goto _out25;
 case 25:
-#line 393 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 10: goto st26;
-		case 13: goto tr51;
-	}
-	goto st24;
-st26:
-	if ( ++p == pe )
-		goto _out26;
-case 26:
+#line 385 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 13: goto st21;
-		case 33: goto tr42;
-		case 124: goto tr42;
-		case 126: goto tr42;
-	}
-	if ( (*p) < 45 ) {
-		if ( (*p) > 39 ) {
-			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr42;
-		} else if ( (*p) >= 35 )
-			goto tr42;
-	} else if ( (*p) > 46 ) {
-		if ( (*p) < 65 ) {
-			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr42;
-		} else if ( (*p) > 90 ) {
-			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr42;
-		} else
-			goto tr42;
-	} else
-		goto tr42;
-	goto st24;
-tr42:
-#line 16 "ext/http11/http11_parser.rl"
-	{ parser->field_start = p; }
-	goto st27;
-st27:
-	if ( ++p == pe )
-		goto _out27;
-case 27:
-#line 435 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 13: goto tr51;
-		case 33: goto st27;
-		case 58: goto tr32;
-		case 124: goto st27;
-		case 126: goto st27;
-	}
-	if ( (*p) < 45 ) {
-		if ( (*p) > 39 ) {
-			if ( 42 <= (*p) && (*p) <= 43 )
-				goto st27;
-		} else if ( (*p) >= 35 )
-			goto st27;
-	} else if ( (*p) > 46 ) {
-		if ( (*p) < 65 ) {
-			if ( 48 <= (*p) && (*p) <= 57 )
-				goto st27;
-		} else if ( (*p) > 90 ) {
-			if ( 94 <= (*p) && (*p) <= 122 )
-				goto st27;
-		} else
-			goto st27;
-	} else
-		goto st27;
-	goto st24;
-tr28:
-#line 14 "ext/http11/http11_parser.rl"
-	{ MARK(parser, p); }
-	goto st28;
-st28:
-	if ( ++p == pe )
-		goto _out28;
-case 28:
-#line 469 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 43: goto st28;
-		case 58: goto st29;
+		case 43: goto st25;
+		case 58: goto st26;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st28;
+			goto st25;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) > 90 ) {
 			if ( 97 <= (*p) && (*p) <= 122 )
-				goto st28;
+				goto st25;
 		} else if ( (*p) >= 65 )
-			goto st28;
+			goto st25;
 	} else
-		goto st28;
+		goto st25;
 	goto st1;
 tr30:
 #line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
-	goto st29;
-st29:
+	goto st26;
+st26:
 	if ( ++p == pe )
-		goto _out29;
-case 29:
-#line 494 "ext/http11/http11_parser.c"
+		goto _out26;
+case 26:
+#line 410 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr34;
-		case 37: goto st30;
+		case 37: goto st27;
 		case 60: goto st1;
 		case 62: goto st1;
 		case 127: goto st1;
@@ -503,49 +419,49 @@ case 29:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto st29;
-st30:
+	goto st26;
+st27:
 	if ( ++p == pe )
-		goto _out30;
-case 30:
+		goto _out27;
+case 27:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st31;
+			goto st28;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st31;
+			goto st28;
 	} else
-		goto st31;
+		goto st28;
 	goto st1;
-st31:
+st28:
 	if ( ++p == pe )
-		goto _out31;
-case 31:
+		goto _out28;
+case 28:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st29;
+			goto st26;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st29;
+			goto st26;
 	} else
-		goto st29;
+		goto st26;
 	goto st1;
 tr29:
 #line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
-	goto st32;
-st32:
+	goto st29;
+st29:
 	if ( ++p == pe )
-		goto _out32;
-case 32:
-#line 542 "ext/http11/http11_parser.c"
+		goto _out29;
+case 29:
+#line 458 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr34;
-		case 37: goto st34;
+		case 37: goto st31;
 		case 47: goto st1;
 		case 60: goto st1;
 		case 62: goto st1;
-		case 63: goto tr46;
+		case 63: goto tr44;
 		case 127: goto st1;
 	}
 	if ( (*p) > 31 ) {
@@ -553,17 +469,17 @@ case 32:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto st33;
-st33:
+	goto st30;
+st30:
 	if ( ++p == pe )
-		goto _out33;
-case 33:
+		goto _out30;
+case 30:
 	switch( (*p) ) {
 		case 32: goto tr34;
-		case 37: goto st34;
+		case 37: goto st31;
 		case 60: goto st1;
 		case 62: goto st1;
-		case 63: goto tr46;
+		case 63: goto tr44;
 		case 127: goto st1;
 	}
 	if ( (*p) > 31 ) {
@@ -571,48 +487,48 @@ case 33:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto st33;
-st34:
+	goto st30;
+st31:
 	if ( ++p == pe )
-		goto _out34;
-case 34:
+		goto _out31;
+case 31:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st35;
+			goto st32;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st35;
+			goto st32;
 	} else
-		goto st35;
+		goto st32;
 	goto st1;
-st35:
+st32:
 	if ( ++p == pe )
-		goto _out35;
-case 35:
+		goto _out32;
+case 32:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st33;
+			goto st30;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st33;
+			goto st30;
 	} else
-		goto st33;
+		goto st30;
 	goto st1;
-tr46:
+tr44:
 #line 33 "ext/http11/http11_parser.rl"
 	{ 
 	       if(parser->request_uri != NULL)
 	       	       parser->request_uri(parser->data, parser->mark, p - parser->mark);
 	}
-	goto st36;
-st36:
+	goto st33;
+st33:
 	if ( ++p == pe )
-		goto _out36;
-case 36:
-#line 613 "ext/http11/http11_parser.c"
+		goto _out33;
+case 33:
+#line 529 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr48;
-		case 37: goto tr54;
+		case 32: goto tr46;
+		case 37: goto tr51;
 		case 60: goto st1;
 		case 62: goto st1;
 		case 127: goto st1;
@@ -622,19 +538,19 @@ case 36:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto tr53;
-tr53:
+	goto tr50;
+tr50:
 #line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
-	goto st37;
-st37:
+	goto st34;
+st34:
 	if ( ++p == pe )
-		goto _out37;
-case 37:
-#line 635 "ext/http11/http11_parser.c"
+		goto _out34;
+case 34:
+#line 551 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr48;
-		case 37: goto st38;
+		case 32: goto tr46;
+		case 37: goto st35;
 		case 60: goto st1;
 		case 62: goto st1;
 		case 127: goto st1;
@@ -644,58 +560,84 @@ case 37:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto st37;
-tr54:
+	goto st34;
+tr51:
 #line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
-	goto st38;
-st38:
+	goto st35;
+st35:
 	if ( ++p == pe )
-		goto _out38;
-case 38:
-#line 657 "ext/http11/http11_parser.c"
+		goto _out35;
+case 35:
+#line 573 "ext/http11/http11_parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st39;
+			goto st36;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st39;
+			goto st36;
 	} else
-		goto st39;
+		goto st36;
 	goto st1;
-st39:
+st36:
 	if ( ++p == pe )
-		goto _out39;
-case 39:
+		goto _out36;
+case 36:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st37;
+			goto st34;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st37;
+			goto st34;
 	} else
-		goto st37;
+		goto st34;
 	goto st1;
 tr14:
 #line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
-	goto st40;
+	goto st37;
+st37:
+	if ( ++p == pe )
+		goto _out37;
+case 37:
+#line 604 "ext/http11/http11_parser.c"
+	if ( (*p) == 69 )
+		goto st38;
+	goto st1;
+st38:
+	if ( ++p == pe )
+		goto _out38;
+case 38:
+	if ( (*p) == 84 )
+		goto st7;
+	goto st1;
+tr15:
+#line 14 "ext/http11/http11_parser.rl"
+	{ MARK(parser, p); }
+	goto st39;
+st39:
+	if ( ++p == pe )
+		goto _out39;
+case 39:
+#line 623 "ext/http11/http11_parser.c"
+	if ( (*p) == 69 )
+		goto st40;
+	goto st1;
 st40:
 	if ( ++p == pe )
 		goto _out40;
 case 40:
-#line 688 "ext/http11/http11_parser.c"
-	if ( (*p) == 69 )
+	if ( (*p) == 65 )
 		goto st41;
 	goto st1;
 st41:
 	if ( ++p == pe )
 		goto _out41;
 case 41:
-	if ( (*p) == 84 )
+	if ( (*p) == 68 )
 		goto st7;
 	goto st1;
-tr15:
+tr16:
 #line 14 "ext/http11/http11_parser.rl"
 	{ MARK(parser, p); }
 	goto st42;
@@ -703,115 +645,89 @@ st42:
 	if ( ++p == pe )
 		goto _out42;
 case 42:
-#line 707 "ext/http11/http11_parser.c"
-	if ( (*p) == 69 )
+#line 649 "ext/http11/http11_parser.c"
+	if ( (*p) == 80 )
 		goto st43;
 	goto st1;
 st43:
 	if ( ++p == pe )
 		goto _out43;
 case 43:
-	if ( (*p) == 65 )
+	if ( (*p) == 84 )
 		goto st44;
 	goto st1;
 st44:
 	if ( ++p == pe )
 		goto _out44;
 case 44:
-	if ( (*p) == 68 )
-		goto st7;
+	if ( (*p) == 73 )
+		goto st45;
 	goto st1;
-tr16:
-#line 14 "ext/http11/http11_parser.rl"
-	{ MARK(parser, p); }
-	goto st45;
 st45:
 	if ( ++p == pe )
 		goto _out45;
 case 45:
-#line 733 "ext/http11/http11_parser.c"
-	if ( (*p) == 80 )
+	if ( (*p) == 79 )
 		goto st46;
 	goto st1;
 st46:
 	if ( ++p == pe )
 		goto _out46;
 case 46:
-	if ( (*p) == 84 )
+	if ( (*p) == 78 )
 		goto st47;
 	goto st1;
 st47:
 	if ( ++p == pe )
 		goto _out47;
 case 47:
-	if ( (*p) == 73 )
-		goto st48;
+	if ( (*p) == 83 )
+		goto st7;
 	goto st1;
+tr17:
+#line 14 "ext/http11/http11_parser.rl"
+	{ MARK(parser, p); }
+	goto st48;
 st48:
 	if ( ++p == pe )
 		goto _out48;
 case 48:
-	if ( (*p) == 79 )
-		goto st49;
+#line 696 "ext/http11/http11_parser.c"
+	switch( (*p) ) {
+		case 79: goto st49;
+		case 85: goto st38;
+	}
 	goto st1;
 st49:
 	if ( ++p == pe )
 		goto _out49;
 case 49:
-	if ( (*p) == 78 )
-		goto st50;
+	if ( (*p) == 83 )
+		goto st38;
 	goto st1;
+tr18:
+#line 14 "ext/http11/http11_parser.rl"
+	{ MARK(parser, p); }
+	goto st50;
 st50:
 	if ( ++p == pe )
 		goto _out50;
 case 50:
-	if ( (*p) == 83 )
-		goto st7;
+#line 717 "ext/http11/http11_parser.c"
+	if ( (*p) == 82 )
+		goto st51;
 	goto st1;
-tr17:
-#line 14 "ext/http11/http11_parser.rl"
-	{ MARK(parser, p); }
-	goto st51;
 st51:
 	if ( ++p == pe )
 		goto _out51;
 case 51:
-#line 780 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 79: goto st52;
-		case 85: goto st41;
-	}
+	if ( (*p) == 65 )
+		goto st52;
 	goto st1;
 st52:
 	if ( ++p == pe )
 		goto _out52;
 case 52:
-	if ( (*p) == 83 )
-		goto st41;
-	goto st1;
-tr18:
-#line 14 "ext/http11/http11_parser.rl"
-	{ MARK(parser, p); }
-	goto st53;
-st53:
-	if ( ++p == pe )
-		goto _out53;
-case 53:
-#line 801 "ext/http11/http11_parser.c"
-	if ( (*p) == 82 )
-		goto st54;
-	goto st1;
-st54:
-	if ( ++p == pe )
-		goto _out54;
-case 54:
-	if ( (*p) == 65 )
-		goto st55;
-	goto st1;
-st55:
-	if ( ++p == pe )
-		goto _out55;
-case 55:
 	if ( (*p) == 67 )
 		goto st6;
 	goto st1;
@@ -837,7 +753,7 @@ case 55:
 	_out19: cs = 19; goto _out; 
 	_out20: cs = 20; goto _out; 
 	_out21: cs = 21; goto _out; 
-	_out56: cs = 56; goto _out; 
+	_out53: cs = 53; goto _out; 
 	_out22: cs = 22; goto _out; 
 	_out23: cs = 23; goto _out; 
 	_out24: cs = 24; goto _out; 
@@ -869,9 +785,6 @@ case 55:
 	_out50: cs = 50; goto _out; 
 	_out51: cs = 51; goto _out; 
 	_out52: cs = 52; goto _out; 
-	_out53: cs = 53; goto _out; 
-	_out54: cs = 54; goto _out; 
-	_out55: cs = 55; goto _out; 
 
 	_out: {}
 	}
@@ -882,7 +795,7 @@ case 55:
     if(parser->body_start) {
         /* final \r\n combo encountered so stop right here */
 	
-#line 886 "ext/http11/http11_parser.c"
+#line 799 "ext/http11/http11_parser.c"
 #line 131 "ext/http11/http11_parser.rl"
 	parser->nread++;
     }
@@ -895,7 +808,7 @@ int http_parser_finish(http_parser *parser)
 	int cs = parser->cs;
 
 	
-#line 899 "ext/http11/http11_parser.c"
+#line 812 "ext/http11/http11_parser.c"
 #line 142 "ext/http11/http11_parser.rl"
 
 	parser->cs = cs;