From: Gregg Lewis Smith <gsmith@apache.org>
Date: Fri, 27 May 2016 15:47:23 +0000 (+0000)
Subject: PR59630: include OpenSSL_Applink when compiling on Visual Studio 2015 and up
X-Git-Tag: 2.5.0-alpha~1567
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94b38ab53b78a11a6a97f2c22e8805e064a40d47;p=thirdparty%2Fapache%2Fhttpd.git

PR59630: include OpenSSL_Applink when compiling on Visual Studio 2015 and up

Submitted By: Jan Ehrhardt <phpdev ehrhardt.nl>
Committed By: gsmith


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

diff --git a/CHANGES b/CHANGES
index 7e7f17f4525..f8f6f8d9283 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) abs: include OpenSSL_Applink when compiling on Visual Studio 2015 
+          and up. PR59630 [Jan Ehrhardt <phpdev ehrhardt.nl>]
+
   *) mod_http2: improved event handling for suspended streams, responses
      and window updates. [Stefan Eissing] 
      
diff --git a/support/ab.c b/support/ab.c
index d7cf8decff5..eafc707644e 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -170,6 +170,10 @@
 #define SK_VALUE(x,y) sk_X509_value(x,y)
 typedef STACK_OF(X509) X509_STACK_TYPE;
 
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+#include <openssl/applink.c>
+#endif
+
 #endif
 
 #if defined(USE_SSL)