kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Fix rack handler logic (#1290)

Browse source 
There was a mistake previously where if both host and port were passed in as "default" they would take precedence of any values from the puma config "file". 

We can fix this by checking to make sure there were values explicitly passed before setting the config.
This commit is contained in:
Richard Schneeman 2017-05-12 15:28:59 -05:00 committed by Nate Berkopec
parent 9d93a0f62f
commit f0767b0e1f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/rack/handler/puma.rb
View file

@ -42,10 +42,12 @@ module Rack
user_config.threads min, max user_config.threads min, max
end end
host = options[:Host] || default_options[:Host] if options[:Host] || options[:Port]
port = options[:Port] || default_options[:Port] host = options[:Host] || default_options[:Host]
port = options[:Port] || default_options[:Port]
self.set_host_port_to_config(host, port, user_config)
end
self.set_host_port_to_config(host, port, user_config)
self.set_host_port_to_config(default_options[:Host], default_options[:Port], default_config) self.set_host_port_to_config(default_options[:Host], default_options[:Port], default_config)
user_config.app app user_config.app app