Skip to content

okhttp: use new APIs to configure TLS in Android (roll forward #6959) - #6960

Merged
voidzcy merged 3 commits into
grpc:masterfrom
voidzcy:bugfix/okhttp_configure_tls_with_public_apis_on_android_r_work_around_invalid_test_hostname
Apr 22, 2020
Merged

okhttp: use new APIs to configure TLS in Android (roll forward #6959)#6960
voidzcy merged 3 commits into
grpc:masterfrom
voidzcy:bugfix/okhttp_configure_tls_with_public_apis_on_android_r_work_around_invalid_test_hostname

Conversation

@voidzcy

@voidzcy voidzcy commented Apr 21, 2020

Copy link
Copy Markdown
Contributor

Roll-forward of ee8b395

The added unit test doesn't really reveal the issue being fixed, as the breakage happens only on Android. Just leave it for coverage.

@voidzcy
voidzcy requested a review from ejona86 April 21, 2020 23:35
@voidzcy
voidzcy merged commit b8bcf98 into grpc:master Apr 22, 2020
dfawley pushed a commit to dfawley/grpc-java that referenced this pull request Jan 15, 2021
) (grpc#6960)

* Revert "okhttp: revert changes for using new APIs to configure TLS in Android (grpc#6959)"

This reverts commit ee8b395.

Roll forward with adding manual check if hostname contains underscore, as Android's URI implementation allows underscore in hostsname.
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jun 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants