Commit 2a82566b authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 64402431

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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

modules/aaa/mod_authn_socache.c

+1 −1
Original line number Diff line number Diff line
@@ -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, '/');