mongrel 1.0.5 → 1.1

data/test/test_configurator.rb

@@ -56,6 +56,7 @@ class ConfiguratorTest < Test::Unit::TestCase
       end
     end
 
+    # pp @config.listeners.values.first.classifier.routes
 
     @config.listeners.each do |host,listener| 
       assert listener.classifier.uris.length == 3, "Wrong number of registered URIs"

data/test/test_redirect_handler.rb

@@ -9,7 +9,9 @@ require 'test/testhelp'
 class RedirectHandlerTest < Test::Unit::TestCase
 
   def setup
-    @server = Mongrel::HttpServer.new('127.0.0.1', 9998)
+    redirect_test_io do
+      @server = Mongrel::HttpServer.new('127.0.0.1', 9998)
+    end
     @server.run
     @client = Net::HTTP.new('127.0.0.1', 9998)
   end

data/test/test_request_progress.rb

@@ -38,7 +38,9 @@ end
 
 class RequestProgressTest < Test::Unit::TestCase
   def setup
-    @server = Mongrel::HttpServer.new("127.0.0.1", 9998)
+    redirect_test_io do
+      @server = Mongrel::HttpServer.new("127.0.0.1", 9998)
+    end
     @handler = UploadBeginHandler.new
     @server.register("/upload", @handler)
     @server.run

data/test/test_uriclassifier.rb

@@ -124,6 +124,7 @@ class URIClassifierTest < Test::Unit::TestCase
       current << c.chr
       uri_classifier.register(current, c)
     end
+    
 
     # Try to resolve everything with no asserts as a fuzzing
     tests.each do |prefix|
@@ -186,7 +187,6 @@ class URIClassifierTest < Test::Unit::TestCase
 
     tests.each do |uri|
       script_name, path_info, handler = uri_classifier.resolve(uri)
-#      p uri_classifier.resolve(uri)
       assert_equal root, script_name, "#{uri} did not resolve to #{root}"
       assert_equal uri, path_info
       assert_equal 2, handler

data/test/test_ws.rb

@@ -22,9 +22,12 @@ class WebServerTest < Test::Unit::TestCase
 
   def setup
     @valid_request = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\n\r\n"
-
-    # We set num_processors=1 so that we can test the reaping code
-    @server = HttpServer.new("127.0.0.1", 9998, num_processors=1)
+    
+    redirect_test_io do
+      # We set num_processors=1 so that we can test the reaping code
+      @server = HttpServer.new("127.0.0.1", 9998, num_processors=1)
+    end
+    
     @tester = TestHandler.new
     @server.register("/test", @tester)
     redirect_test_io do
@@ -44,7 +47,7 @@ class WebServerTest < Test::Unit::TestCase
   end
 
 
-  def do_test(string, chunk, close_after=nil)
+  def do_test(string, chunk, close_after=nil, shutdown_delay=0)
     # Do not use instance variables here, because it needs to be thread safe
     socket = TCPSocket.new("127.0.0.1", 9998);
     request = StringIO.new(string)
@@ -59,7 +62,9 @@ class WebServerTest < Test::Unit::TestCase
         sleep 1
       end
     end
+    sleep(shutdown_delay)
     socket.write(" ") # Some platforms only raise the exception on attempted write
+    socket.flush
   end
 
   def test_trickle_attack
@@ -81,8 +86,8 @@ class WebServerTest < Test::Unit::TestCase
   def test_header_is_too_long
     redirect_test_io do
       long = "GET /test HTTP/1.1\r\n" + ("X-Big: stuff\r\n" * 15000) + "\r\n"
-      assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL do
-        do_test(long, long.length/2)
+      assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL, IOError do
+        do_test(long, long.length/2, 10)
       end
     end
   end

data/test/testhelp.rb

@@ -20,6 +20,7 @@ require 'benchmark'
 require 'digest/sha1'
 require 'uri'
 require 'stringio'
+require 'pp'
 
 require 'mongrel'
 require 'mongrel/stats'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
+rubygems_version: 0.9.4.6
+specification_version: 2
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
-date: 2007-12-29 00:00:00 -03:00
+  version: "1.1"
+date: 2007-11-01 00:00:00 -04:00
 summary: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
 require_paths: 
 - lib
@@ -17,12 +17,18 @@ autorequire:
 default_executable: 
 bindir: bin
 has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: 1.8.4
   version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 platform: ruby
 signing_key: 
 cert_chain: 
