From: Graham Leggett <minfrin@apache.org>
Date: Fri, 3 Jul 2020 08:29:56 +0000 (+0000)
Subject: mod_dav: Allow other DAV modules to use dav_get_resource().
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06af945548afc700e18e60bfcf1cecbe31c62287;p=thirdparty%2Fapache%2Fhttpd.git

mod_dav: Allow other DAV modules to use dav_get_resource().


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

diff --git a/CHANGES b/CHANGES
index 5a26b3eb5f9..bcf48332000 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_dav: Allow other DAV modules to use dav_get_resource().
+     [Graham Leggett]
+
   *) mpm_common: remove ap_mpm_unregister_poll_callback() and
      mpm_unregister_poll_callback hook. [Yann Ylavic]
 
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 7e232a92069..8bf8ffc0879 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -648,8 +648,9 @@
  * 20200420.10 (2.5.1-dev) Add method_precondition hook to mod_dav.h.
  * 20200701.0 (2.5.1-dev)  Axe ap_mpm_unregister_poll_callback() and
  *                         mpm_unregister_poll_callback hook.
- * 20200702.0 (2.5.1-dev)  Add pool arg to mpm_register_poll_callback and
+ * 20200702.1 (2.5.1-dev)  Add pool arg to mpm_register_poll_callback and
  *                         mpm_register_poll_callback_timeout hooks
+ * 20200702.2 (2.5.1-dev)  Add dav_get_resource().
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -657,7 +658,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20200702
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 0             /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 2             /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index b50636262b7..bd6ad3c6e32 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -732,7 +732,7 @@ static int dav_get_overwrite(request_rec *r)
  * the resource identified by the DAV:checked-in property of the resource
  * identified by the Request-URI.
  */
-static dav_error *dav_get_resource(request_rec *r, int label_allowed,
+DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
                                    int use_checked_in, dav_resource **res_p)
 {
     dav_dir_conf *conf;
diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 7b51b604f9c..98b13af1bd2 100644
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -433,6 +433,9 @@ typedef struct dav_resource {
 */
 typedef struct dav_locktoken dav_locktoken;
 
+DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
+                                          int use_checked_in, dav_resource **res_p);
+
 
 /* --------------------------------------------------------------------
 **