Merge branch 'v0.22.x'

This commit is contained in:
Max Kellermann
2021-05-17 19:33:15 +02:00
18 changed files with 314 additions and 102 deletions

View File

@@ -423,6 +423,10 @@ CurlInputStream::InitEasy()
request->SetOption(CURLOPT_MAXREDIRS, 5L);
request->SetOption(CURLOPT_FAILONERROR, 1L);
/* this option eliminates the probe request when
username/password are specified */
request->SetOption(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
if (proxy != nullptr)
request->SetOption(CURLOPT_PROXY, proxy);