pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Small improvement to open_ssl.pas

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5656 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2017-01-15 19:12:48 +00:00
parent f092ed6dd7
commit 815f7dfab0
4 changed files with 77 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/lazautoupdate/latest_stable/open_ssl.pas
View File

@ -5,7 +5,7 @@ unit open_ssl;
interface
uses
// Built-in: fphttpclient
// Built-in 'fphttpclient' replaces 'lazautoupdate_httpclient' for general use
Classes, SysUtils,lazautoupdate_httpclient,LazFileUtils,FileUtil,zipper;
function CheckForOpenSSL:Boolean;
@ -15,9 +15,11 @@ implementation
const
{$ifdef win64}
cOpenSSLURL = 'http://packages.lazarus-ide.org/openssl-1.0.2j-x64_86-win64.zip';
cAltOpenSSLURL = 'http://indy.fulgan.com/SSL/openssl-1.0.2j-i386-win32.zip';
{$endif}
{$ifdef win32}
cOpenSSLURL = 'http://packages.lazarus-ide.org/openssl-1.0.2j-i386-win32.zip';
cAltOpenSSLURL = 'http://indy.fulgan.com/SSL/openssl-1.0.2j-x64_86-win64.zip';
{$endif}
Var FHTTPClient:TFPHttpClient;
@ -44,7 +46,14 @@ begin
ZipFile := ExtractFilePath(ParamStr(0)) + ExtractFileName(cOpenSSLURL);
try
FHTTPClient.Get(cOpenSSLURL, ZipFile);
If (FHTTPClient.ResponseStatusCode <> 200) then
begin
ZipFile := ExtractFilePath(ParamStr(0)) + ExtractFileName(cAltOpenSSLURL);
FHTTPClient.Get(cOpenSSLURL, ZipFile);
end;
except
// Just leave
Exit;
end;
if FileExistsUTF8(ZipFile) then

161
components/lazautoupdate/latest_stable/testapp/testapp.lps
View File

