From 1ae744a2168300dacb512b46cd5fa6067d7a8edb Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 19 Jan 2016 12:57:16 +0000 Subject: [PATCH] Merge r1719257 from trunk: Do not use the magic string "directory". Use the corresponding global variable as in all other places of the module. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1725508 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ modules/aaa/mod_authn_socache.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/STATUS b/STATUS index 010bf29dc58..8742d3973f3 100644 --- a/STATUS +++ b/STATUS @@ -112,12 +112,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_mod_authn_socache: Do not use the magic string "directory". Use the - corresponding global variable as in all other places of the module. - trunk patch: http://svn.apache.org/r1719257 - 2.4.x patch: trunk works - +1: jailletc36, covener, jim - *) mime.types: Add common extension "m4a" for MPEG 4 Audio. As a reference see Wikipedia: https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A diff --git a/modules/aaa/mod_authn_socache.c b/modules/aaa/mod_authn_socache.c index d1a38ee7869..051dde8d739 100644 --- a/modules/aaa/mod_authn_socache.c +++ b/modules/aaa/mod_authn_socache.c @@ -267,7 +267,7 @@ static const char *construct_key(request_rec *r, const char *context, const char *user, const char *realm) { /* handle "special" context values */ - if (!strcmp(context, "directory")) { + if (!strcmp(context, directory)) { /* FIXME: are we at risk of this blowing up? */ char *new_context; char *slash = strrchr(r->uri, '/'); -- 2.47.2