Skip to content

Conversation

xmo-odoo
Copy link
Collaborator

@xmo-odoo xmo-odoo commented Oct 1, 2019

Backport of #36212 which was merged in master but we might as well merge it in 12 too per @odony's comment.

See also #37708

Werkzeug 0.15 modified ProxyFix such that by default it only forwards
the REMOTE_ADDR when enabled, whereas before 0.15 it would also
forward scheme and host. This breaks proxied odoo as the base url
becomes incorrect (cf odoo#34412).

Use properly configured ProxyFix when running with werkzeug 0.15, old
configuration otherwise.

Backport of 4057227 which was merged
in master, because many people apparently run 0.15 now.

Closes odoo#35085
closes odoo#36212
@xmo-odoo
Copy link
Collaborator Author

xmo-odoo commented Oct 1, 2019

@fw-bot up to 12.4

@fw-bot
Copy link
Contributor

fw-bot commented Oct 1, 2019

There is no branch '12.4', it can't be used as a forward port target.

@xmo-odoo
Copy link
Collaborator Author

xmo-odoo commented Oct 1, 2019

@fw-bot up to saas-12.4

@fw-bot
Copy link
Contributor

fw-bot commented Oct 1, 2019

Forward-porting to 'saas-12.4'.

@C3POdoo C3POdoo added the RD research & development, internal work label Oct 1, 2019
@robodoo robodoo added the CI 🤖 Robodoo has seen passing statuses label Oct 2, 2019
@xmo-odoo
Copy link
Collaborator Author

robodoo r+

robodoo pushed a commit that referenced this pull request Oct 25, 2019
Werkzeug 0.15 modified ProxyFix such that by default it only forwards
the REMOTE_ADDR when enabled, whereas before 0.15 it would also
forward scheme and host. This breaks proxied odoo as the base url
becomes incorrect (cf #34412).

Use properly configured ProxyFix when running with werkzeug 0.15, old
configuration otherwise.

Backport of 4057227 which was merged
in master, because many people apparently run 0.15 now.

Closes #35085
closes #36212

closes #37709

Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
@robodoo
Copy link
Contributor

robodoo commented Oct 25, 2019

Merged at e19d624, thanks!

@robodoo robodoo closed this Oct 25, 2019
@xmo-odoo xmo-odoo deleted the 12.0-proxyfix-compat-xmo branch October 25, 2019 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI 🤖 Robodoo has seen passing statuses RD research & development, internal work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants