PR 40037: try to avoid risk of misleading the lusers when they

can't initialise scoreboard after a crash.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@578620 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0ae94571de80a6feca3be30f7642b30a3ef7e012..54eeeea36f0a322895d05280d0c1850c91aec987 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) scoreboard: improve error message on apr_shm_create failure
+     PR 40037 [Nick Kew]
+
   *) mod_rewrite: Add the novary flag to RewriteCond.
      [Ruediger Pluem]
 

diff --git a/server/scoreboard.c b/server/scoreboard.c
index a91930633f59293bd9597693edb91225df8256bd..d35eac0044cb87f01ba75a4e687114ffdbb85279 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -165,7 +165,7 @@ static apr_status_t create_namebased_scoreboard(apr_pool_t *pool,
     rv = apr_shm_create(&ap_scoreboard_shm, scoreboard_size, fname, pool);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
-                     "unable to create scoreboard \"%s\" "
+                     "unable to create or access scoreboard \"%s\" "
                      "(name-based shared memory failure)", fname);
         return rv;
     }
@@ -212,7 +212,7 @@ static apr_status_t open_scoreboard(apr_pool_t *pconf)
                             global_pool); /* anonymous shared memory */
         if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
-                         "Unable to create scoreboard "
+                         "Unable to create or access scoreboard "
                          "(anonymous shared memory failure)");
             return rv;
         }