Commit 4261c014 authored by Rainer Jung's avatar Rainer Jung
Browse files

Merge 1821767 from trunk: 

LibreSSL doesn't have or require applink.c

Submitted by: rjung
Reviewed by: rjung, ylavic, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826885 13f79535-47bb-0310-9956-ffa450edef68
parent 51391a99

CHANGES

+2 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.33



  *) ab: LibreSSL doesn't have or require Windows applink.c.  [Gregg L. Smith]



Changes with Apache 2.4.32



  *) mod_access_compat: Fail if a comment is found in an Allow or Deny

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -126,12 +126,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1826686 ^/httpd/httpd/trunk .

     +1: jailletc36, ylavic, covener



  *) ab: LibreSSL doesn't have or require applink.c

     trunk patch: http://svn.apache.org/r1821767

     2.4.x patch: svn merge -c 1821767 ^/httpd/httpd/trunk .

                  plus CHANGES

     +1: rjung, ylavic, covener



  *) htpasswd: don't point to (unused) stack memory on output

     to make static analysers happy.  PR 60634.

     trunk patch: http://svn.apache.org/r1781509

support/ab.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ 
#define SK_VALUE(x,y) sk_X509_value(x,y)

typedef STACK_OF(X509) X509_STACK_TYPE;



#if defined(_MSC_VER)

#if defined(_MSC_VER) && !defined(LIBRESSL_VERSION_NUMBER)

/* 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.