Commit 004a250c authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r711993 from trunk: 

* Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.

PR: 46018

Submitted by: rpluem
Reviewed by: rpluem, jim, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@720165 13f79535-47bb-0310-9956-ffa450edef68
parent 88522aa2

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.11



  *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is

     not available. PR 46018 [Ruediger Pluem]



  *) mod_proxy_ajp: Do not fail if response data is sent before all request

     data is read. PR 45911 [Ruediger Pluem]

STATUS

+0 −9
Changes for STATUS: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -86,15 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * Build: Correctly set SSL_LIBS during openssl detection if pkgconfig

     is not available. This fixes a regression against 2.2.9.

     PR 46018

     Trunk version of patch:

        http://svn.apache.org/viewvc?rev=711993&view=rev

     Backport version for 2.2.x of patch:

        Trunk version of patch works

     +1: rpluem, jim, jfclere



    * mod_cache: Convert age of cached object to seconds before comparing it to

      age supplied by the request when checking whether to send a Warning

      header for a stale response. PR 39713.

acinclude.m4

+2 −2
Changes for acinclude.m4: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -439,10 +439,10 @@ if test "x$ap_ssltk_configured" = "x"; then 
        pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"

        APR_ADDTO(LDFLAGS, [$pkglookup])

      else

        ap_ssltk_libs="-lssl -lcrypto"

        ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"

      fi

    else

      ap_ssltk_libs="-lssl -lcrypto"

      ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"

    fi

  fi

  APR_SETVAR(SSL_LIBS, [$ap_ssltk_libs])