You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2012/08/15 01:59:25 UTC
svn commit: r1373168 - in /httpd/httpd/branches/2.4.x: ./ docs/conf/extra/
docs/manual/mod/ include/ modules/cache/ modules/cluster/ modules/ldap/
modules/proxy/balancers/ modules/slotmem/ server/
Author: trawick
Date: Tue Aug 14 23:59:24 2012
New Revision: 1373168
URL: http://svn.apache.org/viewvc?rev=1373168&view=rev
Log:
Revert r1373105, the merging of incompatible DefaultRuntimeDir
changes.
The trunk patches for these all have some configuration breakage
as 2.4.x interprets the individual directive or API parameter as
relative to ServerRoot whereas trunk interprets everything
relative to DefaultRuntimeDir.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in
httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_dbm.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_shmcb.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml
httpd/httpd/branches/2.4.x/include/ap_config.h
httpd/httpd/branches/2.4.x/include/heartbeat.h
httpd/httpd/branches/2.4.x/include/http_log.h
httpd/httpd/branches/2.4.x/include/scoreboard.h
httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c
httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c
httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c
httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c
httpd/httpd/branches/2.4.x/server/core.c
httpd/httpd/branches/2.4.x/server/log.c
httpd/httpd/branches/2.4.x/server/mpm_common.c
httpd/httpd/branches/2.4.x/server/scoreboard.c
httpd/httpd/branches/2.4.x/server/util_mutex.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Reverse-merged /httpd/httpd/trunk:r1364695,1369477,1369808,1370225,1370288,1370763,1371684
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Aug 14 23:59:24 2012
@@ -16,14 +16,8 @@ Changes with Apache 2.4.3
*) ab: Fix read failure when targeting SSL server. [Jeff Trawick]
*) The following now respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:
- - core: the scoreboard (ScoreBoardFile), pid file (PidFile), and
- mutexes (Mutex)
- mod_auth_digest: shared memory file
- - APIs: ap_log_pid(), ap_remove_pid, ap_read_pid()
- - mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
- - mod_ldap: shared memory cache
- - mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
- [Jeff Trawick, Jim Jagielski]
+ [Jeff Trawick]
*) htpasswd: Use correct file mode for checking if file is writable.
PR 45923. [Stefan Fritsch]
@@ -84,6 +78,11 @@ Changes with Apache 2.4.3
*) Add "strict" and "warnings" pragmas to Perl scripts. [Rich Bowen]
+ *) The following now respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:
+ - core: the scoreboard (ScoreBoardFile), pid file (PidFile), and
+ mutexes (Mutex)
+ [Jim Jagielski]
+
*) ab: Fix bind() errors. [Joe Orton]
*) mpm_event: Don't do a blocking write when starting a lingering close
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Aug 14 23:59:24 2012
@@ -89,6 +89,27 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
+ * opinion on more complete DefaultRuntimeDir use in 2.4.x?
+ o If a module has a config directive for the run-time file that
+ treats the configured path as relative to server root, preserve
+ that behavior but change the location when not configured to
+ respect DefaultRuntimeDir. With these changes, users with no
+ per-runtime-file configuration directives can control
+ everything with DefaultRuntimeDir.
+ BUT: Existing users of DefaultRuntimeDir might get a short-term scare
+ when some unconfigured run-time file starts respecting their
+ DefaultRuntimeDir directive after an upgrade.
+ +1: trawick, jim, rjung
+ rjung: backport candidates are:
+ heartbeat r1364695
+ scoreboard r1369477
+ core/pid file r1369808
+ core/mutex r1370288
+ mod_socache_XXX r1370225
+ mod_slotmem_plain r1370763
+ mod_ldap r1371684
+
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in Tue Aug 14 23:59:24 2012
@@ -9,7 +9,7 @@
# Note that this is the default PidFile for most MPMs.
#
<IfModule !mpm_netware_module>
- PidFile "httpd.pid"
+ PidFile "@rel_runtimedir@/httpd.pid"
</IfModule>
#
Modified: httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in Tue Aug 14 23:59:24 2012
@@ -72,8 +72,8 @@ SSLPassPhraseDialog builtin
# Inter-Process Session Cache:
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
-#SSLSessionCache "dbm:ssl_scache"
-SSLSessionCache "shmcb:ssl_scache(512000)"
+#SSLSessionCache "dbm:@exp_runtimedir@/ssl_scache"
+SSLSessionCache "shmcb:@exp_runtimedir@/ssl_scache(512000)"
SSLSessionCacheTimeout 300
##
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Tue Aug 14 23:59:24 2012
@@ -3142,11 +3142,9 @@ or specified mutexes</description>
<p>With the file-based mechanisms <em>fcntl</em> and <em>flock</em>,
the path, if provided, is a directory where the lock file will be created.
- The default directory is httpd's run-time file directory,
- <directive module="core">DefaultRuntimeDir</directive>. If a relative
- path is provided, it is relative to
- <directive module="core">DefaultRuntimeDir</directive>. Always use a local
- disk filesystem for <code>/path/to/mutex</code> and never a directory residing
+ The default directory is httpd's run-time file directory relative to
+ <directive module="core">ServerRoot</directive>. Always use a local disk
+ filesystem for <code>/path/to/mutex</code> and never a directory residing
on a NFS- or AFS-filesystem. The basename of the file will be the mutex
type, an optional instance string provided by the module, and unless the
<code>OmitPID</code> keyword is specified, the process id of the httpd
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml Tue Aug 14 23:59:24 2012
@@ -418,16 +418,13 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/c
<directivesynopsis>
<name>LDAPSharedCacheFile</name>
<description>Sets the shared memory cache file</description>
-<syntax>LDAPSharedCacheFile <var>file-path</var></syntax>
+<syntax>LDAPSharedCacheFile <var>directory-path/filename</var></syntax>
<contextlist><context>server config</context></contextlist>
<usage>
- <p>Specifies the path of the shared memory cache file. If not set,
- anonymous shared memory will be used if the platform supports it.</p>
-
- <p>If <var>file-path</var> is not an absolute path, the location specified
- will be relative to the value of
- <directive module="core">DefaultRuntimeDir</directive>.</p>
+ <p>Specifies the directory path and file name of the shared memory
+ cache file. If not set, anonymous shared memory will be used if the
+ platform supports it.</p>
</usage>
</directivesynopsis>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_dbm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_dbm.xml?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_dbm.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_dbm.xml Tue Aug 14 23:59:24 2012
@@ -38,9 +38,6 @@
dbm:/path/to/datafile
</example>
- <p>If the path is not absolute then it is assumed to be relative to
- the <directive module="core">DefaultRuntimeDir</directive>.</p>
-
<p>Details of other shared object cache providers can be found
<a href="../socache.html">here</a>.
</p>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_shmcb.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_shmcb.xml?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_shmcb.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_socache_shmcb.xml Tue Aug 14 23:59:24 2012
@@ -38,9 +38,6 @@
shmcb:/path/to/datafile(512000)
</example>
- <p>If the path is not absolute then it is assumed to be relative to
- the <directive module="core">DefaultRuntimeDir</directive>.</p>
-
<p>Details of other shared object cache providers can be found
<a href="../socache.html">here</a>.
</p>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml Tue Aug 14 23:59:24 2012
@@ -130,7 +130,7 @@ will exit.</description>
<description>File where the server records the process ID
of the daemon</description>
<syntax>PidFile <var>filename</var></syntax>
-<default>PidFile httpd.pid</default>
+<default>PidFile logs/httpd.pid</default>
<contextlist><context>server config</context></contextlist>
<modulelist><module>event</module><module>mpm_winnt</module>
<module>mpmt_os2</module><module>prefork</module><module>worker</module>
@@ -140,7 +140,7 @@ of the daemon</description>
<p>The <directive>PidFile</directive> directive sets the file to
which the server records the process id of the daemon. If the
filename is not absolute then it is assumed to be relative to the
- <directive module="core">DefaultRuntimeDir</directive>.</p>
+ <directive module="core">ServerRoot</directive>.</p>
<example><title>Example</title>
<highlight language="config">
@@ -456,7 +456,7 @@ spikes</description>
<description>Location of the file used to store coordination data for
the child processes</description>
<syntax>ScoreBoardFile <var>file-path</var></syntax>
-<default>ScoreBoardFile apache_runtime_status</default>
+<default>ScoreBoardFile logs/apache_runtime_status</default>
<contextlist><context>server config</context></contextlist>
<modulelist><module>event</module><module>mpm_winnt</module>
<module>prefork</module><module>worker</module></modulelist>
@@ -470,10 +470,6 @@ the child processes</description>
disk (using file-based shared memory). Specifying this directive causes
Apache httpd to always create the file on the disk.</p>
- <p>If <var>file-path</var> is not an absolute path, the location specified
- will be relative to the value of
- <directive module="core">DefaultRuntimeDir</directive>.</p>
-
<example><title>Example</title>
<highlight language="config">
ScoreBoardFile /var/run/apache_runtime_status
Modified: httpd/httpd/branches/2.4.x/include/ap_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_config.h?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_config.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_config.h Tue Aug 14 23:59:24 2012
@@ -141,7 +141,7 @@
/* Where the main/parent process's pid is logged */
#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "httpd.pid"
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
#endif
#if defined(NETWARE)
Modified: httpd/httpd/branches/2.4.x/include/heartbeat.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/heartbeat.h?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/heartbeat.h (original)
+++ httpd/httpd/branches/2.4.x/include/heartbeat.h Tue Aug 14 23:59:24 2012
@@ -47,11 +47,6 @@ typedef struct hm_slot_server_t
int id;
} hm_slot_server_t;
-/* default name of heartbeat data file, created in the configured
- * runtime directory when mod_slotmem_shm is not available
- */
-#define DEFAULT_HEARTBEAT_STORAGE "hb.dat"
-
#ifdef __cplusplus
}
#endif
Modified: httpd/httpd/branches/2.4.x/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_log.h?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_log.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_log.h Tue Aug 14 23:59:24 2012
@@ -570,7 +570,7 @@ AP_DECLARE(void) ap_log_command_line(apr
* Log the current pid of the parent process
* @param p The pool to use for processing
* @param fname The name of the file to log to. If the filename is not
- * absolute then it is assumed to be relative to DefaultRuntimeDir.
+ * absolute then it is assumed to be relative to ServerRoot.
*/
AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *fname);
@@ -578,15 +578,15 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *
* Remove the pidfile.
* @param p The pool to use for processing
* @param fname The name of the pid file to remove. If the filename is not
- * absolute then it is assumed to be relative to DefaultRuntimeDir.
+ * absolute then it is assumed to be relative to ServerRoot.
*/
AP_DECLARE(void) ap_remove_pid(apr_pool_t *p, const char *fname);
/**
* Retrieve the pid from a pidfile.
* @param p The pool to use for processing
- * @param filename The name of the file containing the pid. If the filename
- * is not absolute then it is assumed to be relative to DefaultRuntimeDir.
+ * @param filename The name of the file containing the pid. If the filename is not
+ * absolute then it is assumed to be relative to ServerRoot.
* @param mypid Pointer to pid_t (valid only if return APR_SUCCESS)
*/
AP_DECLARE(apr_status_t) ap_read_pid(apr_pool_t *p, const char *filename, pid_t *mypid);
Modified: httpd/httpd/branches/2.4.x/include/scoreboard.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/scoreboard.h?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/scoreboard.h (original)
+++ httpd/httpd/branches/2.4.x/include/scoreboard.h Tue Aug 14 23:59:24 2012
@@ -40,7 +40,7 @@ extern "C" {
/* Scoreboard file, if there is one */
#ifndef DEFAULT_SCOREBOARD
-#define DEFAULT_SCOREBOARD "apache_runtime_status" /* within DEFAULT_REL_RUNTIMEDIR */
+#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
#endif
/* Scoreboard info on a process is, for now, kept very brief ---
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c Tue Aug 14 23:59:24 2012
@@ -84,7 +84,7 @@ static const char *socache_dbm_create(ap
*context = ctx = apr_pcalloc(p, sizeof *ctx);
if (arg && *arg) {
- ctx->data_file = ap_runtime_dir_relative(p, arg);
+ ctx->data_file = ap_server_root_relative(p, arg);
if (!ctx->data_file) {
return apr_psprintf(tmp, "Invalid cache file path %s", arg);
}
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c Tue Aug 14 23:59:24 2012
@@ -285,7 +285,7 @@ static const char *socache_shmcb_create(
return NULL;
}
- ctx->data_file = path = ap_runtime_dir_relative(p, arg);
+ ctx->data_file = path = ap_server_root_relative(p, arg);
cp = strrchr(path, '(');
cp2 = path + strlen(path) - 1;
Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Tue Aug 14 23:59:24 2012
@@ -792,7 +792,7 @@ static void *hm_create_config(apr_pool_t
hm_ctx_t *ctx = (hm_ctx_t *) apr_palloc(p, sizeof(hm_ctx_t));
ctx->active = 0;
- ctx->storage_path = ap_runtime_dir_relative(p, DEFAULT_HEARTBEAT_STORAGE);
+ ctx->storage_path = ap_server_root_relative(p, "logs/hb.dat");
/* TODO: Add directive for tuning the update interval
*/
ctx->interval = apr_time_from_sec(HM_UPDATE_SEC);
@@ -816,7 +816,7 @@ static const char *cmd_hm_storage(cmd_pa
return err;
}
- ctx->storage_path = ap_runtime_dir_relative(p, path);
+ ctx->storage_path = ap_server_root_relative(p, path);
return NULL;
}
Modified: httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c Tue Aug 14 23:59:24 2012
@@ -2103,7 +2103,7 @@ static const char *util_ldap_set_cache_f
}
if (file) {
- st->cache_file = ap_runtime_dir_relative(st->pool, file);
+ st->cache_file = ap_server_root_relative(st->pool, file);
}
else {
st->cache_file = NULL;
Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c Tue Aug 14 23:59:24 2012
@@ -407,7 +407,7 @@ static void *lb_hb_create_config(apr_poo
{
lb_hb_ctx_t *ctx = (lb_hb_ctx_t *) apr_palloc(p, sizeof(lb_hb_ctx_t));
- ctx->path = ap_runtime_dir_relative(p, DEFAULT_HEARTBEAT_STORAGE);
+ ctx->path = ap_server_root_relative(p, "logs/hb.dat");
return ctx;
}
@@ -442,7 +442,7 @@ static const char *cmd_lb_hb_storage(cmd
return err;
}
- ctx->path = ap_runtime_dir_relative(p, path);
+ ctx->path = ap_server_root_relative(p, path);
return NULL;
}
Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c (original)
+++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c Tue Aug 14 23:59:24 2012
@@ -75,7 +75,7 @@ static apr_status_t slotmem_create(ap_sl
if (name[0] == ':')
fname = name;
else
- fname = ap_runtime_dir_relative(pool, name);
+ fname = ap_server_root_relative(pool, name);
/* first try to attach to existing slotmem */
if (next) {
@@ -126,7 +126,7 @@ static apr_status_t slotmem_attach(ap_sl
if (name[0] == ':')
fname = name;
else
- fname = ap_runtime_dir_relative(pool, name);
+ fname = ap_server_root_relative(pool, name);
}
else
return APR_ENOSHMAVAIL;
Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Tue Aug 14 23:59:24 2012
@@ -4799,7 +4799,7 @@ static void core_dump_config(apr_pool_t
tmp = s->error_fname;
apr_file_printf(out, "Main ErrorLog: \"%s\"\n", tmp);
if (ap_scoreboard_fname) {
- tmp = ap_runtime_dir_relative(p, ap_scoreboard_fname);
+ tmp = ap_server_root_relative(p, ap_scoreboard_fname);
apr_file_printf(out, "ScoreBoardFile: \"%s\"\n", tmp);
}
ap_dump_mutexes(p, s, out);
Modified: httpd/httpd/branches/2.4.x/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/log.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/log.c (original)
+++ httpd/httpd/branches/2.4.x/server/log.c Tue Aug 14 23:59:24 2012
@@ -1394,7 +1394,7 @@ AP_DECLARE(void) ap_log_command_line(apr
AP_DECLARE(void) ap_remove_pid(apr_pool_t *p, const char *rel_fname)
{
apr_status_t rv;
- const char *fname = ap_runtime_dir_relative(p, rel_fname);
+ const char *fname = ap_server_root_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 *
return;
}
- fname = ap_runtime_dir_relative(p, filename);
+ fname = ap_server_root_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
return APR_EGENERAL;
}
- fname = ap_runtime_dir_relative(p, filename);
+ fname = ap_server_root_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);
Modified: httpd/httpd/branches/2.4.x/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm_common.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm_common.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm_common.c Tue Aug 14 23:59:24 2012
@@ -307,7 +307,7 @@ const char *ap_mpm_set_pidfile(cmd_parms
void ap_mpm_dump_pidfile(apr_pool_t *p, apr_file_t *out)
{
apr_file_printf(out, "PidFile: \"%s\"\n",
- ap_runtime_dir_relative(p, ap_pid_fname));
+ ap_server_root_relative(p, ap_pid_fname));
}
const char *ap_mpm_set_max_requests(cmd_parms *cmd, void *dummy,
Modified: httpd/httpd/branches/2.4.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/scoreboard.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.4.x/server/scoreboard.c Tue Aug 14 23:59:24 2012
@@ -217,7 +217,7 @@ static apr_status_t open_scoreboard(apr_
/* The config says to create a name-based shmem */
if (ap_scoreboard_fname) {
/* make sure it's an absolute pathname */
- fname = ap_runtime_dir_relative(pconf, ap_scoreboard_fname);
+ fname = ap_server_root_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_
else if (rv == APR_ENOTIMPL) {
/* Make sure it's an absolute pathname */
ap_scoreboard_fname = DEFAULT_SCOREBOARD;
- fname = ap_runtime_dir_relative(pconf, ap_scoreboard_fname);
+ fname = ap_server_root_relative(pconf, ap_scoreboard_fname);
return create_namebased_scoreboard(global_pool, fname);
}
Modified: httpd/httpd/branches/2.4.x/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_mutex.c?rev=1373168&r1=1373167&r2=1373168&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_mutex.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_mutex.c Tue Aug 14 23:59:24 2012
@@ -117,7 +117,7 @@ AP_DECLARE(apr_status_t) ap_parse_mutex(
* are looking to use
*/
if (file) {
- *mutexfile = ap_runtime_dir_relative(pool, file);
+ *mutexfile = ap_server_root_relative(pool, file);
if (!*mutexfile) {
return APR_BADARG;
}
@@ -304,7 +304,7 @@ static const char *get_mutex_filename(ap
}
#endif
- return ap_runtime_dir_relative(p,
+ return ap_server_root_relative(p,
apr_pstrcat(p,
mxcfg->dir,
"/",
@@ -552,7 +552,7 @@ AP_CORE_DECLARE(void) ap_dump_mutexes(ap
}
if (mxcfg->dir)
- dir = ap_runtime_dir_relative(p, mxcfg->dir);
+ dir = ap_server_root_relative(p, mxcfg->dir);
apr_file_printf(out, "Mutex %s: dir=\"%s\" mechanism=%s %s\n", name, dir, mech,
mxcfg->omit_pid ? "[OmitPid]" : "");