From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 1 Oct 2019 06:56:56 +0000 (+0200)
Subject: Update regarding changed OpenSSL default config path
X-Git-Tag: php-7.4.0RC3~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59ac81f81e2caadb1ffe010155924e9844ba7f5f;p=php

Update regarding changed OpenSSL default config path
---

diff --git a/NEWS b/NEWS
index a9570b5fb2..7aba81dec3 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ PHP                                                                        NEWS
   . Fixed bug #78609 (mb_check_encoding() no longer supports stringable
     objects). (cmb)
 
+- OpenSSL:
+  . Changed the default config path (Windows only). (cmb)
+
 - Standard:
   . Fixed bug #78549 (Stack overflow due to nested serialized input). (Nikita)
 
diff --git a/UPGRADING b/UPGRADING
index ec651de3fa..7f69dc4b4d 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -690,6 +690,10 @@ PHP 7.4 UPGRADE NOTES
   the INI directive opcache.cache_id. All processes with the same cache ID and
   user share an OPcache instance.
 
+- The OpenSSL default config path has been changed to 
+  "C:\Program Files\Common Files\SSL\openssl.cnf" and
+  "C:\Program Files (x86)\Common Files\SSL\openssl.cnf", repectively.
+
 ========================================
 13. Migration to pkg-config
 ========================================
diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt
index 71b1b6a5df..9ce0d41cc3 100644
--- a/ext/openssl/tests/check_default_conf_path.phpt
+++ b/ext/openssl/tests/check_default_conf_path.phpt
@@ -14,11 +14,11 @@ phpinfo();
 $info = ob_get_contents();
 ob_end_clean();
 
-preg_match(",Openssl default config .* (.*),", $info, $m);
+preg_match(",Openssl default config [^ ]* (.*),", $info, $m);
 
 if (isset($m[1])) {
     var_dump(str_replace('/', '\\', strtolower($m[1])));
 }
 ?>
---EXPECT--
-string(28) "c:\usr\local\ssl\openssl.cnf"
+--EXPECTF--
+string(%d) "c:\program files%r( \(x86\)|)%r\common files\ssl\openssl.cnf"