diff options
| author | dimir <vladimir.levijev@zabbix.com> | 2022-11-05 18:23:19 +0300 |
|---|---|---|
| committer | dimir <vladimir.levijev@zabbix.com> | 2022-11-09 14:53:15 +0300 |
| commit | 1a0afc4a406235bf775d7d2bcacc0134726f5bfa (patch) | |
| tree | 5b7c99935291fada4359da3d054ac57d50527b38 | |
| parent | 06825c53e5dda22a832854a3b2d8ed47d49cb4fd (diff) | |
.......... [ZBX-21765] removed Accept-Encoding HTTP header from a web scenario step request
Merge from development branch feature/ZBX-21765-6.0
* commit '7c48f2897854c693cb6b887fffc6feb109cf305c':
.D........ [ZBX-21765] add ChangeLog entry
........S. [ZBX-21765] do not send Accept-Encoding HTTP header in a web scenario step by default
(cherry picked from commit 0071e0310cfce8ef54791d754f363f599a059a28)
(cherry picked from commit 9dd5db1ee86d37848669057413753f6ec2186393)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21765 | 1 | ||||
| -rw-r--r-- | src/zabbix_server/httppoller/httptest.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21765 b/ChangeLog.d/bugfix/ZBX-21765 new file mode 100644 index 00000000000..82f62eb568e --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21765 @@ -0,0 +1 @@ +........S. [ZBX-21765] removed HTTP header "Accept-Encoding" from defaults in a web scenario step request (dimir) diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index 9b57d866836..0a52b61b395 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -662,8 +662,7 @@ static void process_httptest(DC_HOST *host, zbx_httptest_t *httptest, int *delay if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_PROXY, httptest->httptest.http_proxy)) || CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, "")) || CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_USERAGENT, httptest->httptest.agent)) || - CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_ERRORBUFFER, errbuf)) || - CURLE_OK != (err = curl_easy_setopt(easyhandle, ZBX_CURLOPT_ACCEPT_ENCODING, ""))) + CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_ERRORBUFFER, errbuf))) { err_str = zbx_strdup(err_str, curl_easy_strerror(err)); goto clean; |