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

altsvc: set h3 version at a common single spot

Browse Source 
... and move the #ifdefs out of the functions. Addresses the fact they
were different before this change.

Reported-by: Harry Sintonen
Closes #4876
This commit is contained in:
Daniel Stenberg 2020-02-04 15:12:44 +01:00
parent 9e1f720758
commit d913c1e99e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/altsvc.c
View File

@ -48,19 +48,20 @@
#define MAX_ALTSVC_ALPNLENSTR "10"
#define MAX_ALTSVC_ALPNLEN 10
#if (defined(USE_QUICHE) || defined(USE_NGTCP2)) && !defined(UNITTESTS)
#define H3VERSION "h3-25"
#else
#define H3VERSION "h3"
#endif
static enum alpnid alpn2alpnid(char *name)
{
if(strcasecompare(name, "h1"))
return ALPN_h1;
if(strcasecompare(name, "h2"))
return ALPN_h2;
#if (defined(USE_QUICHE) || defined(USE_NGTCP2)) && !defined(UNITTESTS)
if(strcasecompare(name, "h3-25"))
if(strcasecompare(name, H3VERSION))
return ALPN_h3;
#else
if(strcasecompare(name, "h3"))
return ALPN_h3;
#endif
return ALPN_none; /* unknown, probably rubbish input */
}
@ -73,11 +74,7 @@ const char *Curl_alpnid2str(enum alpnid id)
case ALPN_h2:
return "h2";
case ALPN_h3:
#if (defined(USE_QUICHE) || defined(USE_NGTCP2)) && !defined(UNITTESTS)
return "h3-24";
#else
return "h3";
#endif
return H3VERSION;
default:
return ""; /* bad */
}