Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTTPS support for TPicUpload #1

Merged
merged 2 commits into from Sep 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions TPicUpload/TPUMain.dfm
Expand Up @@ -2035,6 +2035,7 @@ object FormTPMain: TFormTPMain
end
end
object IdHTTP1: TIdHTTP
IOHandler = SSLIOHandler
AllowCookies = True
ProxyParams.BasicAuthentication = False
ProxyParams.ProxyPort = 0
Expand All @@ -2055,4 +2056,14 @@ object FormTPMain: TFormTPMain
Left = 584
Top = 192
end
object SSLIOHandler: TIdSSLIOHandlerSocketOpenSSL
MaxLineAction = maException
Port = 0
DefaultPort = 0
SSLOptions.Mode = sslmUnassigned
SSLOptions.VerifyMode = []
SSLOptions.VerifyDepth = 0
Left = 552
Top = 152
end
end
3 changes: 2 additions & 1 deletion TPicUpload/TPUMain.pas
Expand Up @@ -26,7 +26,7 @@ interface
IdURI, IdException, IdExceptionCore, IdStack,
ComObj, JvExControls, JvExStdCtrls, JvListBox, JvDriveCtrls, JvCombobox,
JvBaseDlg, JvBrowseFolder, Mask, JvExMask, JvToolEdit,
FileCtrl;
FileCtrl, IdIOHandlerStack, IdSSL, IdSSLOpenSSL;

type
TFormTPMain = class(TForm)
Expand Down Expand Up @@ -100,6 +100,7 @@ TFormTPMain = class(TForm)
NewFolderDescription: TMemo;
UploadButton: TButton;
DeleteResizedPhotosAfterUpload: TCheckBox;
SSLIOHandler: TIdSSLIOHandlerSocketOpenSSL;
procedure FileCheckListDblClick(Sender: TObject);
procedure ImageViewerProgress(Sender: TObject; Stage: TProgressStage;
PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string);
Expand Down
6 changes: 3 additions & 3 deletions TPicUpload/TPicUpload.ini-dst
@@ -1,10 +1,10 @@
# TPicUpload.ini
# Kommentare werden mit Rauten versehen
# Die Reihenfolge der Internetseiten kann durch die Nummerierung ge�ndert werden.
# Die Reihenfolge der Internetseiten kann durch die Nummerierung geändert werden.

[Sites]
Site1=http://www.mvecho.de
#Site2=http://www.foddoos.de
Site1=https://www.mvecho.de
#Site2=
#Site3=
#Site4=
#Site5=
Expand Down
9 changes: 6 additions & 3 deletions TPicUpload/TPicUpload.iss
Expand Up @@ -10,10 +10,10 @@ AppVerName=TPicUpload
AppCopyright=Copyright (C) 2004-2005 Thorsten Schroff
DefaultDirName={pf}\TPicUpload
DefaultGroupName=TPicUpload
LicenseFile=D:\Delphi\TPicUpload\gnu-gpl-tpicupload.txt
LicenseFile=gnu-gpl-tpicupload.txt
DisableStartupPrompt=yes
DisableReadyMemo=yes
OutputDir=D:\Web\Cargobay
OutputDir=..\..\Cargobay
OutputBaseFilename=Setup-TPicUpload-�RevMitPunkt�
AppVersion=�RevMitPunkt�
ChangesAssociations=no
Expand All @@ -29,7 +29,10 @@ WizardSmallImageFile=compiler:WIZMODERNSMALLIMAGE-IS.BMP
; root (Source: "TPicUpload\*"; DestDir: "{app}")
Source: "TPicUpload.exe"; DestDir: "{app}";
Source: "TPicUpload.ini-dst"; DestDir: "{app}"; DestName: "TPicUpload.ini"; Flags: onlyifdoesntexist uninsneveruninstall;
Source: "D:\Web\Cargobay\TPicUpload_Info.html"; DestDir: "{app}";
Source: "..\openssl\openssl-1.0.2o-i386-win32\libeay32.dll"; DestDir: "{app}";
Source: "..\openssl\openssl-1.0.2o-i386-win32\ssleay32.dll"; DestDir: "{app}";
Source: "..\openssl\openssl-1.0.2o-i386-win32\OpenSSL License.txt"; DestDir: "{app}";
Source: "..\..\Cargobay\TPicUpload_Info.html"; DestDir: "{app}";
Source: "icon_selected.bmp"; DestDir: "{app}";
Source: "icon_unselected.bmp"; DestDir: "{app}";
; source (Source: "TPicUpload\sources\*"; DestDir: {app}")
Expand Down
3 changes: 3 additions & 0 deletions rev/TPicUpload.rev.txt
Expand Up @@ -101,6 +101,9 @@ Features:
DeleteAfterUpload=0
DeleteOriginalsAfterUpload=0

Rev 1.043beta (08.09.19) Thorsten Schroff

Neu: HTTPS-Unterst�tzung per OpenSSL

Rev 1.042 (30.03.11) Thorsten Schroff

Expand Down