From: Joe Orton <jorton@apache.org>
Date: Fri, 12 Jul 2019 07:16:45 +0000 (+0000)
Subject: Merge r1858565 from trunk:
X-Git-Tag: 2.4.40~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d640c049d3e72a37fa8a7c3a127dd9e01de18ceb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1858565 from trunk:

* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe
  error better for anon shm failure case, fixing gcc 9 warning on
  passing NULL for '%s'.

Reviewed by: jorton, icing, jim


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

diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index 2750f254901..9bbe8a8922a 100644
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -368,8 +368,8 @@ static apr_status_t socache_shmcb_init(ap_socache_instance_t *ctx,
          * above will return NULL for invalid paths. */
         if (ctx->data_file == NULL) {
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00818)
-                         "Could not use default path '%s' for shmcb socache",
-                         ctx->data_file);
+                         "Could not use anonymous shm for '%s' cache",
+                         namespace);
             return APR_EINVAL;
         }