com php-src: Change openssl directives to PHP_INI_PERDIR: ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Tue, 25 Feb 2014 16:59:13 +0000 |
| Subject: | com php-src: Change openssl directives to PHP_INI_PERDIR: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76206@lists.php.net to get a copy of this message | ||
Commit: 47b5873c5d0263e8e5feb4457df3594ddf3b4eda
Author: Daniel Lowrey <rdlowrey@php.net> Mon, 24 Feb 2014 13:40:43 -0700
Parents: aad7b724721c01f6269951511ee4c92843f56e0c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=47b5873c5d0263e8e5feb4457df3594ddf3b4eda
Log:
Change openssl directives to PHP_INI_PERDIR
Because openssl.cafile and openssl.capath have implications for
security these directives have been changed to PHP_INI_PERDIR
(previously PHP_INI_ALL)
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index e649fca..c5588f9 100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1099,8 +1099,8 @@ static const EVP_CIPHER * php_openssl_get_evp_cipher_from_algo(long algo) { /*
{
/* {{{ INI Settings */
PHP_INI_BEGIN()
- PHP_INI_ENTRY("openssl.cafile", NULL, PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("openssl.capath", NULL, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("openssl.cafile", NULL, PHP_INI_PERDIR, NULL)
+ PHP_INI_ENTRY("openssl.capath", NULL, PHP_INI_PERDIR, NULL)
PHP_INI_END()
/* }}} */