You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2020/07/03 08:29:57 UTC
svn commit: r1879466 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h
modules/dav/main/mod_dav.c modules/dav/main/mod_dav.h
Author: minfrin
Date: Fri Jul 3 08:29:56 2020
New Revision: 1879466
URL: http://svn.apache.org/viewvc?rev=1879466&view=rev
Log:
mod_dav: Allow other DAV modules to use dav_get_resource().
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/modules/dav/main/mod_dav.c
httpd/httpd/trunk/modules/dav/main/mod_dav.h
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1879466&r1=1879465&r2=1879466&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jul 3 08:29:56 2020
@@ -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]
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1879466&r1=1879465&r2=1879466&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Fri Jul 3 08:29:56 2020
@@ -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
Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.c?rev=1879466&r1=1879465&r2=1879466&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Fri Jul 3 08:29:56 2020
@@ -732,7 +732,7 @@ static int dav_get_overwrite(request_rec
* 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;
Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.h?rev=1879466&r1=1879465&r2=1879466&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Fri Jul 3 08:29:56 2020
@@ -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);
+
/* --------------------------------------------------------------------
**