From: Jan Kaluža <jkaluza@apache.org>
Date: Fri, 17 Apr 2015 07:28:50 +0000 (+0000)
Subject: * mod_dav_fs: set default value of DavLockDB using installation layout
X-Git-Tag: 2.5.0-alpha~3262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac752395e12223d23f968f47b7e791a2fb0380d;p=thirdparty%2Fapache%2Fhttpd.git

* mod_dav_fs: set default value of DavLockDB using installation layout


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674222 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/acinclude.m4 b/acinclude.m4
index e2f8c22e575..dfcb3c9b036 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -43,6 +43,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(installbuilddir)
   APACHE_SUBST(runtimedir)
   APACHE_SUBST(proxycachedir)
+  APACHE_SUBST(davlockdb)
   APACHE_SUBST(other_targets)
   APACHE_SUBST(progname)
   APACHE_SUBST(prefix)
@@ -710,6 +711,7 @@ AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
   APACHE_SUBST_EXPANDED_ARG(runtimedir)
   APACHE_SUBST_EXPANDED_ARG(logfiledir)
   APACHE_SUBST_EXPANDED_ARG(proxycachedir)
+  APACHE_SUBST_EXPANDED_ARG(davlockdb)
 ])
 
 dnl 
diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index c0028cef0c7..40ef183c106 100644
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -26,12 +26,14 @@ BEGIN {
     A["runtimedir"] = "logs"
     A["errordir"] = "error"
     A["proxycachedir"] = "proxy"
+    A["davlockdb"] = "davlockdb"
 
     B["htdocsdir"] = A["ServerRoot"]"/"A["htdocsdir"]
     B["iconsdir"] = A["ServerRoot"]"/"A["iconsdir"]
     B["manualdir"] = A["ServerRoot"]"/"A["manualdir"]
     B["errordir"] = A["ServerRoot"]"/"A["errordir"]
     B["proxycachedir"] = A["ServerRoot"]"/"A["proxycachedir"]
+    B["davlockdb"] = A["ServerRoot"]"/"A["davlockdb"]
     B["cgidir"] = A["ServerRoot"]"/"A["cgidir"]
     B["logfiledir"] = A["logfiledir"]
     B["sysconfdir"] = A["sysconfdir"]
diff --git a/include/ap_config_layout.h.in b/include/ap_config_layout.h.in
index 2b4a70c4616..cda6a1130e6 100644
--- a/include/ap_config_layout.h.in
+++ b/include/ap_config_layout.h.in
@@ -60,5 +60,7 @@
 #define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
 #define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
 #define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"
+#define DEFAULT_EXP_DAVLOCKDB "@exp_davlockdb@"
+#define DEFAULT_REL_DAVLOCKDB "@rel_davlockdb@"
 
 #endif /* AP_CONFIG_LAYOUT_H */
diff --git a/modules/dav/fs/mod_dav_fs.c b/modules/dav/fs/mod_dav_fs.c
index addfd7e93f2..78039c9b989 100644
--- a/modules/dav/fs/mod_dav_fs.c
+++ b/modules/dav/fs/mod_dav_fs.c
@@ -17,6 +17,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "apr_strings.h"
+#include "ap_config_auto.h"
 
 #include "mod_dav.h"
 #include "repos.h"
@@ -39,7 +40,15 @@ const char *dav_get_lockdb_path(const request_rec *r)
 
 static void *dav_fs_create_server_config(apr_pool_t *p, server_rec *s)
 {
-    return apr_pcalloc(p, sizeof(dav_fs_server_conf));
+    dav_fs_server_conf *conf = apr_pcalloc(p, sizeof(dav_fs_server_conf));
+#ifdef DEFAULT_EXP_DAVLOCKDB
+    conf->lockdb_path = DEFAULT_EXP_DAVLOCKDB;
+    if (*conf->lockdb_path == '\0') {
+        conf->lockdb_path = NULL;
+    }
+#endif
+
+    return conf;
 }
 
 static void *dav_fs_merge_server_config(apr_pool_t *p,