@@ -50,24 +56,24 @@ cert_chain:
 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDQzCCAiugAwIBAgIBADANBgkqhkiG9w0BAQUFADBOMRwwGgYDVQQDDBNtb25n
+  MIIDPzCCAiegAwIBAgIBADANBgkqhkiG9w0BAQUFADBOMRwwGgYDVQQDDBNtb25n
   cmVsLWRldmVsb3BtZW50MRkwFwYKCZImiZPyLGQBGRYJcnVieWZvcmdlMRMwEQYK
-  CZImiZPyLGQBGRYDb3JnMB4XDTA3MDkyNDAyMzAzOVoXDTA4MDkyMzAyMzAzOVow
-  QTETMBEGA1UEAwwKbHVpc2xhdmVuYTEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMw
-  EQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-  AQEA5gIWDL7FYk43BEM3guuNz1vrr2RW7UAh+KY8w2+cGxt+MNi3P+rrfx/LAr7d
-  KKV+RT7PQgutb9MZhk8ghn0qgTpCxWbvlhnFrMqIDaJy9nXGEWt6M0fTWdEojrzF
-  dLSO//3GYzZze/ykE20KeNZ8SXzbxPwmIwrKfvoGYshGdmU7RAwiV6vV9ZS4uB1I
-  /pvzsWp3cSqZwxJvtb7P445jcDMPqFXjMFVAXd6KpfVNl4ZNBzYHc0Ii2uLu3Pv4
-  jOmwvJlYZ30ccBh0G86ngtlOpZNrdcnXgRKXADGnxPickYZMdIHPPykIeR6Im0sR
-  hCq6hsHkuWQU6CuwqTtGErw6uwIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQE
-  AwIEsDAdBgNVHQ4EFgQUkz5QYICmPVaUs8rhPOQmhrDosCUwDQYJKoZIhvcNAQEF
-  BQADggEBAMVgi+dtUNn1WNgsrkDi8wPkBbTj4qvTdu/mLncUD/wSNEfaf0ADiycu
-  W9x8imY3UmSyyc2HO+/Wnf6/PkbaoAcUZxl/7a60UDqSyTpdpfB3moA7z9+j+Kyp
-  nVFr7JVQG3SSNC/y0XrYf6J0DCgpLwOqLSes/KaQOtJlXl/xV37AHXEnAPjwJyCD
-  qafzGwoObqIf7Vj8IzU/eoCx/SxAYnaevry1bls58eb28FKGuq7bWyJuDrFu1H8m
-  mPG0Kv6rJ8vKyQiYZMAKm+XpuDZ09rnGm3ytdeEpXDfF5osSDDBSlWox82z2ulMd
-  knPjAuGZt50yNl1teBnVEZkty2RINfo=
+  CZImiZPyLGQBGRYDb3JnMB4XDTA3MDkxNjEwMzMwMFoXDTA4MDkxNTEwMzMwMFow
+  PTENMAsGA1UEAwwEZXZhbjEYMBYGCgmSJomT8ixkARkWCGNsb3VkYnVyMRIwEAYK
+  CZImiZPyLGQBGRYCc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk
+  LQijz2fICmev4+9s0WB71WzJFYCUYFQQxqGlenbxWut9dlPSsBbskGjg+UITeOXi
+  cTh3MTqAB0i1LJyNOiyvDsAivn7GjKXhVvflp2/npMhBBe83P4HOWqeQBjkk3QJI
+  FFNBvqbFLeEXIP+HiqAOiyNHZEVXMepLEJLzGrg3Ly7M7A6L5fK7jDrt8jkm+c+8
+  zGquVHV5ohAebGd/vpHMLjpA7lCG5+MBgYZd33rRfNtCxDJMNRgnOu9PsB05+LJn
+  MpDKQq3x0SkOf5A+MVOcadNCaAkFflYk3SUcXaXWxu/eCHgqfW1m76RNSp5djpKE
+  CgNPK9lGIWpB3CHzDaVNAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSw
+  MB0GA1UdDgQWBBT5aonPfFBdJ5rWFG+8dZwgyB54LjANBgkqhkiG9w0BAQUFAAOC
+  AQEAiKbzWgMcvZs/TPwJxr8tJ+7mSGz7+zDkWcbBl8FpQq1DtRcATh1oyTkQT7t+
+  rFEBYMmb0FxbbUnojQp8hIFgFkUwFpStwWBL/okLSehntzI2iwjuEtfj4ac9Q3Y2
+  uSdbmZqsQTuu+lEUc5C4qLK7YKwToaul+cx7vWxyk1YendcVwRlFLIBqA5cPrwo3
+  yyGLTHlRYn2c9PSbM1B63Yg+LqSSAa4QSU3Wv9pNdffVpvwHPVEQpO7ZDo5slQFL
+  Gf6+gbD/eZAvhpvmn8JlXb+LxKaFVMs2Yvrk1xOuT76SsPjEGWxkr7jZCIpsYfgQ
+  ALN3mi/9z0Mf1YroliUgF0v5Yw==
   -----END CERTIFICATE-----
 
 post_install_message: 
