From: Ruediger Pluem <rpluem@apache.org>
Date: Sun, 7 Oct 2007 12:31:44 +0000 (+0000)
Subject: Merge r578620 from trunk:
X-Git-Tag: 2.2.7~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019dc8f39f6ca3710733e46d2490469c8953f6c6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r578620 from trunk:

PR 40037: try to avoid risk of misleading the lusers when they
can't initialise scoreboard after a crash.

Submitted by: niq
Reviewed by: niq, rpluem, trawick


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

diff --git a/CHANGES b/CHANGES
index 35069b1ec4b..07fa8e19db4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) scoreboard: improve error message on apr_shm_create failure
+     PR 40037 [Nick Kew]
+
   *) proxy: Fix persistent backend connections.
      PR 43472 [Ruediger Pluem]
 
diff --git a/STATUS b/STATUS
index 053c1beef54..7f17d9d5336 100644
--- a/STATUS
+++ b/STATUS
@@ -79,11 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * scoreboard: improve error message on apr_shm_create failure
-     PR 40037
-     http://svn.apache.org/viewvc?view=rev&revision=578620
-     +1: niq, rpluem, trawick
-
    * mod_proxy: Don't by default violate RFC2616 by setting
      Max-Forwards when the client didn't send it to us.
      PR 16137
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 9cb7359a541..9d1ba4bd5d1 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -157,7 +157,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;
     }
@@ -204,7 +204,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;
         }