diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-01 08:56:56 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-01 09:14:58 +0200 |
| commit | 59ac81f81e2caadb1ffe010155924e9844ba7f5f (patch) | |
| tree | 0429bcc0bd568a7d05b56924c7a64cb49e7884dc | |
| parent | 0aa3acc6c420ef19a33ee80e65c4fb2f2ee128d0 (diff) | |
| download | php-git-59ac81f81e2caadb1ffe010155924e9844ba7f5f.tar.gz | |
Update regarding changed OpenSSL default config path
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | UPGRADING | 4 | ||||
| -rw-r--r-- | ext/openssl/tests/check_default_conf_path.phpt | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -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) @@ -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" |