arrfab / rpms / httpd

Forked from rpms/httpd 5 years ago
Clone

Blame SOURCES/httpd-2.4.6-r1674222.patch

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