Merge branch 'po/fix-http2-go-away' into 'master'

We don't want to fail when sending a GoAway frame.

See merge request eng/toolchain/aws!44

Author: TurboGit

src/core/aws-server-protocol_handler.adb

@@ -118,8 +118,7 @@ begin
                AWS.Log.Write
                  (LA.Server.Error_Log,
                   Request,
-                  Utils.CRLF_2_Spaces
-                    (Ada.Exceptions.Exception_Information (E)));
+                  Utils.CRLF_2_Spaces (Exception_Information (E)));
                return False;
          end Send_Error_Answer;
 
@@ -282,25 +281,33 @@ begin
             AWS.Log.Write
               (LA.Server.Error_Log,
                Request,
-               Utils.CRLF_2_Spaces (Ada.Exceptions.Exception_Information (E)));
+               Utils.CRLF_2_Spaces (Exception_Information (E)));
 
             Will_Close := True;
 
             if AWS.Status.Protocol (Request) = AWS.Status.H2
               or else (CNF.HTTP2_Activated (LA.Server.Properties)
                        and then not CNF.Security (LA.Server.Properties))
             then
-               HTTP2.Frame.GoAway.Create
-                 (Stream_Id => 0,
-                  Error     => HTTP2.C_Protocol_Error).Send (Sock_Ptr.all);
+               --  We don't want to fail, if the socket is closed already
+               --  we ignore the socket error.
+
+               begin
+                  HTTP2.Frame.GoAway.Create
+                    (Stream_Id => 0,
+                     Error     => HTTP2.C_Protocol_Error).Send (Sock_Ptr.all);
+               exception
+                  when Net.Socket_Error =>
+                     null;
+               end;
 
                exit For_Every_Request;
 
             else
                Error_Answer := Response.Build
                  (Status_Code  => Messages.S400,
                   Content_Type => "text/plain",
-                  Message_Body => Ada.Exceptions.Exception_Message (E));
+                  Message_Body => Exception_Message (E));
 
                LA.Server.Slots.Mark_Phase (LA.Line, Server_Response);
 
@@ -314,16 +321,15 @@ begin
             AWS.Log.Write
               (LA.Server.Error_Log,
                Request,
-               Utils.CRLF_2_Spaces
-                 (Ada.Exceptions.Exception_Information (E)));
+               Utils.CRLF_2_Spaces (Exception_Information (E)));
 
             Will_Close := True;
 
             if First_Line then
                Error_Answer := Response.Build
                  (Status_Code  => Messages.S414,
                   Content_Type => "text/plain",
-                  Message_Body => Ada.Exceptions.Exception_Message (E));
+                  Message_Body => Exception_Message (E));
 
             elsif
               Exception_Identity (E) =
@@ -332,13 +338,13 @@ begin
                Error_Answer := Response.Build
                  (Status_Code  => Messages.S403,
                   Content_Type => "text/plain",
-                  Message_Body => Ada.Exceptions.Exception_Message (E));
+                  Message_Body => Exception_Message (E));
 
             else
                Error_Answer := Response.Build
                  (Status_Code  => Messages.S400,
                   Content_Type => "text/plain",
-                  Message_Body => Ada.Exceptions.Exception_Message (E));
+                  Message_Body => Exception_Message (E));
             end if;
 
             LA.Server.Slots.Mark_Phase (LA.Line, Server_Response);