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 485f1dfc767703f4b8a8c0376988e53f9bf5400e..861e79bab4d30448352ae37417eaa281bcef5053 100644 (file)
--- 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 eafc707644efd6cbdb0498e2fe9b650b479a7bc6..a426dadb843e5307e2abc1caf99f604e88950e5d 100644 (file)
--- 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