diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2016-08-26 15:18:29 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-10-13 19:26:10 +0000 |
| commit | b1cc056b12702435f6ebdc6ba0a8e17a41e159a0 (patch) | |
| tree | e03028577c61da59952dd3c319aff62faf917a14 /epan/epan.c | |
| parent | ad0a016bd2f7f82e4db8bbac13f959ad3bc7ecf4 (diff) | |
Remove nghttp2 code and use system' nghttp2
Update debian, macos (setup / homebrew) download script
Update testsuite (don't try HPACK when build without nghttp2)
Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112
Reviewed-on: https://code.wireshark.org/review/17347
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/epan/epan.c b/epan/epan.c index 0cd3038134..056a447fbb 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -69,6 +69,10 @@ #include <ares_version.h> #endif +#ifdef HAVE_NGHTTP2 +#include <nghttp2/nghttp2ver.h> +#endif + static wmem_allocator_t *pinfo_pool_cache = NULL; const gchar* @@ -563,6 +567,13 @@ epan_get_compiled_version_info(GString *str) g_string_append(str, "without GeoIP"); #endif /* HAVE_GEOIP */ + /* nghttp2 */ + g_string_append(str, ", "); +#ifdef HAVE_NGHTTP2 + g_string_append(str, "with nghttp2 " NGHTTP2_VERSION); +#else + g_string_append(str, "without nghttp2"); +#endif /* HAVE_NGHTTP2 */ } /* |