mod_dav: Add dav_get_provider_name() function to obtain the name

of the provider from mod_dav.

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

diff --git a/CHANGES b/CHANGES
index 7f7225944ccf6b1b5668558cf7ad1ea729c75c3c..456aa6a8e8fc16b1aa935c2bf0eb81db751aa168 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_dav: Add dav_get_provider_name() function to obtain the name
+     of the provider from mod_dav.
+     [Jari Urpalainen <jari.urpalainen nokia.com>]
+
   *) mod_proxy_fcgi: Avoid passing a filename of proxy:fcgi:// as
      SCRIPT_FILENAME to a FastCGI server. PR59618.
      [Jacob Champion <champion.pxi gmail.com>]

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 0e0327a21f49502dc7426d1fd44b429db4fccaff..7dd811bc9dda79eaa7d3d53c7920e8ca35b84770 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -525,6 +525,7 @@
  *                         and optional ssl_engine_set() to mod_ssl.h.
  * 20160315.3 (2.5.0-dev)  Add childtags to dav_error.
  * 20160608.1 (2.5.0-dev)  Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n]()
+ * 20160608.2 (2.5.0-dev)  Add dav_get_provider_name.
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -532,7 +533,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20160608
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 1                 /* 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 d35c75ae0bdf697843f18f4a5fce34486b5a35dc..1459acc1b680f6a81c554353208ccbe341b714fc 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -201,6 +201,12 @@ static void *dav_merge_dir_config(apr_pool_t *p, void *base, void *overrides)
     return newconf;
 }
 
+DAV_DECLARE(const char *) dav_get_provider_name(request_rec *r)
+{
+    dav_dir_conf *conf = ap_get_module_config(r->per_dir_config, &dav_module);
+    return conf ? conf->provider_name : NULL;
+}
+
 static const dav_provider *dav_get_provider(request_rec *r)
 {
     dav_dir_conf *conf;

diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 7aea8a3489c5c76ac78dcc2d090f02d328268d9f..6104ae6997e75e0ba293d6c0d88f45371921dc98 100644 (file)
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -667,6 +667,7 @@ DAV_DECLARE(const dav_hooks_search *) dav_get_search_hooks(request_rec *r);
 DAV_DECLARE(void) dav_register_provider(apr_pool_t *p, const char *name,
                                         const dav_provider *hooks);
 DAV_DECLARE(const dav_provider *) dav_lookup_provider(const char *name);
+DAV_DECLARE(const char *) dav_get_provider_name(request_rec *r);
 
 
 /* ### deprecated */