lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 22.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2018-12-16 17:14:58 +01:00
parent 665f64a933
commit cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/win-update/updater/updater.cpp
View file

@ -324,6 +324,8 @@ struct update_t {
memcpy(hash, from.hash, sizeof(hash));
memcpy(downloadhash, from.downloadhash, sizeof(downloadhash));
memcpy(my_hash, from.my_hash, sizeof(my_hash));
return *this;
}
};
@ -356,11 +358,11 @@ bool DownloadWorkerThread()
WinHttpSetOption(hSession, WINHTTP_OPTION_SECURE_PROTOCOLS,
(LPVOID)&tlsProtocols, sizeof(tlsProtocols));
HttpHandle hConnect = WinHttpConnect(hSession, L"obsproject.com",
HttpHandle hConnect = WinHttpConnect(hSession, L"cdn-fastly.obsproject.com",
INTERNET_DEFAULT_HTTPS_PORT, 0);
if (!hConnect) {
downloadThreadFailure = true;
Status(L"Update failed: Couldn't connect to obsproject.com");
Status(L"Update failed: Couldn't connect to cdn-fastly.obsproject.com");
return false;
}
@ -612,7 +614,7 @@ static inline bool has_str(const char *file, const char *str)
#define UTF8ToWideBuf(wide, utf8) UTF8ToWide(wide, _countof(wide), utf8)
#define WideToUTF8Buf(utf8, wide) WideToUTF8(utf8, _countof(utf8), wide)
#define UPDATE_URL L"https://obsproject.com/update_studio"
#define UPDATE_URL L"https://cdn-fastly.obsproject.com/update_studio"
static bool AddPackageUpdateFiles(json_t *root, size_t idx,
const wchar_t *tempPath)
@ -748,7 +750,7 @@ static void UpdateWithPatchIfAvailable(const char *name, const char *hash,
wchar_t sourceURL[1024];
wchar_t patchHashStr[BLAKE2_HASH_STR_LENGTH];
if (strncmp(source, "https://obsproject.com/", 23) != 0)
if (strncmp(source, "https://cdn-fastly.obsproject.com/", 34) != 0)
return;
string patchPackageName = name;
@ -957,10 +959,10 @@ static bool UpdateVS2017Redists(json_t *root)
WinHttpSetOption(hSession, WINHTTP_OPTION_SECURE_PROTOCOLS,
(LPVOID)&tlsProtocols, sizeof(tlsProtocols));
HttpHandle hConnect = WinHttpConnect(hSession, L"obsproject.com",
HttpHandle hConnect = WinHttpConnect(hSession, L"cdn-fastly.obsproject.com",
INTERNET_DEFAULT_HTTPS_PORT, 0);
if (!hConnect) {
Status(L"Update failed: Couldn't connect to obsproject.com");
Status(L"Update failed: Couldn't connect to cdn-fastly.obsproject.com");
return false;
}
@ -981,7 +983,7 @@ static bool UpdateVS2017Redists(json_t *root)
: L"vc2017redist_x64.exe";
wstring sourceURL;
sourceURL += L"https://obsproject.com/downloads/";
sourceURL += L"https://cdn-fastly.obsproject.com/downloads/";
sourceURL += file;
wstring destPath;