Issue #2167: remove fallback to insecure http calls when https failed

This commit is contained in:
Ansgar Becker
2025-09-17 18:48:25 +02:00
parent 8beb135a50
commit 0434c2dc79
2 changed files with 2 additions and 15 deletions

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2025-05-22 21:39+0200\n"
"PO-Revision-Date: 2025-09-17 18:46+0200\n"
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
"Language: en\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.6\n"
"X-Generator: Poedit 3.7\n"
#. AboutBox..Caption
#: about.dfm:5
@@ -4331,13 +4331,6 @@ msgstr "Save new %s?"
msgid "Could not open %s (%s)"
msgstr "Could not open %s (%s)"
msgid "Could not open %s (%s) - trying again without SSL..."
msgstr "Could not open %s (%s) - trying again without SSL..."
#: helpers.pas:2829
msgid "Server did not send required \"Content-Length\" header: %s"
msgstr "Server did not send required \"Content-Length\" header: %s"
#: helpers.pas:2837
msgid "Got HTTP status %d from %s"
msgstr "Got HTTP status %d from %s"

View File

@@ -3533,12 +3533,6 @@ begin
FLastContent := '';
try
UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0);
if (not Assigned(UrlHandle)) and FURL.StartsWith('https:', true) then begin
// Try again without SSL. See issue #65 and #1209
MainForm.LogSQL(f_('Could not open %s (%s) - trying again without SSL...', [FURL, SysErrorMessage(GetLastError)]), lcError);
FURL := ReplaceRegExpr('^https:', FURL, 'http:');
UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0);
end;
if not Assigned(UrlHandle) then begin
raise Exception.CreateFmt(_('Could not open %s (%s)'), [FURL, SysErrorMessage(GetLastError)]);
end;