diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-01 15:48:46 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-01 15:48:46 +0000 |
commit | 0491488554883009dac479a3eb653fc135b08ed4 (patch) | |
tree | e11127e759b6c9b596811f9e8ba92c1dacaf2559 /public | |
parent | 785825900a37ee026bc0257d00fe3977d1b30848 (diff) | |
download | redmine-0491488554883009dac479a3eb653fc135b08ed4.tar.gz redmine-0491488554883009dac479a3eb653fc135b08ed4.zip |
Updates dispatch.fcgi.example to work with Rails3 and removes CGI handlers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9604 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public')
-rwxr-xr-x | public/dispatch.cgi.example | 10 | ||||
-rwxr-xr-x | public/dispatch.fcgi.example | 40 | ||||
-rwxr-xr-x | public/dispatch.rb.example | 10 | ||||
-rw-r--r-- | public/htaccess.fcgi.example | 6 |
4 files changed, 18 insertions, 48 deletions
diff --git a/public/dispatch.cgi.example b/public/dispatch.cgi.example deleted file mode 100755 index 32fa3b266..000000000 --- a/public/dispatch.cgi.example +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) - -# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like: -# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired -require "dispatcher" - -ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun) -Dispatcher.dispatch diff --git a/public/dispatch.fcgi.example b/public/dispatch.fcgi.example index 664dbbbee..85184c446 100755 --- a/public/dispatch.fcgi.example +++ b/public/dispatch.fcgi.example @@ -1,24 +1,20 @@ #!/usr/bin/env ruby -# -# You may specify the path to the FastCGI crash log (a log of unhandled -# exceptions which forced the FastCGI instance to exit, great for debugging) -# and the number of requests to process before running garbage collection. -# -# By default, the FastCGI crash log is RAILS_ROOT/log/fastcgi.crash.log -# and the GC period is nil (turned off). A reasonable number of requests -# could range from 10-100 depending on the memory footprint of your app. -# -# Example: -# # Default log path, normal GC behavior. -# RailsFCGIHandler.process! -# -# # Default log path, 50 requests between GC. -# RailsFCGIHandler.process! nil, 50 -# -# # Custom log path, normal GC behavior. -# RailsFCGIHandler.process! '/var/log/myapp_fcgi_crash.log' -# -require File.dirname(__FILE__) + "/../config/environment" -require 'fcgi_handler' -RailsFCGIHandler.process! +require File.dirname(__FILE__) + '/../config/boot' +require File.dirname(__FILE__) + '/../config/environment' + +class Rack::PathInfoRewriter + def initialize(app) + @app = app + end + + def call(env) + env.delete('SCRIPT_NAME') + parts = env['REQUEST_URI'].split('?') + env['PATH_INFO'] = parts[0] + env['QUERY_STRING'] = parts[1].to_s + @app.call(env) + end +end + +Rack::Handler::FastCGI.run Rack::PathInfoRewriter.new(RedmineApp::Application) diff --git a/public/dispatch.rb.example b/public/dispatch.rb.example deleted file mode 100755 index 32fa3b266..000000000 --- a/public/dispatch.rb.example +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) - -# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like: -# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired -require "dispatcher" - -ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun) -Dispatcher.dispatch diff --git a/public/htaccess.fcgi.example b/public/htaccess.fcgi.example index 7183bb0ee..f06975d43 100644 --- a/public/htaccess.fcgi.example +++ b/public/htaccess.fcgi.example @@ -5,9 +5,6 @@ <IfModule mod_fcgid.c> AddHandler fcgid-script .fcgi </IfModule> -<IfModule mod_cgi.c> - AddHandler cgi-script .cgi -</IfModule> Options +FollowSymLinks +ExecCGI # If you don't want Rails to look in certain directories, @@ -42,9 +39,6 @@ RewriteCond %{REQUEST_FILENAME} !-f <IfModule mod_fcgid.c> RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] </IfModule> -<IfModule mod_cgi.c> - RewriteRule ^(.*)$ dispatch.cgi [QSA,L] -</IfModule> # In case Rails experiences terminal errors # Instead of displaying this message you can supply a file here which will be rendered instead |