mongrel 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v1.0.4. Backport fixes for versioning inconsistency, mongrel_rails bug, and DirHandler bug.
+
 v1.0.3. Fix user-switching bug; make people upgrade to the latest from the RC.
 
 v1.0.2. Signed gem; many minor bugfixes and patches.

data/bin/mongrel_rails

@@ -4,11 +4,15 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html
 # for more information.
 
-require 'rubygems'
 require 'yaml'
+require 'etc'
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'mongrel'
 require 'mongrel/rails'
-require 'etc'
+
+# require 'ruby-debug'
+# Debugger.start
 
 module Mongrel
   class Start < GemPlugin::Plugin "/commands"
@@ -174,15 +178,14 @@ module Mongrel
 
     def config_keys
       @config_keys ||=
-        %w(host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script
-           num_processors timeout throttle user group prefix)
+        %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix)
     end
 
     def settings
       config_keys.inject({}) do |hash, key|
         value = self.instance_variable_get("@#{key}")
         key = 'host' if key == 'address'
-        hash[key.to_sym] = value
+        hash[key.to_sym] ||= value
         hash
       end
     end

data/ext/http11/http11.c

@@ -571,7 +571,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 1.0.2");
+  DEF_GLOBAL(mongrel_version, "Mongrel 1.0.4");
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 

data/lib/mongrel.rb

@@ -123,7 +123,7 @@ module Mongrel
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
 
-    MONGREL_VERSION="1.0.2".freeze
+    MONGREL_VERSION="1.0.4".freeze
 
     MONGREL_TMP_BASE="mongrel".freeze
 

data/lib/mongrel/camping.rb

@@ -38,7 +38,7 @@ module Mongrel
       @@file_only_methods = ["GET","HEAD"]
 
       def initialize(klass)
-        @files = Mongrel::DirHandler.new("/",false)
+        @files = Mongrel::DirHandler.new(nil, false)
         @guard = Mutex.new
         @klass = klass
       end

data/lib/mongrel/handlers.rb

@@ -69,9 +69,11 @@ module Mongrel
   end
 
 
+  #
   # The server normally returns a 404 response if an unknown URI is requested, but it
   # also returns a lame empty message.  This lets you do a 404 response
   # with a custom message for special URIs.
+  #
   class Error404Handler < HttpHandler
 
     # Sets the message to return.  This is constructed once for the handler
@@ -87,24 +89,25 @@ module Mongrel
 
   end
 
-
+  #
   # Serves the contents of a directory.  You give it the path to the root
   # where the files are located, and it tries to find the files based on 
   # the PATH_INFO inside the directory.  If the requested path is a
   # directory then it returns a simple directory listing.
   #
   # It does a simple protection against going outside it's root path by
-  # converting all paths to an absolute expanded path, and then making sure
-  # that the final expanded path includes the root path.  If it doesn't
+  # converting all paths to an absolute expanded path, and then making 
+  # sure that the final expanded path includes the root path.  If it doesn't
   # than it simply gives a 404.
   #
   # If you pass nil as the root path, it will not check any locations or
-  # expand any paths. This lets you serve files from multiple directories
+  # expand any paths. This lets you serve files from multiple drives
   # on win32.
   #
   # The default content type is "text/plain; charset=ISO-8859-1" but you
   # can change it anything you want using the DirHandler.default_content_type
   # attribute.
+  #
   class DirHandler < HttpHandler
     attr_accessor :default_content_type
     attr_reader :path
@@ -126,29 +129,27 @@ module Mongrel
     def can_serve(path_info)
 
       req_path = HttpRequest.unescape(path_info)
-      if @path
-        req_path = File.expand_path(File.join(@path, path_info), @path)
-      else
-        req_path = File.expand_path(req_path)
-      end
-
-      if req_path.index(@path) == 0 and File.exist? req_path
-        # it exists and it's in the right location
+      # Add the drive letter or root path
+      req_path = File.join(@path, req_path) if @path
+      req_path = File.expand_path req_path
+      
+      if File.exist? req_path
+        # It exists and it's in the right location
         if File.directory? req_path
-          # the request is for a directory
+          # The request is for a directory
           index = File.join(req_path, @index_html)
           if File.exist? index
-            # serve the index
+            # Serve the index
             return index
           elsif @listing_allowed
-            # serve the directory
+            # Serve the directory
             return req_path
           else
-            # do not serve anything
+            # Do not serve anything
             return nil
           end
         else
-          # it's a file and it's there
+          # It's a file and it's there
           return req_path
         end
       else

data/mongrel.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Mongrel-1.0.3
+# Gem::Specification for Mongrel-1.0.4
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{mongrel}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zed A. Shaw"]
-  s.date = %q{2007-10-27}
+  s.date = %q{2007-10-29}
   s.default_executable = %q{mongrel_rails}
   s.description = %q{A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.}
   s.email = %q{}
@@ -51,10 +51,6 @@ end
 #   p.need_tar_gz = false
 #   p.need_tgz = true
 # 
-#   case RUBY_PLATFORM 
-#   when /mswin/
-#   else
-#   end
 # 
 #   p.eval = proc do  
 #     case RUBY_PLATFORM
@@ -91,12 +87,8 @@ end
 # case RUBY_PLATFORM
 # when /mswin/
 #   filename = "lib/http11.so"
-#   file filename do
-#     Dir.chdir("ext/http11") do 
-#       ruby "extconf.rb"
-#       system(PLATFORM =~ /mswin/ ? 'nmake' : 'make')
-#     end
-#     move_extensions
+#   file filename do    
+#     cp "#{filename}.win32", filename
 #   end 
 #   task :compile => [filename]
 # end
@@ -148,7 +140,7 @@ end
 #   sub_project("mongrel_console", :uninstall)
 #   sub_project("gem_plugin", :uninstall)
 #   sub_project("fastthread", :uninstall)  
-#   sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/
+#   sub_project("mongrel_service", :uninstall) if RUBY_PLATFORM =~ /mswin/
 # end
 # 
 # desc "for Mongrel and all its subprojects"
@@ -178,7 +170,7 @@ end
 #     FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" }
 #     
 #     # XXX Hack, because only Luis can package for Win32 right now
-#     sh "cp ~/Downloads/mongrel-1.0.2-mswin32.gem pkg/gems/"
+#     sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/"
 #     sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"  
 #     sh "rm -rf pkg/mongrel*"
 #     sh "gem generate_index -d pkg"  

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-10-27 00:00:00 -04:00
+  version: 1.0.4
+date: 2007-10-29 00:00:00 -04:00
 summary: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
 require_paths: 
 - lib

metadata.gz.sig

@@ -1,5 +1,2 @@
-�#pf͇�88�Y�g�Š��Xy�F�*(V��Ƞ	:dp�Z]��\W�m4=�?�B�V9�Ro�X�)8��
-��̀�:@w����^�W>�JUy�U�"Ђ����y\J[ ���>�U3E���P�s
-
-B:L%�|�H�v�����v|��5�m����?�]�<���^n�0�!���e=�nɻ��~�J����}���#2F�K��cf���q�T,�36c3l�|
-�u�7os���K�#�`�Ķ�����
+ѐgr�PǯH�+q-��i�t��tI@H�F�ƐՓE]ZrU�|�a�4�i���Q��پ�q�M�W{��
SZD"R�8�>�@ڨM�4��d�mH��L���5$ӞRr� a��;�.�xVK[��ٸ?E3hd$͜
+�K@������\̖�K���,x�U����t�&������$��h�u���1m:���$̾XA����