aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-01-23 19:55:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-23 19:55:50 +0000
commit4dc9601f3ebe457746445283a6ec224d45bbd8ae (patch)
treeeba8780e425ba189c98467cb10e66e746ac88ba5
parent22973e23be0ecbbbc0437a8241d0338734209378 (diff)
parent711381f25a8ce4ddbe0ec1fcd63e6759c9dfd438 (diff)
downloadokhttp-4dc9601f3ebe457746445283a6ec224d45bbd8ae.tar.gz
am 711381f2: am 576c6599: Merge "Clean up comments that still reference NPN."
* commit '711381f25a8ce4ddbe0ec1fcd63e6759c9dfd438': Clean up comments that still reference NPN.
-rw-r--r--android/main/java/com/squareup/okhttp/internal/Platform.java4
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());
}