Skip to content
This repository was archived by the owner on Sep 3, 2026. It is now read-only.

EZP-25482: Do not use CSRF token manager if not available - #1589

Merged
andrerom merged 1 commit into
ezsystems:masterfrom
emodric:fix_csrf_token_disable_crash
Feb 25, 2016
Merged

andrerom merged 1 commit into
ezsystems:masterfrom
emodric:fix_csrf_token_disable_crash

Conversation

@emodric

@emodric emodric commented Feb 17, 2016

Copy link
Copy Markdown
Contributor

When CSRF protection is disabled with framework.csrf_protection.enabled flag set to false, site crashes with an exception about missing security.csrf.token_manager service.

Required by: ezsystems/PlatformUIBundle#515

@emodric

emodric commented Feb 17, 2016

Copy link
Copy Markdown
Contributor Author

If this needs to go against 6.1 branch please let me know :)

@andrerom

Copy link
Copy Markdown
Contributor

ideally yes :)

@emodric

emodric commented Feb 19, 2016

Copy link
Copy Markdown
Contributor Author

Should I close this then and create a new PR? GitHub doesn't allow changing the destination branch :(

@andrerom

Copy link
Copy Markdown
Contributor

Either you re open, or we take care of it on merge (which we can do on simple changes like this).

+1

@emodric

emodric commented Feb 22, 2016

Copy link
Copy Markdown
Contributor Author

If you can do a manual merge, that would be great :) I'll base my PRs in the future on 6.x branches ;)

@emodric

emodric commented Feb 25, 2016

Copy link
Copy Markdown
Contributor Author

@andrerom This can be safely merged without waiting for ezsystems/PlatformUIBundle#515, right?

andrerom added a commit that referenced this pull request Feb 25, 2016
EZP-25482: Do not use CSRF token manager if not available
@andrerom
andrerom merged commit 39fa2b8 into ezsystems:master Feb 25, 2016
@andrerom

Copy link
Copy Markdown
Contributor

yes :) And since 6.2-rc will be out soon, there is no need to move it to 6.1.

@emodric

emodric commented Feb 25, 2016

Copy link
Copy Markdown
Contributor Author

And since 6.2-rc will be out soon, there is no need to move it to 6.1.

Why not? Would be useful to have it in 6.1 too (together with patch for Platform UI)

@emodric

emodric commented Feb 25, 2016

Copy link
Copy Markdown
Contributor Author

Thanks, btw ;)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants