Skip to content

Commit 5fafdbf

Browse files
committed
Minor code refactoring to prepare HTTP/2 client support.
Part of S507-051.
1 parent 898dbf7 commit 5fafdbf

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

src/core/aws-client-http_utils.adb

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -642,9 +642,16 @@ package body AWS.Client.HTTP_Utils is
642642
begin
643643
-- Post Data with headers
644644

645-
Send_Common_Post
645+
Set_Common_Post
646646
(Connection, Data, URI, SOAPAction, Content_Type, Headers);
647647

648+
AWS.Headers.Send_Header
649+
(Connection.Socket.all, Connection.F_Headers, End_Block => True);
650+
651+
-- Send message body
652+
653+
Net.Buffered.Write (Connection.Socket.all, Data);
654+
648655
-- Get answer from server
649656

650657
Get_Response
@@ -1245,49 +1252,6 @@ package body AWS.Client.HTTP_Utils is
12451252
end loop;
12461253
end Read_Body;
12471254

1248-
----------------------
1249-
-- Send_Common_Post --
1250-
----------------------
1251-
1252-
procedure Send_Common_Post
1253-
(Connection : in out HTTP_Connection;
1254-
Data : Stream_Element_Array;
1255-
URI : String;
1256-
SOAPAction : String;
1257-
Content_Type : String;
1258-
Headers : Header_List := Empty_Header_List) is
1259-
begin
1260-
Open_Set_Common_Header (Connection, Messages.Post_Token, URI, Headers);
1261-
1262-
if Content_Type /= Client.No_Data then
1263-
Set_Header
1264-
(Connection.F_Headers,
1265-
Messages.Content_Type_Token,
1266-
Content_Type);
1267-
end if;
1268-
1269-
if SOAPAction /= Client.No_Data then
1270-
-- SOAP header
1271-
1272-
Set_Header
1273-
(Connection.F_Headers, Messages.SOAPAction_Token, SOAPAction);
1274-
end if;
1275-
1276-
-- Send message Content_Length
1277-
1278-
Set_Header
1279-
(Connection.F_Headers,
1280-
Messages.Content_Length_Token,
1281-
Utils.Image (Stream_Element_Offset'(Data'Length)));
1282-
1283-
AWS.Headers.Send_Header
1284-
(Connection.Socket.all, Connection.F_Headers, End_Block => True);
1285-
1286-
-- Send message body
1287-
1288-
Net.Buffered.Write (Connection.Socket.all, Data);
1289-
end Send_Common_Post;
1290-
12911255
------------------
12921256
-- Send_Request --
12931257
------------------
@@ -1516,6 +1480,42 @@ package body AWS.Client.HTTP_Utils is
15161480
end if;
15171481
end Set_Authentication_Header;
15181482

1483+
---------------------
1484+
-- Set_Common_Post --
1485+
---------------------
1486+
1487+
procedure Set_Common_Post
1488+
(Connection : in out HTTP_Connection;
1489+
Data : Stream_Element_Array;
1490+
URI : String;
1491+
SOAPAction : String;
1492+
Content_Type : String;
1493+
Headers : Header_List := Empty_Header_List) is
1494+
begin
1495+
Open_Set_Common_Header (Connection, Messages.Post_Token, URI, Headers);
1496+
1497+
if Content_Type /= Client.No_Data then
1498+
Set_Header
1499+
(Connection.F_Headers,
1500+
Messages.Content_Type_Token,
1501+
Content_Type);
1502+
end if;
1503+
1504+
if SOAPAction /= Client.No_Data then
1505+
-- SOAP header
1506+
1507+
Set_Header
1508+
(Connection.F_Headers, Messages.SOAPAction_Token, SOAPAction);
1509+
end if;
1510+
1511+
-- Send message Content_Length
1512+
1513+
Set_Header
1514+
(Connection.F_Headers,
1515+
Messages.Content_Length_Token,
1516+
Utils.Image (Stream_Element_Offset'(Data'Length)));
1517+
end Set_Common_Post;
1518+
15191519
----------------
15201520
-- Set_Header --
15211521
----------------

src/core/aws-client-http_utils.ads

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ package AWS.Client.HTTP_Utils is
131131
Headers : Header_List := Empty_Header_List);
132132
-- Only used by Internal_Post
133133

134-
procedure Send_Common_Post
134+
procedure Set_Common_Post
135135
(Connection : in out HTTP_Connection;
136136
Data : Stream_Element_Array;
137137
URI : String;

0 commit comments

Comments
 (0)