From: Nick Kew <niq@apache.org>
Date: Mon, 24 Sep 2007 01:58:50 +0000 (+0000)
Subject: PR 40037: try to avoid risk of misleading the lusers when they
X-Git-Tag: 2.3.0~1401
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a30598a8a6a1130cedca9692b75e0bf4bf72ff08;p=thirdparty%2Fapache%2Fhttpd.git

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 0ae94571de8..54eeeea36f0 100644
--- 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 a91930633f5..d35eac0044c 100644
--- 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;
         }