Upstream commit of Android SNI / NPN fix #1137
Conversation
https://android-review.googlesource.com/#/c/111211 The change's to Android's Platform have been ported. This does not include the introduction of PlatformTest, which will be difficult to write so it works everywhere.
|
This is a bit scrappy. I've dropped PlatformTest, which I added in Android. It's hard to write a good test there because it will behave differently on every platform (assuming this is why there is no PlatformTest to start with). The changes to Platform.java should be looked at especially closely because these are new here and only roughly based on the Android version. I ran the tests on an ART host with vogar and received many failures (mostly to do with cache tests attempting to set the java.io.tmp). When I compared against a version without my changes it turns out the run with my change received one less failure (something to do with certificate pinning). Something to look at when I upgrade Android to 2.1 - I'd like us to get to green there. When I ran mvn verify and run tests against an OpenJDK host it either hangs or I get several failures (e.g. ones related to thread interruption). Probably related to the version of OpenJDK we use. |
Upstream commit of Android SNI / NPN fix
|
Thanks! And sorry for the awful turnaround on the review this time. |
square/okhttp#1137 ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82149209
square/okhttp#1137 ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82149209
https://android-review.googlesource.com/#/c/111211
The change's to Android's Platform have been ported.
This does not include the introduction of PlatformTest,
which will be difficult to write so it works everywhere.