From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 14 Jun 2016 20:37:52 +0000 (+0000)
Subject: abs: Include OPENSSL_Applink when compiling on Windows, to resolve
X-Git-Tag: 2.2.32~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35c88d736c01909663c15e23898310f59b412b7c;p=thirdparty%2Fapache%2Fhttpd.git

abs: Include OPENSSL_Applink when compiling on Windows, to resolve
failures under Visual Studio 2015 and other mismatched MSVCRT flavors.

PR: 59630
Submitted by: Jan Ehrhardt <phpdev ehrhardt.nl>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1748461 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 28c3b80c1e7..201260085fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.32
 
+  *) abs: Include OPENSSL_Applink when compiling on Windows, to resolve
+     failures under Visual Studio 2015 and other mismatched MSVCRT flavors.
+     PR59630 [Jan Ehrhardt <phpdev ehrhardt.nl>]
+
   *) mod_proxy: Fix a regression with 2.2.31 that caused inherited workers to
      use a different scoreboard slot then the original one.  PR 58267.
      [Ruediger Pluem]
diff --git a/support/ab.c b/support/ab.c
index 25fc0e03c39..c9d4cb306db 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -187,6 +187,14 @@ typedef STACK X509_STACK_TYPE;
 #define SK_VALUE(x,y) sk_X509_value(x,y)
 typedef STACK_OF(X509) X509_STACK_TYPE;
 
+#if defined(_MSC_VER)
+/* The following logic ensures we correctly glue FILE* within one CRT used
+ * by the OpenSSL library build to another CRT used by the ab.exe build.
+ * This became especially problematic with Visual Studio 2015.
+ */
+#include <openssl/applink.c>
+#endif
+
 #endif
 
 #if defined(USE_SSL)