walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Bump ngtcp2

This commit is contained in:
Tatsuhiro Tsujikawa 2022-09-20 17:32:56 +09:00
parent 931adb146b
commit 11d1f95412
5 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -127,7 +127,7 @@ jobs:
run: | run: |
git clone https://boringssl.googlesource.com/boringssl git clone https://boringssl.googlesource.com/boringssl
cd boringssl cd boringssl
git checkout a6d321b11fa80496b7c8ae6405468c212d4f5c87 git checkout 04989786e9ab16cef5261bbd05a2b1a8cb312dbf
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
@ -148,7 +148,7 @@ jobs:
- name: Build nghttp3 - name: Build nghttp3
if: matrix.http3 == 'http3' if: matrix.http3 == 'http3'
run: | 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 cd nghttp3
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only ./configure --prefix=$PWD/build --enable-lib-only
@ -157,7 +157,7 @@ jobs:
- name: Build ngtcp2 - name: Build ngtcp2
if: matrix.http3 == 'http3' if: matrix.http3 == 'http3'
run: | 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 cd ngtcp2
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig" $EXTRA_NGTCP2_OPTS ./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig" $EXTRA_NGTCP2_OPTS

8
README.rst
View File

@ -150,8 +150,8 @@ following libraries are required:
* `OpenSSL with QUIC support * `OpenSSL with QUIC support
<https://github.com/quictls/openssl/tree/OpenSSL_1_1_1q+quic>`_; or <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1q+quic>`_; or
`BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
a6d321b11fa80496b7c8ae6405468c212d4f5c87) 04989786e9ab16cef5261bbd05a2b1a8cb312dbf)
* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.8.0 * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.9.0
* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 0.7.0 * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 0.7.0
Use ``--enable-http3`` configure option to enable HTTP/3 feature for Use ``--enable-http3`` configure option to enable HTTP/3 feature for
@ -363,7 +363,7 @@ Build nghttp3:
.. code-block:: text .. 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 $ cd nghttp3
$ autoreconf -i $ autoreconf -i
$ ./configure --prefix=$PWD/build --enable-lib-only $ ./configure --prefix=$PWD/build --enable-lib-only
@ -375,7 +375,7 @@ Build ngtcp2:
.. code-block:: text .. 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 $ cd ngtcp2
$ autoreconf -i $ autoreconf -i
$ ./configure --prefix=$PWD/build --enable-lib-only \ $ ./configure --prefix=$PWD/build --enable-lib-only \

4
configure.ac
View File

@ -540,7 +540,7 @@ fi
# ngtcp2 (for src) # ngtcp2 (for src)
have_libngtcp2=no have_libngtcp2=no
if test "x${request_libngtcp2}" != "xno"; then 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]) [have_libngtcp2=no])
if test "x${have_libngtcp2}" = "xno"; then if test "x${have_libngtcp2}" = "xno"; then
AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS) AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS)
@ -557,7 +557,7 @@ have_libngtcp2_crypto_openssl=no
if test "x${have_ssl_is_quic}" = "xyes" && if test "x${have_ssl_is_quic}" = "xyes" &&
test "x${request_libngtcp2}" != "xno"; then test "x${request_libngtcp2}" != "xno"; then
PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_OPENSSL], 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=yes],
[have_libngtcp2_crypto_openssl=no]) [have_libngtcp2_crypto_openssl=no])
if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then

4
docker/Dockerfile
View File

@ -15,7 +15,7 @@ RUN git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openss
cd .. && \ cd .. && \
rm -rf openssl 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 && \ cd nghttp3 && \
autoreconf -i && \ autoreconf -i && \
./configure --enable-lib-only && \ ./configure --enable-lib-only && \
@ -24,7 +24,7 @@ RUN git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/nghttp3 && \
cd .. && \ cd .. && \
rm -rf nghttp3 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 && \ cd ngtcp2 && \
autoreconf -i && \ autoreconf -i && \
./configure --enable-lib-only \ ./configure --enable-lib-only \

11
src/shrpx_http3_upstream.cc
View File

@ -757,17 +757,6 @@ int Http3Upstream::write_streams() {
ngtcp2_path_storage_zero(&ps); ngtcp2_path_storage_zero(&ps);
ngtcp2_path_storage_zero(&prev_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 (;;) { for (;;) {
int64_t stream_id = -1; int64_t stream_id = -1;
int fin = 0; int fin = 0;