opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1215: modify original url variable so error messages show the right one

Browse Source
This commit is contained in:
Ansgar Becker
2020-11-13 17:19:17 +01:00
parent 7fe1a58a8e
commit e04d0ee783
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/apphelpers.pas
View File

@ -3312,7 +3312,6 @@ var
UserAgent, OS: String; UserAgent, OS: String;
HttpStatus: Integer; HttpStatus: Integer;
ContentChunk: UTF8String; ContentChunk: UTF8String;
InsecureUrl: String;
begin begin
DoStore := False; DoStore := False;
if MainForm.IsWine then if MainForm.IsWine then
@ -3332,9 +3331,9 @@ begin
UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0); UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0);
if (not Assigned(UrlHandle)) and FURL.StartsWith('https:', true) then begin if (not Assigned(UrlHandle)) and FURL.StartsWith('https:', true) then begin
// Try again without SSL. See issue #65 and #1209 // Try again without SSL. See issue #65 and #1209
InsecureUrl := ReplaceRegExpr('^https:', FURL, 'http:');
MainForm.LogSQL(f_('Could not open %s (%s) - trying again without SSL...', [FURL, SysErrorMessage(Windows.GetLastError)]), lcError); MainForm.LogSQL(f_('Could not open %s (%s) - trying again without SSL...', [FURL, SysErrorMessage(Windows.GetLastError)]), lcError);
UrlHandle := InternetOpenURL(NetHandle, PChar(InsecureUrl), nil, 0, INTERNET_FLAG_RELOAD, 0); FURL := ReplaceRegExpr('^https:', FURL, 'http:');
UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0);
end; end;
if not Assigned(UrlHandle) then begin if not Assigned(UrlHandle) then begin
raise Exception.CreateFmt(_('Could not open %s (%s)'), [FURL, SysErrorMessage(Windows.GetLastError)]); raise Exception.CreateFmt(_('Could not open %s (%s)'), [FURL, SysErrorMessage(Windows.GetLastError)]);