You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2007/10/07 14:31:44 UTC
svn commit: r582621 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
server/scoreboard.c
Author: rpluem
Date: Sun Oct 7 05:31:44 2007
New Revision: 582621
URL: http://svn.apache.org/viewvc?rev=582621&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/scoreboard.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=582621&r1=582620&r2=582621&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Oct 7 05:31:44 2007
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=582621&r1=582620&r2=582621&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Oct 7 05:31:44 2007
@@ -79,11 +79,6 @@
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
Modified: httpd/httpd/branches/2.2.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/scoreboard.c?rev=582621&r1=582620&r2=582621&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.2.x/server/scoreboard.c Sun Oct 7 05:31:44 2007
@@ -157,7 +157,7 @@
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 @@
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;
}