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

Use bundled Rack

Browse source 
WEBrick in Rack doesn't respond to TERM signals.
This is a problem (especially on MacOSX). Make
sure we use our bundled version instead.
This commit is contained in:
Jacques Distler 2009-02-04 16:39:13 -06:00
parent 4e14ccc74d
commit b30002261a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/environment.rb
View file

@ -7,7 +7,7 @@ rexml_versions = ['', File.dirname(__FILE__) + '/../vendor/plugins/rexml/lib/'].
`ruby -r #{v + 'rexml/rexml'} -e 'p REXML::VERSION'`.split('.').collect {|n| n.to_i} } `ruby -r #{v + 'rexml/rexml'} -e 'p REXML::VERSION'`.split('.').collect {|n| n.to_i} }
$:.unshift(File.dirname(__FILE__) + '/../vendor/plugins/rexml/lib') if (rexml_versions[0] <=> rexml_versions[1]) == -1 $:.unshift(File.dirname(__FILE__) + '/../vendor/plugins/rexml/lib') if (rexml_versions[0] <=> rexml_versions[1]) == -1
$: << File.dirname(__FILE__) + '/../vendor/plugins/rack/lib' $:.unshift(File.dirname(__FILE__) + '/../vendor/plugins/rack/lib')
require File.join(File.dirname(__FILE__), 'boot') require File.join(File.dirname(__FILE__), 'boot')
require 'active_support/secure_random' require 'active_support/secure_random'

2
instiki
View file

@ -1,6 +1,6 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
$: << File.dirname(__FILE__) + '/vendor/plugins/rack/lib' $:.unshift(File.dirname(__FILE__) + '/vendor/plugins/rack/lib')
# Executable file for a gem # Executable file for a gem
# must be same as ./instiki.rb # must be same as ./instiki.rb