From: Remi Gacogne <rgacogne+github@valombre.net>
Date: Mon, 25 Oct 2021 08:52:00 +0000 (+0200)
Subject: dnsdist: A goaway frame can't be a headers or data one
X-Git-Tag: rec-4.6.0-beta1~34^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10845%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: A goaway frame can't be a headers or data one

Co-authored-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/dnsdistdist/dnsdist-nghttp2.cc b/pdns/dnsdistdist/dnsdist-nghttp2.cc
index 452c3c414d..001822c732 100644
--- a/pdns/dnsdistdist/dnsdist-nghttp2.cc
+++ b/pdns/dnsdistdist/dnsdist-nghttp2.cc
@@ -654,7 +654,7 @@ int DoHConnectionToBackend::on_frame_recv_callback(nghttp2_session* session, con
   }
 
   /* is this the last frame for this stream? */
-  if ((frame->hd.type == NGHTTP2_HEADERS || frame->hd.type == NGHTTP2_DATA) && frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
+  else if ((frame->hd.type == NGHTTP2_HEADERS || frame->hd.type == NGHTTP2_DATA) && frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
     auto stream = conn->d_currentStreams.find(frame->hd.stream_id);
     if (stream != conn->d_currentStreams.end()) {
       // cerr<<"Stream "<<frame->hd.stream_id<<" is now finished"<<endl;