VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-25 17:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport:

Browse Source 
*) OpenSSL autoconf detection improvement
     trunk patch: http://svn.apache.org/r1834497
     2.4.x patch: svn merge -c 1834497 ^/httpd/httpd/trunk .
     +1: jorton, ylavic, minfrin



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895924 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2021-12-13 19:30:46 +00:00
parent bbc5378660
commit dcc8ecf2e2
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.52
*) OpenSSL autoconf detection improvement: pick up openssl.pc in the
specified openssl path. [Joe Orton]
*) mod_proxy_connect, mod_proxy: Do not change the status code after we
already sent it to the client.

5
STATUS
View File

@ -145,11 +145,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
*) OpenSSL autoconf detection improvement
trunk patch: http://svn.apache.org/r1834497
2.4.x patch: svn merge -c 1834497 ^/httpd/httpd/trunk .
+1: jorton, ylavic, minfrin
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]

18
acinclude.m4
View File

@ -517,12 +517,18 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
dnl Before doing anything else, load in pkg-config variables
if test -n "$PKGCONFIG"; then
saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
if test "x$ap_openssl_base" != "x" -a \
-f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then
dnl Ensure that the given path is used by pkg-config too, otherwise
dnl the system openssl.pc might be picked up instead.
PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
export PKG_CONFIG_PATH
if test "x$ap_openssl_base" != "x"; then
if test -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then
dnl Ensure that the given path is used by pkg-config too, otherwise
dnl the system openssl.pc might be picked up instead.
PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
export PKG_CONFIG_PATH
elif test -f "${ap_openssl_base}/lib64/pkgconfig/openssl.pc"; then
dnl Ensure that the given path is used by pkg-config too, otherwise
dnl the system openssl.pc might be picked up instead.
PKG_CONFIG_PATH="${ap_openssl_base}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
export PKG_CONFIG_PATH
fi
fi
AC_ARG_ENABLE(ssl-staticlib-deps,APACHE_HELP_STRING(--enable-ssl-staticlib-deps,[link mod_ssl with dependencies of OpenSSL's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-ssl.]), [
if test "$enableval" = "yes"; then