]> granicus.if.org Git - php/commitdiff
integrate the openssl applink shim
authorAnatol Belski <ab@php.net>
Thu, 2 Jul 2015 17:49:40 +0000 (19:49 +0200)
committerAnatol Belski <ab@php.net>
Fri, 3 Jul 2015 05:11:13 +0000 (07:11 +0200)
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.

sapi/cli/php_cli.c

index 3c9c5a8475121415667271f31ac46fc69867df48..e48481dd0c13b0b30459f097861448d5b547cd86 100644 (file)
 # 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;