luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

urlapi: remove unused flags argument from Curl_url_set_authority

Browse Source 
The function is only called from a single place (for HTTP/2 server push)
so might as well just assume this fixed option every time.

Closes #13409
This commit is contained in:
Daniel Stenberg 2024-04-18 16:49:10 +02:00
parent 89ce720028
commit 0a25b3e014
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/http2.c
View File

@ -832,7 +832,7 @@ static int set_transfer_url(struct Curl_easy *data,
v = curl_pushheader_byname(hp, HTTP_PSEUDO_AUTHORITY);
if(v) {
uc = Curl_url_set_authority(u, v, CURLU_DISALLOW_USER);
uc = Curl_url_set_authority(u, v);
if(uc) {
rc = 2;
goto fail;

3
lib/urlapi-int.h
View File

@ -28,8 +28,7 @@
size_t Curl_is_absolute_url(const char *url, char *buf, size_t buflen,
bool guess_scheme);
CURLUcode Curl_url_set_authority(CURLU *u, const char *authority,
unsigned int flags);
CURLUcode Curl_url_set_authority(CURLU *u, const char *authority);
#ifdef DEBUGBUILD
CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host,

8
lib/urlapi.c
View File

@ -851,8 +851,8 @@ out:
return uc;
}
CURLUcode Curl_url_set_authority(CURLU *u, const char *authority,
unsigned int flags)
/* used for HTTP/2 server push */
CURLUcode Curl_url_set_authority(CURLU *u, const char *authority)
{
CURLUcode result;
struct dynbuf host;
@ -860,8 +860,8 @@ CURLUcode Curl_url_set_authority(CURLU *u, const char *authority,
DEBUGASSERT(authority);
Curl_dyn_init(&host, CURL_MAX_INPUT_LENGTH);
result = parse_authority(u, authority, strlen(authority), flags,
&host, !!u->scheme);
result = parse_authority(u, authority, strlen(authority),
CURLU_DISALLOW_USER, &host, !!u->scheme);
if(result)
Curl_dyn_free(&host);
else {