From 9ed1a27a3dfcdc79e3eda403b4dd1022f895df39 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 10 Jun 2016 14:24:27 +0000 Subject: [PATCH] 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 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 --- STATUS | 6 ------ modules/aaa/mod_authz_host.c | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 3d686b1bc6..4ff99dc76f 100644 --- a/STATUS +++ b/STATUS @@ -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 ] diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c index dff1d32204..76f95b8460 100644 --- a/modules/aaa/mod_authz_host.c +++ b/modules/aaa/mod_authz_host.c @@ -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; } -- 2.40.0