Commit 57e51d1f authored by Joe Orton's avatar Joe Orton
Browse files

Merge r1684636 from trunk: 

* mod_auth_digest: Use anonymous shm by default, fall back on name-based.

Submitted by: jkaluza
Reviewed by: jorton, ylavic, jim


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

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.4.26



  *) mod_auth_digest: Use an anonymous shared memory segment by default,

     preventing startup failure after unclean shutdown.  PR 54622.

     [Jan Kaluza]



  *) mod_filter: Fix AddOutputFilterByType with non-content-level filters.

     PR 58856. [Micha Lenk <micha lenk.info>]

modules/aaa/mod_auth_digest.c

+12 −3
Original line number Diff line number Diff line
@@ -299,9 +299,18 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx) 
    client_shm_filename = ap_runtime_dir_relative(ctx, "authdigest_shm");

    client_shm_filename = ap_append_pid(ctx, client_shm_filename, ".");



    /* Use anonymous shm by default, fall back on name-based. */

    sts = apr_shm_create(&client_shm, shmem_size, NULL, ctx);

    if (APR_STATUS_IS_ENOTIMPL(sts)) {

        /* For a name-based segment, remove it first in case of a

         * previous unclean shutdown. */

        apr_shm_remove(client_shm_filename, ctx);



        /* Now create that segment */

        sts = apr_shm_create(&client_shm, shmem_size,

                            client_shm_filename, ctx);

    }



    if (APR_SUCCESS != sts) {

        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01762)

                     "Failed to create shared memory segment on file %s",