lib/mongrel/gems.rb @@ -46,9 +46,9 @@ lib/mongrel.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 Manifest @@ -1,13 +1,13 @@ require 'rubygems' -gem 'echoe', '>=2.6.4' +gem 'echoe', '>=2.7' require 'echoe' e = Echoe.new("mongrel") do |p| p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps." p.author ="Zed A. Shaw" - p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage'] - p.rdoc_pattern = ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc'] + p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage'] + p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc'] p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/ p.ruby_version = '>= 1.8.4' p.dependencies = ['gem_plugin >=0.2.3', 'cgi_multipart_eof_fix >=2.4'] @@ -15,14 +15,14 @@ e = Echoe.new("mongrel") do |p| p.need_tar_gz = false p.need_tgz = true - case RUBY_PLATFORM - when /mswin/ - p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem', - '~/gem_certificates/luislavena-mongrel-public_cert.pem'] - else +# case RUBY_PLATFORM +# when /mswin/ +# p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem', +# '~/gem_certificates/luislavena-mongrel-public_cert.pem'] +# else p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem', '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] - end +# end p.eval = proc do case RUBY_PLATFORM @@ -72,7 +72,7 @@ end #### XXX Hack around RubyGems and Echoe for pre-compiled extensions. def move_extensions - Dir["ext/**/*.#{Config::CONFIG['DLEXT']}"].each { |file| cp file, "lib/" } + Dir["ext/**/*.#{Config::CONFIG['DLEXT']}"].each { |file| mv file, "lib/" } end def java_classpath_arg @@ -118,7 +118,9 @@ end def sub_project(project, *targets) targets.each do |target| Dir.chdir "projects/#{project}" do - sh %{rake --trace #{target.to_s} } + unless RUBY_PLATFORM =~ /mswin/ + sh %{rake --trace #{target.to_s} } + end end end end @@ -132,6 +134,7 @@ task :package_all => [:package] do sub_project("mongrel_upload_progress", :package) sub_project("mongrel_console", :package) sub_project("mongrel_cluster", :package) + sub_project("mongrel_experimental", :package) sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/ sh("rake java package") unless RUBY_PLATFORM =~ /java/ # sh("rake mswin package") unless RUBY_PLATFORM =~ /mswin/ @@ -151,6 +154,7 @@ task :install => [:install_requirements] do sub_project("mongrel_upload_progress", :install) sub_project("mongrel_console", :install) sub_project("mongrel_cluster", :install) + sub_project("mongrel_experimental", :install) sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/ end @@ -162,6 +166,7 @@ task :uninstall => [:clean] do sub_project("mongrel_console", :uninstall) sub_project("gem_plugin", :uninstall) sub_project("fastthread", :uninstall) + sub_project("mongrel_experimental", :uninstall) sub_project("mongrel_service", :uninstall) if RUBY_PLATFORM =~ /mswin/ end @@ -174,6 +179,7 @@ task :clean do sub_project("mongrel_upload_progress", :clean) sub_project("mongrel_console", :clean) sub_project("mongrel_cluster", :clean) + sub_project("mongrel_experimental", :clean) sub_project("mongrel_service", :clean) if RUBY_PLATFORM =~ /mswin/ end @@ -192,8 +198,8 @@ namespace :site do FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" } # XXX Hack, because only Luis can package for Win32 right now - # sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/" - # sh "cp ~/Downloads/mongrel_service-0.3.3-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" sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/" Rakefile @@ -1,3 +1,5 @@ v1.2. Rewrite and merge mongrel cluster and mongrel_rails into something small and maintainable. Remove gem_plugin entirely. +v1.1.1. See if Java is setting the server version string in the request properly. + TODO @@ -124,7 +124,7 @@ module Mongrel end config.run - config.log "Mongrel available at #{@address}:#{@port}" + config.log "Mongrel #{Mongrel::Const::MONGREL_VERSION} available at #{@address}:#{@port}" if config.defaults[:daemon] config.write_pid_file bin/mongrel_rails @@ -235,13 +235,21 @@ module Mongrel def configure_socket_options case RUBY_PLATFORM - when /linux/ - # 9 is currently TCP_DEFER_ACCEPT - $tcp_defer_accept_opts = [Socket::SOL_TCP, 9, 1] - $tcp_cork_opts = [Socket::SOL_TCP, 3, 1] + when /linux/ + # 9 is currently TCP_DEFER_ACCEPT + $tcp_defer_accept_opts = [Socket::SOL_TCP, 9, 1] + $tcp_cork_opts = [Socket::SOL_TCP, 3, 1] + when /freebsd(([1-4]\..{1,2})|5\.[0-4])/ + # Do nothing, just closing a bug when freebsd <= 5.4 + when /freebsd/ + # Use the HTTP accept filter if available. + # The struct made by pack() is defined in /usr/include/sys/socket.h as accept_filter_arg + unless `/sbin/sysctl -nq net.inet.accf.http`.empty? + $tcp_defer_accept_opts = [Socket::SOL_SOCKET, Socket::SO_ACCEPTFILTER, ['httpready', nil].pack('a16a240')] + end end end - + # Runs the thing. It returns the thread used so you can "join" it. You can also # access the HttpServer::acceptor attribute to get the thread later. def run @@ -340,4 +348,4 @@ end # in regular Mongrel. $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/' -Mongrel::Gems.require 'mongrel_experimental', '=1.1' +Mongrel::Gems.require 'mongrel_experimental', ">=#{Mongrel::Const::MONGREL_VERSION}" lib/mongrel.rb @@ -1,8 +1,6 @@ if respond_to?(:namespace) - # Cap 2 - load 'mongrel_cluster/recipes_2' -else - # Cap 1 - load 'mongrel_cluster/recipes_1' + require 'mongrel_cluster/recipes_2' # Cap 2 +else + require 'mongrel_cluster/recipes_1' # Cap 1 end projects/mongrel_cluster/lib/mongrel_cluster/recipes.rb @@ -1,3 +1,3 @@ require 'uri_classifier' -STDERR.puts "** mongrel_experimental loaded" +STDERR.puts "** Mongrel_experimental loaded" projects/mongrel_experimental/lib/mongrel_experimental.rb @@ -1,7 +1,16 @@ <dl> + <dt>Nov-1-2007</dt> + <dd> + <h5><a href="{relocatable: news.html}">Mongrel 1.1, caffeinated edition</a></h5> + + <p>Mongrel 1.1 is out, with JRuby support. Mongrel_cluster is also updated to 1.0.4.</p> + <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a> + <a href="{relocatable: news.html}"><img src="{relocatable: images/li4.gif}" alt="more" /><br /></a></p> + </dd> + <dt>Oct-29-2007</dt> <dd> - <h5><a href="{relocatable: news.html}">Mongrel 1.0.4 released</a></h5> + <h5><a href="{relocatable: news.html}">Mongrel 1.0.4, bugfix release</a></h5> <p>Mongrel 1.0.4 is out. It fixes three bugs that were introduced in 1.0.3.</p> <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a> site/src/news.include @@ -7,6 +7,10 @@ ordering: 2 h1. Latest News +h2. Nov 1: Mongrel 1.1, caffeinated edition + +Mongrel 1.1 is out, with JRuby support. Mongrel_cluster is also updated to 1.0.4, with fixes for a Capistrano recipe bug. The URIClassifier has been updated; if you still need the old one (you don't), it's available in the mongrel_experimental gem. + h2. Oct 29: Mongrel 1.0.4, spooky. Mongrel 1.0.4 is out. It fixes three bugs that were introduced in 1.0.3. site/src/news.page test/jruby_socket.rb a39dea46464237e5a1f70f06c26a0e9c7f06bdd5 9faeddbd36dd1aab53b10d777c1311a31ab1b423 evanweaver evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9 http://github.com/pivotal/mongrel/commit/69370dc0501cccd972145a36b0e0aabfb831be7d 69370dc0501cccd972145a36b0e0aabfb831be7d 2007-10-31T23:52:51-07:00 2007-10-31T23:52:51-07:00 tag 1.1 git-svn-id: svn://rubyforge.org/var/svn/mongrel/tags/rel_1-1-0@867 19e92222-5c0b-0410-8929-a290d50e31e9 2c2ec0d9fd455089185229183863212248697d05 evanweaver evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9