diff options
author | Neil Fuller <nfuller@google.com> | 2015-01-23 15:15:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 15:15:45 +0000 |
commit | 711381f25a8ce4ddbe0ec1fcd63e6759c9dfd438 (patch) | |
tree | eba8780e425ba189c98467cb10e66e746ac88ba5 | |
parent | cc33cfd7afe21458edad4782188770f20c770b57 (diff) | |
parent | 576c6599deeae3ca87e545c67ce765d9c4062b14 (diff) | |
download | okhttp-711381f25a8ce4ddbe0ec1fcd63e6759c9dfd438.tar.gz |
am 576c6599: Merge "Clean up comments that still reference NPN."
* commit '576c6599deeae3ca87e545c67ce765d9c4062b14':
Clean up comments that still reference NPN.
-rw-r--r-- | android/main/java/com/squareup/okhttp/internal/Platform.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/main/java/com/squareup/okhttp/internal/Platform.java b/android/main/java/com/squareup/okhttp/internal/Platform.java index 328bf3a..8c44ad9 100644 --- a/android/main/java/com/squareup/okhttp/internal/Platform.java +++ b/android/main/java/com/squareup/okhttp/internal/Platform.java @@ -79,7 +79,7 @@ public final class Platform { SET_HOSTNAME.invokeOptionalWithoutCheckedException(sslSocket, hostname); } - // Enable NPN / ALPN. + // Enable ALPN. boolean alpnSupported = SET_ALPN_PROTOCOLS.isSupported(sslSocket); if (!alpnSupported) { return; @@ -130,7 +130,7 @@ public final class Platform { Buffer result = new Buffer(); for (int i = 0, size = protocols.size(); i < size; i++) { Protocol protocol = protocols.get(i); - if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for NPN. + if (protocol == Protocol.HTTP_1_0) continue; // No HTTP/1.0 for ALPN. result.writeByte(protocol.toString().length()); result.writeUtf8(protocol.toString()); } |