summaryrefslogtreecommitdiffstats
path: root/net/quic/crypto/crypto_server_test.cc
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2015-07-27 21:27:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-28 04:29:01 +0000
commit0b073d0b7df16c4af32a1ba5be2c253164391e54 (patch)
tree5e040c441544df0bef0c837d92c3aac9daf982f7 /net/quic/crypto/crypto_server_test.cc
parent9806ffde757b3ebe984f25932e4a5cf5bc4f6b82 (diff)
downloadchromium_src-0b073d0b7df16c4af32a1ba5be2c253164391e54.zip
chromium_src-0b073d0b7df16c4af32a1ba5be2c253164391e54.tar.gz
chromium_src-0b073d0b7df16c4af32a1ba5be2c253164391e54.tar.bz2
Landing Recent QUIC changes until 7/27/2015 18:48 UTC.
QUIC - Moved packets_between_mtu_probes() to QuicConnectionPeer because it is used in tests only. Merge change 1226083005 from Chrome. relnote: n/a (test-only change) Merge internal change: 99201483 https://codereview.chromium.org/1262463005/ Make MTU probe failure test run faster by sending probes sooner. relnote: n/a (test-only change) FIXED=22720425 Merge internal change: 99067184 https://codereview.chromium.org/1262463004/ Changed LocalSocketAddress to local_address. That is the only QUIC specific change in the following CL merge. Rest of the changes are to fix "Do not attempt to SetQos on FdWrappers that don't support QoS.". Merge internal change: 99058919 https://codereview.chromium.org/1260793005/ QUIC - minor comment fix. Created bugs for the following DISABLED tests. + ProofTest::DISABLED_Verify + CryptoServerTest::DISABLED_DefaultCert https://codereview.chromium.org/1260793004/ relnote: Instantiate an HTTP/2 SpdyFramer instead of a SPDY/3 SpdyFramer in QUIC's toy client and server stream code. There should be no behavior change, because the only method on that framer which is called is ParseHeaderBlockInBuffer() which behaves identially for SPDY/3 and HTTP/2. In any case, these classes are not part of the internal server code. Merge internal change: 99048851 https://codereview.chromium.org/1254973007/ Replace map<string,string> with SpdyHeaderBlock typedef. No behavior change. Missed this in cl/98865397 (didn't port CL 98865397 because it has SPDY changes). relnote: n/a (QUIC client change) Merge internal change: 98929211 https://codereview.chromium.org/1260133002/ relnote: Return 0 instead of false in case of error in QuicFramer::SerializedFrameLength. No behavior change. Merge internal change: 98861345 https://codereview.chromium.org/1260833002/ relnote: Add missing space to logging message. git cl format net changes. Merge internal change: 98824828 https://codereview.chromium.org/1254373003/ R=rch@chromium.org Review URL: https://codereview.chromium.org/1254343005 Cr-Commit-Position: refs/heads/master@{#340639}
Diffstat (limited to 'net/quic/crypto/crypto_server_test.cc')
-rw-r--r--net/quic/crypto/crypto_server_test.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/quic/crypto/crypto_server_test.cc b/net/quic/crypto/crypto_server_test.cc
index 8fc6ad2..46db166 100644
--- a/net/quic/crypto/crypto_server_test.cc
+++ b/net/quic/crypto/crypto_server_test.cc
@@ -389,6 +389,7 @@ TEST_P(CryptoServerTest, BadSNI) {
}
// TODO(rtenneti): Enable the DefaultCert test after implementing ProofSource.
+// See http://crbug.com/514472.
TEST_F(CryptoServerTest, DISABLED_DefaultCert) {
// Check that the server replies with a default certificate when no SNI is
// specified.