dc3119303a
Rewrite concat_string_ref
2016-03-20 17:55:17 +09:00
d2b55ad1a2
nghttpx: Allow '*' in --error-page to be used as wildcard
2016-03-19 23:49:15 +09:00
d7051f5207
nghttpx: Add custom error pages
2016-03-19 23:41:21 +09:00
db1ee3aa88
nghttpd: Use StringRef
2016-03-19 20:57:40 +09:00
a1e0bd134e
nghttpx: Create at least the same number of h2 session as load balancing hosts
2016-03-19 12:00:27 +09:00
7a1e0eb618
integration: Disable tests that sometimes break randomly on travis
2016-03-19 11:50:01 +09:00
65b59bd78a
Include config.h from tests/*.h
2016-03-19 11:46:49 +09:00
dcae6efaa2
nghttpx: Rewrite Downstream::assemble_request_cookie using StringRef
2016-03-19 11:38:09 +09:00
71cc7a96c2
Merge branch 'Lekensteyn-cmake'
2016-03-19 11:35:27 +09:00
8da0d649e4
Merge branch 'cmake' of https://github.com/Lekensteyn/nghttp2 into Lekensteyn-cmake
2016-03-19 11:20:31 +09:00
08c7656e47
travis: remove -DCMAKE_BUILD_TYPE=None
...
It was added because the default RelWithDebInfo type disabled
assertions, but now that -DNDEBUG is removed from its flags, it is not
necessary to change the build type anymore.
2016-03-17 23:34:14 +01:00
bd253e1bdd
cmake: fix Windows build with CUnit
...
failmalloc and main tests succesfully pass the test now.
2016-03-17 23:32:07 +01:00
d10f149161
cmake: fix Windows support
...
Fix Windows build by defining `ssize_t` when missing and adjusting the
install commands.
Add support for ENABLE_WERROR=1 while at it.
Tested with MSVC 2013 on Windows 7 x64.
2016-03-16 17:33:20 +01:00
3a2a943fe9
cmake: do not fail without libxml2
...
Avoid adding a LIBXML2_LIBRARIES-NOTFOUND to the libraries list when it
is not found. Likewise for OpenSSL.
2016-03-16 17:33:10 +01:00
f34971774b
cmake: use -std=c++11 instead of -std=gnu+11
...
Matches autotools behavior. The m4_if logic was misread...
2016-03-16 14:52:42 +01:00
f8a9a21428
cmake: add _U_ and NGHTTP2_NORETURN to config.h
...
Do not add _U_ and NGHTTP2_NORETURN definitions to the command line,
instead add it to config.h. This matches what autotools does.
2016-03-16 14:25:58 +01:00
0c49e5d56e
cmake: enable assertions by default
...
Users can disable this by setting -DCMAKE_C_FLAGS=-DNDEBUG or
-DCMAKE_CXX_FLAGS=-DNDEBUG to disable assertions as desired.
2016-03-16 14:10:42 +01:00
e84755eb35
Merge pull request #542 from Lekensteyn/build-fixes
...
src/Makefile.am: fix missing allocator.h
2016-03-15 23:44:20 +09:00
b348a02b85
cmake: fix printed C/CXX flags
...
Build type-specific flags are added before other flags, reflect this in
the output.
2016-03-15 13:58:53 +01:00
439636c579
cmake: set CMAKE_BUILD_TYPE=RelWithDebInfo by default
...
NOTE: RelWithDebInfo *disables* assertions by default. To keep
assertions, use CMAKE_BUILD_TYPE=Debug or CMAKE_BUILD_TYPE=None.
2016-03-15 13:40:15 +01:00
162b1c5e03
cmake: only install ASIO headers when requested
2016-03-15 00:02:46 +01:00
dc56b951df
src/Makefile.am: fix missing allocator.h
...
Fix regression from v1.8.0-38-gbae37e3 breaking distcheck.
2016-03-14 17:49:23 +01:00
4d801cd696
travis: add cmake to build matrix
...
Add Nathan's PPA for cmake 3.2.3 (3.0 or newer is required).
2016-03-14 17:26:59 +01:00
7c55c335cc
Merge branches 'master' and 'cmake-updated' into cmake
...
Update to latest master with appropriate cmake changes at the same time.
2016-03-14 17:26:15 +01:00
2ddb83206b
cmake: sync with v1.8.0-63-g37b09f6
...
Adds missing source files and configure.ac changes since
v1.7.0-93-g093eb51.
2016-03-14 17:20:37 +01:00
ab734f09b6
nghttpx: Fix possible crash in rare case
2016-03-15 00:46:15 +09:00
dd2bdf3e31
nghttpx: Update doc
2016-03-14 23:53:10 +09:00
a909bb3eca
nghttpx: Initialize proto field
2016-03-14 23:47:29 +09:00
aaebeceded
Merge pull request #538 from Jan-E/master
...
Fixes and improvements for Makefile.MSVC
2016-03-14 23:00:23 +09:00
3de435d7b8
contrib: Use simple form in prerequisites
2016-03-14 22:57:26 +09:00
01408209d8
nghttpx: Fix the bug that forwarded query contains duplicated '?'
...
This change also fixes that bug that the multiple '/' at the start of
request were not coalesced into one.
2016-03-14 22:20:00 +09:00
e8b62c620d
Revert change of NGHTTP2_VERSION_NUM, keep the parentheses around VERSION_NUM, not in the sed -e
2016-03-14 14:13:19 +01:00
2eb7137e04
Merge branch 'Lekensteyn-autotools-it'
2016-03-14 21:15:59 +09:00
caa12ec587
Merge branch 'autotools-it' of https://github.com/Lekensteyn/nghttp2 into Lekensteyn-autotools-it
2016-03-14 21:12:33 +09:00
0f71fbce8d
Generate nghttp2ver.h before compiling
2016-03-13 18:57:58 +01:00
4e2972a5dc
Use string for NGHTTP2_VERSION_NUM, e.g 0x010800: do not add parentheses
2016-03-13 18:43:44 +01:00
78e5417ff2
Remove -nologo: not used in VC11/VC14, throws error in VC9
2016-03-13 18:31:14 +01:00
77852cf572
Use string for NGHTTP2_VERSION_NUM, e.g 0x010800
2016-03-13 18:24:32 +01:00
fa36537f82
Detect version for releases en dev versions
2016-03-13 18:18:22 +01:00
4cde76c9c3
Do not use Cython by default
2016-03-13 18:13:46 +01:00
e02512032b
Fix missing external symbol nghttp2_rcbuf_new2
2016-03-13 18:12:39 +01:00
b092166bc6
cmake: clean more files, fix python dependency
...
Remove generated documentation, python and mruby build artifacts.
Note that this does not work for Ninja, Makefile works fine though.
2016-03-13 17:36:03 +01:00
e58db4f8b0
Attempt to fix compile error with msvc
2016-03-14 00:54:02 +09:00
dad222b8f4
cmake: fix jemalloc, libevent include dirs
...
Caught with cmake --warn-uninitialized.
2016-03-13 16:42:35 +01:00
e80977c812
integration-tests: do not use recursive target
...
Older automake (travis, *cough*) do not support the
AM_EXTRA_RECURSIVE_TARGETS option, this results in invoking "it-local"
directly in the travis script which relies on an implementation detail.
Since the "it" target is only used by the integration-tests directory,
just avoid the recursive targets. The README.rst suggests to enter the
integration-tests directory anyway.
2016-03-13 15:40:17 +01:00
2b3bc710fc
cmake: fix version checks for external packages
...
The name passed to find_package should match the one that is passed to
find_package_handle_standard_args, otherwise the version matching is not
properly done. The names are based on the FindXXX.cmake filename.
This also simplifies components reporting for Libevent (done by
find_package_handle_standard_args) and results in reporting a library
instead of include directory when found.
2016-03-13 15:06:56 +01:00
a45540fd79
Lower libev version requirement
...
libev 4.11 seems to build fine as demonstrated by Travis with autotools.
2016-03-13 13:15:50 +01:00
7f8110601e
cmake: fix compatibility with cmake before 3.3
...
The COMPILE_LANGUAGE generator expression is only supported since CMake
3.3. Moreover, it does not work with all generators (works with Makefile
and Ninja, but not with Visual Studio).
target_compile_options would only work if a target does not mix C and
C++ sources, since the flags are intended to be set for a specific
language, use set_source_files_properties instead. This approach is also
less repetitive.
Drop the idea of using lists and COMPILE_OPTIONS,
set_source_files_properties only understands COMPILE_FLAGS (a single
string, not a list).
2016-03-13 12:30:41 +01:00
37b09f6785
Use %u for uint8_t for formatting
2016-03-13 18:25:30 +09:00
2a606bae4c
Add nghttp2_error_callback to tell application human readable error message
2016-03-13 18:22:52 +09:00
Tatsuhiro Tsujikawa
Peter Wu
Jan-E