Skip to content

Commit

Permalink
remove patch for Passenger 2.2.2 and later
Browse files Browse the repository at this point in the history
  • Loading branch information
tra committed Apr 26, 2009
1 parent e2ef81b commit 3a7a730
Showing 1 changed file with 33 additions and 23 deletions.
56 changes: 33 additions & 23 deletions lib/patches.rb
Expand Up @@ -61,35 +61,45 @@ def process_client(client)
end
end

# Patch for work with passenger < 2.1.0
if defined? Passenger::Railz::RequestHandler
class Passenger::Railz::RequestHandler
alias_method :orig_process_request, :process_request
def process_request(headers, input, output)
Spawn.resources_to_close(input, output)
orig_process_request(headers, input, output)
need_passenger_patch = true
if defined? PhusionPassenger::VERSION_STRING
# The VERSION_STRING variable was defined sometime after 2.1.0.
# We don't need passenger patch for 2.2.2 or later.
pv = PhusionPassenger::VERSION_STRING.split('.').collect{|s| s.to_i}
need_passenger_patch = pv[0] < 2 || (pv[0] == 2 && (pv[1] < 2 || (pv[1] == 2 && pv[2] < 2)))
end

if need_passenger_patch
# Patch for work with passenger < 2.1.0
if defined? Passenger::Railz::RequestHandler
class Passenger::Railz::RequestHandler
alias_method :orig_process_request, :process_request
def process_request(headers, input, output)
Spawn.resources_to_close(input, output)
orig_process_request(headers, input, output)
end
end
end
end

# Patch for work with passenger >= 2.1.0
if defined? PhusionPassenger::Railz::RequestHandler
class PhusionPassenger::Railz::RequestHandler
alias_method :orig_process_request, :process_request
def process_request(headers, input, output)
Spawn.resources_to_close(input, output)
orig_process_request(headers, input, output)
# Patch for work with passenger >= 2.1.0
if defined? PhusionPassenger::Railz::RequestHandler
class PhusionPassenger::Railz::RequestHandler
alias_method :orig_process_request, :process_request
def process_request(headers, input, output)
Spawn.resources_to_close(input, output)
orig_process_request(headers, input, output)
end
end
end
end

# Patch for passenger with Rails >= 2.3.0 (uses rack)
if defined? PhusionPassenger::Rack::RequestHandler
class PhusionPassenger::Rack::RequestHandler
alias_method :orig_process_request, :process_request
def process_request(headers, input, output)
Spawn.resources_to_close(input, output)
orig_process_request(headers, input, output)
# Patch for passenger with Rails >= 2.3.0 (uses rack)
if defined? PhusionPassenger::Rack::RequestHandler
class PhusionPassenger::Rack::RequestHandler
alias_method :orig_process_request, :process_request
def process_request(headers, input, output)
Spawn.resources_to_close(input, output)
orig_process_request(headers, input, output)
end
end
end
end

0 comments on commit 3a7a730

Please sign in to comment.