diff options
| author | Jeff Trawick <trawick@apache.org> | 2012-08-04 23:40:08 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2012-08-04 23:40:08 +0200 |
| commit | 37d741a9abef42e6802232a9f10b6360266f09c7 (patch) | |
| tree | baf45830a4f98865ea2ade25c11d169f3e6c1ed8 /server/scoreboard.c | |
| parent | Remove backported items from trunk CHANGES. (diff) | |
| download | apache2-37d741a9abef42e6802232a9f10b6360266f09c7.tar.xz apache2-37d741a9abef42e6802232a9f10b6360266f09c7.zip | |
core: Respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR for the
scoreboard (ScoreBoardFile).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369477 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/scoreboard.c')
| -rw-r--r-- | server/scoreboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/scoreboard.c b/server/scoreboard.c index bef2b90908..67b0386c4b 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -217,7 +217,7 @@ static apr_status_t open_scoreboard(apr_pool_t *pconf) /* The config says to create a name-based shmem */ if (ap_scoreboard_fname) { /* make sure it's an absolute pathname */ - fname = ap_server_root_relative(pconf, ap_scoreboard_fname); + fname = ap_runtime_dir_relative(pconf, ap_scoreboard_fname); if (!fname) { ap_log_error(APLOG_MARK, APLOG_CRIT, APR_EBADPATH, ap_server_conf, APLOGNO(00003) "Fatal error: Invalid Scoreboard path %s", @@ -239,7 +239,7 @@ static apr_status_t open_scoreboard(apr_pool_t *pconf) else if (rv == APR_ENOTIMPL) { /* Make sure it's an absolute pathname */ ap_scoreboard_fname = DEFAULT_SCOREBOARD; - fname = ap_server_root_relative(pconf, ap_scoreboard_fname); + fname = ap_runtime_dir_relative(pconf, ap_scoreboard_fname); return create_namebased_scoreboard(global_pool, fname); } |