From: Anatol Belski <ab@php.net>
Date: Thu, 2 Jul 2015 17:49:40 +0000 (+0200)
Subject: integrate the openssl applink shim
X-Git-Tag: php-7.1.0alpha3~25^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59444347d1c33020d571bb8e8649e7aad432c913;p=php

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.
---

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;