Commit 66833d79 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent 5f832d44

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

support/ab.c

+8 −0
Original line number Diff line number Diff line
@@ -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)