Skip to content

Compatibility with Rack 3 #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compatibility with Rack 3 #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module Benchmark
class Server < Sinatra::Base

def self.run
Rack::Handler::WEBrick.run(
Rackup::Handler.get('webrick').run(
Benchmark::Server.new,
:Port => 9292,
:AccessLog => [],
Expand Down
5 changes: 3 additions & 2 deletions em-http-request.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ Gem::Specification.new do |s|
s.add_dependency 'eventmachine', '>= 1.0.3'
s.add_dependency 'http_parser.rb', '>= 0.6.0'

s.add_development_dependency 'mongrel', '~> 1.2.0.pre2'
s.add_development_dependency 'webrick'
s.add_development_dependency 'multi_json'
s.add_development_dependency 'rack', '< 2.0'
s.add_development_dependency 'rack'
s.add_development_dependency 'rackup'
s.add_development_dependency 'rake'
s.add_development_dependency 'rspec'

Expand Down
7 changes: 4 additions & 3 deletions spec/stallion.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# #--

require 'rack'
require 'rackup/handler'

module Stallion
class Mount
Expand All @@ -16,7 +17,7 @@ def ride
end

def match?(request)
method = request['REQUEST_METHOD']
method = request.env['REQUEST_METHOD']
@methods.empty? or @methods.include?(method)
end
end
Expand Down Expand Up @@ -56,9 +57,9 @@ def self.run(options = {})

ruby_version = RUBY_VERSION.split('.').map(&:to_i)
if ruby_version[0] >= 3
Rack::Handler::Mongrel.run(Rack::Lint.new(self), **options)
Rackup::Handler.default.run(Rack::Lint.new(self), **options)
else
Rack::Handler::Mongrel.run(Rack::Lint.new(self), options)
Rackup::Handler.default.run(Rack::Lint.new(self), options)
end
end

Expand Down