com php-src: integrate the openssl applink shim: sapi/cli/php _cli.c

Commit: 59444347d1c33020d571bb8e8649e7aad432c913 Author: Anatol Belski <ab@php.net> Thu, 2 Jul 2015 19:49:40 +0200 Parents: e8f992c163eff2fc5ebf44d9a39599ed70463253 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59444347d1c33020d571bb8e8649e7aad432c913 Log: 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. Changed paths: M sapi/cli/php_cli.c Diff: diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 3c9c5a8..e48481d 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;