Commit 4fce01a2 authored by Drake Arconis's avatar Drake Arconis
Browse files

Merge vendor to default

parents 5d8de932 71b86392
......@@ -3,3 +3,6 @@
41200dc552abd040ad718e2089843f8052e31b04 current
f80904f3d75d51c06531c0e2689335f94ef6ce31 current
f80904f3d75d51c06531c0e2689335f94ef6ce31 1.37.0
eeeae742dcf55628bfbc210f0bdd27f6a6231574 1.39.2
f80904f3d75d51c06531c0e2689335f94ef6ce31 current
eeeae742dcf55628bfbc210f0bdd27f6a6231574 current
......@@ -14,6 +14,7 @@ github issues [2].
--------
187j3x1
Adam Gołębiowski
Alek Storm
Alex Nalivko
Alexandros Konstantinakis-Karmis
......@@ -50,6 +51,7 @@ Jan Kundrát
Jan-E
Janusz Dziemidowicz
Jay Satiro
Jeff 'Raid' Baitis
Jianqing Wang
Jim Morrison
Josh Braegger
......
......@@ -24,13 +24,13 @@
cmake_minimum_required(VERSION 3.0)
# XXX using 1.8.90 instead of 1.9.0-DEV
project(nghttp2 VERSION 1.37.0)
project(nghttp2 VERSION 1.39.2)
# See versioning rule:
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
set(LT_CURRENT 31)
set(LT_REVISION 2)
set(LT_AGE 17)
set(LT_CURRENT 32)
set(LT_REVISION 0)
set(LT_AGE 18)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include(Version)
......
commit cfb47d30a5bb5dfcc6b0dc30698957d8605348c5 (HEAD, tag: v1.37.0, origin/master, origin/HEAD, master)
commit 957abacf9920a42becdf1935d14ca48d260bb8e7 (HEAD, tag: v1.39.2, origin/v1.39.x, origin/HEAD, v1.39.x)
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-08
AuthorDate: 2019-08-13
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-08
CommitDate: 2019-08-13
Take into account larger frame size for prioritization
Larger frame size just destroys multiplexing and prioritization does
not work.
commit dbbe4e017a353ced5264baa33db95f336a76c54f
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-08
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-08
Remove unused field
commit 371bc3a8f74a4148c9ee5133db644177182f46fe
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-08
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-08
clang-format
Bump up version number to 1.39.2, LT revision to 32:0:18
commit 5e7889c5ef28ef5ba57ac29626e4d8ae770bf2b9
commit 83d362c6d21f76599b86e7b94cd1992288a1d43c
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-07
AuthorDate: 2019-06-25
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-07
CommitDate: 2019-08-13
Update manual pages
Don't read too greedily
commit b1b2ad5017f3923a84248058853d788336c30445
commit a76d0723b5f52902139ff453e0ec840673e86e75
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-07
AuthorDate: 2019-06-25
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-07
CommitDate: 2019-08-13
Bump up version number to 1.37.0, LT revision to 31:2:17
Add nghttp2_option_set_max_outbound_ack
commit e043ca83c5d9381febd0ab2041b617d3f90ad781
commit db2f612a30d54aa152ce5530fa1d683738baa4d1
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-07
AuthorDate: 2019-08-06
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-07
Update AUTHORS
commit c2434dfbbc65b543eb2c27f7924242e90e7ae5f7
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-04
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-04
Simplify stream_less
CommitDate: 2019-08-13
commit 816ad2102fe1e0c4e47a2160e1958dfdc2cbabc9
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-03-04
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-03-04
Reuse name when indexing header by referencing dynamic table
commit f5feb16ef400fa72319eda0d34d863c6ff58fabc
Merge: adf09f21 34482ed4
Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
AuthorDate: 2019-02-20
Commit: GitHub <noreply@github.com>
CommitDate: 2019-02-20
Merge pull request #1295 from bratkartoffel/fix-compile-boringssl
nghttpx: Fix request stall
Fix compilation with boringssl
commit adf09f2124d16765f40fde3806ba9ee2aaf5b42e
Merge: d93842db 2591960e
Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
AuthorDate: 2019-02-20
Commit: GitHub <noreply@github.com>
CommitDate: 2019-02-20
Merge pull request #1303 from donny-dont/fix-shared-install
Explicitly set install location when building shared libs
commit 2591960e2fc9aef919b010224a221f92a20da3d1
Author: Don <don.j.olmstead@gmail.com>
AuthorDate: 2019-02-06
Commit: Don <don.j.olmstead@gmail.com>
CommitDate: 2019-02-06
Explicitly set install location when building shared libs
commit d93842db3eb481fc6953ec70a81ed2f7863ffb45
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-23
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-23
nghttpx: Fix backend stall if header and request body are sent in 2 packets
commit 8dc2b263ba62c4b8c3e682757baa59a9708b3b7d
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-22
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-22
nghttpx: Use std::priority_queue
commit 8d842701b512791b3f7613703070fb3079de33de
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-21
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-21
Update manual pages
commit de85b0fda592934a64886ba6a584424b777e97ac
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-21
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-21
Update README
commit 5d6beed59099487cf77fb0641aae575f3ce6d967
Merge: 9b6ced66 1ff9de4c
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-21
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-21
Merge branch 'nghttpx-backend-weight'
commit 1ff9de4c873908ca0612df10daef9ecd7b580051
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-19
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-21
nghttpx: Backend address selection with weight
commit 34482ed4df79c7c143226f759af0a8834298acd1
Author: Simon Frankenberger <simon@fraho.eu>
AuthorDate: 2019-01-18
Commit: Simon Frankenberger <simon@fraho.eu>
CommitDate: 2019-01-18
Fix compilation with boringssl
commit 9b6ced66f3b89a3a005002ff2df68dae9d7295cd
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-18
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-18
Bump up version number to 1.37.0-DEV
Fix request stall if backend connection is reused and buffer is full.
......@@ -323,12 +323,7 @@ its testing framework. We depend on the following libraries:
* golang.org/x/net/websocket
* https://github.com/tatsuhiro-t/go-nghttp2
To download the above packages, after settings ``GOPATH``, run the
following command under ``integration-tests`` directory:
.. code-block:: text
$ make itprep
Go modules will download these dependencies automatically.
To run the tests, run the following command under
``integration-tests`` directory:
......
......@@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29)
dnl serial 11 (pkg-config-0.29.1)
dnl
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
......@@ -63,7 +63,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
[m4_define([PKG_MACROS_VERSION], [0.29])
[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for nghttp2 1.37.0.
# Generated by GNU Autoconf 2.69 for nghttp2 1.39.2.
#
# Report bugs to <t-tujikawa@users.sourceforge.net>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nghttp2'
PACKAGE_TARNAME='nghttp2'
PACKAGE_VERSION='1.37.0'
PACKAGE_STRING='nghttp2 1.37.0'
PACKAGE_VERSION='1.39.2'
PACKAGE_STRING='nghttp2 1.39.2'
PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net'
PACKAGE_URL=''
 
......@@ -1464,7 +1464,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures nghttp2 1.37.0 to adapt to many kinds of systems.
\`configure' configures nghttp2 1.39.2 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1536,7 +1536,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of nghttp2 1.37.0:";;
short | recursive ) echo "Configuration of nghttp2 1.39.2:";;
esac
cat <<\_ACEOF
 
......@@ -1732,7 +1732,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
nghttp2 configure 1.37.0
nghttp2 configure 1.39.2
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2692,7 +2692,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by nghttp2 $as_me 1.37.0, which was
It was created by nghttp2 $as_me 1.39.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -8551,6 +8551,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
# flang / f18. f95 an alias for gfortran or flang on Debian
flang* | f18* | f95*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-fPIC'
lt_prog_compiler_static='-static'
;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
......@@ -12657,7 +12663,7 @@ fi
 
# Define the identity of the package.
PACKAGE='nghttp2'
VERSION='1.37.0'
VERSION='1.39.2'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -12919,11 +12925,11 @@ fi
AM_BACKSLASH='\'
 
 
LT_CURRENT=31
LT_CURRENT=32
 
LT_REVISION=2
LT_REVISION=0
 
LT_AGE=17
LT_AGE=18
 
 
major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/^0-9//g"`
......@@ -24916,7 +24922,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by nghttp2 $as_me 1.37.0, which was
This file was extended by nghttp2 $as_me 1.39.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -24982,7 +24988,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
nghttp2 config.status 1.37.0
nghttp2 config.status 1.39.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......@@ -27008,9 +27014,9 @@ fi
Failmalloc: ${enable_failmalloc}
Libs:
OpenSSL: ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
Libxml2: ${have_libxml2} (CFLAGS='${LIBXML2_CPPFLAGS}' LIBS='${LIBXML2_LIBS}')
Libxml2: ${have_libxml2} (CFLAGS='${LIBXML2_CFLAGS}' LIBS='${LIBXML2_LIBS}')
Libev: ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
Libc-ares ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
Libc-ares: ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
Libevent(SSL): ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
Jansson: ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
Jemalloc: ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
......@@ -27072,9 +27078,9 @@ $as_echo "$as_me: summary of build options:
Failmalloc: ${enable_failmalloc}
Libs:
OpenSSL: ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
Libxml2: ${have_libxml2} (CFLAGS='${LIBXML2_CPPFLAGS}' LIBS='${LIBXML2_LIBS}')
Libxml2: ${have_libxml2} (CFLAGS='${LIBXML2_CFLAGS}' LIBS='${LIBXML2_LIBS}')
Libev: ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
Libc-ares ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
Libc-ares: ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
Libevent(SSL): ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
Jansson: ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
Jemalloc: ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
......
......@@ -25,7 +25,7 @@ dnl Do not change user variables!
dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
AC_PREREQ(2.61)
AC_INIT([nghttp2], [1.37.0], [t-tujikawa@users.sourceforge.net])
AC_INIT([nghttp2], [1.39.2], [t-tujikawa@users.sourceforge.net])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
......@@ -44,9 +44,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl See versioning rule:
dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST(LT_CURRENT, 31)
AC_SUBST(LT_REVISION, 2)
AC_SUBST(LT_AGE, 17)
AC_SUBST(LT_CURRENT, 32)
AC_SUBST(LT_REVISION, 0)
AC_SUBST(LT_AGE, 18)
major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
......@@ -899,9 +899,9 @@ AC_MSG_NOTICE([summary of build options:
Failmalloc: ${enable_failmalloc}
Libs:
OpenSSL: ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
Libxml2: ${have_libxml2} (CFLAGS='${LIBXML2_CPPFLAGS}' LIBS='${LIBXML2_LIBS}')
Libxml2: ${have_libxml2} (CFLAGS='${LIBXML2_CFLAGS}' LIBS='${LIBXML2_LIBS}')
Libev: ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
Libc-ares ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
Libc-ares: ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
Libevent(SSL): ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
Jansson: ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
Jemalloc: ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
......
......@@ -67,6 +67,7 @@ APIDOCS= \
nghttp2_option_set_no_recv_client_magic.rst \
nghttp2_option_set_peer_max_concurrent_streams.rst \
nghttp2_option_set_user_recv_extension_type.rst \
nghttp2_option_set_max_outbound_ack.rst \
nghttp2_pack_settings_payload.rst \
nghttp2_priority_spec_check_default.rst \
nghttp2_priority_spec_default_init.rst \
......
......@@ -424,6 +424,7 @@ APIDOCS = \
nghttp2_option_set_no_recv_client_magic.rst \
nghttp2_option_set_peer_max_concurrent_streams.rst \
nghttp2_option_set_user_recv_extension_type.rst \
nghttp2_option_set_max_outbound_ack.rst \
nghttp2_pack_settings_payload.rst \
nghttp2_priority_spec_check_default.rst \
nghttp2_priority_spec_default_init.rst \
......
.\" Man page generated from reStructuredText.
.
.TH "H2LOAD" "1" "Mar 07, 2019" "1.37.0" "nghttp2"
.TH "H2LOAD" "1" "Jun 11, 2019" "1.39.0" "nghttp2"
.SH NAME
h2load \- HTTP/2 benchmarking tool
.
......
.\" Man page generated from reStructuredText.
.
.TH "NGHTTP" "1" "Mar 07, 2019" "1.37.0" "nghttp2"
.TH "NGHTTP" "1" "Jun 11, 2019" "1.39.0" "nghttp2"
.SH NAME
nghttp \- HTTP/2 client
.
......
nghttp2_option_set_max_outbound_ack
===================================
Synopsis
--------
*#include <nghttp2/nghttp2.h>*
.. function:: void nghttp2_option_set_max_outbound_ack(nghttp2_option *option, size_t val)
This function sets the maximum number of outgoing SETTINGS ACK and
PING ACK frames retained in :type:`nghttp2_session` object. If
more than those frames are retained, the peer is considered to be
misbehaving and session will be closed. The default value is 1000.
.\" Man page generated from reStructuredText.
.
.TH "NGHTTPD" "1" "Mar 07, 2019" "1.37.0" "nghttp2"
.TH "NGHTTPD" "1" "Jun 11, 2019" "1.39.0" "nghttp2"
.SH NAME
nghttpd \- HTTP/2 server
.
......
.\" Man page generated from reStructuredText.
.
.TH "NGHTTPX" "1" "Mar 07, 2019" "1.37.0" "nghttp2"
.TH "NGHTTPX" "1" "Jun 11, 2019" "1.39.0" "nghttp2"
.SH NAME
nghttpx \- HTTP/2 proxy
.
......
......@@ -26,14 +26,14 @@ Coding style
We use clang-format to format source code consistently. The
clang-format configuration file .clang-format is located at the root
directory. Since clang-format produces slightly different results
between versions, we currently use clang-format-7.
between versions, we currently use clang-format-8.
To detect any violation to the coding style, we recommend to setup git
pre-commit hook to check coding style of the changes you introduced.
The pre-commit file is located at the root directory. Copy it under
.git/hooks and make sure that it is executable. The pre-commit script
uses clang-format-diff.py to detect any style errors. If it is not in
your PATH or it exists under different name (e.g., clang-format-diff-7
your PATH or it exists under different name (e.g., clang-format-diff-8
in debian), either add it to PATH variable or add git option
``clangformatdiff.binary`` to point to the script.
......
......@@ -498,6 +498,14 @@ naming scheme and structure, nghttpx provides the new option
:option:`--tls13-ciphers` and :option:`--tls13-client-ciphers` to
change preferred cipher list for TLSv1.3.
WebSockets over HTTP/2
----------------------
nghttpx supports `RFC 8441 <https://tools.ietf.org/html/rfc8441>`_
Bootstrapping WebSockets with HTTP/2 for both frontend and backend
connections. This feature is enabled by default and no configuration
is required.
Migration from nghttpx v1.18.x or earlier
-----------------------------------------
......
......@@ -9,6 +9,7 @@ if(ENABLE_EXAMPLES)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/../third-party"
"${CMAKE_CURRENT_SOURCE_DIR}/../third-party/llhttp/include"
${LIBEVENT_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS}
......@@ -21,14 +22,24 @@ if(ENABLE_EXAMPLES)
${APP_LIBRARIES}
)
add_executable(client client.c $<TARGET_OBJECTS:http-parser>)
add_executable(libevent-client libevent-client.c $<TARGET_OBJECTS:http-parser>)
add_executable(libevent-server libevent-server.c $<TARGET_OBJECTS:http-parser>)
add_executable(deflate deflate.c $<TARGET_OBJECTS:http-parser>)
add_executable(client client.c $<TARGET_OBJECTS:llhttp>
$<TARGET_OBJECTS:url-parser>
)
add_executable(libevent-client libevent-client.c $<TARGET_OBJECTS:llhttp>
$<TARGET_OBJECTS:url-parser>
)
add_executable(libevent-server libevent-server.c $<TARGET_OBJECTS:llhttp>
$<TARGET_OBJECTS:url-parser>
)
add_executable(deflate deflate.c $<TARGET_OBJECTS:llhttp>
$<TARGET_OBJECTS:url-parser>
)
if(ENABLE_ASIO_LIB)
foreach(name asio-sv asio-sv2 asio-cl asio-cl2)
add_executable(${name} ${name}.cc $<TARGET_OBJECTS:http-parser>)
add_executable(${name} ${name}.cc $<TARGET_OBJECTS:llhttp>
$<TARGET_OBJECTS:url-parser>
)
target_include_directories(${name} PRIVATE
${OPENSSL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
......
......@@ -36,7 +36,7 @@ AM_CPPFLAGS = \
@OPENSSL_CFLAGS@ \
@DEFS@
LDADD = $(top_builddir)/lib/libnghttp2.la \
$(top_builddir)/third-party/libhttp-parser.la \
$(top_builddir)/third-party/liburl-parser.la \
@LIBEVENT_OPENSSL_LIBS@ \
@OPENSSL_LIBS@ \
@APPLDFLAGS@
......@@ -61,7 +61,7 @@ noinst_PROGRAMS += asio-sv asio-sv2 asio-cl asio-cl2
ASIOCPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \
$(top_builddir)/src/libnghttp2_asio.la @JEMALLOC_LIBS@ \
$(top_builddir)/third-party/libhttp-parser.la \
$(top_builddir)/third-party/liburl-parser.la \
@OPENSSL_LIBS@ \
${BOOST_LDFLAGS} \
${BOOST_ASIO_LIB} \
......
......@@ -148,7 +148,7 @@ asio_cl_OBJECTS = $(am_asio_cl_OBJECTS)
am__DEPENDENCIES_1 =
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/lib/libnghttp2.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/src/libnghttp2_asio.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_1) \
......@@ -176,14 +176,14 @@ client_OBJECTS = $(am_client_OBJECTS)
client_LDADD = $(LDADD)
@ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES = \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la
am__deflate_SOURCES_DIST = deflate.c
@ENABLE_EXAMPLES_TRUE@am_deflate_OBJECTS = deflate.$(OBJEXT)
deflate_OBJECTS = $(am_deflate_OBJECTS)
deflate_LDADD = $(LDADD)
@ENABLE_EXAMPLES_TRUE@deflate_DEPENDENCIES = \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la
am__libevent_client_SOURCES_DIST = libevent-client.c
@ENABLE_EXAMPLES_TRUE@am_libevent_client_OBJECTS = \
@ENABLE_EXAMPLES_TRUE@ libevent-client.$(OBJEXT)
......@@ -191,7 +191,7 @@ libevent_client_OBJECTS = $(am_libevent_client_OBJECTS)
libevent_client_LDADD = $(LDADD)
@ENABLE_EXAMPLES_TRUE@libevent_client_DEPENDENCIES = \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la
am__libevent_server_SOURCES_DIST = libevent-server.c
@ENABLE_EXAMPLES_TRUE@am_libevent_server_OBJECTS = \
@ENABLE_EXAMPLES_TRUE@ libevent-server.$(OBJEXT)
......@@ -199,7 +199,7 @@ libevent_server_OBJECTS = $(am_libevent_server_OBJECTS)
libevent_server_LDADD = $(LDADD)
@ENABLE_EXAMPLES_TRUE@libevent_server_DEPENDENCIES = \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -486,7 +486,7 @@ EXTRA_DIST = CMakeLists.txt
@ENABLE_EXAMPLES_TRUE@ @DEFS@
@ENABLE_EXAMPLES_TRUE@LDADD = $(top_builddir)/lib/libnghttp2.la \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la \
@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la \
@ENABLE_EXAMPLES_TRUE@ @LIBEVENT_OPENSSL_LIBS@ \
@ENABLE_EXAMPLES_TRUE@ @OPENSSL_LIBS@ \
@ENABLE_EXAMPLES_TRUE@ @APPLDFLAGS@
......@@ -502,7 +502,7 @@ EXTRA_DIST = CMakeLists.txt
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/src/libnghttp2_asio.la @JEMALLOC_LIBS@ \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/libhttp-parser.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ @OPENSSL_LIBS@ \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ ${BOOST_LDFLAGS} \
@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ ${BOOST_ASIO_LIB} \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment