|
 |
41a6c3 |
Index: acinclude.m4
|
|
|
41a6c3 |
===================================================================
|
|
|
41a6c3 |
--- a/acinclude.m4 (revision 1667671)
|
|
|
41a6c3 |
+++ b/acinclude.m4 (working copy)
|
|
|
41a6c3 |
@@ -43,6 +43,7 @@
|
|
|
41a6c3 |
APACHE_SUBST(installbuilddir)
|
|
|
41a6c3 |
APACHE_SUBST(runtimedir)
|
|
|
41a6c3 |
APACHE_SUBST(proxycachedir)
|
|
|
41a6c3 |
+ APACHE_SUBST(davlockdb)
|
|
|
41a6c3 |
APACHE_SUBST(other_targets)
|
|
|
41a6c3 |
APACHE_SUBST(progname)
|
|
|
41a6c3 |
APACHE_SUBST(prefix)
|
|
|
41a6c3 |
@@ -710,6 +711,7 @@
|
|
|
41a6c3 |
APACHE_SUBST_EXPANDED_ARG(runtimedir)
|
|
|
41a6c3 |
APACHE_SUBST_EXPANDED_ARG(logfiledir)
|
|
|
41a6c3 |
APACHE_SUBST_EXPANDED_ARG(proxycachedir)
|
|
|
41a6c3 |
+ APACHE_SUBST_EXPANDED_ARG(davlockdb)
|
|
|
41a6c3 |
])
|
|
|
41a6c3 |
|
|
|
41a6c3 |
dnl
|
|
|
41a6c3 |
Index: build/mkconfNW.awk
|
|
|
41a6c3 |
===================================================================
|
|
|
41a6c3 |
--- a/build/mkconfNW.awk (revision 1667671)
|
|
|
41a6c3 |
+++ b/build/mkconfNW.awk (working copy)
|
|
|
41a6c3 |
@@ -26,6 +26,7 @@
|
|
|
41a6c3 |
A["runtimedir"] = "logs"
|
|
|
41a6c3 |
A["errordir"] = "error"
|
|
|
41a6c3 |
A["proxycachedir"] = "proxy"
|
|
|
41a6c3 |
+ A["davlockdb"] = "davlockdb"
|
|
|
41a6c3 |
|
|
|
41a6c3 |
B["htdocsdir"] = A["ServerRoot"]"/"A["htdocsdir"]
|
|
|
41a6c3 |
B["iconsdir"] = A["ServerRoot"]"/"A["iconsdir"]
|
|
|
41a6c3 |
@@ -32,6 +33,7 @@
|
|
|
41a6c3 |
B["manualdir"] = A["ServerRoot"]"/"A["manualdir"]
|
|
|
41a6c3 |
B["errordir"] = A["ServerRoot"]"/"A["errordir"]
|
|
|
41a6c3 |
B["proxycachedir"] = A["ServerRoot"]"/"A["proxycachedir"]
|
|
|
41a6c3 |
+ B["davlockdb"] = A["ServerRoot"]"/"A["davlockdb"]
|
|
|
41a6c3 |
B["cgidir"] = A["ServerRoot"]"/"A["cgidir"]
|
|
|
41a6c3 |
B["logfiledir"] = A["logfiledir"]
|
|
|
41a6c3 |
B["sysconfdir"] = A["sysconfdir"]
|
|
|
41a6c3 |
Index: include/ap_config_layout.h.in
|
|
|
41a6c3 |
===================================================================
|
|
|
41a6c3 |
--- a/include/ap_config_layout.h.in (revision 1667671)
|
|
|
41a6c3 |
+++ b/include/ap_config_layout.h.in (working copy)
|
|
|
41a6c3 |
@@ -60,5 +60,7 @@
|
|
|
41a6c3 |
#define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
|
|
|
41a6c3 |
#define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
|
|
|
41a6c3 |
#define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"
|
|
|
41a6c3 |
+#define DEFAULT_EXP_DAVLOCKDB "@exp_davlockdb@"
|
|
|
41a6c3 |
+#define DEFAULT_REL_DAVLOCKDB "@rel_davlockdb@"
|
|
|
41a6c3 |
|
|
|
41a6c3 |
#endif /* AP_CONFIG_LAYOUT_H */
|
|
|
41a6c3 |
Index: modules/dav/fs/mod_dav_fs.c
|
|
|
41a6c3 |
===================================================================
|
|
|
41a6c3 |
--- a/modules/dav/fs/mod_dav_fs.c (revision 1667671)
|
|
|
41a6c3 |
+++ b/modules/dav/fs/mod_dav_fs.c (working copy)
|
|
|
41a6c3 |
@@ -17,6 +17,7 @@
|
|
|
41a6c3 |
#include "httpd.h"
|
|
|
41a6c3 |
#include "http_config.h"
|
|
|
41a6c3 |
#include "apr_strings.h"
|
|
|
41a6c3 |
+#include "ap_config_auto.h"
|
|
|
41a6c3 |
|
|
|
41a6c3 |
#include "mod_dav.h"
|
|
|
41a6c3 |
#include "repos.h"
|
|
|
41a6c3 |
@@ -39,7 +40,15 @@
|
|
|
41a6c3 |
|
|
|
41a6c3 |
static void *dav_fs_create_server_config(apr_pool_t *p, server_rec *s)
|
|
|
41a6c3 |
{
|
|
|
41a6c3 |
- return apr_pcalloc(p, sizeof(dav_fs_server_conf));
|
|
|
41a6c3 |
+ dav_fs_server_conf *conf = apr_pcalloc(p, sizeof(dav_fs_server_conf));
|
|
|
41a6c3 |
+#ifdef DEFAULT_EXP_DAVLOCKDB
|
|
|
41a6c3 |
+ conf->lockdb_path = DEFAULT_EXP_DAVLOCKDB;
|
|
|
41a6c3 |
+ if (*conf->lockdb_path == '\0') {
|
|
|
41a6c3 |
+ conf->lockdb_path = NULL;
|
|
|
41a6c3 |
+ }
|
|
|
41a6c3 |
+#endif
|
|
|
41a6c3 |
+
|
|
|
41a6c3 |
+ return conf;
|
|
|
41a6c3 |
}
|
|
|
41a6c3 |
|
|
|
41a6c3 |
static void *dav_fs_merge_server_config(apr_pool_t *p,
|