[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  1ed3249f253e4490a813279e2eb253c8e5cfaabb (commit)
      from  24cdb1bfecbd765e829b9932a5a60ff63a7dff4b (commit)


- Log -----------------------------------------------------------------
commit 1ed3249f253e4490a813279e2eb253c8e5cfaabb
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Sep 13 08:14:58 2021 +0200

    80-test_cmp_http.t: Fix handling of empty HTTP proxy string
    
    Fixes #16546
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16593)

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

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

diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 7bd95337e8..92f11e8ac8 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -42,8 +42,8 @@ sub chop_dblquot { # chop any leading and trailing '"' (needed for Windows)
     return $str;
 }
 
-my $proxy = "<EMPTY>";
-$proxy = chop_dblquot($ENV{http_proxy} // $ENV{HTTP_PROXY} // $proxy);
+my $proxy = chop_dblquot($ENV{http_proxy} // $ENV{HTTP_PROXY} // "");
+$proxy = "<EMPTY>" if $proxy eq "";
 $proxy =~ s{^https?://}{}i;
 my $no_proxy = $ENV{no_proxy} // $ENV{NO_PROXY};