Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed default HTTP UserAgent to ShakaPackager/<version> 

Closes #939.
This commit is contained in:
Daniel Cantarín 2021-05-07 14:15:44 -03:00 committed by GitHub
parent 62f37eb3b7
commit 8515a66031
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/file/file.gyp
View File

@ -41,6 +41,7 @@
'../packager.gyp:status', '../packager.gyp:status',
'../third_party/gflags/gflags.gyp:gflags', '../third_party/gflags/gflags.gyp:gflags',
'../third_party/curl/curl.gyp:libcurl', '../third_party/curl/curl.gyp:libcurl',
'../version/version.gyp:version',
], ],
}, },
{ {
@ -61,6 +62,7 @@
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
'../third_party/gflags/gflags.gyp:gflags', '../third_party/gflags/gflags.gyp:gflags',
'../third_party/curl/curl.gyp:libcurl', '../third_party/curl/curl.gyp:libcurl',
'../version/version.gyp:version',
'file', 'file',
], ],
}, },

8
packager/file/http_file.cc
View File

@ -15,6 +15,7 @@
#include "packager/base/strings/string_number_conversions.h" #include "packager/base/strings/string_number_conversions.h"
#include "packager/base/strings/stringprintf.h" #include "packager/base/strings/stringprintf.h"
#include "packager/base/threading/worker_pool.h" #include "packager/base/threading/worker_pool.h"
#include "packager/version/version.h"
DEFINE_string(user_agent, "", DEFINE_string(user_agent, "",
"Set a custom User-Agent string for HTTP requests."); "Set a custom User-Agent string for HTTP requests.");
@ -42,7 +43,6 @@ namespace shaka {
namespace { namespace {
constexpr const char* kBinaryContentType = "application/octet-stream"; constexpr const char* kBinaryContentType = "application/octet-stream";
constexpr const char* kUserAgent = "shaka-packager-http-fetch/1.0";
constexpr const int kMinLogLevelForCurlDebugFunction = 2; constexpr const int kMinLogLevelForCurlDebugFunction = 2;
size_t CurlWriteCallback(char* buffer, size_t size, size_t nmemb, void* user) { size_t CurlWriteCallback(char* buffer, size_t size, size_t nmemb, void* user) {
@ -171,6 +171,9 @@ HttpFile::HttpFile(HttpMethod method,
task_exit_event_(base::WaitableEvent::ResetPolicy::MANUAL, task_exit_event_(base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED) { base::WaitableEvent::InitialState::NOT_SIGNALED) {
static LibCurlInitializer lib_curl_initializer; static LibCurlInitializer lib_curl_initializer;
if (user_agent_.empty()) {
user_agent_ += "ShakaPackager/" + GetPackagerVersion();
}
// We will have at least one header, so use a null header to signal error // We will have at least one header, so use a null header to signal error
// to Open. // to Open.
@ -288,8 +291,7 @@ void HttpFile::SetupRequest() {
} }
curl_easy_setopt(curl, CURLOPT_URL, url_.c_str()); curl_easy_setopt(curl, CURLOPT_URL, url_.c_str());
curl_easy_setopt(curl, CURLOPT_USERAGENT, curl_easy_setopt(curl, CURLOPT_USERAGENT, user_agent_.c_str());
user_agent_.empty() ? kUserAgent : user_agent_.data());
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout_in_seconds_); curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout_in_seconds_);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);