From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 14 Jun 2016 18:32:27 +0000 (+0000)
Subject: Prepare to backport, this is not specific to VS 2015...
X-Git-Tag: 2.5.0-alpha~1503
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b89b38ae13e500afa335ac87598f3a3a82f3b364;p=thirdparty%2Fapache%2Fhttpd.git

Prepare to backport, this is not specific to VS 2015...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1748448 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 485f1dfc767..861e79bab4d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,9 +20,6 @@ Changes with Apache 2.5.0
   *) mod_dav: Add support for childtags to dav_error.
      [Jari Urpalainen <jari.urpalainen nokia.com>]
 
-  *) abs: include OpenSSL_Applink when compiling on Visual Studio 2015 
-          and up. PR59630 [Jan Ehrhardt <phpdev ehrhardt.nl>]
-
   *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
      allowing per backend TLS configuration.  [Yann Ylavic]
 
diff --git a/support/ab.c b/support/ab.c
index eafc707644e..a426dadb843 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -170,7 +170,11 @@
 #define SK_VALUE(x,y) sk_X509_value(x,y)
 typedef STACK_OF(X509) X509_STACK_TYPE;
 
-#if defined(_MSC_VER) && _MSC_VER >= 1900
+#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