@@ -98,33 +104,33 @@ files:
 - ext/http11/http11_parser.java.rl
 - ext/http11/http11_parser.rl
 - ext/http11/http11_parser_common.rl
-- ext/http11/MANIFEST
-- ext/http11/tst.h
-- ext/http11/tst_cleanup.c
-- ext/http11/tst_delete.c
-- ext/http11/tst_grow_node_free_list.c
-- ext/http11/tst_init.c
-- ext/http11/tst_insert.c
-- ext/http11/tst_search.c
+- ext/http11_java/Http11Service.java
+- ext/http11_java/org/jruby/mongrel/Http11.java
+- ext/http11_java/org/jruby/mongrel/Http11Parser.java
 - lib/mongrel/camping.rb
 - lib/mongrel/cgi.rb
 - lib/mongrel/command.rb
 - lib/mongrel/configurator.rb
+- lib/mongrel/const.rb
 - lib/mongrel/debug.rb
+- lib/mongrel/gems.rb
 - lib/mongrel/handlers.rb
+- lib/mongrel/header_out.rb
+- lib/mongrel/http_request.rb
+- lib/mongrel/http_response.rb
 - lib/mongrel/init.rb
 - lib/mongrel/mime_types.yml
 - lib/mongrel/rails.rb
 - lib/mongrel/stats.rb
 - lib/mongrel/tcphack.rb
+- lib/mongrel/uri_classifier.rb
 - lib/mongrel.rb
-- lib/mutex_fix.rb
 - LICENSE
 - Manifest
 - mongrel-public_cert.pem
+- mongrel.gemspec
 - README
 - setup.rb
-- test/jruby_socket.rb
 - test/mime.yaml
 - test/mongrel.conf
 - test/test_cgi_wrapper.rb
@@ -141,8 +147,8 @@ files:
 - test/test_uriclassifier.rb
 - test/test_ws.rb
 - test/testhelp.rb
+- TODO
 - tools/trickletest.rb
-- mongrel.gemspec
 test_files: 
 - test/test_cgi_wrapper.rb
 - test/test_command.rb
@@ -171,9 +177,36 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: gem_plugin
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: cgi_multipart_eof_fix
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.4"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fastthread
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+    version: 

metadata.gz.sig

