timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-20 10:44:37 +10:00
Code Issues Packages Projects Releases Wiki Activity

Proper support for HTTPS in DownloadFile

Browse Source 
Use secure connection right from the beginning.
This commit is contained in:
ge0rdi
2020-09-07 19:14:54 +02:00
parent 96423b8918
commit a422105c61
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Lib/DownloadHelper.cpp
View File

@@ -211,7 +211,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
int time=GetTickCount(); int time=GetTickCount();
if (pProgress) if (pProgress)
pProgress->SetText(LoadStringEx(IDS_PROGRESS_CONNECT)); pProgress->SetText(LoadStringEx(IDS_PROGRESS_CONNECT));
HINTERNET hConnect=InternetConnect(hInternet,host,INTERNET_DEFAULT_HTTP_PORT,L"",L"",INTERNET_SERVICE_HTTP,0,0); HINTERNET hConnect=InternetConnect(hInternet,host,components.nPort,L"",L"",INTERNET_SERVICE_HTTP,0,0);
if (hConnect) if (hConnect)
{ {
if (pProgress && pProgress->IsCanceled()) if (pProgress && pProgress->IsCanceled())
@@ -219,7 +219,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
const wchar_t *accept[]={L"*/*",NULL}; const wchar_t *accept[]={L"*/*",NULL};
if (res==DOWNLOAD_OK) if (res==DOWNLOAD_OK)
{ {
HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,bAcceptCached?0:INTERNET_FLAG_RELOAD,0); HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,((components.nScheme==INTERNET_SCHEME_HTTPS)?INTERNET_FLAG_SECURE:0)|(bAcceptCached?0:INTERNET_FLAG_RELOAD),0);
if (hRequest) if (hRequest)
{ {
if (pProgress && pProgress->IsCanceled()) if (pProgress && pProgress->IsCanceled())