Commit 679e7330 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1745034 from trunk: 

PR59612: Print the ap_expr() error message when an expression cannot
be evaluated in forward-dns provider.

Submitted By: Tianyin Xu <tixu cs.ucsd.edu>
Committed By: covener


Submitted by: covener
Reviewed/backported by: jim


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

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) authz_host,authz_ldap: log messages fix

     trunk patch: 

                  http://svn.apache.org/r1745034

     2.4.x patch: trunk works

     +1: covener, jailletc36, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/aaa/mod_authz_host.c

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ forward_dns_check_authorization(request_rec *r, 
    require = ap_expr_str_exec(r, expr, &err);

    if (err) {

      ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03354)

                    "authz_host authorize: require forward-dns: "

                    "Can't evaluate require expression: %s", err);

      return AUTHZ_DENIED;

    }