Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
Tatsuhiro Tsujikawa | 53dfaad925 | |
Tatsuhiro Tsujikawa | 2f2da110a1 | |
Tatsuhiro Tsujikawa | 8a14435aa8 | |
Tatsuhiro Tsujikawa | dbaa59908e | |
Tatsuhiro Tsujikawa | ca41f2faab | |
Tatsuhiro Tsujikawa | daae20d4a5 | |
Tatsuhiro Tsujikawa | 6d9667dc74 |
|
@ -60,8 +60,6 @@ jobs:
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libtool
|
libtool
|
||||||
echo 'PKG_CONFIG_PATH=/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig' >> $GITHUB_ENV
|
echo 'PKG_CONFIG_PATH=/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig' >> $GITHUB_ENV
|
||||||
# This fixes infamous 'stdio.h not found' error.
|
|
||||||
echo 'SDKROOT='"$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
|
|
||||||
- name: Setup clang (Linux)
|
- name: Setup clang (Linux)
|
||||||
if: runner.os == 'Linux' && matrix.compiler == 'clang'
|
if: runner.os == 'Linux' && matrix.compiler == 'clang'
|
||||||
run: |
|
run: |
|
||||||
|
@ -144,22 +142,31 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
- name: Configure autotools
|
- name: Configure autotools
|
||||||
if: matrix.buildtool == 'autotools'
|
|
||||||
run: |
|
run: |
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
./configure --enable-werror --with-mruby $EXTRA_AUTOTOOLS_OPTS
|
./configure
|
||||||
- name: Configure cmake
|
- name: Configure cmake
|
||||||
if: matrix.buildtool == 'cmake'
|
if: matrix.buildtool == 'cmake'
|
||||||
run: |
|
run: |
|
||||||
cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 $EXTRA_CMAKE_OPTS -DCPPFLAGS="$CPPFLAGS" -DLDFLAGS="$LDFLAGS" .
|
make dist
|
||||||
|
VERSION=$(grep PACKAGE_VERSION config.h | cut -d' ' -f3 | tr -d '"')
|
||||||
|
tar xf nghttp2-$VERSION.tar.gz
|
||||||
|
cd nghttp2-$VERSION
|
||||||
|
echo 'NGHTTP2_CMAKE_DIR='"$PWD" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
# This fixes infamous 'stdio.h not found' error.
|
||||||
|
echo 'SDKROOT='"$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DENABLE_APP=1 $EXTRA_CMAKE_OPTS -DCPPFLAGS="$CPPFLAGS" -DLDFLAGS="$LDFLAGS" .
|
||||||
- name: Build nghttp2 with autotools
|
- name: Build nghttp2 with autotools
|
||||||
if: matrix.buildtool == 'autotools'
|
if: matrix.buildtool == 'autotools'
|
||||||
run: |
|
run: |
|
||||||
make distcheck \
|
make distcheck \
|
||||||
DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --enable-werror $EXTRA_AUTOTOOLS_OPTS CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\""
|
DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --with-libev --enable-werror $EXTRA_AUTOTOOLS_OPTS CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\""
|
||||||
- name: Build nghttp2 with cmake
|
- name: Build nghttp2 with cmake
|
||||||
if: matrix.buildtool == 'cmake'
|
if: matrix.buildtool == 'cmake'
|
||||||
run: |
|
run: |
|
||||||
|
cd $NGHTTP2_CMAKE_DIR
|
||||||
make
|
make
|
||||||
make check
|
make check
|
||||||
- name: Integration test
|
- name: Integration test
|
||||||
|
@ -167,5 +174,5 @@ jobs:
|
||||||
# artifacts.
|
# artifacts.
|
||||||
if: matrix.buildtool == 'cmake'
|
if: matrix.buildtool == 'cmake'
|
||||||
run: |
|
run: |
|
||||||
cd integration-tests
|
cd $NGHTTP2_CMAKE_DIR/integration-tests
|
||||||
make itprep it
|
make itprep it
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.0)
|
||||||
# XXX using 1.8.90 instead of 1.9.0-DEV
|
# XXX using 1.8.90 instead of 1.9.0-DEV
|
||||||
project(nghttp2 VERSION 1.45.0)
|
project(nghttp2 VERSION 1.45.1)
|
||||||
|
|
||||||
# See versioning rule:
|
# See versioning rule:
|
||||||
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
||||||
|
|
|
@ -46,7 +46,11 @@ EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
|
||||||
cmake/FindLibevent.cmake \
|
cmake/FindLibevent.cmake \
|
||||||
cmake/FindJansson.cmake \
|
cmake/FindJansson.cmake \
|
||||||
cmake/FindLibcares.cmake \
|
cmake/FindLibcares.cmake \
|
||||||
cmake/FindSystemd.cmake
|
cmake/FindSystemd.cmake \
|
||||||
|
cmake/FindLibbpf.cmake \
|
||||||
|
cmake/FindLibnghttp3.cmake \
|
||||||
|
cmake/FindLibngtcp2.cmake \
|
||||||
|
cmake/FindLibngtcp2_crypto_openssl.cmake
|
||||||
|
|
||||||
.PHONY: clang-format
|
.PHONY: clang-format
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,9 @@
|
||||||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
if HAVE_LIBBPF
|
EXTRA_DIST = CMakeLists.txt reuseport_kern.c
|
||||||
|
|
||||||
EXTRA_DIST = reuseport_kern.c
|
if HAVE_LIBBPF
|
||||||
|
|
||||||
bpf_pkglibdir = $(pkglibdir)
|
bpf_pkglibdir = $(pkglibdir)
|
||||||
bpf_pkglib_DATA = reuseport_kern.o
|
bpf_pkglib_DATA = reuseport_kern.o
|
||||||
|
|
|
@ -25,7 +25,7 @@ dnl Do not change user variables!
|
||||||
dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
|
dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
|
||||||
|
|
||||||
AC_PREREQ(2.61)
|
AC_PREREQ(2.61)
|
||||||
AC_INIT([nghttp2], [1.45.0], [t-tujikawa@users.sourceforge.net])
|
AC_INIT([nghttp2], [1.45.1], [t-tujikawa@users.sourceforge.net])
|
||||||
AC_CONFIG_AUX_DIR([.])
|
AC_CONFIG_AUX_DIR([.])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.\" Man page generated from reStructuredText.
|
.\" Man page generated from reStructuredText.
|
||||||
.
|
.
|
||||||
.TH "H2LOAD" "1" "Sep 20, 2021" "1.45.0" "nghttp2"
|
.TH "H2LOAD" "1" "Sep 21, 2021" "1.45.1" "nghttp2"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
h2load \- HTTP/2 benchmarking tool
|
h2load \- HTTP/2 benchmarking tool
|
||||||
.
|
.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.\" Man page generated from reStructuredText.
|
.\" Man page generated from reStructuredText.
|
||||||
.
|
.
|
||||||
.TH "NGHTTP" "1" "Sep 20, 2021" "1.45.0" "nghttp2"
|
.TH "NGHTTP" "1" "Sep 21, 2021" "1.45.1" "nghttp2"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
nghttp \- HTTP/2 client
|
nghttp \- HTTP/2 client
|
||||||
.
|
.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.\" Man page generated from reStructuredText.
|
.\" Man page generated from reStructuredText.
|
||||||
.
|
.
|
||||||
.TH "NGHTTPD" "1" "Sep 20, 2021" "1.45.0" "nghttp2"
|
.TH "NGHTTPD" "1" "Sep 21, 2021" "1.45.1" "nghttp2"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
nghttpd \- HTTP/2 server
|
nghttpd \- HTTP/2 server
|
||||||
.
|
.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.\" Man page generated from reStructuredText.
|
.\" Man page generated from reStructuredText.
|
||||||
.
|
.
|
||||||
.TH "NGHTTPX" "1" "Sep 20, 2021" "1.45.0" "nghttp2"
|
.TH "NGHTTPX" "1" "Sep 21, 2021" "1.45.1" "nghttp2"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
nghttpx \- HTTP/2 proxy
|
nghttpx \- HTTP/2 proxy
|
||||||
.
|
.
|
||||||
|
|
|
@ -81,6 +81,7 @@ bool recorded(const std::chrono::steady_clock::time_point &t) {
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
#if OPENSSL_1_1_1_API
|
||||||
namespace {
|
namespace {
|
||||||
std::ofstream keylog_file;
|
std::ofstream keylog_file;
|
||||||
void keylog_callback(const SSL *ssl, const char *line) {
|
void keylog_callback(const SSL *ssl, const char *line) {
|
||||||
|
@ -89,6 +90,7 @@ void keylog_callback(const SSL *ssl, const char *line) {
|
||||||
keylog_file.flush();
|
keylog_file.flush();
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
#endif // OPENSSL_1_1_1_API
|
||||||
|
|
||||||
Config::Config()
|
Config::Config()
|
||||||
: ciphers(tls::DEFAULT_CIPHER_LIST),
|
: ciphers(tls::DEFAULT_CIPHER_LIST),
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
AM_CPPFLAGS = @DEFS@
|
AM_CPPFLAGS = @DEFS@
|
||||||
|
|
||||||
EXTRA_DIST = CMakeLists.txt
|
EXTRA_DIST = CMakeLists.txt build_config.rb mruby/*
|
||||||
|
|
||||||
if ENABLE_THIRD_PARTY
|
if ENABLE_THIRD_PARTY
|
||||||
|
|
||||||
|
@ -49,8 +49,6 @@ endif # HAVE_NEVERBLEED
|
||||||
|
|
||||||
if HAVE_MRUBY
|
if HAVE_MRUBY
|
||||||
|
|
||||||
EXTRA_DIST += build_config.rb mruby/*
|
|
||||||
|
|
||||||
.PHONY: all-local clean mruby
|
.PHONY: all-local clean mruby
|
||||||
|
|
||||||
mruby:
|
mruby:
|
||||||
|
|
Loading…
Reference in New Issue