diff options
| author | Jeff Trawick <trawick@apache.org> | 2012-08-06 12:15:03 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2012-08-06 12:15:03 +0000 |
| commit | b6f86b92c214c73bfcd9a863f1506f523adce2cc (patch) | |
| tree | 605a9c18e455c54e0443aa314a1f9b2f0ad317c2 /server/log.c | |
| parent | 2e5559bb81ec4926285874126b5abf7af6aed8b7 (diff) | |
| download | httpd-b6f86b92c214c73bfcd9a863f1506f523adce2cc.tar.gz | |
The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()
now respect DefaultRuntimeDir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369808 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/log.c')
| -rw-r--r-- | server/log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/log.c b/server/log.c index b33aa1fc1b..1c9a59bb1e 100644 --- a/server/log.c +++ b/server/log.c @@ -1394,7 +1394,7 @@ AP_DECLARE(void) ap_log_command_line(apr_pool_t *plog, server_rec *s) AP_DECLARE(void) ap_remove_pid(apr_pool_t *p, const char *rel_fname) { apr_status_t rv; - const char *fname = ap_server_root_relative(p, rel_fname); + const char *fname = ap_runtime_dir_relative(p, rel_fname); if (fname != NULL) { rv = apr_file_remove(fname, p); @@ -1423,7 +1423,7 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) return; } - fname = ap_server_root_relative(p, filename); + fname = ap_runtime_dir_relative(p, filename); if (!fname) { ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH, NULL, APLOGNO(00097) "Invalid PID file path %s, ignoring.", filename); @@ -1476,7 +1476,7 @@ AP_DECLARE(apr_status_t) ap_read_pid(apr_pool_t *p, const char *filename, return APR_EGENERAL; } - fname = ap_server_root_relative(p, filename); + fname = ap_runtime_dir_relative(p, filename); if (!fname) { ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH, NULL, APLOGNO(00101) "Invalid PID file path %s, ignoring.", filename); |