From 4d98018bb21a479b1422b5242d6c61ee331d9f9c Mon Sep 17 00:00:00 2001 From: Mike Schore Date: Wed, 7 Aug 2019 12:00:40 -0700 Subject: [PATCH] envoy: update upstream for onComplete callback Signed-off-by: Mike Schore --- envoy | 2 +- library/common/http/dispatcher.cc | 4 ++++ library/common/http/dispatcher.h | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/envoy b/envoy index 0979ccb9fa..feb56a1f8e 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit 0979ccb9fa9a0e3bba11cf252968c58d30c7ecb0 +Subproject commit feb56a1f8ee2cf1ea2048e20b7ba05f8199355c6 diff --git a/library/common/http/dispatcher.cc b/library/common/http/dispatcher.cc index 1c7ac805bf..f66d03ca16 100644 --- a/library/common/http/dispatcher.cc +++ b/library/common/http/dispatcher.cc @@ -33,6 +33,10 @@ void Dispatcher::DirectStreamCallbacks::onTrailers(HeaderMapPtr&& trailers) { observer_.on_trailers_f(Utility::transformHeaders(*trailers), observer_.context); } +void Dispatcher::DirectStreamCallbacks::onComplete() { + // TODO: implement me +} + void Dispatcher::DirectStreamCallbacks::onReset() { http_dispatcher_.removeStream(stream_); observer_.on_error_f({ENVOY_STREAM_RESET, {0, nullptr}}, observer_.context); diff --git a/library/common/http/dispatcher.h b/library/common/http/dispatcher.h index 1680b93ea4..0266997db8 100644 --- a/library/common/http/dispatcher.h +++ b/library/common/http/dispatcher.h @@ -59,10 +59,11 @@ class Dispatcher : public Logger::Loggable { Dispatcher& http_dispatcher); // AsyncClient::StreamCallbacks - void onHeaders(HeaderMapPtr&& headers, bool end_stream); - void onData(Buffer::Instance& data, bool end_stream); - void onTrailers(HeaderMapPtr&& trailers); - void onReset(); + void onHeaders(HeaderMapPtr&& headers, bool end_stream) override; + void onData(Buffer::Instance& data, bool end_stream) override; + void onTrailers(HeaderMapPtr&& trailers) override; + void onComplete() override; + void onReset() override; private: const envoy_stream_t stream_;