diff options
author | Anatol Belski <ab@php.net> | 2015-07-02 19:49:40 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2015-07-03 07:11:13 +0200 |
commit | 59444347d1c33020d571bb8e8649e7aad432c913 (patch) | |
tree | 85c8c5a84ba7267c6a231d338fd1ef4c47209a82 /sapi/cli/php_cli.c | |
parent | e8f992c163eff2fc5ebf44d9a39599ed70463253 (diff) | |
download | php-git-59444347d1c33020d571bb8e8649e7aad432c913.tar.gz |
integrate the openssl applink shim
This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r-- | sapi/cli/php_cli.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 3c9c5a8475..e48481dd0c 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -94,6 +94,10 @@ # include "win32/select.h" #endif +#if defined(PHP_WIN32) && defined(HAVE_OPENSSL) +# include "openssl/applink.c" +#endif + PHPAPI extern char *php_ini_opened_path; PHPAPI extern char *php_ini_scanned_path; PHPAPI extern char *php_ini_scanned_files; |