Some more minor tweaks for new release

LongDirtyAnimAlf · Mar 7, 2018 · d5015a4 · d5015a4
1 parent b4a6bf1
commit d5015a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/fpcuplibcurl.pas b/fpcuplibcurl.pas
@@ -826,6 +826,10 @@ function LoadCurlLibrary:boolean;
     {$endif}
     if libcurl = NilHandle then libcurl:= LoadLibrary(External_library+'.'+SharedSuffix+'.4');
     if libcurl = NilHandle then libcurl:= LoadLibrary(External_library+'.'+SharedSuffix+'.3');
+
+    if libcurl = NilHandle then libcurl:= LoadLibrary(External_library+'-gnutls.'+SharedSuffix+'.4');
+    if libcurl = NilHandle then libcurl:= LoadLibrary(External_library+'-gnutls.'+SharedSuffix+'.3');
+
     if libcurl = NilHandle then libcurl:= LoadLibrary(External_library+'.'+SharedSuffix+'.0');
 
     if (libcurl <> NilHandle) then

diff --git a/fpcuputil.pas b/fpcuputil.pas
@@ -63,10 +63,8 @@ interface
   Classes, SysUtils, strutils,
   typinfo,
   zipper,
-  {$ifdef ENABLENATIVE}
-  fphttpclient,
   //sslsockets, fpopenssl,
-  {$endif}
+  fphttpclient, // for github api file list and others
   //fpftpclient,
   eventlog;
 
@@ -1207,14 +1205,14 @@ function Download(UseWget:boolean; URL, TargetFile: string; HTTPProxyHost: strin
 
 procedure GetGitHubFileList(aURL:string;fileurllist:TStringList);
 var
-  Http: TFPHttpClient;
+  Http: TFPHTTPClient;
   Content : string;
   Json : TJSONData;
   JsonObject : TJSONObject;
   JsonArray: TJSONArray;
   i,j:integer;
 begin
-  Http:=TFPHttpClient.Create(Nil);
+  Http:=TFPHTTPClient.Create(Nil);
   try
      Http.AddHeader('User-Agent',USERAGENT);
      Http.AllowRedirect:=true;