From 11d1f954126b9908797093c3156476e94e0c7f3b Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 20 Sep 2022 17:32:56 +0900
Subject: [PATCH] Bump ngtcp2

---
 .github/workflows/build.yml |  6 +++---
 README.rst                  |  8 ++++----
 configure.ac                |  4 ++--
 docker/Dockerfile           |  4 ++--
 src/shrpx_http3_upstream.cc | 11 -----------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22bf6a54..ffcd334a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -127,7 +127,7 @@ jobs:
       run: |
         git clone https://boringssl.googlesource.com/boringssl
         cd boringssl
-        git checkout a6d321b11fa80496b7c8ae6405468c212d4f5c87
+        git checkout 04989786e9ab16cef5261bbd05a2b1a8cb312dbf
         mkdir build
         cd build
         cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
@@ -148,7 +148,7 @@ jobs:
     - name: Build nghttp3
       if: matrix.http3 == 'http3'
       run: |
-        git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/nghttp3
+        git clone --depth 1 -b v0.7.1 https://github.com/ngtcp2/nghttp3
         cd nghttp3
         autoreconf -i
         ./configure --prefix=$PWD/build --enable-lib-only
@@ -157,7 +157,7 @@ jobs:
     - name: Build ngtcp2
       if: matrix.http3 == 'http3'
       run: |
-        git clone --depth 1 -b v0.8.1 https://github.com/ngtcp2/ngtcp2
+        git clone --depth 1 -b v0.9.0 https://github.com/ngtcp2/ngtcp2
         cd ngtcp2
         autoreconf -i
         ./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig" $EXTRA_NGTCP2_OPTS
diff --git a/README.rst b/README.rst
index 2c66fafa..22d54810 100644
--- a/README.rst
+++ b/README.rst
@@ -150,8 +150,8 @@ following libraries are required:
 * `OpenSSL with QUIC support
   <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1q+quic>`_; or
   `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
-  a6d321b11fa80496b7c8ae6405468c212d4f5c87)
-* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.8.0
+  04989786e9ab16cef5261bbd05a2b1a8cb312dbf)
+* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.9.0
 * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 0.7.0
 
 Use ``--enable-http3`` configure option to enable HTTP/3 feature for
@@ -363,7 +363,7 @@ Build nghttp3:
 
 .. code-block:: text
 
-   $ git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/nghttp3
+   $ git clone --depth 1 -b v0.7.1 https://github.com/ngtcp2/nghttp3
    $ cd nghttp3
    $ autoreconf -i
    $ ./configure --prefix=$PWD/build --enable-lib-only
@@ -375,7 +375,7 @@ Build ngtcp2:
 
 .. code-block:: text
 
-   $ git clone --depth 1 -b v0.8.1 https://github.com/ngtcp2/ngtcp2
+   $ git clone --depth 1 -b v0.9.0 https://github.com/ngtcp2/ngtcp2
    $ cd ngtcp2
    $ autoreconf -i
    $ ./configure --prefix=$PWD/build --enable-lib-only \
diff --git a/configure.ac b/configure.ac
index 0a41e6b3..5f0a6742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,7 +540,7 @@ fi
 # ngtcp2 (for src)
 have_libngtcp2=no
 if test "x${request_libngtcp2}" != "xno"; then
-  PKG_CHECK_MODULES([LIBNGTCP2], [libngtcp2 >= 0.8.0], [have_libngtcp2=yes],
+  PKG_CHECK_MODULES([LIBNGTCP2], [libngtcp2 >= 0.9.0], [have_libngtcp2=yes],
                     [have_libngtcp2=no])
   if test "x${have_libngtcp2}" = "xno"; then
     AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS)
@@ -557,7 +557,7 @@ have_libngtcp2_crypto_openssl=no
 if test "x${have_ssl_is_quic}" = "xyes" &&
    test "x${request_libngtcp2}" != "xno"; then
   PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_OPENSSL],
-                    [libngtcp2_crypto_openssl >= 0.8.0],
+                    [libngtcp2_crypto_openssl >= 0.9.0],
                     [have_libngtcp2_crypto_openssl=yes],
                     [have_libngtcp2_crypto_openssl=no])
   if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4e08a5c5..16cef814 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@ RUN git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openss
     cd .. && \
     rm -rf openssl
 
-RUN git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/nghttp3 && \
+RUN git clone --depth 1 -b v0.7.1 https://github.com/ngtcp2/nghttp3 && \
     cd nghttp3 && \
     autoreconf -i && \
     ./configure --enable-lib-only && \
@@ -24,7 +24,7 @@ RUN git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/nghttp3 && \
     cd .. && \
     rm -rf nghttp3
 
-RUN git clone --depth 1 -b v0.8.1 https://github.com/ngtcp2/ngtcp2 && \
+RUN git clone --depth 1 -b v0.9.0 https://github.com/ngtcp2/ngtcp2 && \
     cd ngtcp2 && \
     autoreconf -i && \
     ./configure --enable-lib-only \
diff --git a/src/shrpx_http3_upstream.cc b/src/shrpx_http3_upstream.cc
index 1c15f57b..1d530621 100644
--- a/src/shrpx_http3_upstream.cc
+++ b/src/shrpx_http3_upstream.cc
@@ -757,17 +757,6 @@ int Http3Upstream::write_streams() {
   ngtcp2_path_storage_zero(&ps);
   ngtcp2_path_storage_zero(&prev_ps);
 
-  auto config = get_config();
-  auto &quicconf = config->quic;
-
-  switch (quicconf.upstream.congestion_controller) {
-  case NGTCP2_CC_ALGO_BBR:
-  case NGTCP2_CC_ALGO_BBR2:
-    break;
-  default:
-    max_pktcnt = std::min(max_pktcnt, static_cast<size_t>(10));
-  }
-
   for (;;) {
     int64_t stream_id = -1;
     int fin = 0;