Commit 34685c58 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-webpack-dev-server-proxy' into 'master'

Fix webpack dev server when behind proxy

See merge request !9543
parents bbba5eb0 48707bc2
...@@ -8,16 +8,16 @@ module Gitlab ...@@ -8,16 +8,16 @@ module Gitlab
@proxy_host = opts.fetch(:proxy_host, 'localhost') @proxy_host = opts.fetch(:proxy_host, 'localhost')
@proxy_port = opts.fetch(:proxy_port, 3808) @proxy_port = opts.fetch(:proxy_port, 3808)
@proxy_path = opts[:proxy_path] if opts[:proxy_path] @proxy_path = opts[:proxy_path] if opts[:proxy_path]
super(app, opts)
super(app, backend: "http://#{proxy_host}:#{proxy_port}", **opts)
end end
def perform_request(env) def perform_request(env)
unless @proxy_path && env['PATH_INFO'].start_with?("/#{@proxy_path}") if @proxy_path && env['PATH_INFO'].start_with?("/#{@proxy_path}")
return @app.call(env) super(env)
else
@app.call(env)
end end
env['HTTP_HOST'] = "#{@proxy_host}:#{@proxy_port}"
super(env)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment