]> granicus.if.org Git - apache/commit
Revert r1373105, the merging of incompatible DefaultRuntimeDir
authorJeff Trawick <trawick@apache.org>
Tue, 14 Aug 2012 23:59:24 +0000 (23:59 +0000)
committerJeff Trawick <trawick@apache.org>
Tue, 14 Aug 2012 23:59:24 +0000 (23:59 +0000)
commit577acc2d12f51feff38ed413b6efede9a8eb0b2e
tree90c76c9bfb031537d083aa9c1b9e16318d03a1fd
parent2fefb0746d1fe33ac369ed3ba9747eda30754349
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373168 13f79535-47bb-0310-9956-ffa450edef68
24 files changed:
CHANGES
STATUS
docs/conf/extra/httpd-mpm.conf.in
docs/conf/extra/httpd-ssl.conf.in
docs/manual/mod/core.xml
docs/manual/mod/mod_ldap.xml
docs/manual/mod/mod_socache_dbm.xml
docs/manual/mod/mod_socache_shmcb.xml
docs/manual/mod/mpm_common.xml
include/ap_config.h
include/heartbeat.h
include/http_log.h
include/scoreboard.h
modules/cache/mod_socache_dbm.c
modules/cache/mod_socache_shmcb.c
modules/cluster/mod_heartmonitor.c
modules/ldap/util_ldap.c
modules/proxy/balancers/mod_lbmethod_heartbeat.c
modules/slotmem/mod_slotmem_plain.c
server/core.c
server/log.c
server/mpm_common.c
server/scoreboard.c
server/util_mutex.c