diff options
| -rw-r--r-- | lib/gitlab/middleware/webpack_proxy.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/middleware/webpack_proxy.rb b/lib/gitlab/middleware/webpack_proxy.rb index cb60c5f96ba..3fe32adeade 100644 --- a/lib/gitlab/middleware/webpack_proxy.rb +++ b/lib/gitlab/middleware/webpack_proxy.rb @@ -8,16 +8,16 @@ module Gitlab @proxy_host = opts.fetch(:proxy_host, 'localhost') @proxy_port = opts.fetch(:proxy_port, 3808) @proxy_path = opts[:proxy_path] if opts[:proxy_path] - - super(app, backend: "http://#{proxy_host}:#{proxy_port}", **opts) + super(app, opts) end def perform_request(env) - if @proxy_path && env['PATH_INFO'].start_with?("/#{@proxy_path}") - super(env) - else - @app.call(env) + unless @proxy_path && env['PATH_INFO'].start_with?("/#{@proxy_path}") + return @app.call(env) end + + env['HTTP_HOST'] = "#{@proxy_host}:#{@proxy_port}" + super(env) end end end |