android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-24 04:02:07 +03:00
Code Releases Activity

Merge pull request #418 from square/jw/update-npn

Browse Source 
Remove duplication of protocols in MWS' NPN declaration.
This commit is contained in:
Adrian Cole
2014-01-07 09:49:49 -08:00
parent 277c1e7865 efcffd0c1c
commit 09264ca41c
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
View File

@@ -70,11 +70,6 @@ import static com.squareup.okhttp.mockwebserver.SocketPolicy.FAIL_HANDSHAKE;
* replays them upon request in sequence.
*/
public final class MockWebServer {
private static final byte[] NPN_PROTOCOLS = {
17, 'H', 'T', 'T', 'P', '-', 'd', 'r', 'a', 'f', 't', '-', '0', '6', '/', '2', '.', '0',
6, 's', 'p', 'd', 'y', '/', '3',
8, 'h', 't', 't', 'p', '/', '1', '.', '1'
};
private static final byte[] HTTP_20_DRAFT_09 = new byte[] {
'H', 'T', 'T', 'P', '-', 'd', 'r', 'a', 'f', 't', '-', '0', '9', '/', '2', '.', '0'
};
@@ -84,6 +79,20 @@ public final class MockWebServer {
private static final byte[] HTTP_11 = new byte[] {
'h', 't', 't', 'p', '/', '1', '.', '1'
};
private static final byte[] NPN_PROTOCOLS = joinNpnProtocols(HTTP_20_DRAFT_09, SPDY3, HTTP_11);
private static byte[] joinNpnProtocols(byte[]... protocols) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (byte[] protocol : protocols) {
baos.write(protocol.length);
baos.write(protocol);
}
return baos.toByteArray();
} catch (IOException e) {
throw new AssertionError(e);
}
}
private static final X509TrustManager UNTRUSTED_TRUST_MANAGER = new X509TrustManager() {
@Override public void checkClientTrusted(X509Certificate[] chain, String authType)