moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

curl: provide libgsasl version and feature info in -V output

Browse Source 
Closes #6592
This commit is contained in:
Daniel Stenberg 2021-02-11 08:54:23 +01:00
parent 8d9346f1a0
commit 1560cd1f9f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/version.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -100,7 +100,7 @@ static size_t zstd_version(char *buf, size_t bufsz)
* zeros in the data. * zeros in the data.
*/ */
#define VERSION_PARTS 15 /* number of substrings we can concatenate */ #define VERSION_PARTS 16 /* number of substrings we can concatenate */
char *curl_version(void) char *curl_version(void)
{ {
@ -146,6 +146,9 @@ char *curl_version(void)
#endif #endif
#ifdef USE_HYPER #ifdef USE_HYPER
char hyper_buf[30]; char hyper_buf[30];
#endif
#ifdef USE_GSASL
char gsasl_buf[30];
#endif #endif
int i = 0; int i = 0;
int j; int j;
@ -235,6 +238,11 @@ char *curl_version(void)
msnprintf(hyper_buf, sizeof(hyper_buf), "Hyper/%s", hyper_version()); msnprintf(hyper_buf, sizeof(hyper_buf), "Hyper/%s", hyper_version());
src[i++] = hyper_buf; src[i++] = hyper_buf;
#endif #endif
#ifdef USE_GSASL
msnprintf(gsasl_buf, sizeof(gsasl_buf), "libgsasl/%s",
gsasl_check_version(NULL));
src[i++] = gsasl_buf;
#endif
DEBUGASSERT(i <= VERSION_PARTS); DEBUGASSERT(i <= VERSION_PARTS);
@ -430,6 +438,9 @@ static curl_version_info_data version_info = {
#endif #endif
#if defined(USE_HSTS) #if defined(USE_HSTS)
| CURL_VERSION_HSTS | CURL_VERSION_HSTS
#endif
#if defined(USE_GSASL)
| CURL_VERSION_GSASL
#endif #endif
, ,
NULL, /* ssl_version */ NULL, /* ssl_version */

1
src/tool_help.c
View File

@ -875,6 +875,7 @@ static const struct feat feats[] = {
{"PSL", CURL_VERSION_PSL}, {"PSL", CURL_VERSION_PSL},
{"alt-svc", CURL_VERSION_ALTSVC}, {"alt-svc", CURL_VERSION_ALTSVC},
{"HSTS", CURL_VERSION_HSTS}, {"HSTS", CURL_VERSION_HSTS},
{"gsasl", CURL_VERSION_GSASL},
}; };
static void print_category(curlhelp_t category) static void print_category(curlhelp_t category)