httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1748448 - in /httpd/httpd/trunk: CHANGES support/ab.c
Date Tue, 14 Jun 2016 18:32:27 GMT
Author: wrowe
Date: Tue Jun 14 18:32:27 2016
New Revision: 1748448

URL: http://svn.apache.org/viewvc?rev=1748448&view=rev
Log:
Prepare to backport, this is not specific to VS 2015...

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/support/ab.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1748448&r1=1748447&r2=1748448&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Jun 14 18:32:27 2016
@@ -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]
 

Modified: httpd/httpd/trunk/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/ab.c?rev=1748448&r1=1748447&r2=1748448&view=diff
==============================================================================
--- httpd/httpd/trunk/support/ab.c (original)
+++ httpd/httpd/trunk/support/ab.c Tue Jun 14 18:32:27 2016
@@ -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
 



Mime
View raw message