@@ -1 +1 @@
-�p��=����4��A���&e�RE�}#k������
b�9���s�9w��D3���UT���Z�Gv�ѩ
+Cw�����q]�o[ݳ$�]岧�b�M�� �ov�d�qV�"��\��f��_0��|�ԏ��'i*�L��	���Ò,��#X� Й;7X�XA;�]u+Oξ���+�|!���_�����|�.0w5�*\4Vΰ�Deedw��"�C���Y�3Iiu��Z(��`v���[]0}�P�;��%^6$'���-S�Och���u����E�ɿ��Q!ܗ��g3�Q��33ĩ`������X�
���l���P�v

data/ext/http11/tst.h

@@ -1,40 +0,0 @@
-
-
-struct node
-{
-   unsigned char value;
-   struct node *left;
-   struct node *middle;
-   struct node *right;
-};
-
-struct tst
-{
-   int node_line_width;
-   struct node_lines *node_lines;
-   struct node *free_list;
-   struct node *head[127];
-};
-
-struct node_lines
-{
-   struct node *node_line;
-   struct node_lines *next;
-};
-
-enum tst_constants
-{
-   TST_OK, TST_ERROR, TST_NULL_KEY, TST_DUPLICATE_KEY, TST_REPLACE, TST_LONGEST_MATCH
-};
-
-struct tst *tst_init(int node_line_width);
-
-int tst_insert(unsigned char *key, void *data, struct tst *tst, int option, void **exist_ptr);
-
-void *tst_search(const unsigned char *key, struct tst *tst, int option, unsigned int *match_len);
-
-void *tst_delete(unsigned char *key, struct tst *tst);
-
-void tst_cleanup(struct tst *tst);
-
-

data/ext/http11/tst_cleanup.c

@@ -1,23 +0,0 @@
-
-#include "tst.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-void tst_cleanup(struct tst *tst)
-{
-   struct node_lines *current_line;
-   struct node_lines *next_line;
-
-   next_line = tst->node_lines;
-
-   do
-   {
-      current_line = next_line;
-      next_line = current_line->next;
-      free(current_line->node_line);
-      free(current_line);
-   }
-   while(next_line != NULL);
-
-   free(tst);
-}

data/ext/http11/tst_delete.c

@@ -1,146 +0,0 @@
-
-#include "tst.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-void *tst_delete(unsigned char *key, struct tst *tst)
-{
-   struct node *current_node;
-   struct node *current_node_parent;
-   struct node *last_branch;
-   struct node *last_branch_parent;
-   struct node *next_node;
-   struct node *last_branch_replacement;
-   struct node *last_branch_dangling_child;
-   int key_index;
-
-   
-   if(key[0] == 0)
-      return NULL;
-   if(tst->head[(int)key[0]] == NULL)
-      return NULL;
-   
-   last_branch = NULL;
-   last_branch_parent = NULL;
-   current_node = tst->head[(int)key[0]];
-   current_node_parent = NULL;
-   key_index = 1;
-   while(current_node != NULL)
-   {
-      if(key[key_index] == current_node->value)
-      {
-         
-         if( (current_node->left != NULL) || (current_node->right != NULL) )
-         {
-            last_branch = current_node;
-            last_branch_parent = current_node_parent;
-         }
-         if(key[key_index] == 0)
-            break;
-         else
-         {
-            current_node_parent = current_node;
-            current_node = current_node->middle;
-            key_index++;
-            continue;
-         }
-      }
-      else if( ((current_node->value == 0) && (key[key_index] < 64)) ||
-         ((current_node->value != 0) && (key[key_index] <
-         current_node->value)) )
-      {
-         last_branch_parent = current_node;
-         current_node_parent = current_node;
-         current_node = current_node->left;
-         last_branch = current_node;
-         continue;
-      }
-      else
-      {
-         last_branch_parent = current_node;
-         current_node_parent = current_node;
-         current_node = current_node->right;
-         last_branch = current_node;
-         continue;
-      }
-   
-   }
-   if(current_node == NULL)
-      return NULL;
-   
-   if(last_branch == NULL)
-   {
-      
-         next_node = tst->head[(int)key[0]];
-         tst->head[(int)key[0]] = NULL;
-   }
-   else if( (last_branch->left == NULL) && (last_branch->right == NULL) )
-   {
-      
-      if(last_branch_parent->left == last_branch)
-         last_branch_parent->left = NULL;
-      else
-         last_branch_parent->right = NULL;
-      
-      next_node = last_branch;
-   }
-   else
-   {
-      
-      if( (last_branch->left != NULL) && (last_branch->right != NULL) )
-      {
-         last_branch_replacement = last_branch->right;
-         last_branch_dangling_child = last_branch->left;
-      }
-      else if(last_branch->right != NULL)
-      {
-         last_branch_replacement = last_branch->right;
-         last_branch_dangling_child = NULL;
-      }
-      else
-      {
-         last_branch_replacement = last_branch->left;
-         last_branch_dangling_child = NULL;
-      }
-      
-      if(last_branch_parent == NULL)
-         tst->head[(int)key[0]]=last_branch_replacement;
-      else
-      {
-         if (last_branch_parent->left == last_branch)
-            last_branch_parent->left = last_branch_replacement;
-         else if (last_branch_parent->right == last_branch)
-            last_branch_parent->right = last_branch_replacement;
-         else
-            last_branch_parent->middle = last_branch_replacement;
-      }
-      
-      if(last_branch_dangling_child != NULL)
-      {
-         current_node = last_branch_replacement;
-      
-         while (current_node->left != NULL)
-            current_node = current_node->left;
-      
-         current_node->left = last_branch_dangling_child;
-      }
-      
-      next_node = last_branch;
-   }
-   
-   do
-   {
-      current_node = next_node;
-      next_node = current_node->middle;
-      
-      current_node->left = NULL;
-      current_node->right = NULL;
-      current_node->middle = tst->free_list;
-      tst->free_list = current_node;
-   }
-   while(current_node->value != 0);
-   
-   return next_node;
-   
-}
-