From 68ed01ed6c614f9a584eae937ef0c0abc2f9b395 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 1 May 2021 08:49:25 +0000
Subject: [PATCH] * Merging revisions r49276,r49277 from trunk:    
 ------------------------------------------------------------------------    
 r49276 | michael | 2021-04-27 13:16:58 +0200 (Tue, 27 Apr 2021) | 1 line

    * Make some properties public
    ------------------------------------------------------------------------
    r49277 | michael | 2021-04-27 13:30:53 +0200 (Tue, 27 Apr 2021) | 1 line

    * Forgot to include sslbase
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@49300 -
---
 packages/fcl-web/src/base/custhttpapp.pp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/fcl-web/src/base/custhttpapp.pp b/packages/fcl-web/src/base/custhttpapp.pp
index 58bb5a6842..d51a9efff1 100644
--- a/packages/fcl-web/src/base/custhttpapp.pp
+++ b/packages/fcl-web/src/base/custhttpapp.pp
@@ -21,7 +21,7 @@ unit custhttpapp;
 Interface
 
 uses
-  Classes, SysUtils, httpdefs, custweb, ssockets,  fphttpserver;
+  Classes, SysUtils, httpdefs, custweb, ssockets,  fphttpserver, sslbase;
 
 Type
   TCustomHTTPApplication = Class;
@@ -76,7 +76,6 @@ Type
     Procedure InitResponse(AResponse : TResponse); override;
     function WaitForRequest(out ARequest : TRequest; out AResponse : TResponse) : boolean; override;
     Function CreateServer : TEmbeddedHttpServer; virtual;
-    Property HTTPServer : TEmbeddedHttpServer Read FServer;
   Public
     Procedure Run; override;
     Procedure Terminate; override;
@@ -104,6 +103,8 @@ Type
     Property UseSSL : Boolean Read GetUseSSL Write SetUseSSL;
     // HostName to use when using SSL
     Property HostName : String Read GetHostName Write SetHostName;
+    // Access to server so you can set certificate data
+    Property HTTPServer : TEmbeddedHttpServer Read FServer;
   end;
 
   { TCustomHTTPApplication }
@@ -111,6 +112,7 @@ Type
   TCustomHTTPApplication = Class(TCustomWebApplication)
   private
     procedure FakeConnect;
+    function GetCertificateData: TCertificateData;
     function GetHostName: String;
     function GetIdle: TNotifyEvent;
     function GetIDleTimeOut: Cardinal;
@@ -133,9 +135,10 @@ Type
     procedure SetUseSSL(AValue: Boolean);
   protected
     function InitializeWebHandler: TWebHandler; override;
-    Function HTTPHandler : TFPHTTPServerHandler;
   Public
     procedure Terminate; override;
+    // Access to HTTP handler
+    Function HTTPHandler : TFPHTTPServerHandler;
     Property Address : string Read GetAddress Write SetAddress;
     Property Port : Word Read GetPort Write SetPort Default 80;
     // Max connections on queue (for Listen call)
@@ -154,6 +157,8 @@ Type
     Property UseSSL : Boolean Read GetUseSSL Write SetUseSSL;
     // Hostname to use when using SSL
     Property HostName : String Read GetHostName Write SetHostName;
+    // Access to certificate data
+    Property CertificateData : TCertificateData Read GetCertificateData;
   end;
 
 
@@ -296,6 +301,11 @@ begin
   end
 end;
 
+function TCustomHTTPApplication.GetCertificateData: TCertificateData;
+begin
+  Result:=HTTPHandler.HTTPServer.CertificateData;
+end;
+
 function TCustomHTTPApplication.GetHostName: String;
 begin
   Result:=HTTPHandler.HostName;