paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-25 00:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fphttpclient allow to override supported protocols from url

Browse Source
This commit is contained in:
Andrew Haines 2022-12-18 16:53:40 -05:00
parent d1f999100b
commit bc17da25e1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-web/src/base/fphttpclient.pp
View File

@ -141,6 +141,8 @@ Type
Function ParseStatusLine(AStatusLine : String) : Integer;
// Construct server URL for use in request line.
function GetServerURL(URI: TURI): String;
// Verify protocol is supported
function ProtocolSupported(Protocol: String; out IsSSL: Boolean): Boolean; virtual;
// Read raw data from socket
Function ReadFromSocket(var Buffer; Count: Longint): Longint; virtual;
// Write raw data to socket
@ -719,6 +721,11 @@ procedure TFPCustomHTTPClient.DisconnectFromServer;
begin
FreeAndNil(FSocket);
end;
function TFPCustomHTTPClient.ProtocolSupported(Protocol: String; out IsSSL: Boolean): Boolean;
begin
Result := (Protocol='http') or (Protocol='https');
IsSSL := (Protocol = 'https');
end;
function TFPCustomHTTPClient.ReadFromSocket(var Buffer; Count: Longint): Longint;
begin
@ -1461,9 +1468,8 @@ begin
ResetResponse;
URI:=ParseURI(AURL,False);
p:=LowerCase(URI.Protocol);
If Not ((P='http') or (P='https')) then
If Not ProtocolSupported(p, IsHttps) then
Raise EHTTPClient.CreateFmt(SErrInvalidProtocol,[URI.Protocol]);
IsHttps:=P='https';
HeadersOnly:=CompareText(AMethod,'HEAD')=0;
if FKeepConnection then
DoKeepConnectionRequest(URI,AMethod,Stream,AllowedResponseCodes,HeadersOnly,IsHttps)