Merge branch 'header-only' of github.com:snowp/envoy into header-only

Signed-off-by: Snow Pettersen <snowp@squareup.com>

source/common/http/conn_manager_impl.cc

@@ -648,6 +648,12 @@ void ConnectionManagerImpl::ActiveStream::decodeHeaders(HeaderMapPtr&& headers,
 
   decodeHeaders(nullptr, *request_headers_, end_stream);
 
+  // Normally we end decode at the start of this function, but if the request was turned into
+  // a header only request we need to set this flag here.
+  if (encoding_headers_only_) {
+    maybeEndDecode(true);
+  }
+
   // Reset it here for both global and overridden cases.
   resetIdleTimer();
 }
@@ -1135,6 +1141,8 @@ void ConnectionManagerImpl::ActiveStream::encodeHeaders(ActiveStreamEncoderFilte
     (*continue_data_entry)->stopped_ = true;
     (*continue_data_entry)->continueEncoding();
   } else {
+    // End encoding if this is a header only response, either due to a filter converting it to one
+    // or due to the upstream returning headers only.
     maybeEndEncode(encoding_headers_only_ || end_stream);
   }
 }

source/common/http/conn_manager_impl.h

@@ -409,7 +409,10 @@ class ConnectionManagerImpl : Logger::Loggable<Logger::Id::http>,
     // is ever called, this is set to true so commonContinue resumes processing the 100-Continue.
     bool has_continue_headers_{};
     bool is_head_request_{};
+    // Whether a filter has indicated that the request should be treated as a headers only request.
     bool decoding_headers_only_{};
+    // Whether a filter has indicated that the response should be treated as a headers only
+    // response.
     bool encoding_headers_only_{};
   };