deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Sync with latest Instiki trunk. Changes:

Browse source 
1) Upgrade Rails to 1.2.3
2) Revert RedCloth to previous version (who %#$@ cares?)
3) Preserve the Rails Security fix  to vendor/rails/actionpack/lib/action_controller/caching.rb from Revision 80.
This commit is contained in:
Jacques Distler 2007-03-18 11:56:12 -05:00
parent ff3e03a45a
commit 7adac51d6d
68 changed files with 466 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/rails/railties/lib/commands/process/inspector.rb vendored
View file

@ -1,6 +1,6 @@
require 'optparse'
if RUBY_PLATFORM =~ /mswin32/ then abort("Inspector is only for Unix") end
if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Inspector is only for Unix") end
OPTIONS = {
:pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
@ -65,4 +65,4 @@ ARGV.options do |opts|
opts.parse!
end
Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])
Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])

2
vendor/rails/railties/lib/commands/process/reaper.rb vendored
View file

@ -2,7 +2,7 @@ require 'optparse'
require 'net/http'
require 'uri'
if RUBY_PLATFORM =~ /mswin32/ then abort("Reaper is only for Unix") end
if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Reaper is only for Unix") end
class Killer
class << self

4
vendor/rails/railties/lib/commands/process/spawner.rb vendored
View file

@ -92,7 +92,7 @@ server = case ARGV.first
else
if defined?(Mongrel)
"mongrel"
elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
"fcgi"
end
end
@ -206,4 +206,4 @@ if OPTIONS[:repeat]
end
else
spawner_class.spawn_all
end
end