Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CherryPy CORS on Python3 #55207

Merged
merged 2 commits into from
Dec 7, 2019
Merged

Conversation

niflostancu
Copy link
Contributor

What does this PR do?

Fixes a salt_cherrypy bug on Python3 (500 Internal Server Error).

What issues does this PR fix or reference?

Fixes #55087

Tests written?

I created a unit test for the cors_tool that verifies whether CORS OPTIONS request returns HTTP 200 OK. Test failed before the second commit which fixes the bug.

Commits signed with GPG?

No (no backdoors included, trivial to verify :D)

@niflostancu niflostancu requested a review from a team as a code owner November 5, 2019 13:56
@ghost ghost requested a review from Akm0d November 5, 2019 13:56
@dwoz dwoz merged commit 825a3b0 into saltstack:master Dec 7, 2019
@niflostancu niflostancu deleted the fix-cherrypy-cors branch December 7, 2019 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

salt_cherrypy with Python3 and complex CORS OPTION requests return HTTP 500
2 participants