[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e23206ae5604a0498c2127a71ae302c477b3a563 (commit)
      from  98dc656e5f491cc29a61892d152c9779527da6f8 (commit)


- Log -----------------------------------------------------------------
commit e23206ae5604a0498c2127a71ae302c477b3a563
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jun 17 10:47:26 2021 +0200

    test/recipes/80-test_cmp_http.t: Kill the mock server brutally
    
    To kill a subprocess with the KILL signal is pretty brutal.  However,
    it doesn't seem to be killed completely on some platforms, which makes
    this test recipe hang indefinitely when (implicitly) closing the file
    handle for this server ($server_fh).  A brutal KILL resolves this
    problem.
    
    Fixes #15781
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15797)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/80-test_cmp_http.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 10f2b84c68..dddc1db918 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -294,5 +294,5 @@ sub start_mock_server {
 sub stop_mock_server {
     my $pid = $_[0];
     print "Killing mock server with pid=$pid\n";
-    kill('QUIT', $pid);
+    kill('KILL', $pid);
 }