Merge branch 'Lekensteyn-cmake'
This commit is contained in:
Tatsuhiro Tsujikawa
commit
71cc7a96c2
|
|
@ -29,6 +29,22 @@ missing
|
||||||
stamp-h1
|
stamp-h1
|
||||||
test-driver
|
test-driver
|
||||||
|
|
||||||
|
# cmake
|
||||||
|
CMakeCache.txt
|
||||||
|
CMakeFiles/
|
||||||
|
cmake_install.cmake
|
||||||
|
install_manifest.txt
|
||||||
|
CTestTestfile.cmake
|
||||||
|
build.ninja
|
||||||
|
rules.ninja
|
||||||
|
.ninja_deps
|
||||||
|
.ninja_log
|
||||||
|
lib*.so
|
||||||
|
lib*.so.*
|
||||||
|
lib*.a
|
||||||
|
# generated by "make test" with cmake
|
||||||
|
Testing/
|
||||||
|
|
||||||
# test logs generated by `make check`
|
# test logs generated by `make check`
|
||||||
*.log
|
*.log
|
||||||
*.trs
|
*.trs
|
||||||
|
|
|
||||||
13
.travis.yml
13
.travis.yml
|
|
@ -1,3 +1,7 @@
|
||||||
|
env:
|
||||||
|
matrix:
|
||||||
|
- CI_BUILD=cmake
|
||||||
|
- CI_BUILD=autotools
|
||||||
language: cpp
|
language: cpp
|
||||||
compiler:
|
compiler:
|
||||||
- clang
|
- clang
|
||||||
|
|
@ -7,6 +11,7 @@ addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
|
- george-edison55-precise-backports
|
||||||
packages:
|
packages:
|
||||||
- g++-4.9
|
- g++-4.9
|
||||||
- libstdc++-4.9-dev
|
- libstdc++-4.9-dev
|
||||||
|
|
@ -23,11 +28,14 @@ addons:
|
||||||
- libevent-dev
|
- libevent-dev
|
||||||
- libjansson-dev
|
- libjansson-dev
|
||||||
- libjemalloc-dev
|
- libjemalloc-dev
|
||||||
|
- cmake
|
||||||
|
- cmake-data
|
||||||
before_install:
|
before_install:
|
||||||
- $CC --version
|
- $CC --version
|
||||||
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
|
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
|
||||||
- $CC --version
|
- $CC --version
|
||||||
- go version
|
- go version
|
||||||
|
- cmake --version
|
||||||
before_script:
|
before_script:
|
||||||
# First build spdylay, since integration tests require it.
|
# First build spdylay, since integration tests require it.
|
||||||
# spdylay is going to be built under third-party/spdylay
|
# spdylay is going to be built under third-party/spdylay
|
||||||
|
|
@ -40,9 +48,10 @@ before_script:
|
||||||
- export SPDYLAY_HOME=$PWD
|
- export SPDYLAY_HOME=$PWD
|
||||||
- cd ../..
|
- cd ../..
|
||||||
# Now build nghttp2
|
# Now build nghttp2
|
||||||
- autoreconf -i
|
- if [ "$CI_BUILD" = "autotools" ]; then autoreconf -i; fi
|
||||||
- git submodule update --init
|
- git submodule update --init
|
||||||
- ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay"
|
- if [ "$CI_BUILD" = "autotools" ]; then ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay"; fi
|
||||||
|
- if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DSPDYLAY_INCLUDE_DIR="$SPDYLAY_HOME/lib/includes" -DSPDYLAY_LIBRARY="$SPDYLAY_HOME/lib/.libs/libspdylay.so"; fi
|
||||||
script:
|
script:
|
||||||
- make
|
- make
|
||||||
- make check
|
- make check
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,524 @@
|
||||||
|
# nghttp2 - HTTP/2 C Library
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012, 2013, 2014, 2015 Tatsuhiro Tsujikawa
|
||||||
|
# Copyright (c) 2016 Peter Wu <peter@lekensteyn.nl>
|
||||||
|
#
|
||||||
|
# Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
# a copy of this software and associated documentation files (the
|
||||||
|
# "Software"), to deal in the Software without restriction, including
|
||||||
|
# without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
# distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
# permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
# the following conditions:
|
||||||
|
#
|
||||||
|
# The above copyright notice and this permission notice shall be
|
||||||
|
# included in all copies or substantial portions of the Software.
|
||||||
|
#
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.0)
|
||||||
|
# XXX using 1.8.90 instead of 1.9.0-DEV
|
||||||
|
project(nghttp2 VERSION 1.8.90)
|
||||||
|
|
||||||
|
# See versioning rule:
|
||||||
|
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
||||||
|
set(LT_CURRENT 19)
|
||||||
|
set(LT_REVISION 0)
|
||||||
|
set(LT_AGE 5)
|
||||||
|
|
||||||
|
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
||||||
|
include(Version)
|
||||||
|
|
||||||
|
math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}")
|
||||||
|
set(LT_VERSION "${LT_SOVERSION}.${LT_AGE}.${LT_REVISION}")
|
||||||
|
set(PACKAGE_VERSION "${PROJECT_VERSION}")
|
||||||
|
HexVersion(PACKAGE_VERSION_NUM ${PROJECT_VERSION_MAJOR} ${PROJECT_VERSION_MINOR} ${PROJECT_VERSION_PATCH})
|
||||||
|
|
||||||
|
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
||||||
|
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the build type" FORCE)
|
||||||
|
|
||||||
|
# Include "None" as option to disable any additional (optimization) flags,
|
||||||
|
# relying on just CMAKE_C_FLAGS and CMAKE_CXX_FLAGS (which are empty by
|
||||||
|
# default). These strings are presented in cmake-gui.
|
||||||
|
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
|
||||||
|
"None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
# For Python bindings and documentation
|
||||||
|
# (Must be called before PythonLibs for matching versions.)
|
||||||
|
find_package(PythonInterp)
|
||||||
|
|
||||||
|
# Auto-detection of features that can be toggled
|
||||||
|
find_package(OpenSSL 1.0.1)
|
||||||
|
find_package(Libev 4.11)
|
||||||
|
find_package(ZLIB 1.2.3)
|
||||||
|
if(OPENSSL_FOUND AND LIBEV_FOUND AND ZLIB_FOUND)
|
||||||
|
set(ENABLE_APP_DEFAULT ON)
|
||||||
|
else()
|
||||||
|
set(ENABLE_APP_DEFAULT OFF)
|
||||||
|
endif()
|
||||||
|
find_package(Jansson 2.5)
|
||||||
|
set(ENABLE_HPACK_TOOLS_DEFAULT ${JANSSON_FOUND})
|
||||||
|
# 2.0.8 is required because we use evconnlistener_set_error_cb()
|
||||||
|
find_package(Libevent 2.0.8 COMPONENTS libevent openssl)
|
||||||
|
set(ENABLE_EXAMPLES_DEFAULT ${LIBEVENT_OPENSSL_FOUND})
|
||||||
|
find_package(Cython)
|
||||||
|
find_package(PythonLibs)
|
||||||
|
if(CYTHON_FOUND AND PYTHONLIBS_FOUND)
|
||||||
|
set(ENABLE_PYTHON_BINDINGS_DEFAULT ON)
|
||||||
|
else()
|
||||||
|
set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_package(LibXml2 2.7.7)
|
||||||
|
set(WITH_LIBXML2_DEFAULT ${LIBXML2_FOUND})
|
||||||
|
find_package(Jemalloc)
|
||||||
|
set(WITH_JEMALLOC_DEFAULT ${JEMALLOC_FOUND})
|
||||||
|
find_package(Spdylay 1.3.2)
|
||||||
|
set(WITH_SPDYLAY_DEFAULT ${SPDYLAY_FOUND})
|
||||||
|
|
||||||
|
include(CMakeOptions.txt)
|
||||||
|
|
||||||
|
if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES OR
|
||||||
|
ENABLE_PYTHON_BINDINGS))
|
||||||
|
# Remember when disabled options are disabled for later diagnostics.
|
||||||
|
set(ENABLE_LIB_ONLY_DISABLED_OTHERS 1)
|
||||||
|
else()
|
||||||
|
set(ENABLE_LIB_ONLY_DISABLED_OTHERS 0)
|
||||||
|
endif()
|
||||||
|
if(ENABLE_LIB_ONLY)
|
||||||
|
set(ENABLE_APP OFF)
|
||||||
|
set(ENABLE_HPACK_TOOLS OFF)
|
||||||
|
set(ENABLE_EXAMPLES OFF)
|
||||||
|
set(ENABLE_PYTHON_BINDINGS OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Do not disable assertions based on CMAKE_BUILD_TYPE.
|
||||||
|
foreach(_build_type "Release" "MinSizeRel" "RelWithDebInfo")
|
||||||
|
foreach(_lang C CXX)
|
||||||
|
string(TOUPPER "CMAKE_${_lang}_FLAGS_${_build_type}" _var)
|
||||||
|
string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" "" ${_var} "${${_var}}")
|
||||||
|
endforeach()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
#
|
||||||
|
# If we're running GCC or clang define _U_ to be "__attribute__((unused))"
|
||||||
|
# so we can use _U_ to flag unused function parameters and not get warnings
|
||||||
|
# about them. Otherwise, define _U_ to be an empty string so that _U_ used
|
||||||
|
# to flag an unused function parameters will compile with other compilers.
|
||||||
|
#
|
||||||
|
# XXX - similar hints for other compilers?
|
||||||
|
#
|
||||||
|
if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||||
|
set(HINT_UNUSED_PARAM "__attribute__((unused))")
|
||||||
|
set(HINT_NORETURN "__attribute__((noreturn))")
|
||||||
|
else()
|
||||||
|
set(HINT_UNUSED_PARAM)
|
||||||
|
set(HINT_NORETURN)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(ExtractValidFlags)
|
||||||
|
foreach(_cxx1x_flag -std=c++11 -std=c++0x)
|
||||||
|
extract_valid_cxx_flags(_cxx1x_flag_supported ${_cxx1x_flag})
|
||||||
|
if(_cxx1x_flag_supported)
|
||||||
|
set(CXX1XCXXFLAGS ${_cxx1x_flag})
|
||||||
|
break()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
include(CMakePushCheckState)
|
||||||
|
include(CheckCXXSourceCompiles)
|
||||||
|
cmake_push_check_state()
|
||||||
|
set(CMAKE_REQUIRED_DEFINITIONS "${CXX1XCXXFLAGS}")
|
||||||
|
# Check that std::future is available.
|
||||||
|
check_cxx_source_compiles("
|
||||||
|
#include <vector>
|
||||||
|
#include <future>
|
||||||
|
int main() { std::vector<std::future<int>> v; }" HAVE_STD_FUTURE)
|
||||||
|
# Check that std::map::emplace is available for g++-4.7.
|
||||||
|
check_cxx_source_compiles("
|
||||||
|
#include <map>
|
||||||
|
int main() { std::map<int, int>().emplace(1, 2); }" HAVE_STD_MAP_EMPLACE)
|
||||||
|
cmake_pop_check_state()
|
||||||
|
|
||||||
|
|
||||||
|
# Checks for libraries.
|
||||||
|
# Additional libraries required for programs under src directory.
|
||||||
|
set(APP_LIBRARIES)
|
||||||
|
|
||||||
|
if(ENABLE_PYTHON_BINDINGS)
|
||||||
|
if(NOT (CYTHON_FOUND AND PYTHONLIBS_FOUND))
|
||||||
|
message(FATAL_ERROR "python bindings were requested "
|
||||||
|
"(ENABLE_PYTHON_BINDINGS=1) but dependencies are not met.")
|
||||||
|
endif()
|
||||||
|
if(NOT PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING)
|
||||||
|
message(FATAL_ERROR
|
||||||
|
"Python executable and library must have the same version!"
|
||||||
|
" Found Python ${PYTHON_VERSION_STRING} and"
|
||||||
|
" PythonLibs ${PYTHONLIBS_VERSION_STRING}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(CMAKE_THREAD_PREFER_PTHREAD 1)
|
||||||
|
find_package(Threads)
|
||||||
|
if(CMAKE_USE_PTHREADS_INIT)
|
||||||
|
list(APPEND APP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
endif()
|
||||||
|
# XXX android and C++, is this still needed in cmake?
|
||||||
|
# case "$host" in
|
||||||
|
# *android*)
|
||||||
|
# android_build=yes
|
||||||
|
# # android does not need -pthread, but needs followng 3 libs for C++
|
||||||
|
# APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
|
||||||
|
|
||||||
|
# dl: openssl requires libdl when it is statically linked.
|
||||||
|
# XXX shouldn't ${CMAKE_DL_LIBS} be appended to OPENSSL_LIBRARIES instead of
|
||||||
|
# APP_LIBRARIES if it is really specific to OpenSSL?
|
||||||
|
|
||||||
|
find_package(CUnit 2.1)
|
||||||
|
enable_testing()
|
||||||
|
set(HAVE_CUNIT ${CUNIT_FOUND})
|
||||||
|
if(HAVE_CUNIT)
|
||||||
|
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# openssl (for src)
|
||||||
|
set(HAVE_OPENSSL ${OPENSSL_FOUND})
|
||||||
|
if(OPENSSL_FOUND)
|
||||||
|
set(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
|
||||||
|
else()
|
||||||
|
set(OPENSSL_INCLUDE_DIRS "")
|
||||||
|
set(OPENSSL_LIBRARIES "")
|
||||||
|
endif()
|
||||||
|
# libev (for src)
|
||||||
|
set(HAVE_LIBEV ${LIBEV_FOUND})
|
||||||
|
set(HAVE_ZLIB ${ZLIB_FOUND})
|
||||||
|
set(HAVE_LIBEVENT_OPENSSL ${LIBEVENT_FOUND})
|
||||||
|
if(LIBEVENT_FOUND)
|
||||||
|
# Must both link the core and openssl libraries.
|
||||||
|
set(LIBEVENT_OPENSSL_LIBRARIES ${LIBEVENT_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
# jansson (for src/nghttp, src/deflatehd and src/inflatehd)
|
||||||
|
set(HAVE_JANSSON ${JANSSON_FOUND})
|
||||||
|
# libxml2 (for src/nghttp)
|
||||||
|
set(HAVE_LIBXML2 ${LIBXML2_FOUND})
|
||||||
|
if(LIBXML2_FOUND)
|
||||||
|
set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
|
||||||
|
else()
|
||||||
|
set(LIBXML2_INCLUDE_DIRS "")
|
||||||
|
set(LIBXML2_LIBRARIES "")
|
||||||
|
endif()
|
||||||
|
# jemalloc
|
||||||
|
set(HAVE_JEMALLOC ${JEMALLOC_FOUND})
|
||||||
|
# spdylay (for src/nghttpx and src/h2load)
|
||||||
|
set(HAVE_SPDYLAY ${SPDYLAY_FOUND})
|
||||||
|
|
||||||
|
if(ENABLE_ASIO_LIB)
|
||||||
|
find_package(Boost 1.54.0 REQUIRED system thread)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL and libev
|
||||||
|
if(ENABLE_APP AND NOT (ZLIB_FOUND AND OPENSSL_FOUND AND LIBEV_FOUND))
|
||||||
|
message(FATAL_ERROR "Applications were requested (ENABLE_APP=1) but dependencies are not met.")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# HPACK tools requires jansson
|
||||||
|
if(ENABLE_HPACK_TOOLS AND NOT HAVE_JANSSON)
|
||||||
|
message(FATAL_ERROR "HPACK tools were requested (ENABLE_HPACK_TOOLS=1) but dependencies are not met.")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# C++ library libnghttp2_asio
|
||||||
|
if(ENABLE_EXAMPLES AND NOT (OPENSSL_FOUND AND LIBEVENT_OPENSSL_FOUND))
|
||||||
|
message(FATAL_ERROR "examples were requested (ENABLE_EXAMPLES=1) but dependencies are not met.")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# third-party http-parser only be built when needed
|
||||||
|
if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_ASIO_LIB)
|
||||||
|
set(ENABLE_THIRD_PARTY 1)
|
||||||
|
# mruby (for src/nghttpx)
|
||||||
|
set(HAVE_MRUBY ${WITH_MRUBY})
|
||||||
|
set(HAVE_NEVERBLEED ${WITH_NEVERBLEED})
|
||||||
|
else()
|
||||||
|
set(HAVE_MRUBY 0)
|
||||||
|
set(HAVE_NEVERBLEED 0)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Checks for header files.
|
||||||
|
include(CheckIncludeFile)
|
||||||
|
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
|
||||||
|
check_include_file("fcntl.h" HAVE_FCNTL_H)
|
||||||
|
check_include_file("inttypes.h" HAVE_INTTYPES_H)
|
||||||
|
check_include_file("limits.h" HAVE_LIMITS_H)
|
||||||
|
check_include_file("netdb.h" HAVE_NETDB_H)
|
||||||
|
check_include_file("netinet/in.h" HAVE_NETINET_IN_H)
|
||||||
|
check_include_file("pwd.h" HAVE_PWD_H)
|
||||||
|
check_include_file("sys/socket.h" HAVE_SYS_SOCKET_H)
|
||||||
|
check_include_file("sys/time.h" HAVE_SYS_TIME_H)
|
||||||
|
check_include_file("syslog.h" HAVE_SYSLOG_H)
|
||||||
|
check_include_file("time.h" HAVE_TIME_H)
|
||||||
|
check_include_file("unistd.h" HAVE_UNISTD_H)
|
||||||
|
|
||||||
|
include(CheckTypeSize)
|
||||||
|
# Checks for typedefs, structures, and compiler characteristics.
|
||||||
|
# AC_TYPE_SIZE_T
|
||||||
|
check_type_size("ssize_t" SIZEOF_SSIZE_T)
|
||||||
|
if(SIZEOF_SSIZE_T STREQUAL "")
|
||||||
|
# ssize_t is a signed type in POSIX storing at least -1.
|
||||||
|
# Set it to "int" to match the behavior of AC_TYPE_SSIZE_T (autotools).
|
||||||
|
set(ssize_t int)
|
||||||
|
endif()
|
||||||
|
# AC_TYPE_UINT8_T
|
||||||
|
# AC_TYPE_UINT16_T
|
||||||
|
# AC_TYPE_UINT32_T
|
||||||
|
# AC_TYPE_UINT64_T
|
||||||
|
# AC_TYPE_INT8_T
|
||||||
|
# AC_TYPE_INT16_T
|
||||||
|
# AC_TYPE_INT32_T
|
||||||
|
# AC_TYPE_INT64_T
|
||||||
|
# AC_TYPE_OFF_T
|
||||||
|
# AC_TYPE_PID_T
|
||||||
|
# AC_TYPE_UID_T
|
||||||
|
# XXX To support inline for crappy compilers, see https://cmake.org/Wiki/CMakeTestInline
|
||||||
|
# AC_C_INLINE
|
||||||
|
# XXX is AC_SYS_LARGEFILE still needed for modern systems?
|
||||||
|
# add_definitions(-D_FILE_OFFSET_BITS=64)
|
||||||
|
|
||||||
|
include(CheckStructHasMember)
|
||||||
|
check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_STRUCT_TM_TM_GMTOFF)
|
||||||
|
|
||||||
|
# Check size of pointer to decide we need 8 bytes alignment adjustment.
|
||||||
|
check_type_size("int *" SIZEOF_INT_P)
|
||||||
|
check_type_size("time_t" SIZEOF_TIME_T)
|
||||||
|
|
||||||
|
# Checks for library functions.
|
||||||
|
include(CheckFunctionExists)
|
||||||
|
check_function_exists(_Exit HAVE__EXIT)
|
||||||
|
check_function_exists(accept4 HAVE_ACCEPT4)
|
||||||
|
|
||||||
|
# timerfd_create was added in linux kernel 2.6.25
|
||||||
|
include(CheckSymbolExists)
|
||||||
|
# XXX does this correctly detect initgroups (un)availability on cygwin?
|
||||||
|
check_symbol_exists(initgroups grp.h HAVE_DECL_INITGROUPS)
|
||||||
|
if(NOT HAVE_DECL_INITGROUPS AND HAVE_UNISTD_H)
|
||||||
|
# FreeBSD declares initgroups() in unistd.h
|
||||||
|
check_symbol_exists(initgroups unistd.h HAVE_DECL_INITGROUPS2)
|
||||||
|
if(HAVE_DECL_INITGROUPS2)
|
||||||
|
set(HAVE_DECL_INITGROUPS 1)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
check_function_exists(timerfd_create HAVE_TIMERFD_CREATE)
|
||||||
|
# Checks for epoll availability, primarily for examples/tiny-nghttpd
|
||||||
|
check_symbol_exists(epoll_create sys/epoll.h HAVE_EPOLL)
|
||||||
|
if(HAVE_EPOLL AND HAVE_TIMERFD_CREATE)
|
||||||
|
set(ENABLE_TINY_NGHTTPD 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(WARNCFLAGS)
|
||||||
|
set(WARNCXXFLAGS)
|
||||||
|
if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||||
|
if(ENABLE_WERROR)
|
||||||
|
set(WARNCFLAGS /WX)
|
||||||
|
set(WARNCXXFLAGS /WX)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
if(ENABLE_WERROR)
|
||||||
|
extract_valid_c_flags(WARNCFLAGS -Werror)
|
||||||
|
extract_valid_c_flags(WARNCXXFLAGS -Werror)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# For C compiler
|
||||||
|
extract_valid_c_flags(WARNCFLAGS
|
||||||
|
-Wall
|
||||||
|
-Wextra
|
||||||
|
-Wmissing-prototypes
|
||||||
|
-Wstrict-prototypes
|
||||||
|
-Wmissing-declarations
|
||||||
|
-Wpointer-arith
|
||||||
|
-Wdeclaration-after-statement
|
||||||
|
-Wformat-security
|
||||||
|
-Wwrite-strings
|
||||||
|
-Wshadow
|
||||||
|
-Winline
|
||||||
|
-Wnested-externs
|
||||||
|
-Wfloat-equal
|
||||||
|
-Wundef
|
||||||
|
-Wendif-labels
|
||||||
|
-Wempty-body
|
||||||
|
-Wcast-align
|
||||||
|
-Wclobbered
|
||||||
|
-Wvla
|
||||||
|
-Wpragmas
|
||||||
|
-Wunreachable-code
|
||||||
|
-Waddress
|
||||||
|
-Wattributes
|
||||||
|
-Wdiv-by-zero
|
||||||
|
-Wshorten-64-to-32
|
||||||
|
|
||||||
|
-Wconversion
|
||||||
|
-Wextended-offsetof
|
||||||
|
-Wformat-nonliteral
|
||||||
|
-Wlanguage-extension-token
|
||||||
|
-Wmissing-field-initializers
|
||||||
|
-Wmissing-noreturn
|
||||||
|
-Wmissing-variable-declarations
|
||||||
|
# Not used because we cannot change public structs
|
||||||
|
# -Wpadded
|
||||||
|
-Wsign-conversion
|
||||||
|
# Not used because this basically disallows default case
|
||||||
|
# -Wswitch-enum
|
||||||
|
-Wunreachable-code-break
|
||||||
|
-Wunused-macros
|
||||||
|
-Wunused-parameter
|
||||||
|
-Wredundant-decls
|
||||||
|
# Only work with Clang for the moment
|
||||||
|
-Wheader-guard
|
||||||
|
# This is required because we pass format string as "const char*.
|
||||||
|
-Wno-format-nonliteral
|
||||||
|
)
|
||||||
|
|
||||||
|
extract_valid_cxx_flags(WARNCXXFLAGS
|
||||||
|
# For C++ compiler
|
||||||
|
-Wall
|
||||||
|
-Wformat-security
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_DEBUG)
|
||||||
|
set(DEBUGBUILD 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Some platform does not have working std::future. We disable
|
||||||
|
# threading for those platforms.
|
||||||
|
if(NOT ENABLE_THREADS OR NOT HAVE_STD_FUTURE)
|
||||||
|
set(NOTHREADS 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_definitions(-DHAVE_CONFIG_H)
|
||||||
|
configure_file(cmakeconfig.h.in config.h)
|
||||||
|
# autotools-compatible names
|
||||||
|
# Sphinx expects relative paths in the .rst files. Use the fact that the files
|
||||||
|
# below are all one directory level deep.
|
||||||
|
file(RELATIVE_PATH top_srcdir "${CMAKE_BINARY_DIR}/dir" "${CMAKE_SOURCE_DIR}")
|
||||||
|
file(RELATIVE_PATH top_builddir "${CMAKE_BINARY_DIR}/dir" "${CMAKE_BINARY_DIR}")
|
||||||
|
set(abs_top_srcdir "${CMAKE_SOURCE_DIR}")
|
||||||
|
set(abs_top_builddir "${CMAKE_BINARY_DIR}")
|
||||||
|
# libnghttp2.pc (pkg-config file)
|
||||||
|
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
||||||
|
set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
|
||||||
|
set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||||
|
set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
|
||||||
|
set(VERSION "${PACKAGE_VERSION}")
|
||||||
|
# For init scripts and systemd service file (in contrib/)
|
||||||
|
set(bindir "${CMAKE_INSTALL_FULL_BINDIR}")
|
||||||
|
set(sbindir "${CMAKE_INSTALL_FULL_SBINDIR}")
|
||||||
|
foreach(name
|
||||||
|
lib/libnghttp2.pc
|
||||||
|
lib/includes/nghttp2/nghttp2ver.h
|
||||||
|
src/libnghttp2_asio.pc
|
||||||
|
python/setup.py
|
||||||
|
integration-tests/config.go
|
||||||
|
integration-tests/setenv
|
||||||
|
doc/conf.py
|
||||||
|
doc/index.rst
|
||||||
|
doc/package_README.rst
|
||||||
|
doc/tutorial-client.rst
|
||||||
|
doc/tutorial-server.rst
|
||||||
|
doc/tutorial-hpack.rst
|
||||||
|
doc/nghttpx-howto.rst
|
||||||
|
doc/h2load-howto.rst
|
||||||
|
doc/libnghttp2_asio.rst
|
||||||
|
doc/python-apiref.rst
|
||||||
|
doc/building-android-binary.rst
|
||||||
|
doc/nghttp2.h.rst
|
||||||
|
doc/nghttp2ver.h.rst
|
||||||
|
doc/asio_http2.h.rst
|
||||||
|
doc/asio_http2_server.h.rst
|
||||||
|
doc/asio_http2_client.h.rst
|
||||||
|
doc/contribute.rst
|
||||||
|
)
|
||||||
|
configure_file("${name}.in" "${name}" @ONLY)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
"${CMAKE_BINARY_DIR}" # for config.h
|
||||||
|
)
|
||||||
|
# For use in src/CMakeLists.txt
|
||||||
|
set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
|
||||||
|
|
||||||
|
install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
|
||||||
|
|
||||||
|
add_subdirectory(lib)
|
||||||
|
#add_subdirectory(lib/includes)
|
||||||
|
add_subdirectory(third-party)
|
||||||
|
add_subdirectory(src)
|
||||||
|
#add_subdirectory(src/includes)
|
||||||
|
add_subdirectory(examples)
|
||||||
|
add_subdirectory(python)
|
||||||
|
add_subdirectory(tests)
|
||||||
|
#add_subdirectory(tests/testdata)
|
||||||
|
add_subdirectory(integration-tests)
|
||||||
|
add_subdirectory(doc)
|
||||||
|
add_subdirectory(contrib)
|
||||||
|
add_subdirectory(script)
|
||||||
|
|
||||||
|
|
||||||
|
string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
|
||||||
|
message(STATUS "summary of build options:
|
||||||
|
|
||||||
|
Package version: ${VERSION}
|
||||||
|
Library version: ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}
|
||||||
|
Install prefix: ${CMAKE_INSTALL_PREFIX}
|
||||||
|
Target system: ${CMAKE_SYSTEM_NAME}
|
||||||
|
Compiler:
|
||||||
|
Build type: ${CMAKE_BUILD_TYPE}
|
||||||
|
C compiler: ${CMAKE_C_COMPILER}
|
||||||
|
CFLAGS: ${CMAKE_C_FLAGS_${_build_type}} ${CMAKE_C_FLAGS}
|
||||||
|
C++ compiler: ${CMAKE_CXX_COMPILER}
|
||||||
|
CXXFLAGS: ${CMAKE_CXX_FLAGS_${_build_type}} ${CMAKE_CXX_FLAGS}
|
||||||
|
WARNCFLAGS: ${WARNCFLAGS}
|
||||||
|
CXX1XCXXFLAGS: ${CXX1XCXXFLAGS}
|
||||||
|
Python:
|
||||||
|
Python: ${PYTHON_EXECUTABLE}
|
||||||
|
PYTHON_VERSION: ${PYTHON_VERSION_STRING}
|
||||||
|
Library version:${PYTHONLIBS_VERSION_STRING}
|
||||||
|
Cython: ${CYTHON_EXECUTABLE}
|
||||||
|
Test:
|
||||||
|
CUnit: ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}')
|
||||||
|
Failmalloc: ${ENABLE_FAILMALLOC}
|
||||||
|
Libs:
|
||||||
|
OpenSSL: ${HAVE_OPENSSL} (LIBS='${OPENSSL_LIBRARIES}')
|
||||||
|
Libxml2: ${HAVE_LIBXML2} (LIBS='${LIBXML2_LIBRARIES}')
|
||||||
|
Libev: ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}')
|
||||||
|
Libevent(SSL): ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}')
|
||||||
|
Spdylay: ${HAVE_SPDYLAY} (LIBS='${SPDYLAY_LIBRARIES}')
|
||||||
|
Jansson: ${HAVE_JANSSON} (LIBS='${JANSSON_LIBRARIES}')
|
||||||
|
Jemalloc: ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}')
|
||||||
|
Zlib: ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}')
|
||||||
|
Boost::System: ${Boost_SYSTEM_LIBRARY}
|
||||||
|
Boost::Thread: ${Boost_THREAD_LIBRARY}
|
||||||
|
Third-party:
|
||||||
|
http-parser: ${ENABLE_THIRD_PARTY}
|
||||||
|
MRuby: ${HAVE_MRUBY}
|
||||||
|
Neverbleed: ${HAVE_NEVERBLEED}
|
||||||
|
Features:
|
||||||
|
Applications: ${ENABLE_APP}
|
||||||
|
HPACK tools: ${ENABLE_HPACK_TOOLS}
|
||||||
|
Libnghttp2_asio:${ENABLE_ASIO_LIB}
|
||||||
|
Examples: ${ENABLE_EXAMPLES}
|
||||||
|
Python bindings:${ENABLE_PYTHON_BINDINGS}
|
||||||
|
Threading: ${ENABLE_THREADS}
|
||||||
|
")
|
||||||
|
if(ENABLE_LIB_ONLY_DISABLED_OTHERS)
|
||||||
|
message("Only the library will be built. To build other components "
|
||||||
|
"(such as applications and examples), set ENABLE_LIB_ONLY=OFF.")
|
||||||
|
endif()
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
# Features that can be enabled for cmake (see CMakeLists.txt)
|
||||||
|
|
||||||
|
option(ENABLE_WERROR "Turn on compile time warnings")
|
||||||
|
option(ENABLE_DEBUG "Turn on debug output")
|
||||||
|
option(ENABLE_THREADS "Turn on threading in apps" ON)
|
||||||
|
option(ENABLE_APP "Build applications (nghttp, nghttpd, nghttpx and h2load)"
|
||||||
|
${ENABLE_APP_DEFAULT})
|
||||||
|
option(ENABLE_HPACK_TOOLS "Build HPACK tools"
|
||||||
|
${ENABLE_HPACK_TOOLS_DEFAULT})
|
||||||
|
option(ENABLE_ASIO_LIB "Build C++ libnghttp2_asio library")
|
||||||
|
option(ENABLE_EXAMPLES "Build examples"
|
||||||
|
${ENABLE_EXAMPLES_DEFAULT})
|
||||||
|
option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
|
||||||
|
${ENABLE_PYTHON_BINDINGS_DEFAULT})
|
||||||
|
option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
|
||||||
|
option(ENABLE_LIB_ONLY "Build libnghttp2 only. This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
|
||||||
|
|
||||||
|
option(WITH_LIBXML2 "Use libxml2"
|
||||||
|
${WITH_LIBXML2_DEFAULT})
|
||||||
|
option(WITH_JEMALLOC "Use jemalloc"
|
||||||
|
${WITH_JEMALLOC_DEFAULT})
|
||||||
|
option(WITH_SPDYLAY "Use spdylay"
|
||||||
|
${WITH_SPDYLAY_DEFAULT})
|
||||||
|
option(WITH_MRUBY "Use mruby")
|
||||||
|
option(WITH_NEVERBLEED "Use neverbleed")
|
||||||
|
|
||||||
|
# vim: ft=cmake:
|
||||||
14
Makefile.am
14
Makefile.am
|
|
@ -33,7 +33,19 @@ ACLOCAL_AMFLAGS = -I m4
|
||||||
dist_doc_DATA = README.rst
|
dist_doc_DATA = README.rst
|
||||||
|
|
||||||
EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
|
EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
|
||||||
Dockerfile.android
|
Dockerfile.android \
|
||||||
|
cmakeconfig.h.in \
|
||||||
|
CMakeLists.txt \
|
||||||
|
CMakeOptions.txt \
|
||||||
|
cmake/FindSpdylay.cmake \
|
||||||
|
cmake/ExtractValidFlags.cmake \
|
||||||
|
cmake/FindJemalloc.cmake \
|
||||||
|
cmake/FindLibev.cmake \
|
||||||
|
cmake/FindCUnit.cmake \
|
||||||
|
cmake/Version.cmake \
|
||||||
|
cmake/FindCython.cmake \
|
||||||
|
cmake/FindLibevent.cmake \
|
||||||
|
cmake/FindJansson.cmake
|
||||||
|
|
||||||
.PHONY: clang-format
|
.PHONY: clang-format
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ To build and run the application programs (``nghttp``, ``nghttpd``,
|
||||||
are required:
|
are required:
|
||||||
|
|
||||||
* OpenSSL >= 1.0.1
|
* OpenSSL >= 1.0.1
|
||||||
* libev >= 4.15
|
* libev >= 4.11
|
||||||
* zlib >= 1.2.3
|
* zlib >= 1.2.3
|
||||||
|
|
||||||
ALPN support requires OpenSSL >= 1.0.2 (released 22 January 2015).
|
ALPN support requires OpenSSL >= 1.0.2 (released 22 January 2015).
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
# Convenience function that checks the availability of certain
|
||||||
|
# C or C++ compiler flags and returns valid ones as a string.
|
||||||
|
|
||||||
|
include(CheckCCompilerFlag)
|
||||||
|
include(CheckCXXCompilerFlag)
|
||||||
|
|
||||||
|
function(extract_valid_c_flags varname)
|
||||||
|
set(valid_flags)
|
||||||
|
foreach(flag IN LISTS ARGN)
|
||||||
|
string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
|
||||||
|
set(flag_var "C_FLAG_${flag_var}")
|
||||||
|
check_c_compiler_flag("${flag}" "${flag_var}")
|
||||||
|
if(${flag_var})
|
||||||
|
set(valid_flags "${valid_flags} ${flag}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
set(${varname} "${valid_flags}" PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
function(extract_valid_cxx_flags varname)
|
||||||
|
set(valid_flags)
|
||||||
|
foreach(flag IN LISTS ARGN)
|
||||||
|
string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
|
||||||
|
set(flag_var "CXX_FLAG_${flag_var}")
|
||||||
|
check_cxx_compiler_flag("${flag}" "${flag_var}")
|
||||||
|
if(${flag_var})
|
||||||
|
set(valid_flags "${valid_flags} ${flag}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
set(${varname} "${valid_flags}" PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
# - Try to find cunit
|
||||||
|
# Once done this will define
|
||||||
|
# CUNIT_FOUND - System has cunit
|
||||||
|
# CUNIT_INCLUDE_DIRS - The cunit include directories
|
||||||
|
# CUNIT_LIBRARIES - The libraries needed to use cunit
|
||||||
|
|
||||||
|
find_package(PkgConfig QUIET)
|
||||||
|
pkg_check_modules(PC_CUNIT QUIET cunit)
|
||||||
|
|
||||||
|
find_path(CUNIT_INCLUDE_DIR
|
||||||
|
NAMES CUnit/CUnit.h
|
||||||
|
HINTS ${PC_CUNIT_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
find_library(CUNIT_LIBRARY
|
||||||
|
NAMES cunit
|
||||||
|
HINTS ${PC_CUNIT_LIBRARY_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(CUNIT_INCLUDE_DIR)
|
||||||
|
set(_version_regex "^#define[ \t]+CU_VERSION[ \t]+\"([^\"]+)\".*")
|
||||||
|
file(STRINGS "${CUNIT_INCLUDE_DIR}/CUnit/CUnit.h"
|
||||||
|
CUNIT_VERSION REGEX "${_version_regex}")
|
||||||
|
string(REGEX REPLACE "${_version_regex}" "\\1"
|
||||||
|
CUNIT_VERSION "${CUNIT_VERSION}")
|
||||||
|
unset(_version_regex)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set CUNIT_FOUND to TRUE
|
||||||
|
# if all listed variables are TRUE and the requested version matches.
|
||||||
|
find_package_handle_standard_args(CUnit REQUIRED_VARS
|
||||||
|
CUNIT_LIBRARY CUNIT_INCLUDE_DIR
|
||||||
|
VERSION_VAR CUNIT_VERSION)
|
||||||
|
|
||||||
|
if(CUNIT_FOUND)
|
||||||
|
set(CUNIT_LIBRARIES ${CUNIT_LIBRARY})
|
||||||
|
set(CUNIT_INCLUDE_DIRS ${CUNIT_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
# Find the Cython compiler.
|
||||||
|
#
|
||||||
|
# This code sets the following variables:
|
||||||
|
#
|
||||||
|
# CYTHON_EXECUTABLE
|
||||||
|
#
|
||||||
|
# See also UseCython.cmake
|
||||||
|
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2011 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# Use the Cython executable that lives next to the Python executable
|
||||||
|
# if it is a local installation.
|
||||||
|
find_package( PythonInterp )
|
||||||
|
if( PYTHONINTERP_FOUND )
|
||||||
|
get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
|
||||||
|
find_program( CYTHON_EXECUTABLE
|
||||||
|
NAMES cython cython.bat cython3
|
||||||
|
HINTS ${_python_path}
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
find_program( CYTHON_EXECUTABLE
|
||||||
|
NAMES cython cython.bat cython3
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
include( FindPackageHandleStandardArgs )
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
|
||||||
|
|
||||||
|
mark_as_advanced( CYTHON_EXECUTABLE )
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
# - Try to find jansson
|
||||||
|
# Once done this will define
|
||||||
|
# JANSSON_FOUND - System has jansson
|
||||||
|
# JANSSON_INCLUDE_DIRS - The jansson include directories
|
||||||
|
# JANSSON_LIBRARIES - The libraries needed to use jansson
|
||||||
|
|
||||||
|
find_package(PkgConfig QUIET)
|
||||||
|
pkg_check_modules(PC_JANSSON QUIET jansson)
|
||||||
|
|
||||||
|
find_path(JANSSON_INCLUDE_DIR
|
||||||
|
NAMES jansson.h
|
||||||
|
HINTS ${PC_JANSSON_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
find_library(JANSSON_LIBRARY
|
||||||
|
NAMES jansson
|
||||||
|
HINTS ${PC_JANSSON_LIBRARY_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(JANSSON_INCLUDE_DIR)
|
||||||
|
set(_version_regex "^#define[ \t]+JANSSON_VERSION[ \t]+\"([^\"]+)\".*")
|
||||||
|
file(STRINGS "${JANSSON_INCLUDE_DIR}/jansson.h"
|
||||||
|
JANSSON_VERSION REGEX "${_version_regex}")
|
||||||
|
string(REGEX REPLACE "${_version_regex}" "\\1"
|
||||||
|
JANSSON_VERSION "${JANSSON_VERSION}")
|
||||||
|
unset(_version_regex)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set JANSSON_FOUND to TRUE
|
||||||
|
# if all listed variables are TRUE and the requested version matches.
|
||||||
|
find_package_handle_standard_args(Jansson REQUIRED_VARS
|
||||||
|
JANSSON_LIBRARY JANSSON_INCLUDE_DIR
|
||||||
|
VERSION_VAR JANSSON_VERSION)
|
||||||
|
|
||||||
|
if(JANSSON_FOUND)
|
||||||
|
set(JANSSON_LIBRARIES ${JANSSON_LIBRARY})
|
||||||
|
set(JANSSON_INCLUDE_DIRS ${JANSSON_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY)
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
# - Try to find jemalloc
|
||||||
|
# Once done this will define
|
||||||
|
# JEMALLOC_FOUND - System has jemalloc
|
||||||
|
# JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
|
||||||
|
# JEMALLOC_LIBRARIES - The libraries needed to use jemalloc
|
||||||
|
|
||||||
|
find_package(PkgConfig QUIET)
|
||||||
|
pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
|
||||||
|
|
||||||
|
find_path(JEMALLOC_INCLUDE_DIR
|
||||||
|
NAMES jemalloc/jemalloc.h
|
||||||
|
HINTS ${PC_JEMALLOC_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
find_library(JEMALLOC_LIBRARY
|
||||||
|
NAMES jemalloc
|
||||||
|
HINTS ${PC_JEMALLOC_LIBRARY_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(JEMALLOC_INCLUDE_DIR)
|
||||||
|
set(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*")
|
||||||
|
file(STRINGS "${JEMALLOC_INCLUDE_DIR}/jemalloc/jemalloc.h"
|
||||||
|
JEMALLOC_VERSION REGEX "${_version_regex}")
|
||||||
|
string(REGEX REPLACE "${_version_regex}" "\\1"
|
||||||
|
JEMALLOC_VERSION "${JEMALLOC_VERSION}")
|
||||||
|
unset(_version_regex)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE
|
||||||
|
# if all listed variables are TRUE and the requested version matches.
|
||||||
|
find_package_handle_standard_args(Jemalloc REQUIRED_VARS
|
||||||
|
JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR
|
||||||
|
VERSION_VAR JEMALLOC_VERSION)
|
||||||
|
|
||||||
|
if(JEMALLOC_FOUND)
|
||||||
|
set(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
|
||||||
|
set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY)
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
# - Try to find libev
|
||||||
|
# Once done this will define
|
||||||
|
# LIBEV_FOUND - System has libev
|
||||||
|
# LIBEV_INCLUDE_DIRS - The libev include directories
|
||||||
|
# LIBEV_LIBRARIES - The libraries needed to use libev
|
||||||
|
|
||||||
|
find_path(LIBEV_INCLUDE_DIR
|
||||||
|
NAMES ev.h
|
||||||
|
)
|
||||||
|
find_library(LIBEV_LIBRARY
|
||||||
|
NAMES ev
|
||||||
|
)
|
||||||
|
|
||||||
|
if(LIBEV_INCLUDE_DIR)
|
||||||
|
file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
|
||||||
|
LIBEV_VERSION_MAJOR REGEX "^#define[ \t]+EV_VERSION_MAJOR[ \t]+[0-9]+")
|
||||||
|
file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
|
||||||
|
LIBEV_VERSION_MINOR REGEX "^#define[ \t]+EV_VERSION_MINOR[ \t]+[0-9]+")
|
||||||
|
string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MAJOR "${LIBEV_VERSION_MAJOR}")
|
||||||
|
string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MINOR "${LIBEV_VERSION_MINOR}")
|
||||||
|
set(LIBEV_VERSION "${LIBEV_VERSION_MAJOR}.${LIBEV_VERSION_MINOR}")
|
||||||
|
unset(LIBEV_VERSION_MINOR)
|
||||||
|
unset(LIBEV_VERSION_MAJOR)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set LIBEV_FOUND to TRUE
|
||||||
|
# if all listed variables are TRUE and the requested version matches.
|
||||||
|
find_package_handle_standard_args(Libev REQUIRED_VARS
|
||||||
|
LIBEV_LIBRARY LIBEV_INCLUDE_DIR
|
||||||
|
VERSION_VAR LIBEV_VERSION)
|
||||||
|
|
||||||
|
if(LIBEV_FOUND)
|
||||||
|
set(LIBEV_LIBRARIES ${LIBEV_LIBRARY})
|
||||||
|
set(LIBEV_INCLUDE_DIRS ${LIBEV_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(LIBEV_INCLUDE_DIR LIBEV_LIBRARY)
|
||||||
|
|
@ -0,0 +1,94 @@
|
||||||
|
# - Try to find libevent
|
||||||
|
#.rst
|
||||||
|
# FindLibevent
|
||||||
|
# ------------
|
||||||
|
#
|
||||||
|
# Find Libevent include directories and libraries. Invoke as::
|
||||||
|
#
|
||||||
|
# find_package(Libevent
|
||||||
|
# [version] [EXACT] # Minimum or exact version
|
||||||
|
# [REQUIRED] # Fail if Libevent is not found
|
||||||
|
# [COMPONENT <C>...]) # Libraries to look for
|
||||||
|
#
|
||||||
|
# Valid components are one or more of:: libevent core extra pthreads openssl.
|
||||||
|
# Note that 'libevent' contains both core and extra. You must specify one of
|
||||||
|
# them for the other components.
|
||||||
|
#
|
||||||
|
# This module will define the following variables::
|
||||||
|
#
|
||||||
|
# LIBEVENT_FOUND - True if headers and requested libraries were found
|
||||||
|
# LIBEVENT_INCLUDE_DIRS - Libevent include directories
|
||||||
|
# LIBEVENT_LIBRARIES - Libevent libraries to be linked
|
||||||
|
# LIBEVENT_<C>_FOUND - Component <C> was found (<C> is uppercase)
|
||||||
|
# LIBEVENT_<C>_LIBRARY - Library to be linked for Libevent component <C>.
|
||||||
|
|
||||||
|
find_package(PkgConfig QUIET)
|
||||||
|
pkg_check_modules(PC_LIBEVENT QUIET libevent)
|
||||||
|
|
||||||
|
# Look for the Libevent 2.0 or 1.4 headers
|
||||||
|
find_path(LIBEVENT_INCLUDE_DIR
|
||||||
|
NAMES
|
||||||
|
event2/event-config.h
|
||||||
|
event-config.h
|
||||||
|
HINTS
|
||||||
|
${PC_LIBEVENT_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(LIBEVENT_INCLUDE_DIR)
|
||||||
|
set(_version_regex "^#define[ \t]+_EVENT_VERSION[ \t]+\"([^\"]+)\".*")
|
||||||
|
if(EXISTS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h")
|
||||||
|
# Libevent 2.0
|
||||||
|
file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h"
|
||||||
|
LIBEVENT_VERSION REGEX "${_version_regex}")
|
||||||
|
else()
|
||||||
|
# Libevent 1.4
|
||||||
|
file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event-config.h"
|
||||||
|
LIBEVENT_VERSION REGEX "${_version_regex}")
|
||||||
|
endif()
|
||||||
|
string(REGEX REPLACE "${_version_regex}" "\\1"
|
||||||
|
LIBEVENT_VERSION "${LIBEVENT_VERSION}")
|
||||||
|
unset(_version_regex)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_LIBEVENT_REQUIRED_VARS)
|
||||||
|
foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
|
||||||
|
set(_LIBEVENT_LIBNAME libevent)
|
||||||
|
# Note: compare two variables to avoid a CMP0054 policy warning
|
||||||
|
if(COMPONENT STREQUAL _LIBEVENT_LIBNAME)
|
||||||
|
set(_LIBEVENT_LIBNAME event)
|
||||||
|
else()
|
||||||
|
set(_LIBEVENT_LIBNAME "event_${COMPONENT}")
|
||||||
|
endif()
|
||||||
|
string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
|
||||||
|
find_library(LIBEVENT_${COMPONENT_UPPER}_LIBRARY
|
||||||
|
NAMES ${_LIBEVENT_LIBNAME}
|
||||||
|
HINTS ${PC_LIBEVENT_LIBRARY_DIRS}
|
||||||
|
)
|
||||||
|
if(LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
|
||||||
|
set(Libevent_${COMPONENT}_FOUND 1)
|
||||||
|
endif()
|
||||||
|
list(APPEND _LIBEVENT_REQUIRED_VARS LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
|
||||||
|
endforeach()
|
||||||
|
unset(_LIBEVENT_LIBNAME)
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set LIBEVENT_FOUND to TRUE
|
||||||
|
# if all listed variables are TRUE and the requested version matches.
|
||||||
|
find_package_handle_standard_args(Libevent REQUIRED_VARS
|
||||||
|
${_LIBEVENT_REQUIRED_VARS}
|
||||||
|
LIBEVENT_INCLUDE_DIR
|
||||||
|
VERSION_VAR LIBEVENT_VERSION
|
||||||
|
HANDLE_COMPONENTS)
|
||||||
|
|
||||||
|
if(LIBEVENT_FOUND)
|
||||||
|
set(LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIR})
|
||||||
|
set(LIBEVENT_LIBRARIES)
|
||||||
|
foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
|
||||||
|
string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
|
||||||
|
list(APPEND LIBEVENT_LIBRARIES ${LIBEVENT_${COMPONENT_UPPER}_LIBRARY})
|
||||||
|
set(LIBEVENT_${COMPONENT_UPPER}_FOUND ${Libevent_${COMPONENT}_FOUND})
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(LIBEVENT_INCLUDE_DIR ${_LIBEVENT_REQUIRED_VARS})
|
||||||
|
unset(_LIBEVENT_REQUIRED_VARS)
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
# - Try to find spdylay
|
||||||
|
# Once done this will define
|
||||||
|
# SPDYLAY_FOUND - System has spdylay
|
||||||
|
# SPDYLAY_INCLUDE_DIRS - The spdylay include directories
|
||||||
|
# SPDYLAY_LIBRARIES - The libraries needed to use spdylay
|
||||||
|
|
||||||
|
find_package(PkgConfig QUIET)
|
||||||
|
pkg_check_modules(PC_SPDYLAY QUIET libspdylay)
|
||||||
|
|
||||||
|
find_path(SPDYLAY_INCLUDE_DIR
|
||||||
|
NAMES spdylay/spdylay.h
|
||||||
|
HINTS ${PC_SPDYLAY_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
find_library(SPDYLAY_LIBRARY
|
||||||
|
NAMES spdylay
|
||||||
|
HINTS ${PC_SPDYLAY_LIBRARY_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(SPDYLAY_INCLUDE_DIR)
|
||||||
|
set(_version_regex "^#define[ \t]+SPDYLAY_VERSION[ \t]+\"([^\"]+)\".*")
|
||||||
|
file(STRINGS "${SPDYLAY_INCLUDE_DIR}/spdylay/spdylayver.h"
|
||||||
|
SPDYLAY_VERSION REGEX "${_version_regex}")
|
||||||
|
string(REGEX REPLACE "${_version_regex}" "\\1"
|
||||||
|
SPDYLAY_VERSION "${SPDYLAY_VERSION}")
|
||||||
|
unset(_version_regex)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set SPDYLAY_FOUND to TRUE
|
||||||
|
# if all listed variables are TRUE and the requested version matches.
|
||||||
|
find_package_handle_standard_args(Spdylay REQUIRED_VARS
|
||||||
|
SPDYLAY_LIBRARY SPDYLAY_INCLUDE_DIR
|
||||||
|
VERSION_VAR SPDYLAY_VERSION)
|
||||||
|
|
||||||
|
if(SPDYLAY_FOUND)
|
||||||
|
set(SPDYLAY_LIBRARIES ${SPDYLAY_LIBRARY})
|
||||||
|
set(SPDYLAY_INCLUDE_DIRS ${SPDYLAY_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(SPDYLAY_INCLUDE_DIR SPDYLAY_LIBRARY)
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
# Converts a version such as 1.2.255 to 0x0102ff
|
||||||
|
function(HexVersion version_hex_var major minor patch)
|
||||||
|
math(EXPR version_dec "${major} * 256 * 256 + ${minor} * 256 + ${patch}")
|
||||||
|
set(version_hex "0x")
|
||||||
|
foreach(i RANGE 5 0 -1)
|
||||||
|
math(EXPR num "(${version_dec} >> (4 * ${i})) & 15")
|
||||||
|
string(SUBSTRING "0123456789abcdef" ${num} 1 num_hex)
|
||||||
|
set(version_hex "${version_hex}${num_hex}")
|
||||||
|
endforeach()
|
||||||
|
set(${version_hex_var} "${version_hex}" PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
@ -0,0 +1,84 @@
|
||||||
|
|
||||||
|
/* Hint to the compiler that a function parameter is not used */
|
||||||
|
#define _U_ @HINT_UNUSED_PARAM@
|
||||||
|
|
||||||
|
/* Hint to the compiler that a function never returns */
|
||||||
|
#define NGHTTP2_NORETURN @HINT_NORETURN@
|
||||||
|
|
||||||
|
/* Define to `int' if <sys/types.h> does not define. */
|
||||||
|
#cmakedefine ssize_t @ssize_t@
|
||||||
|
|
||||||
|
/* Define to 1 if you have the `std::map::emplace`. */
|
||||||
|
#cmakedefine HAVE_STD_MAP_EMPLACE 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have `libjansson` library. */
|
||||||
|
#cmakedefine HAVE_JANSSON 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have `libxml2` library. */
|
||||||
|
#cmakedefine HAVE_LIBXML2 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have `spdylay` library. */
|
||||||
|
#cmakedefine HAVE_SPDYLAY 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have `mruby` library. */
|
||||||
|
#cmakedefine HAVE_MRUBY 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have `neverbleed` library. */
|
||||||
|
#cmakedefine HAVE_NEVERBLEED 1
|
||||||
|
|
||||||
|
/* sizeof(int *) */
|
||||||
|
#cmakedefine SIZEOF_INT_P @SIZEOF_INT_P@
|
||||||
|
|
||||||
|
/* sizeof(time_t) */
|
||||||
|
#cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
|
||||||
|
|
||||||
|
/* Define to 1 if you have the `_Exit` function. */
|
||||||
|
#cmakedefine HAVE__EXIT 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the `accept4` function. */
|
||||||
|
#cmakedefine HAVE_ACCEPT4 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the `initgroups` function. */
|
||||||
|
#cmakedefine01 HAVE_DECL_INITGROUPS
|
||||||
|
|
||||||
|
/* Define to 1 to enable debug output. */
|
||||||
|
#cmakedefine DEBUGBUILD 1
|
||||||
|
|
||||||
|
/* Define to 1 if you want to disable threads. */
|
||||||
|
#cmakedefine NOTHREADS 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <arpa/inet.h> header file. */
|
||||||
|
#cmakedefine HAVE_ARPA_INET_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||||
|
#cmakedefine HAVE_FCNTL_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
|
#cmakedefine HAVE_INTTYPES_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <limits.h> header file. */
|
||||||
|
#cmakedefine HAVE_LIMITS_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <netdb.h> header file. */
|
||||||
|
#cmakedefine HAVE_NETDB_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <netinet/in.h> header file. */
|
||||||
|
#cmakedefine HAVE_NETINET_IN_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <pwd.h> header file. */
|
||||||
|
#cmakedefine HAVE_PWD_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <sys/socket.h> header file. */
|
||||||
|
#cmakedefine HAVE_SYS_SOCKET_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <sys/time.h> header file. */
|
||||||
|
#cmakedefine HAVE_SYS_TIME_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <syslog.h> header file. */
|
||||||
|
#cmakedefine HAVE_SYSLOG_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <time.h> header file. */
|
||||||
|
#cmakedefine HAVE_TIME_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
|
#cmakedefine HAVE_UNISTD_H 1
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
set(CONFIGFILES
|
||||||
|
nghttpx-init
|
||||||
|
nghttpx.service
|
||||||
|
nghttpx-upstart.conf
|
||||||
|
)
|
||||||
|
|
||||||
|
# Note that the execute permissions of nghttpx-init is preserved
|
||||||
|
foreach(name IN LISTS CONFIGFILES)
|
||||||
|
configure_file("${name}.in" "${name}" @ONLY)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
# set(EXTRA_DIST ${CONFIGFILES} nghttpx-logrotate tlsticketupdate.go)
|
||||||
|
|
@ -23,7 +23,11 @@
|
||||||
|
|
||||||
configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
|
configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
|
||||||
|
|
||||||
EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate tlsticketupdate.go
|
EXTRA_DIST = \
|
||||||
|
CMakeLists.txt \
|
||||||
|
$(configfiles:%=%.in) \
|
||||||
|
nghttpx-logrotate \
|
||||||
|
tlsticketupdate.go
|
||||||
|
|
||||||
edit = sed -e 's|@bindir[@]|$(bindir)|g'
|
edit = sed -e 's|@bindir[@]|$(bindir)|g'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,337 @@
|
||||||
|
# Generated documents
|
||||||
|
set(APIDOCS
|
||||||
|
macros.rst
|
||||||
|
enums.rst
|
||||||
|
types.rst
|
||||||
|
nghttp2_check_header_name.rst
|
||||||
|
nghttp2_check_header_value.rst
|
||||||
|
nghttp2_hd_deflate_bound.rst
|
||||||
|
nghttp2_hd_deflate_change_table_size.rst
|
||||||
|
nghttp2_hd_deflate_del.rst
|
||||||
|
nghttp2_hd_deflate_get_dynamic_table_size.rst
|
||||||
|
nghttp2_hd_deflate_get_max_dynamic_table_size.rst
|
||||||
|
nghttp2_hd_deflate_get_num_table_entries.rst
|
||||||
|
nghttp2_hd_deflate_get_table_entry.rst
|
||||||
|
nghttp2_hd_deflate_hd.rst
|
||||||
|
nghttp2_hd_deflate_new.rst
|
||||||
|
nghttp2_hd_deflate_new2.rst
|
||||||
|
nghttp2_hd_inflate_change_table_size.rst
|
||||||
|
nghttp2_hd_inflate_del.rst
|
||||||
|
nghttp2_hd_inflate_end_headers.rst
|
||||||
|
nghttp2_hd_inflate_get_dynamic_table_size.rst
|
||||||
|
nghttp2_hd_inflate_get_max_dynamic_table_size.rst
|
||||||
|
nghttp2_hd_inflate_get_num_table_entries.rst
|
||||||
|
nghttp2_hd_inflate_get_table_entry.rst
|
||||||
|
nghttp2_hd_inflate_hd.rst
|
||||||
|
nghttp2_hd_inflate_new.rst
|
||||||
|
nghttp2_hd_inflate_new2.rst
|
||||||
|
nghttp2_http2_strerror.rst
|
||||||
|
nghttp2_is_fatal.rst
|
||||||
|
nghttp2_nv_compare_name.rst
|
||||||
|
nghttp2_option_del.rst
|
||||||
|
nghttp2_option_new.rst
|
||||||
|
nghttp2_option_set_max_reserved_remote_streams.rst
|
||||||
|
nghttp2_option_set_no_auto_ping_ack.rst
|
||||||
|
nghttp2_option_set_no_auto_window_update.rst
|
||||||
|
nghttp2_option_set_no_http_messaging.rst
|
||||||
|
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_pack_settings_payload.rst
|
||||||
|
nghttp2_priority_spec_check_default.rst
|
||||||
|
nghttp2_priority_spec_default_init.rst
|
||||||
|
nghttp2_priority_spec_init.rst
|
||||||
|
nghttp2_rcbuf_decref.rst
|
||||||
|
nghttp2_rcbuf_get_buf.rst
|
||||||
|
nghttp2_rcbuf_incref.rst
|
||||||
|
nghttp2_select_next_protocol.rst
|
||||||
|
nghttp2_session_callbacks_del.rst
|
||||||
|
nghttp2_session_callbacks_new.rst
|
||||||
|
nghttp2_session_callbacks_set_before_frame_send_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_data_source_read_length_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_error_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_begin_frame_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_begin_headers_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_frame_not_send_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_frame_recv_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_frame_send_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_header_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_header_callback2.rst
|
||||||
|
nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_on_stream_close_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_pack_extension_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_recv_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_select_padding_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_send_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_send_data_callback.rst
|
||||||
|
nghttp2_session_callbacks_set_unpack_extension_callback.rst
|
||||||
|
nghttp2_session_client_new.rst
|
||||||
|
nghttp2_session_client_new2.rst
|
||||||
|
nghttp2_session_client_new3.rst
|
||||||
|
nghttp2_session_consume.rst
|
||||||
|
nghttp2_session_consume_connection.rst
|
||||||
|
nghttp2_session_consume_stream.rst
|
||||||
|
nghttp2_session_create_idle_stream.rst
|
||||||
|
nghttp2_session_del.rst
|
||||||
|
nghttp2_session_find_stream.rst
|
||||||
|
nghttp2_session_get_effective_local_window_size.rst
|
||||||
|
nghttp2_session_get_effective_recv_data_length.rst
|
||||||
|
nghttp2_session_get_last_proc_stream_id.rst
|
||||||
|
nghttp2_session_get_next_stream_id.rst
|
||||||
|
nghttp2_session_get_outbound_queue_size.rst
|
||||||
|
nghttp2_session_get_remote_settings.rst
|
||||||
|
nghttp2_session_get_remote_window_size.rst
|
||||||
|
nghttp2_session_get_root_stream.rst
|
||||||
|
nghttp2_session_get_stream_effective_local_window_size.rst
|
||||||
|
nghttp2_session_get_stream_effective_recv_data_length.rst
|
||||||
|
nghttp2_session_get_stream_local_close.rst
|
||||||
|
nghttp2_session_get_stream_remote_close.rst
|
||||||
|
nghttp2_session_get_stream_remote_window_size.rst
|
||||||
|
nghttp2_session_get_stream_user_data.rst
|
||||||
|
nghttp2_session_mem_recv.rst
|
||||||
|
nghttp2_session_mem_send.rst
|
||||||
|
nghttp2_session_recv.rst
|
||||||
|
nghttp2_session_change_stream_priority.rst
|
||||||
|
nghttp2_session_check_request_allowed.rst
|
||||||
|
nghttp2_session_check_server_session.rst
|
||||||
|
nghttp2_session_resume_data.rst
|
||||||
|
nghttp2_session_send.rst
|
||||||
|
nghttp2_session_server_new.rst
|
||||||
|
nghttp2_session_server_new2.rst
|
||||||
|
nghttp2_session_server_new3.rst
|
||||||
|
nghttp2_session_set_next_stream_id.rst
|
||||||
|
nghttp2_session_set_stream_user_data.rst
|
||||||
|
nghttp2_session_terminate_session.rst
|
||||||
|
nghttp2_session_terminate_session2.rst
|
||||||
|
nghttp2_session_upgrade.rst
|
||||||
|
nghttp2_session_upgrade2.rst
|
||||||
|
nghttp2_session_want_read.rst
|
||||||
|
nghttp2_session_want_write.rst
|
||||||
|
nghttp2_stream_get_first_child.rst
|
||||||
|
nghttp2_stream_get_next_sibling.rst
|
||||||
|
nghttp2_stream_get_parent.rst
|
||||||
|
nghttp2_stream_get_previous_sibling.rst
|
||||||
|
nghttp2_stream_get_state.rst
|
||||||
|
nghttp2_stream_get_sum_dependency_weight.rst
|
||||||
|
nghttp2_stream_get_weight.rst
|
||||||
|
nghttp2_strerror.rst
|
||||||
|
nghttp2_submit_data.rst
|
||||||
|
nghttp2_submit_extension.rst
|
||||||
|
nghttp2_submit_goaway.rst
|
||||||
|
nghttp2_submit_headers.rst
|
||||||
|
nghttp2_submit_ping.rst
|
||||||
|
nghttp2_submit_priority.rst
|
||||||
|
nghttp2_submit_push_promise.rst
|
||||||
|
nghttp2_submit_request.rst
|
||||||
|
nghttp2_submit_response.rst
|
||||||
|
nghttp2_submit_rst_stream.rst
|
||||||
|
nghttp2_submit_settings.rst
|
||||||
|
nghttp2_submit_shutdown_notice.rst
|
||||||
|
nghttp2_submit_trailer.rst
|
||||||
|
nghttp2_submit_window_update.rst
|
||||||
|
nghttp2_version.rst
|
||||||
|
)
|
||||||
|
|
||||||
|
set(MAN_PAGES
|
||||||
|
nghttp.1
|
||||||
|
nghttpd.1
|
||||||
|
nghttpx.1
|
||||||
|
h2load.1
|
||||||
|
)
|
||||||
|
|
||||||
|
# Other .rst files from the source tree that need to be copied
|
||||||
|
# XXX move them to sources/ and create .in files?
|
||||||
|
set(RST_FILES
|
||||||
|
README.rst
|
||||||
|
programmers-guide.rst
|
||||||
|
nghttp.1.rst
|
||||||
|
nghttpd.1.rst
|
||||||
|
nghttpx.1.rst
|
||||||
|
h2load.1.rst
|
||||||
|
)
|
||||||
|
|
||||||
|
# XXX unused for now
|
||||||
|
set(EXTRA_DIST
|
||||||
|
mkapiref.py
|
||||||
|
${RST_FILES}
|
||||||
|
${APIDOCS}
|
||||||
|
sources/index.rst
|
||||||
|
sources/tutorial-client.rst
|
||||||
|
sources/tutorial-server.rst
|
||||||
|
sources/tutorial-hpack.rst
|
||||||
|
sources/nghttpx-howto.rst
|
||||||
|
sources/h2load-howto.rst
|
||||||
|
sources/libnghttp2_asio.rst
|
||||||
|
sources/python-apiref.rst
|
||||||
|
sources/building-android-binary.rst
|
||||||
|
sources/contribute.rst
|
||||||
|
_exts/sphinxcontrib/LICENSE.rubydomain
|
||||||
|
_exts/sphinxcontrib/__init__.py
|
||||||
|
_exts/sphinxcontrib/rubydomain.py
|
||||||
|
_themes/sphinx_rtd_theme/__init__.py
|
||||||
|
_themes/sphinx_rtd_theme/breadcrumbs.html
|
||||||
|
_themes/sphinx_rtd_theme/footer.html
|
||||||
|
_themes/sphinx_rtd_theme/layout.html
|
||||||
|
_themes/sphinx_rtd_theme/layout_old.html
|
||||||
|
_themes/sphinx_rtd_theme/search.html
|
||||||
|
_themes/sphinx_rtd_theme/searchbox.html
|
||||||
|
_themes/sphinx_rtd_theme/static/css/badge_only.css
|
||||||
|
_themes/sphinx_rtd_theme/static/css/theme.css
|
||||||
|
_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
|
||||||
|
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
|
||||||
|
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
|
||||||
|
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
|
||||||
|
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
|
||||||
|
_themes/sphinx_rtd_theme/static/js/theme.js
|
||||||
|
_themes/sphinx_rtd_theme/theme.conf
|
||||||
|
_themes/sphinx_rtd_theme/versions.html
|
||||||
|
${MAN_PAGES}
|
||||||
|
bash_completion/nghttp
|
||||||
|
bash_completion/nghttpd
|
||||||
|
bash_completion/nghttpx
|
||||||
|
bash_completion/h2load
|
||||||
|
)
|
||||||
|
|
||||||
|
# Based on Makefile for Sphinx documentation
|
||||||
|
|
||||||
|
# You can set these variables from the command line.
|
||||||
|
set(SPHINXOPTS)
|
||||||
|
set(SPHINXBUILD sphinx-build)
|
||||||
|
set(PAPER)
|
||||||
|
set(BUILDDIR manual)
|
||||||
|
|
||||||
|
# Internal variables.
|
||||||
|
set(PAPEROPT_a4 -D latex_paper_size=a4)
|
||||||
|
set(PAPEROPT_letter -D latex_paper_size=letter)
|
||||||
|
set(ALLSPHINXOPTS -d ${BUILDDIR}/doctrees ${PAPEROPT_${PAPER}} ${SPHINXOPTS} .)
|
||||||
|
|
||||||
|
# "Please use `make <target>' where <target> is one of"
|
||||||
|
# " html to make standalone HTML files"
|
||||||
|
# " dirhtml to make HTML files named index.html in directories"
|
||||||
|
# " singlehtml to make a single large HTML file"
|
||||||
|
# " pickle to make pickle files"
|
||||||
|
# " json to make JSON files"
|
||||||
|
# " htmlhelp to make HTML files and a HTML help project"
|
||||||
|
# " qthelp to make HTML files and a qthelp project"
|
||||||
|
# " devhelp to make HTML files and a Devhelp project"
|
||||||
|
# " epub to make an epub"
|
||||||
|
# " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
|
||||||
|
# " latexpdf to make LaTeX files and run them through pdflatex"
|
||||||
|
# " text to make text files"
|
||||||
|
# " man to make manual pages"
|
||||||
|
# " changes to make an overview of all changed/added/deprecated items"
|
||||||
|
# " linkcheck to check all external links for integrity"
|
||||||
|
# " doctest to run all doctests embedded in the documentation (if enabled)"
|
||||||
|
|
||||||
|
|
||||||
|
# Copy files for out-of-tree builds
|
||||||
|
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
|
||||||
|
set(RST_BUILD_FILES)
|
||||||
|
foreach(rstfile IN LISTS RST_FILES)
|
||||||
|
set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${rstfile}")
|
||||||
|
add_custom_command(OUTPUT "${outfile}"
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}" "${outfile}"
|
||||||
|
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}"
|
||||||
|
)
|
||||||
|
list(APPEND RST_BUILD_FILES "${outfile}")
|
||||||
|
endforeach()
|
||||||
|
else()
|
||||||
|
set(RST_BUILD_FILES "${RST_FILES}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(apiref_SOURCES
|
||||||
|
${CMAKE_BINARY_DIR}/lib/includes/nghttp2/nghttp2ver.h
|
||||||
|
${CMAKE_SOURCE_DIR}/lib/includes/nghttp2/nghttp2.h
|
||||||
|
)
|
||||||
|
# Generates apiref.rst and other files
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT
|
||||||
|
apiref.rst
|
||||||
|
${APIDOCS}
|
||||||
|
COMMAND
|
||||||
|
"${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mkapiref.py"
|
||||||
|
apiref.rst macros.rst enums.rst types.rst .
|
||||||
|
${apiref_SOURCES}
|
||||||
|
DEPENDS
|
||||||
|
${RST_BUILD_FILES}
|
||||||
|
${apiref_SOURCES}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILDDIR}")
|
||||||
|
|
||||||
|
# Invokes sphinx-build and prints the given messages when completed
|
||||||
|
function(sphinxbuild builder)
|
||||||
|
set(echo_commands)
|
||||||
|
foreach(message IN LISTS ARGN)
|
||||||
|
list(APPEND echo_commands COMMAND ${CMAKE_COMMAND} -E echo "${message}")
|
||||||
|
endforeach()
|
||||||
|
add_custom_target(${builder}
|
||||||
|
COMMAND "${SPHINXBUILD}" -b ${builder} ${ALLSPHINXOPTS} "${BUILDDIR}/${builder}"
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E echo
|
||||||
|
${echo_commands}
|
||||||
|
VERBATIM
|
||||||
|
DEPENDS apiref.rst
|
||||||
|
)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
foreach(builder html dirhtml singlehtml)
|
||||||
|
sphinxbuild(${builder}
|
||||||
|
"Build finished. The HTML pages are in ${BUILDDIR}/${builder}.")
|
||||||
|
endforeach()
|
||||||
|
sphinxbuild(pickle "Build finished; now you can process the pickle files.")
|
||||||
|
sphinxbuild(json "Build finished; now you can process the JSON files.")
|
||||||
|
sphinxbuild(htmlhelp
|
||||||
|
"Build finished; now you can run HTML Help Workshop with the"
|
||||||
|
".hhp project file in ${BUILDDIR}/htmlhelp."
|
||||||
|
)
|
||||||
|
sphinxbuild(qthelp
|
||||||
|
"Build finished; now you can run \"qcollectiongenerator\" with the"
|
||||||
|
".qhcp project file in ${BUILDDIR}/qthelp, like this:"
|
||||||
|
"# qcollectiongenerator ${BUILDDIR}/qthelp/nghttp2.qhcp"
|
||||||
|
"To view the help file:"
|
||||||
|
"# assistant -collectionFile ${BUILDDIR}/qthelp/nghttp2.qhc"
|
||||||
|
)
|
||||||
|
sphinxbuild(devhelp
|
||||||
|
"Build finished."
|
||||||
|
"To view the help file:"
|
||||||
|
"# mkdir -p ~/.local/share/devhelp/nghttp2"
|
||||||
|
"# ln -s ${BUILDDIR}/devhelp ~/.local/share/devhelp/nghttp2"
|
||||||
|
"# devhelp"
|
||||||
|
)
|
||||||
|
sphinxbuild(epub "Build finished. The epub file is in ${BUILDDIR}/epub.")
|
||||||
|
sphinxbuild(latex
|
||||||
|
"Build finished; the LaTeX files are in ${BUILDDIR}/latex."
|
||||||
|
"Run `make' in that directory to run these through (pdf)latex"
|
||||||
|
"(use `make latexpdf' here to do that automatically)."
|
||||||
|
)
|
||||||
|
|
||||||
|
# Invoke the Makefile generated by sphinx
|
||||||
|
add_custom_target(latexpdf
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E echo "Running LaTeX files through pdflatex..."
|
||||||
|
COMMAND make -C "${BUILDDIR}/latex" all-pdf
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E echo "pdflatex finished; the PDF files are in ${BUILDDIR}/latex."
|
||||||
|
DEPENDS latex
|
||||||
|
)
|
||||||
|
|
||||||
|
sphinxbuild(text "Build finished. The text files are in ${BUILDDIR}/text.")
|
||||||
|
sphinxbuild(man "Build finished. The manual pages are in ${BUILDDIR}/man.")
|
||||||
|
sphinxbuild(changes "The overview file is in ${BUILDDIR}/changes.")
|
||||||
|
sphinxbuild(linkcheck
|
||||||
|
"Link check complete; look for any errors in the above output"
|
||||||
|
"or in ${BUILDDIR}/linkcheck/output.txt."
|
||||||
|
)
|
||||||
|
sphinxbuild(doctest
|
||||||
|
"Testing of doctests in the sources finished, look at the"
|
||||||
|
"results in ${BUILDDIR}/doctest/output.txt."
|
||||||
|
)
|
||||||
|
|
||||||
|
foreach(_man_page IN LISTS MAN_PAGES)
|
||||||
|
install(FILES ${_man_page}
|
||||||
|
DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
|
||||||
|
)
|
||||||
|
endforeach()
|
||||||
|
|
@ -166,6 +166,7 @@ RST_FILES = \
|
||||||
h2load.1.rst
|
h2load.1.rst
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
CMakeLists.txt \
|
||||||
mkapiref.py \
|
mkapiref.py \
|
||||||
$(RST_FILES) \
|
$(RST_FILES) \
|
||||||
$(APIDOCS) \
|
$(APIDOCS) \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
if(ENABLE_EXAMPLES)
|
||||||
|
file(GLOB c_sources *.c)
|
||||||
|
set_source_files_properties(${c_sources} PROPERTIES
|
||||||
|
COMPILE_FLAGS "${WARNCFLAGS}")
|
||||||
|
file(GLOB cxx_sources *.cc)
|
||||||
|
set_source_files_properties(${cxx_sources} PROPERTIES
|
||||||
|
COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}")
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
${CMAKE_SOURCE_DIR}
|
||||||
|
${CMAKE_SOURCE_DIR}/lib/includes
|
||||||
|
${CMAKE_BINARY_DIR}/lib/includes
|
||||||
|
${CMAKE_SOURCE_DIR}/src/includes
|
||||||
|
${CMAKE_SOURCE_DIR}/third-party
|
||||||
|
|
||||||
|
${LIBEVENT_INCLUDE_DIRS}
|
||||||
|
${OPENSSL_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
link_libraries(
|
||||||
|
nghttp2
|
||||||
|
${LIBEVENT_OPENSSL_LIBRARIES}
|
||||||
|
${OPENSSL_LIBRARIES}
|
||||||
|
${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>)
|
||||||
|
|
||||||
|
if(ENABLE_TINY_NGHTTPD)
|
||||||
|
add_executable(tiny-nghttpd tiny-nghttpd.c $<TARGET_OBJECTS:http-parser>)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_ASIO_LIB)
|
||||||
|
foreach(name asio-sv asio-sv2 asio-cl asio-cl2)
|
||||||
|
add_executable(${name} ${name}.cc $<TARGET_OBJECTS:http-parser>)
|
||||||
|
target_include_directories(${name} PRIVATE
|
||||||
|
${OPENSSL_INCLUDE_DIRS}
|
||||||
|
${Boost_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
target_link_libraries(${name}
|
||||||
|
nghttp2
|
||||||
|
nghttp2_asio
|
||||||
|
${JEMALLOC_LIBRARIES}
|
||||||
|
${OPENSSL_LIBRARIES}
|
||||||
|
${Boost_LIBRARIES}
|
||||||
|
${APP_LIBRARIES}
|
||||||
|
)
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
@ -21,6 +21,8 @@
|
||||||
# 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.
|
||||||
|
|
||||||
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
if ENABLE_EXAMPLES
|
if ENABLE_EXAMPLES
|
||||||
|
|
||||||
AM_CFLAGS = $(WARNCFLAGS)
|
AM_CFLAGS = $(WARNCFLAGS)
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
# generated files
|
# generated files
|
||||||
config.go
|
config.go
|
||||||
|
setenv
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
set(GO_FILES
|
||||||
|
nghttpx_http1_test.go
|
||||||
|
nghttpx_http2_test.go
|
||||||
|
nghttpx_spdy_test.go
|
||||||
|
server_tester.go
|
||||||
|
)
|
||||||
|
|
||||||
|
# XXX unused
|
||||||
|
set(EXTRA_DIST
|
||||||
|
${GO_FILES}
|
||||||
|
server.key
|
||||||
|
server.crt
|
||||||
|
alt-server.key
|
||||||
|
alt-server.crt
|
||||||
|
setenv
|
||||||
|
req-set-header.rb
|
||||||
|
resp-set-header.rb
|
||||||
|
req-return.rb
|
||||||
|
resp-return.rb
|
||||||
|
)
|
||||||
|
|
||||||
|
add_custom_target(itprep
|
||||||
|
COMMAND go get -d -v golang.org/x/net/http2
|
||||||
|
COMMAND go get -d -v github.com/tatsuhiro-t/go-nghttp2
|
||||||
|
COMMAND go get -d -v github.com/tatsuhiro-t/spdy
|
||||||
|
COMMAND go get -d -v golang.org/x/net/websocket
|
||||||
|
)
|
||||||
|
|
||||||
|
# 'go test' requires both config.go and the test files in the same directory.
|
||||||
|
# For out-of-tree builds, config.go is normally not placed next to the source
|
||||||
|
# files, so copy the tests to the build directory as a workaround.
|
||||||
|
set(GO_BUILD_FILES)
|
||||||
|
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
|
||||||
|
foreach(gofile IN LISTS GO_FILES)
|
||||||
|
set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${gofile}")
|
||||||
|
add_custom_command(OUTPUT "${outfile}"
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/${gofile}" "${outfile}"
|
||||||
|
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${gofile}"
|
||||||
|
)
|
||||||
|
list(APPEND GO_BUILD_FILES "${outfile}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_custom_target(it
|
||||||
|
COMMAND sh setenv go test -v
|
||||||
|
DEPENDS ${GO_BUILD_FILES}
|
||||||
|
)
|
||||||
|
|
@ -28,6 +28,7 @@ GO_FILES = \
|
||||||
server_tester.go
|
server_tester.go
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
CMakeLists.txt \
|
||||||
$(GO_FILES) \
|
$(GO_FILES) \
|
||||||
server.key \
|
server.key \
|
||||||
server.crt \
|
server.crt \
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,11 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
libdir="@abs_top_builddir@/lib"
|
||||||
|
if [ -d "$libdir/.libs" ]; then
|
||||||
|
libdir="$libdir/.libs"
|
||||||
|
fi
|
||||||
|
|
||||||
export CGO_CFLAGS="-I@abs_top_srcdir@/lib/includes -I@abs_top_builddir@/lib/includes"
|
export CGO_CFLAGS="-I@abs_top_srcdir@/lib/includes -I@abs_top_builddir@/lib/includes"
|
||||||
export CGO_LDFLAGS="-L@abs_top_builddir@/lib/.libs"
|
export CGO_LDFLAGS="-L$libdir"
|
||||||
export LD_LIBRARY_PATH="@abs_top_builddir@/lib/.libs"
|
export LD_LIBRARY_PATH="$libdir"
|
||||||
"$@"
|
"$@"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
add_subdirectory(includes)
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/includes"
|
||||||
|
)
|
||||||
|
|
||||||
|
add_definitions(-DBUILDING_NGHTTP2)
|
||||||
|
|
||||||
|
set(NGHTTP2_SOURCES
|
||||||
|
nghttp2_pq.c nghttp2_map.c nghttp2_queue.c
|
||||||
|
nghttp2_frame.c
|
||||||
|
nghttp2_buf.c
|
||||||
|
nghttp2_stream.c nghttp2_outbound_item.c
|
||||||
|
nghttp2_session.c nghttp2_submit.c
|
||||||
|
nghttp2_helper.c
|
||||||
|
nghttp2_npn.c
|
||||||
|
nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c
|
||||||
|
nghttp2_version.c
|
||||||
|
nghttp2_priority_spec.c
|
||||||
|
nghttp2_option.c
|
||||||
|
nghttp2_callbacks.c
|
||||||
|
nghttp2_mem.c
|
||||||
|
nghttp2_http.c
|
||||||
|
nghttp2_rcbuf.c
|
||||||
|
)
|
||||||
|
|
||||||
|
# Public shared library
|
||||||
|
add_library(nghttp2 SHARED ${NGHTTP2_SOURCES})
|
||||||
|
set_target_properties(nghttp2 PROPERTIES
|
||||||
|
COMPILE_FLAGS "${WARNCFLAGS}"
|
||||||
|
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
|
||||||
|
C_VISIBILITY_PRESET hidden
|
||||||
|
)
|
||||||
|
|
||||||
|
if(HAVE_CUNIT)
|
||||||
|
# Static library (for unittests because of symbol visibility)
|
||||||
|
add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})
|
||||||
|
set_target_properties(nghttp2_static PROPERTIES
|
||||||
|
COMPILE_FLAGS "${WARNCFLAGS}"
|
||||||
|
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
|
||||||
|
ARCHIVE_OUTPUT_NAME nghttp2
|
||||||
|
)
|
||||||
|
target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
install(TARGETS nghttp2
|
||||||
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
|
||||||
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
|
||||||
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
SUBDIRS = includes
|
SUBDIRS = includes
|
||||||
|
|
||||||
EXTRA_DIST = Makefile.msvc
|
EXTRA_DIST = Makefile.msvc CMakeLists.txt
|
||||||
|
|
||||||
AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
|
AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
|
||||||
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
|
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
install(FILES
|
||||||
|
nghttp2/nghttp2.h
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/nghttp2/nghttp2ver.h"
|
||||||
|
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/nghttp2")
|
||||||
|
|
@ -20,4 +20,7 @@
|
||||||
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
# 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.
|
||||||
|
|
||||||
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
nobase_include_HEADERS = nghttp2/nghttp2.h nghttp2/nghttp2ver.h
|
nobase_include_HEADERS = nghttp2/nghttp2.h nghttp2/nghttp2ver.h
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
# EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
|
||||||
|
|
||||||
|
if(ENABLE_PYTHON_BINDINGS)
|
||||||
|
add_custom_target(python ALL
|
||||||
|
COMMAND "${PYTHON_EXECUTABLE}" setup.py build
|
||||||
|
VERBATIM
|
||||||
|
DEPENDS nghttp2.c nghttp2
|
||||||
|
)
|
||||||
|
|
||||||
|
configure_file(install-python.cmake.in install-python.cmake ESCAPE_QUOTES @ONLY)
|
||||||
|
install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-python.cmake")
|
||||||
|
|
||||||
|
add_custom_command(OUTPUT nghttp2.c
|
||||||
|
COMMAND "${CYTHON_EXECUTABLE}" -o nghttp2.c
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/nghttp2.pyx"
|
||||||
|
VERBATIM
|
||||||
|
DEPENDS nghttp2.pyx
|
||||||
|
)
|
||||||
|
|
||||||
|
# Instead of calling "setup.py clean --all", this should do...
|
||||||
|
set_directory_properties(PROPERTIES
|
||||||
|
ADDITIONAL_MAKE_CLEAN_FILES "build;python_nghttp2.egg-info"
|
||||||
|
)
|
||||||
|
|
||||||
|
## This works also, except that the installation target is missing...
|
||||||
|
# include(UseCython)
|
||||||
|
# cython_add_module(python_nghttp2 nghttp2.pyx)
|
||||||
|
# set_target_properties(python_nghttp2 PROPERTIES
|
||||||
|
# OUTPUT_NAME nghttp2
|
||||||
|
# )
|
||||||
|
# target_include_directories(python_nghttp2 PRIVATE
|
||||||
|
# "${CMAKE_SOURCE_DIR}/lib"
|
||||||
|
# "${CMAKE_SOURCE_DIR}/lib/includes"
|
||||||
|
# "${CMAKE_BINARY_DIR}/lib/includes"
|
||||||
|
# )
|
||||||
|
# target_link_libraries(python_nghttp2
|
||||||
|
# nghttp2
|
||||||
|
# )
|
||||||
|
endif()
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
# clean-local in parallel build.
|
# clean-local in parallel build.
|
||||||
.NOTPARALLEL:
|
.NOTPARALLEL:
|
||||||
|
|
||||||
EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
|
EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CMakeLists.txt install-python.cmake.in
|
||||||
|
|
||||||
if ENABLE_PYTHON_BINDINGS
|
if ENABLE_PYTHON_BINDINGS
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
get_filename_component(rootdir "$ENV{DESTDIR}" ABSOLUTE)
|
||||||
|
if(rootdir STREQUAL "")
|
||||||
|
set(rootdir /)
|
||||||
|
endif()
|
||||||
|
execute_process(
|
||||||
|
COMMAND "@PYTHON_EXECUTABLE@" setup.py install
|
||||||
|
--skip-build
|
||||||
|
--root=${rootdir} --prefix=${CMAKE_INSTALL_PREFIX}
|
||||||
|
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@"
|
||||||
|
)
|
||||||
|
|
@ -39,6 +39,7 @@ setup(
|
||||||
'@top_srcdir@/lib/includes',
|
'@top_srcdir@/lib/includes',
|
||||||
'@top_builddir@/lib/includes'],
|
'@top_builddir@/lib/includes'],
|
||||||
library_dirs=['@top_builddir@/lib/.libs',
|
library_dirs=['@top_builddir@/lib/.libs',
|
||||||
|
'@top_builddir@/lib',
|
||||||
'@top_builddir@'],
|
'@top_builddir@'],
|
||||||
libraries=LIBS)],
|
libraries=LIBS)],
|
||||||
long_description='TBD'
|
long_description='TBD'
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
# EXTRA_DIST = README.rst
|
||||||
|
install(
|
||||||
|
PROGRAMS fetch-ocsp-response
|
||||||
|
DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}"
|
||||||
|
)
|
||||||
|
|
@ -21,5 +21,5 @@
|
||||||
# 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.
|
||||||
|
|
||||||
EXTRA_DIST = README.rst
|
EXTRA_DIST = README.rst CMakeLists.txt
|
||||||
dist_pkgdata_SCRIPTS = fetch-ocsp-response
|
dist_pkgdata_SCRIPTS = fetch-ocsp-response
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,257 @@
|
||||||
|
add_subdirectory(includes)
|
||||||
|
|
||||||
|
file(GLOB c_sources *.c)
|
||||||
|
set_source_files_properties(${c_sources} PROPERTIES
|
||||||
|
COMPILE_FLAGS "${WARNCFLAGS}")
|
||||||
|
file(GLOB cxx_sources *.cc)
|
||||||
|
set_source_files_properties(${cxx_sources} PROPERTIES
|
||||||
|
COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}")
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
"${CMAKE_SOURCE_DIR}/lib/includes"
|
||||||
|
"${CMAKE_BINARY_DIR}/lib/includes"
|
||||||
|
"${CMAKE_SOURCE_DIR}/lib"
|
||||||
|
"${CMAKE_SOURCE_DIR}/src/includes"
|
||||||
|
"${CMAKE_SOURCE_DIR}/third-party"
|
||||||
|
|
||||||
|
${JEMALLOC_INCLUDE_DIRS}
|
||||||
|
${SPDYLAY_INCLUDE_DIRS}
|
||||||
|
${LIBXML2_INCLUDE_DIRS}
|
||||||
|
${LIBEV_INCLUDE_DIRS}
|
||||||
|
${OPENSSL_INCLUDE_DIRS}
|
||||||
|
${JANSSON_INCLUDE_DIRS}
|
||||||
|
${ZLIB_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
# XXX per-target?
|
||||||
|
link_libraries(
|
||||||
|
nghttp2
|
||||||
|
${JEMALLOC_LIBRARIES}
|
||||||
|
${SPDYLAY_LIBRARIES}
|
||||||
|
${LIBXML2_LIBRARIES}
|
||||||
|
${LIBEV_LIBRARIES}
|
||||||
|
${OPENSSL_LIBRARIES}
|
||||||
|
${JANSSON_LIBRARIES}
|
||||||
|
${ZLIB_LIBRARIES}
|
||||||
|
${APP_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(ENABLE_APP)
|
||||||
|
set(HELPER_OBJECTS
|
||||||
|
util.cc
|
||||||
|
http2.cc timegm.c app_helper.cc nghttp2_gzip.c
|
||||||
|
)
|
||||||
|
|
||||||
|
# nghttp client
|
||||||
|
set(NGHTTP_SOURCES
|
||||||
|
${HELPER_OBJECTS}
|
||||||
|
nghttp.cc
|
||||||
|
ssl.cc
|
||||||
|
)
|
||||||
|
if(HAVE_LIBXML2)
|
||||||
|
list(APPEND NGHTTP_SOURCES HtmlParser.cc)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# nghttpd
|
||||||
|
set(NGHTTPD_SOURCES
|
||||||
|
${HELPER_OBJECTS}
|
||||||
|
nghttpd.cc
|
||||||
|
ssl.cc
|
||||||
|
HttpServer.cc
|
||||||
|
)
|
||||||
|
|
||||||
|
# h2load
|
||||||
|
set(H2LOAD_SOURCES
|
||||||
|
util.cc
|
||||||
|
http2.cc h2load.cc
|
||||||
|
timegm.c
|
||||||
|
ssl.cc
|
||||||
|
h2load_http2_session.cc
|
||||||
|
h2load_http1_session.cc
|
||||||
|
)
|
||||||
|
if(HAVE_SPDYLAY)
|
||||||
|
list(APPEND H2LOAD_SOURCES
|
||||||
|
h2load_spdy_session.cc
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
# Common libnhttpx sources (used for nghttpx and unit tests)
|
||||||
|
set(NGHTTPX_SRCS
|
||||||
|
util.cc http2.cc timegm.c
|
||||||
|
app_helper.cc
|
||||||
|
ssl.cc
|
||||||
|
shrpx_config.cc
|
||||||
|
shrpx_accept_handler.cc
|
||||||
|
shrpx_connection_handler.cc
|
||||||
|
shrpx_client_handler.cc
|
||||||
|
shrpx_http2_upstream.cc
|
||||||
|
shrpx_https_upstream.cc
|
||||||
|
shrpx_downstream.cc
|
||||||
|
shrpx_downstream_connection.cc
|
||||||
|
shrpx_http_downstream_connection.cc
|
||||||
|
shrpx_http2_downstream_connection.cc
|
||||||
|
shrpx_http2_session.cc
|
||||||
|
shrpx_downstream_queue.cc
|
||||||
|
shrpx_log.cc
|
||||||
|
shrpx_http.cc
|
||||||
|
shrpx_io_control.cc
|
||||||
|
shrpx_ssl.cc
|
||||||
|
shrpx_worker.cc
|
||||||
|
shrpx_log_config.cc
|
||||||
|
shrpx_connect_blocker.cc
|
||||||
|
shrpx_downstream_connection_pool.cc
|
||||||
|
shrpx_rate_limit.cc
|
||||||
|
shrpx_connection.cc
|
||||||
|
shrpx_memcached_dispatcher.cc
|
||||||
|
shrpx_memcached_connection.cc
|
||||||
|
shrpx_worker_process.cc
|
||||||
|
shrpx_signal.cc
|
||||||
|
shrpx_router.cc
|
||||||
|
)
|
||||||
|
if(HAVE_SPDYLAY)
|
||||||
|
list(APPEND NGHTTPX_SRCS
|
||||||
|
shrpx_spdy_upstream.cc
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(HAVE_MRUBY)
|
||||||
|
list(APPEND NGHTTPX_SRCS
|
||||||
|
shrpx_mruby.cc
|
||||||
|
shrpx_mruby_module.cc
|
||||||
|
shrpx_mruby_module_env.cc
|
||||||
|
shrpx_mruby_module_request.cc
|
||||||
|
shrpx_mruby_module_response.cc
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
add_library(nghttpx_static STATIC ${NGHTTPX_SRCS})
|
||||||
|
set_target_properties(nghttpx_static PROPERTIES ARCHIVE_OUTPUT_NAME nghttpx)
|
||||||
|
|
||||||
|
set(NGHTTPX-bin_SOURCES
|
||||||
|
shrpx.cc
|
||||||
|
)
|
||||||
|
|
||||||
|
if(HAVE_MRUBY)
|
||||||
|
target_link_libraries(nghttpx_static mruby-lib)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(HAVE_NEVERBLEED)
|
||||||
|
target_link_libraries(nghttpx_static neverbleed)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
if(HAVE_CUNIT)
|
||||||
|
set(NGHTTPX_UNITTEST_SOURCES
|
||||||
|
shrpx-unittest.cc
|
||||||
|
shrpx_ssl_test.cc
|
||||||
|
shrpx_downstream_test.cc
|
||||||
|
shrpx_config_test.cc
|
||||||
|
shrpx_worker_test.cc
|
||||||
|
shrpx_http_test.cc
|
||||||
|
http2_test.cc
|
||||||
|
util_test.cc
|
||||||
|
nghttp2_gzip_test.c
|
||||||
|
nghttp2_gzip.c
|
||||||
|
buffer_test.cc
|
||||||
|
memchunk_test.cc
|
||||||
|
template_test.cc
|
||||||
|
base64_test.cc
|
||||||
|
)
|
||||||
|
add_executable(nghttpx-unittest EXCLUDE_FROM_ALL
|
||||||
|
${NGHTTPX_UNITTEST_SOURCES}
|
||||||
|
$<TARGET_OBJECTS:http-parser>
|
||||||
|
)
|
||||||
|
target_include_directories(nghttpx-unittest PRIVATE ${CUNIT_INCLUDE_DIRS})
|
||||||
|
target_compile_definitions(nghttpx-unittest
|
||||||
|
PRIVATE "-DNGHTTP2_TESTS_DIR=\"${CMAKE_SOURCE_DIR}/tests\""
|
||||||
|
)
|
||||||
|
target_link_libraries(nghttpx-unittest nghttpx_static ${CUNIT_LIBRARIES})
|
||||||
|
if(HAVE_MRUBY)
|
||||||
|
target_link_libraries(nghttpx-unittest mruby-lib)
|
||||||
|
endif()
|
||||||
|
if(HAVE_NEVERBLEED)
|
||||||
|
target_link_libraries(nghttpx-unittest neverbleed)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_test(nghttpx-unittest nghttpx-unittest)
|
||||||
|
add_dependencies(check nghttpx-unittest)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_executable(nghttp ${NGHTTP_SOURCES} $<TARGET_OBJECTS:http-parser>)
|
||||||
|
add_executable(nghttpd ${NGHTTPD_SOURCES} $<TARGET_OBJECTS:http-parser>)
|
||||||
|
add_executable(nghttpx ${NGHTTPX-bin_SOURCES} $<TARGET_OBJECTS:http-parser>)
|
||||||
|
target_compile_definitions(nghttpx PRIVATE "-DPKGDATADIR=\"${PKGDATADIR}\"")
|
||||||
|
target_link_libraries(nghttpx nghttpx_static)
|
||||||
|
add_executable(h2load ${H2LOAD_SOURCES} $<TARGET_OBJECTS:http-parser>)
|
||||||
|
|
||||||
|
install(TARGETS nghttp nghttpd nghttpx h2load
|
||||||
|
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_HPACK_TOOLS)
|
||||||
|
set(inflatehd_SOURCES
|
||||||
|
inflatehd.cc
|
||||||
|
comp_helper.c
|
||||||
|
)
|
||||||
|
set(deflatehd_SOURCES
|
||||||
|
deflatehd.cc
|
||||||
|
comp_helper.c
|
||||||
|
)
|
||||||
|
add_executable(inflatehd ${inflatehd_SOURCES})
|
||||||
|
add_executable(deflatehd ${deflatehd_SOURCES})
|
||||||
|
install(TARGETS inflatehd deflatehd
|
||||||
|
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_ASIO_LIB)
|
||||||
|
set(NGHTTP2_ASIO_SOURCES
|
||||||
|
util.cc http2.cc
|
||||||
|
ssl.cc
|
||||||
|
timegm.c
|
||||||
|
asio_common.cc
|
||||||
|
asio_io_service_pool.cc
|
||||||
|
asio_server_http2.cc
|
||||||
|
asio_server_http2_impl.cc
|
||||||
|
asio_server.cc
|
||||||
|
asio_server_http2_handler.cc
|
||||||
|
asio_server_request.cc
|
||||||
|
asio_server_request_impl.cc
|
||||||
|
asio_server_response.cc
|
||||||
|
asio_server_response_impl.cc
|
||||||
|
asio_server_stream.cc
|
||||||
|
asio_server_serve_mux.cc
|
||||||
|
asio_server_request_handler.cc
|
||||||
|
asio_server_tls_context.cc
|
||||||
|
asio_client_session.cc
|
||||||
|
asio_client_session_impl.cc
|
||||||
|
asio_client_session_tcp_impl.cc
|
||||||
|
asio_client_session_tls_impl.cc
|
||||||
|
asio_client_response.cc
|
||||||
|
asio_client_response_impl.cc
|
||||||
|
asio_client_request.cc
|
||||||
|
asio_client_request_impl.cc
|
||||||
|
asio_client_stream.cc
|
||||||
|
asio_client_tls_context.cc
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(nghttp2_asio SHARED
|
||||||
|
${NGHTTP2_ASIO_SOURCES}
|
||||||
|
$<TARGET_OBJECTS:http-parser>
|
||||||
|
)
|
||||||
|
target_include_directories(nghttp2_asio PRIVATE
|
||||||
|
${OPENSSL_INCLUDE_DIRS}
|
||||||
|
${Boost_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
target_link_libraries(nghttp2_asio
|
||||||
|
nghttp2
|
||||||
|
${OPENSSL_LIBRARIES}
|
||||||
|
${Boost_LIBRARIES}
|
||||||
|
)
|
||||||
|
set_target_properties(nghttp2_asio PROPERTIES
|
||||||
|
VERSION 1.0.0 SOVERSION 1)
|
||||||
|
|
||||||
|
install(TARGETS nghttp2_asio
|
||||||
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
|
||||||
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc"
|
||||||
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||||
|
endif()
|
||||||
|
|
@ -22,6 +22,8 @@
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
SUBDIRS = includes
|
SUBDIRS = includes
|
||||||
|
|
||||||
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
bin_PROGRAMS =
|
bin_PROGRAMS =
|
||||||
check_PROGRAMS =
|
check_PROGRAMS =
|
||||||
TESTS =
|
TESTS =
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
if(ENABLE_ASIO_LIB)
|
||||||
|
install(FILES
|
||||||
|
nghttp2/asio_http2.h
|
||||||
|
nghttp2/asio_http2_client.h
|
||||||
|
nghttp2/asio_http2_server.h
|
||||||
|
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/nghttp2")
|
||||||
|
endif()
|
||||||
|
|
@ -21,6 +21,8 @@
|
||||||
# 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.
|
||||||
|
|
||||||
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
if ENABLE_ASIO_LIB
|
if ENABLE_ASIO_LIB
|
||||||
nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
|
nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
|
||||||
nghttp2/asio_http2_server.h
|
nghttp2/asio_http2_server.h
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
# XXX testdata/: EXTRA_DIST = cacert.pem index.html privkey.pem
|
||||||
|
if(HAVE_CUNIT)
|
||||||
|
string(REPLACE " " ";" c_flags "${WARNCFLAGS}")
|
||||||
|
add_compile_options(${c_flags})
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
"${CMAKE_SOURCE_DIR}/lib/includes"
|
||||||
|
"${CMAKE_SOURCE_DIR}/lib"
|
||||||
|
"${CMAKE_SOURCE_DIR}/src/includes"
|
||||||
|
"${CMAKE_BINARY_DIR}/lib/includes"
|
||||||
|
${CUNIT_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
set(MAIN_SOURCES
|
||||||
|
main.c nghttp2_pq_test.c nghttp2_map_test.c nghttp2_queue_test.c
|
||||||
|
nghttp2_test_helper.c
|
||||||
|
nghttp2_frame_test.c
|
||||||
|
nghttp2_stream_test.c
|
||||||
|
nghttp2_session_test.c
|
||||||
|
nghttp2_hd_test.c
|
||||||
|
nghttp2_npn_test.c
|
||||||
|
nghttp2_helper_test.c
|
||||||
|
nghttp2_buf_test.c
|
||||||
|
)
|
||||||
|
|
||||||
|
add_executable(main EXCLUDE_FROM_ALL
|
||||||
|
${MAIN_SOURCES}
|
||||||
|
)
|
||||||
|
target_include_directories(main PRIVATE ${CUNIT_INCLUDE_DIRS})
|
||||||
|
target_link_libraries(main
|
||||||
|
nghttp2_static
|
||||||
|
${CUNIT_LIBRARIES}
|
||||||
|
)
|
||||||
|
add_test(main main)
|
||||||
|
add_dependencies(check main)
|
||||||
|
|
||||||
|
if(ENABLE_FAILMALLOC)
|
||||||
|
set(FAILMALLOC_SOURCES
|
||||||
|
failmalloc.c failmalloc_test.c
|
||||||
|
malloc_wrapper.c
|
||||||
|
nghttp2_test_helper.c
|
||||||
|
)
|
||||||
|
add_executable(failmalloc EXCLUDE_FROM_ALL
|
||||||
|
${FAILMALLOC_SOURCES}
|
||||||
|
)
|
||||||
|
target_link_libraries(failmalloc
|
||||||
|
nghttp2_static
|
||||||
|
${CUNIT_LIBRARIES}
|
||||||
|
)
|
||||||
|
add_test(failmalloc failmalloc)
|
||||||
|
add_dependencies(check failmalloc)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_APP)
|
||||||
|
# EXTRA_DIST = end_to_end.py
|
||||||
|
# TESTS += end_to_end.py
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
@ -22,6 +22,8 @@
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
SUBDIRS = testdata
|
SUBDIRS = testdata
|
||||||
|
|
||||||
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
if HAVE_CUNIT
|
if HAVE_CUNIT
|
||||||
|
|
||||||
check_PROGRAMS = main
|
check_PROGRAMS = main
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,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.
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif /* HAVE_CONFIG_H */
|
||||||
#include "nghttp2_npn_test.h"
|
#include "nghttp2_npn_test.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
if(ENABLE_THIRD_PARTY)
|
||||||
|
set(LIBHTTP_PARSER_SOURCES
|
||||||
|
http-parser/http_parser.c
|
||||||
|
)
|
||||||
|
add_library(http-parser OBJECT ${LIBHTTP_PARSER_SOURCES})
|
||||||
|
set_target_properties(http-parser PROPERTIES
|
||||||
|
POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
|
if(HAVE_NEVERBLEED)
|
||||||
|
set(NEVERBLEED_SOURCES
|
||||||
|
neverbleed/neverbleed.c
|
||||||
|
)
|
||||||
|
add_library(neverbleed ${NEVERBLEED_SOURCES})
|
||||||
|
target_include_directories(neverbleed PRIVATE ${OPENSSL_INCLUDE_DIRS})
|
||||||
|
target_include_directories(neverbleed INTERFACE
|
||||||
|
"${CMAKE_SOURCE_DIR}/third-party/neverbleed"
|
||||||
|
)
|
||||||
|
target_link_libraries(neverbleed ${OPENSSL_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(HAVE_MRUBY)
|
||||||
|
# EXTRA_DIST = build_config.rb mruby/*
|
||||||
|
|
||||||
|
set(MRUBY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/mruby/build")
|
||||||
|
set(MRUBY_LIBRARY
|
||||||
|
"${CMAKE_STATIC_LIBRARY_PREFIX}mruby${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# The mruby build needs some env vars. Alternatively, look at cmake -P
|
||||||
|
if(CMAKE_VERSION VERSION_LESS "3.1")
|
||||||
|
# XXX works only for Unixes?
|
||||||
|
set(ENV_COMMAND env)
|
||||||
|
else()
|
||||||
|
set(ENV_COMMAND ${CMAKE_COMMAND} -E env)
|
||||||
|
endif()
|
||||||
|
# Required for the Ninja generator. For older CMake, you first have to
|
||||||
|
# invoke 'ninja mruby' before building dependents.
|
||||||
|
if(CMAKE_VERSION VERSION_LESS "3.2")
|
||||||
|
set(_byproducts)
|
||||||
|
else()
|
||||||
|
set(_byproducts BYPRODUCTS "mruby/build/lib/${MRUBY_LIBRARY}")
|
||||||
|
endif()
|
||||||
|
add_custom_target(mruby
|
||||||
|
COMMAND ${ENV_COMMAND}
|
||||||
|
"MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/build_config.rb"
|
||||||
|
"BUILD_DIR=${MRUBY_BUILD_DIR}"
|
||||||
|
"INSTALL_DIR=${MRUBY_BUILD_DIR}/install/bin"
|
||||||
|
"CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}"
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/mruby/minirake"
|
||||||
|
-f "${CMAKE_CURRENT_SOURCE_DIR}/mruby/Rakefile"
|
||||||
|
${_byproducts}
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
|
||||||
|
# Make the mruby library available to others in this project without them
|
||||||
|
# having to worry about include dirs and the mruby location.
|
||||||
|
add_library(mruby-lib STATIC IMPORTED GLOBAL)
|
||||||
|
set_target_properties(mruby-lib PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${MRUBY_BUILD_DIR}/lib/${MRUBY_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/mruby/include"
|
||||||
|
)
|
||||||
|
add_dependencies(mruby-lib mruby)
|
||||||
|
|
||||||
|
set_directory_properties(PROPERTIES
|
||||||
|
ADDITIONAL_MAKE_CLEAN_FILES mruby/build
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
@ -23,6 +23,8 @@
|
||||||
|
|
||||||
AM_CPPFLAGS = @DEFS@
|
AM_CPPFLAGS = @DEFS@
|
||||||
|
|
||||||
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
if ENABLE_THIRD_PARTY
|
if ENABLE_THIRD_PARTY
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libhttp-parser.la
|
noinst_LTLIBRARIES = libhttp-parser.la
|
||||||
|
|
@ -39,7 +41,7 @@ endif # HAVE_NEVERBLEED
|
||||||
|
|
||||||
if HAVE_MRUBY
|
if HAVE_MRUBY
|
||||||
|
|
||||||
EXTRA_DIST = build_config.rb mruby/*
|
EXTRA_DIST += build_config.rb mruby/*
|
||||||
|
|
||||||
.PHONY: all-local clean mruby
|
.PHONY: all-local clean mruby
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue