From 2c8112033ef6ddf3c57a6c281129322ea15858a2 Mon Sep 17 00:00:00 2001 From: evanweaver Date: Sat, 27 Oct 2007 09:11:45 +0000 Subject: forward port patch from 1.0.3 git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@801 19e92222-5c0b-0410-8929-a290d50e31e9 --- CHANGELOG | 2 ++ Rakefile | 8 ++++---- lib/mongrel/configurator.rb | 2 +- projects/gem_plugin/Rakefile | 11 +++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ac093c1..829e7b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ v1.1. Pure Ruby URIClassifier. More modular architecture. JRuby support. Move C URIClassifier into mongrel_experimental project. +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. diff --git a/Rakefile b/Rakefile index e46e89b..c86c753 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ 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'] - p.rdoc_pattern = ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc', 'ext/http11/http11.c'] + p.rdoc_pattern = ['README', 'LICENSE', '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'] @@ -209,13 +209,13 @@ namespace :site do desc "Upload the rdocs" task :rdoc => [:doc] do - sh "rsync -azv doc/* rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/" - sh "cd projects/gem_plugin; rake site" + sh "rsync -azv --no-perms --no-times doc/* rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/" + sh "cd projects/gem_plugin; rake site:rdoc" end desc "Upload the coverage report" task :coverage => [:rcov] do - sh "rsync -azv test/coverage/* rubyforge.org:/var/www/gforge-projects/mongrel/coverage/" + sh "rsync -azv --no-perms --no-times test/coverage/* rubyforge.org:/var/www/gforge-projects/mongrel/coverage/" end desc "Upload the website, the rdocs, and the coverage report" diff --git a/lib/mongrel/configurator.rb b/lib/mongrel/configurator.rb index e6b2205..334bdc4 100644 --- a/lib/mongrel/configurator.rb +++ b/lib/mongrel/configurator.rb @@ -60,7 +60,7 @@ module Mongrel if uid != target_uid or gid != target_gid log "Initiating groups for #{user.inspect}:#{group.inspect}." - Process.initgroups(user, target_id) + Process.initgroups(user, target_gid) log "Changing group to #{group.inspect}." Process::GID.change_privilege(target_gid) diff --git a/projects/gem_plugin/Rakefile b/projects/gem_plugin/Rakefile index ff716e9..4455294 100644 --- a/projects/gem_plugin/Rakefile +++ b/projects/gem_plugin/Rakefile @@ -17,9 +17,8 @@ Echoe.new("gem_plugin") do |p| p.rdoc_pattern = ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc'] end -# The default Echoe rdoc location should be good enough, but it's not what we currently use. -# It would be: rubyforge.org:/var/www/gforge-projects/mongrel/gem_plugin/ -# -# task :site => [:redocs] do -# sh %{ rsync -r doc/* rubyforge.org:/var/www/gforge-projects/mongrel/gem_plugin_rdoc/ } -# end +namespace :site do + task :rdoc => [:doc] do + sh "rsync -azv --no-perms --no-times doc/* rubyforge.org:/var/www/gforge-projects/mongrel/gem_plugin_rdoc/" + end +end \ No newline at end of file -- cgit v1.2.3-24-ge0c7