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.

Sign up for GitHub

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

Jump to bottom

Fix to only add assert_hostname for https urls #578

Merged
merged 3 commits into from
Aug 30, 2019
Merged

Fix to only add assert_hostname for https urls #578

merged 3 commits into from
Aug 30, 2019

Conversation

basepi
Copy link
Contributor

@basepi basepi commented Aug 29, 2019

Given an http:// server url and 'VERIFY_SERVER_CERT': False,
don't pass in assert_hostname (it will error).

Fixes #570

@basepi
Fix to only add assert_hostname for https urls
d8a553b 
Given an http:// server url and `'VERIFY_SERVER_CERT': False`,
don't pass in assert_hostname (it will error)
@basepi basepi requested a review from beniwohli August 29, 2019 22:52
@basepi basepi mentioned this pull request Aug 29, 2019
Closed
beniwohli
beniwohli suggested changes Aug 30, 2019
View reviewed changes
Copy link
Contributor

@beniwohli beniwohli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff!

elasticapm/transport/http.py Outdated Show resolved Hide resolved
tests/transports/test_urllib3.py Show resolved Hide resolved
@beniwohli
Copy link
Contributor

jenkins run elasticsearch-ci/docs

@basepi
Copy link
Contributor Author

basepi commented Aug 30, 2019

All requested changes complete.

@basepi basepi requested a review from beniwohli August 30, 2019 14:50
beniwohli
beniwohli approved these changes Aug 30, 2019
View reviewed changes
Copy link
Contributor

@beniwohli beniwohli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay!

@basepi
Copy link
Contributor Author

basepi commented Aug 30, 2019

Looks like it was just the flakey windows test that failed. Merging.

@basepi basepi merged commit aadaba1 into elastic:master Aug 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beniwohli beniwohli beniwohli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

__init__() got an unexpected keyword argument 'assert_hostname'
2 participants
@basepi @beniwohli