Commit 4b617b3a authored by Dan Zhang's avatar Dan Zhang Committed by Commit Bot

Roll src/net/third_party/quiche/src/ ff86db3f4..7eef071bd (10 commits)

https://quiche.googlesource.com/quiche.git/+log/ff86db3f4a3d..7eef071bd3d6

$ git log ff86db3f4..7eef071bd --date=short --no-merges --format='%ad %ae %s'
2019-05-09 quiche-dev Change SendOrQueueMessage to take a QuicMemSliceSpan.
2019-05-09 fayang gfe-relnote: In QUIC, factor out ProcessVersionLabel and ValidateIetfConnectionIdLength functions. No functional change expected, not protected.
2019-05-09 fayang gfe-relnote: In QUIC, stop setting and restoring framer's version in QuicDispatcher::StatelesslyTerminateConnection as terminator now have its own framer. Not protected as this is no-op change.
2019-05-09 ianswett Re-enable QuicConnectionTest::AckNeedsRetransmittableFrames when multiple packet number spaces are used by setting the encryption level.
2019-05-09 danzh gfe-relnote: n/a(code clean up) Clean up #include in quic proof_source and proof_verifier.
2019-05-08 renjietang Allow QuicStream constructor to take parameter on static-ness when constructing from PendingStream.
2019-05-08 dschinazi Make QUIC server set fixed bit in version negotiation packets
2019-05-08 bnc Fix QpackRoundTripFuzzer when cookies are split along '\0'.
2019-05-08 renjietang Add APIs to allow sessions to read stream types from pending stream.
2019-05-08 nharper gfe-relnote: Remove client-side support for Channel ID from QUIC. Not flag protected.

Created with:
  roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src

R=rch@chromium.org

Change-Id: I5b14616ed27a9a5294825a9646e1e0ec338b2b16
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1603184Reviewed-by: default avatarSteve Anton <steveanton@chromium.org>
Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Commit-Queue: Dan Zhang <danzh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658360}
parent d3aad5ee
...@@ -272,7 +272,7 @@ vars = { ...@@ -272,7 +272,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'quiche_revision': 'ff86db3f4a3d59250eeafbb9787fb52b70e6ac31', 'quiche_revision': '7eef071bd3d6738a167533695485c559310435bf',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit # the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -21,6 +21,20 @@ QuicTestMemSliceVectorImpl::QuicTestMemSliceVectorImpl( ...@@ -21,6 +21,20 @@ QuicTestMemSliceVectorImpl::QuicTestMemSliceVectorImpl(
} }
} }
QuicTestMemSliceVectorImpl::QuicTestMemSliceVectorImpl(
QuicTestMemSliceVectorImpl&& other) {
*this = std::move(other);
}
QuicTestMemSliceVectorImpl& QuicTestMemSliceVectorImpl::operator=(
QuicTestMemSliceVectorImpl&& other) {
if (this != &other) {
buffers_ = std::move(other.buffers_);
lengths_ = std::move(other.lengths_);
}
return *this;
}
QuicMemSliceSpanImpl QuicTestMemSliceVectorImpl::span() { QuicMemSliceSpanImpl QuicTestMemSliceVectorImpl::span() {
return QuicMemSliceSpanImpl(buffers_.data(), lengths_.data(), return QuicMemSliceSpanImpl(buffers_.data(), lengths_.data(),
buffers_.size()); buffers_.size());
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#ifndef NET_QUIC_PLATFORM_IMPL_QUIC_TEST_MEM_SLICE_VECTOR_IMPL_H_ #ifndef NET_QUIC_PLATFORM_IMPL_QUIC_TEST_MEM_SLICE_VECTOR_IMPL_H_
#define NET_QUIC_PLATFORM_IMPL_QUIC_TEST_MEM_SLICE_VECTOR_IMPL_H_ #define NET_QUIC_PLATFORM_IMPL_QUIC_TEST_MEM_SLICE_VECTOR_IMPL_H_
#include <memory>
#include "net/quic/platform/impl/quic_mem_slice_span_impl.h" #include "net/quic/platform/impl/quic_mem_slice_span_impl.h"
namespace quic { namespace quic {
...@@ -25,6 +27,9 @@ class QuicTestMemSliceVectorImpl { ...@@ -25,6 +27,9 @@ class QuicTestMemSliceVectorImpl {
std::vector<std::pair<char*, size_t>> buffers); std::vector<std::pair<char*, size_t>> buffers);
~QuicTestMemSliceVectorImpl(); ~QuicTestMemSliceVectorImpl();
QuicTestMemSliceVectorImpl(QuicTestMemSliceVectorImpl&& other);
QuicTestMemSliceVectorImpl& operator=(QuicTestMemSliceVectorImpl&& other);
QuicMemSliceSpanImpl span(); QuicMemSliceSpanImpl span();
private: private:
......
...@@ -358,3 +358,9 @@ QUIC_FLAG(bool, ...@@ -358,3 +358,9 @@ QUIC_FLAG(bool,
QUIC_FLAG(bool, QUIC_FLAG(bool,
FLAGS_quic_restart_flag_quic_server_drop_version_negotiation, FLAGS_quic_restart_flag_quic_server_drop_version_negotiation,
false) false)
// When true, version negotiation packets sent by the server will set the fixed
// bit.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_send_version_negotiation_fixed_bit,
false)
...@@ -25,7 +25,9 @@ P2PQuicStreamImpl::P2PQuicStreamImpl(quic::PendingStream pending, ...@@ -25,7 +25,9 @@ P2PQuicStreamImpl::P2PQuicStreamImpl(quic::PendingStream pending,
quic::QuicSession* session, quic::QuicSession* session,
uint32_t delegate_read_buffer_size, uint32_t delegate_read_buffer_size,
uint32_t write_buffer_size) uint32_t write_buffer_size)
: quic::QuicStream(std::move(pending), quic::BIDIRECTIONAL), : quic::QuicStream(std::move(pending),
quic::BIDIRECTIONAL,
/*is_static=*/false),
delegate_read_buffer_size_(delegate_read_buffer_size), delegate_read_buffer_size_(delegate_read_buffer_size),
write_buffer_size_(write_buffer_size) { write_buffer_size_(write_buffer_size) {
DCHECK_GT(delegate_read_buffer_size_, 0u); DCHECK_GT(delegate_read_buffer_size_, 0u);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment