Changeset 331

Timestamp:

08/16/06 16:51:38 (2 years ago)

Author:

zedshaw

Message:

Added mongrel_cluster as officially part of mongrel.

Files:

• trunk/Rakefile (modified) (1 diff)
• trunk/ext/http11/http11_parser.c (modified) (17 diffs)
• trunk/ext/http11/http11_parser.rl (modified) (1 diff)
• trunk/lib/mongrel.rb (modified) (2 diffs)
• trunk/lib/mongrel/configurator.rb (modified) (1 diff)
• trunk/test/test_http11.rb (modified) (3 diffs)

trunk/Rakefile

@@ -88 +88 @@
-  sub_project("mongrel_upload_progress", :install)
-  sub_project("mongrel_console", :install)
+  sub_project("mongrel_cluster", :install)
-  if RUBY_PLATFORM =~ /mswin/
-    sub_project("mongrel_service", :install)

trunk/ext/http11/http11_parser.c

@@ -181 +181 @@
-  }
-        goto st5;
+tr40:
+#line 43 "ext/http11/http11_parser.rl"
+        {MARK(query_start, p); }
+#line 44 "ext/http11/http11_parser.rl"
+        { 
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+  }
+#line 38 "ext/http11/http11_parser.rl"
+        { 
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+        goto st5;
-st5:
-        if ( ++p == pe )
-                goto _out5;
-case 5:
-188
+202
-        if ( (*p) == 72 )
-                goto tr3;
@@ -197 +211 @@
-                goto _out6;
-case 6:
-00
+14
-        if ( (*p) == 84 )
-                goto st7;
@@ -273 +287 @@
-                goto _out14;
-case 14:
-76
+90
-        if ( (*p) == 10 )
-                goto st15;
@@ -325 +339 @@
-                goto _out53;
-case 53:
-28
+42
-        goto st1;
-tr21:
@@ -335 +349 @@
-                goto _out17;
-case 17:
-38
+52
-        switch( (*p) ) {
-                case 33: goto st17;
@@ -374 +388 @@
-                goto _out18;
-case 18:
-77
+91
-        switch( (*p) ) {
-                case 13: goto tr36;
@@ -388 +402 @@
-                goto _out19;
-case 19:
-391
+405
-        if ( (*p) == 13 )
-                goto tr36;
@@ -400 +414 @@
-                goto _out20;
-case 20:
-03
+17
-        switch( (*p) ) {
-                case 43: goto st20;
@@ -425 +439 @@
-                goto _out21;
-case 21:
-28
+42
-        switch( (*p) ) {
-                case 32: goto tr19;
@@ -473 +487 @@
-                goto _out24;
-case 24:
-76
+90
-        switch( (*p) ) {
-                case 32: goto tr31;
@@ -526 +540 @@
-                goto _out27;
-case 27:
-29
+43
-        switch( (*p) ) {
-                case 32: goto tr19;
@@ -578 +592 @@
-                goto _out30;
-case 30:
-81
-
-28
-0
+95
+
+40
+1
-                case 60: goto st1;
-                case 62: goto st1;
@@ -600 +614 @@
-                goto _out31;
-case 31:
-03
+17
-        switch( (*p) ) {
-                case 32: goto tr28;
@@ -614 +628 @@
-                goto st1;
-        goto st31;
-0
+1
-#line 43 "ext/http11/http11_parser.rl"
-        {MARK(query_start, p); }
@@ -622 +636 @@
-                goto _out32;
-case 32:
-25
+39
-        if ( (*p) < 65 ) {
-                if ( 48 <= (*p) && (*p) <= 57 )
@@ -1048 +1062 @@
-    /* final \r\n combo encountered so stop right here */
-    
-51
+65
-#line 163 "ext/http11/http11_parser.rl"
-    parser->nread++;
@@ -1061 +1075 @@
-
-  
-64
+78
-#line 174 "ext/http11/http11_parser.rl"
-

trunk/ext/http11/http11_parser.rl

@@ -90 +90 @@
-
-  path = (pchar+ ( "/" pchar* )*) ;
->start_query 
+
-  param = ( pchar | "/" )* ;
-  params = (param ( ";" param )*) ;
-
+%start_query 
-  absolute_path = ("/"+ rel_path);
-

trunk/lib/mongrel.rb

@@ -4 +4 @@
-# Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
-# for more information.
+
+$mongrel_debug_client = false
-
-require 'socket'
@@ -586 +588 @@
-      rescue HttpParserError
-        STDERR.puts "#{Time.now}: BAD CLIENT (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!"
+        if $mongrel_debug_client
+          STDERR.puts "#{Time.now}: REQUEST DATA: #{data.inspect}\n---\nPARAMS: #{params.inspect}\n---\n"
+        end
-      rescue Errno::EMFILE
-        reap_dead_workers('too many files')
-      rescue Object
-        STDERR.puts "#{Time.now}: ERROR: #$!"
-
+ if $mongrel_debug_client
-      ensure
-        client.close rescue Object

trunk/lib/mongrel/configurator.rb

@@ -357 +357 @@
-        # graceful shutdown
-        trap("TERM") { log "TERM signal received."; stop }
-
+
-        # restart
-        trap("USR2") { log "USR2 signal received."; stop(true) }

trunk/test/test_http11.rb

@@ -61 +61 @@
-    
-    if readable
-0
+
-    else
-0
+
-    end
-
@@ -73 +73 @@
-    parser = HttpParser.new
-
-    # first verify that large random get requests fail
-    100.times do |c| 
-      get = "GET /#{rand_data(1024, 1024+(c*1024))} HTTP/1.1\r\n"
-      assert_raises Mongrel::HttpParserError do
-        parser.execute({}, get, 0)
-        parser.reset
-      end
-    end
-
-    # then that large header names are caught
-0
+
-      get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-#{rand_data(1024, 1024+(c*1024))}: Test\r\n\r\n"
-      assert_raises Mongrel::HttpParserError do
@@ -92 +83 @@
-
-    # then that large mangled field values are caught
-0
+
-      get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
-      assert_raises Mongrel::HttpParserError do