diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2013-10-14 20:13:11 +0200 |
|---|---|---|
| committer | Alessandro Ghedini <alessandro@ghedini.me> | 2013-10-14 20:13:11 +0200 |
| commit | 3b8c5de1a123041aa79bbb3aded3b643bd42782d (patch) | |
| tree | 1229e12c6da03fe515329ec5803179399b76e736 /lib/version.c | |
| parent | 5c3a355e9fe0ffdbd36488c890d25c065f35678b (diff) | |
Imported Upstream version 7.33.0
Diffstat (limited to 'lib/version.c')
| -rw-r--r-- | lib/version.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/version.c b/lib/version.c index d39fe0c1..1f62131e 100644 --- a/lib/version.c +++ b/lib/version.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -25,6 +25,7 @@ #include <curl/curl.h> #include "urldata.h" #include "sslgen.h" +#include "http2.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> @@ -122,6 +123,11 @@ char *curl_version(void) left -= len; ptr += len; #endif +#ifdef USE_NGHTTP2 + len = Curl_http2_ver(ptr, left); + left -= len; + ptr += len; +#endif #ifdef USE_LIBRTMP { char suff[2]; @@ -235,9 +241,6 @@ static curl_version_info_data version_info = { #ifdef ENABLE_IPV6 | CURL_VERSION_IPV6 #endif -#ifdef HAVE_KRB4 - | CURL_VERSION_KERBEROS4 -#endif #ifdef USE_SSL | CURL_VERSION_SSL #endif @@ -278,6 +281,9 @@ static curl_version_info_data version_info = { #if defined(USE_TLS_SRP) | CURL_VERSION_TLSAUTH_SRP #endif +#if defined(USE_NGHTTP2) + | CURL_VERSION_HTTP2 +#endif , NULL, /* ssl_version */ 0, /* ssl_version_num, this is kept at zero */ |