morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

journal-upload: split-out update_content_encoding_header()

Browse Source 
No functional change, just refactoring and preparation for later commit.
This commit is contained in:
Yu Watanabe
2025-02-11 17:13:13 +09:00
parent c259c9e253
commit 04b096400b
1 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/journal-remote/journal-upload.c
View File

@@ -495,6 +495,65 @@ static void destroy_uploader(Uploader *u) {
}
#if LIBCURL_VERSION_NUM >= 0x075300
static int update_content_encoding_header(Uploader *u, const CompressionConfig *cc) {
bool update_header = false;
assert(u);
if (cc == u->compression)
return 0; /* Already picked the algorithm. Let's shortcut. */
if (cc) {
_cleanup_free_ char *header = strjoin("Content-Encoding: ", compression_lowercase_to_string(cc->algorithm));
if (!header)
return log_oom();
/* First, try to update existing Content-Encoding header. */
bool found = false;
for (struct curl_slist *l = u->header; l; l = l->next)
if (startswith(l->data, "Content-Encoding:")) {
free_and_replace(l->data, header);
found = true;
break;
}
/* If Content-Encoding header is not found, append new one. */
if (!found) {
struct curl_slist *l = curl_slist_append(u->header, header);
if (!l)
return log_oom();
u->header = l;
}
update_header = true;
} else
/* Remove Content-Encoding header. */
for (struct curl_slist *l = u->header, *prev = NULL; l; prev = l, l = l->next)
if (startswith(l->data, "Content-Encoding:")) {
if (prev)
prev->next = TAKE_PTR(l->next);
else
u->header = TAKE_PTR(l->next);
curl_slist_free_all(l);
update_header = true;
break;
}
if (update_header) {
CURLcode code;
easy_setopt(u->easy, CURLOPT_HTTPHEADER, u->header, LOG_WARNING, return -EXFULL);
}
u->compression = cc;
if (cc)
log_debug("Using compression algorithm %s with compression level %i.", compression_lowercase_to_string(cc->algorithm), cc->level);
else
log_debug("Disabled compression algorithm.");
return 0;
}
static int update_content_encoding(Uploader *u, const char *accept_encoding) {
int r;
@@ -522,31 +581,7 @@ static int update_content_encoding(Uploader *u, const char *accept_encoding) {
if (!cc)
continue; /* The specified algorithm is not enabled. */
_cleanup_free_ char *header = strjoin("Content-Encoding: ", compression_lowercase_to_string(cc->algorithm));
if (!header)
return log_oom();
/* First, update existing Content-Encoding header. */
bool found = false;
for (struct curl_slist *l = u->header; l; l = l->next)
if (startswith(l->data, "Content-Encoding:")) {
free_and_replace(l->data, header);
found = true;
break;
}
/* If Content-Encoding header is not found, append new one. */
if (!found) {
struct curl_slist *l = curl_slist_append(u->header, header);
if (!l)
return log_oom();
u->header = l;
}
CURLcode code;
easy_setopt(u->easy, CURLOPT_HTTPHEADER, u->header, LOG_ERR, return -EXFULL);
u->compression = cc;
return 0;
return update_content_encoding_header(u, cc);
}
}
#endif