@ -26,24 +26,34 @@
<LoadedDesigner Value="True"/>
</Unit1>
<Unit2>
<Filename Value="..\lazautoupdate_httpclient.pas"/>
<Filename Value="..\open_ssl.pas"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<CursorPos X="28" Y="15"/>
<UsageCount Value="18"/>
<EditorIndex Value="1"/>
<WindowIndex Value="1"/>
<TopLine Value="34"/>
<CursorPos X="5" Y="81"/>
<UsageCount Value="21"/>
<Loaded Value="True"/>
</Unit2>
<Unit3>
<Filename Value="..\ulazautoupdate.pas"/>
<Filename Value="..\lazautoupdate_httpclient.pas"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<CursorPos X="97" Y="12"/>
<UsageCount Value="18"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
<Filename Value="..\ulazautoupdate.pas"/>
<WindowIndex Value="1"/>
<TopLine Value="28"/>
<CursorPos X="3" Y="746"/>
<TopLine Value="1050"/>
<CursorPos X="37" Y="1061"/>
<ExtraEditorCount Value="2"/>
<ExtraEditor1>
<EditorIndex Value="3"/>
<TopLine Value="1135"/>
<CursorPos X="11" Y="1225"/>
<TopLine Value="1137"/>
<CursorPos X="11" Y="1227"/>
</ExtraEditor1>
<ExtraEditor2>
<EditorIndex Value="-1"/>
@ -53,58 +63,58 @@
</ExtraEditor2>
<UsageCount Value="18"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
</Unit4>
<Unit5>
<Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/>
<UnitName Value="Lazarus"/>
<EditorIndex Value="-1"/>
<TopLine Value="101"/>
<CursorPos Y="154"/>
<UsageCount Value="10"/>
</Unit4>
<Unit5>
</Unit5>
<Unit6>
<Filename Value="..\..\..\..\applications\foobot\monitor\foobot_sensors.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="76"/>
<CursorPos X="75" Y="77"/>
<UsageCount Value="10"/>
</Unit5>
<Unit6>
</Unit6>
<Unit7>
<Filename Value="..\..\..\..\applications\foobot\foobot.lpr"/>
<EditorIndex Value="-1"/>
<CursorPos Y="21"/>
<UsageCount Value="10"/>
</Unit6>
<Unit7>
</Unit7>
<Unit8>
<Filename Value="C:\trunklatest\lazarus\lcl\asyncprocess.pp"/>
<UnitName Value="AsyncProcess"/>
<EditorIndex Value="-1"/>
<TopLine Value="22"/>
<CursorPos X="31" Y="31"/>
<UsageCount Value="12"/>
</Unit7>
<Unit8>
</Unit8>
<Unit9>
<Filename Value="C:\trunklatest\lazarus\components\lazutils\utf8process.pp"/>
<UnitName Value="UTF8Process"/>
<EditorIndex Value="-1"/>
<CursorPos X="3" Y="85"/>
<UsageCount Value="12"/>
</Unit8>
<Unit9>
</Unit9>
<Unit10>
<Filename Value="..\..\..\..\applications\foobot\monitor\umainform.pas"/>
<EditorIndex Value="1"/>
<TopLine Value="25"/>
<CursorPos X="25" Y="55"/>
<UsageCount Value="16"/>
<Loaded Value="True"/>
</Unit9>
<Unit10>
</Unit10>
<Unit11>
<Filename Value="C:\trunklatest\fpc\rtl\objpas\sysutils\osutilsh.inc"/>
<EditorIndex Value="-1"/>
<CursorPos X="10" Y="20"/>
<UsageCount Value="11"/>
</Unit10>
<Unit11>
</Unit11>
<Unit12>
<Filename Value="..\versionsupport.pas"/>
<UnitName Value="VersionSupport"/>
<EditorIndex Value="4"/>
@ -112,139 +122,96 @@
<CursorPos X="71" Y="44"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit11>
<Unit12>
<Filename Value="..\open_ssl.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="1"/>
<WindowIndex Value="1"/>
<TopLine Value="22"/>
<CursorPos X="25" Y="35"/>
<UsageCount Value="21"/>
<Loaded Value="True"/>
</Unit12>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<General>
<ActiveWindowIndexAtStart Value="1"/>
</General>
<JumpHistory Count="21" HistoryIndex="20">
<Position1>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="182" Column="58" TopLine="154"/>
<Caret Line="913" Column="35" TopLine="875"/>
</Position1>
<Position2>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="913" Column="35" TopLine="875"/>
<Caret Line="123" Column="52" TopLine="115"/>
</Position2>
<Position3>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="123" Column="52" TopLine="115"/>
<Caret Line="56" Column="3" TopLine="33"/>
</Position3>
<Position4>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="56" Column="3" TopLine="33"/>
<Caret Line="165" Column="36" TopLine="147"/>
</Position4>
<Position5>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="165" Column="36" TopLine="147"/>
<Caret Line="913" Column="38" TopLine="891"/>
</Position5>
<Position6>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="913" Column="38" TopLine="891"/>
<Caret Line="1074" Column="38" TopLine="1053"/>
</Position6>
<Position7>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="1074" Column="38" TopLine="1053"/>
<Caret Line="182" Column="51" TopLine="159"/>
</Position7>
<Position8>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="182" Column="51" TopLine="159"/>
<Caret Line="935" TopLine="900"/>
</Position8>
<Position9>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="935" TopLine="900"/>
<Caret Line="1059" TopLine="1037"/>
</Position9>
<Position10>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="1059" TopLine="1037"/>
<Caret Line="1974" TopLine="1945"/>
</Position10>
<Position11>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="1974" TopLine="1945"/>
<Caret Line="54" Column="18" TopLine="44"/>
</Position11>
<Position12>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="54" Column="18" TopLine="44"/>
<Caret Line="935" Column="89" TopLine="901"/>
</Position12>
<Position13>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="935" Column="89" TopLine="901"/>
</Position13>
<Position14>
<Filename Value="umainform.pas"/>
<Caret Line="108" Column="43" TopLine="88"/>
</Position13>
<Position14>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="51" Column="20" TopLine="35"/>
</Position14>
<Position15>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="51" Column="20" TopLine="35"/>
<Caret Line="914" TopLine="893"/>
</Position15>
<Position16>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="914" TopLine="893"/>
<Caret Line="1076" TopLine="1039"/>
</Position16>
<Position17>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="1076" TopLine="1039"/>
<Caret Line="180" Column="33" TopLine="157"/>
</Position17>
<Position18>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="180" Column="33" TopLine="157"/>
<Filename Value="umainform.pas"/>
<Caret Line="76" Column="3" TopLine="74"/>
</Position18>
<Position19>
<Filename Value="umainform.pas"/>
<Caret Line="76" Column="3" TopLine="74"/>
<Caret Line="129" Column="3" TopLine="92"/>
</Position19>
<Position20>
<Filename Value="umainform.pas"/>
<Caret Line="129" Column="3" TopLine="92"/>
<Caret Line="122" Column="3" TopLine="92"/>
</Position20>
<Position21>
<Filename Value="umainform.pas"/>
<Caret Line="122" Column="3" TopLine="92"/>
<Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="56" Column="27" TopLine="28"/>
</Position21>
<Position22>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="8" Column="25"/>
</Position22>
<Position23>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="6" Column="43"/>
</Position23>
<Position24>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="8" Column="37"/>
</Position24>
<Position25>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="25" Column="26" TopLine="5"/>
</Position25>
<Position26>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="8" Column="47"/>
</Position26>
<Position27>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="71" Column="23" TopLine="32"/>
</Position27>
<Position28>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="68" Column="27" TopLine="34"/>
</Position28>
<Position29>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="48" Column="6" TopLine="25"/>
</Position29>
<Position30>
<Filename Value="..\open_ssl.pas"/>
<Caret Line="29" Column="18"/>
</Position30>
</JumpHistory>
</ProjectSession>
</CONFIG>

4
components/lazautoupdate/latest_stable/ulazautoupdate.pas
View File

@ -50,9 +50,11 @@ const
// [updatepath,projectname,filename]
// C_GITHUBFILE_URL = 'https://raw.github.com/%s/%s/master/%s/%s';
C_GITHUBFILE_URL = 'https://raw.github.com/%s/%s/%s/%s/%s';
C_GITHUBFILE_URL_UPDATES = 'https://raw.github.com/%s/%s/%s/%s/%s/%s';
// https://raw.github.com/<username>/<repo>/<branch>/some_directory/file
// GitHubUserName,GitHubProjectName,updatepath,filename
C_GITHUBFILE_URL_UPDATES = 'https://raw.github.com/%s/%s/%s/%s/%s/%s';
C_TLazAutoUpdateComponentVersion = '0.2.3';
C_LAUTRayINI = 'lauimport.ini';

BIN
components/lazautoupdate/latest_stable/updates/lazautoupdate.zip
View File

Binary file not shown.