diff options
author | Eric Wong <e@80x24.org> | 2016-02-20 03:33:56 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-02-20 06:31:11 +0000 |
commit | eff81df43ed92b8a8ecc1fc27b69e25fac6f191d (patch) | |
tree | 43552c132fbdf1a2e9231bbced62b7bb27b131fd /lib/yahns/http_client.rb | |
parent | 551e670281bea77e727a732ba94275265ccae5f6 (diff) | |
download | yahns-eff81df43ed92b8a8ecc1fc27b69e25fac6f191d.tar.gz |
This helps Rack::Request#url and similar methods generate proper URLs instead of the obviously wrong: "https://example.com:80/" Note: we don't track the actual port the listener is bound to, and it may not be worth it since the use of the Host: header is long-established and Host: headers include the port number if non-standard.
Diffstat (limited to 'lib/yahns/http_client.rb')
-rw-r--r-- | lib/yahns/http_client.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb index c300742..272db85 100644 --- a/lib/yahns/http_client.rb +++ b/lib/yahns/http_client.rb @@ -206,8 +206,17 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc: end end + env.merge!(k.app_defaults) + + # workaround stupid unicorn_http parser behavior when it parses HTTP_HOST + if env['HTTPS'] == 'on'.freeze && + env['HTTP_HOST'] && + env['SERVER_PORT'] == '80'.freeze + env['SERVER_PORT'] = '443'.freeze + end + # run the rack app - status, headers, body = k.app.call(env.merge!(k.app_defaults)) + status, headers, body = k.app.call(env) return :ignore if app_hijacked?(env, body) if status.to_i == 100 rv = http_100_response(env) and return rv |