Commit d9f3b991 authored Jun 14, 2016 by William A. Rowe Jr

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.4.x@1748449 13f79535-47bb-0310-9956-ffa450edef68

parent 1d692794

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@

		Changes with Apache 2.4.21

		*) 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_ssl: Add "no_crl_for_cert_ok" flag to SSLCARevocationCheck directive
		to opt-in previous behaviour (2.2) with CRLs verification when checking
		certificate(s) with no corresponding CRL. [Yann Ylavic]

STATUS

+0 −7

Original line number	Diff line number	Diff line
		@@ -126,13 +126,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
		+1: trawick
		ylavic: there may be missing bits, see thread for commit r1736510.

		*) abs: Add OPENSSL_Applink in Visual Studio >= 2015 or abs fails with a no
		OPENSSL_Applink error. PR59630
		trunk patch: http://svn.apache.org/r1745767
		2.4.x: trunk works (modulo CHANGES)
		+1: gsmith,
		+0: wrowe [I did not observe such issues, and will review the patch/issue]

		*) mod_dav: Add support for childtags to dav_error.
		trunk patch: http://svn.apache.org/r1747810
		2.4.x: trunk works modulo CHANGES/MMN

support/ab.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,12 @@
		#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

		#if defined(USE_SSL)