Get rid of the DAVParam support. That was a concept to help out

mod_dav providers in the 1.0.x series. Nowadays, the providers are
full-fledged Apache modules and can define their own directives and
set up per-server and per-directory parameters. (for example,
mod_dav_fs and the DAVLockDB directive)

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

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 3b331355e8afdb60c6d22fb3f9cfd2a542370ace..6ce8c7b519ccd45d0acc7aa387cf36a79a64becb 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -115,8 +115,6 @@ typedef struct {
     int locktimeout;
     int allow_depthinfinity;
 
-    apr_table_t *d_params;     /* per-directory DAV config parameters */
-
 } dav_dir_conf;
 
 /* per-server configuration */
@@ -220,8 +218,6 @@ static void *dav_create_dir_config(apr_pool_t *p, char *dir)
         conf->dir = d;
     }
 
-    conf->d_params = apr_table_make(p, 1);
-
     return conf;
 }
 
@@ -255,21 +251,9 @@ static void *dav_merge_dir_config(apr_pool_t *p, void *base, void *overrides)
     newconf->allow_depthinfinity = DAV_INHERIT_VALUE(parent, child,
                                                      allow_depthinfinity);
 
-    newconf->d_params = apr_table_copy(p, parent->d_params);
-    apr_table_overlap(newconf->d_params, child->d_params,
-                     APR_OVERLAP_TABLES_SET);
-
     return newconf;
 }
 
-apr_table_t *dav_get_dir_params(const request_rec *r)
-{
-    dav_dir_conf *conf;
-
-    conf = ap_get_module_config(r->per_dir_config, &dav_module);
-    return conf->d_params;
-}
-
 static const dav_provider * dav_get_provider(request_rec *r)
 {
     dav_dir_conf *conf;
@@ -367,19 +351,6 @@ static const char *dav_cmd_davmintimeout(cmd_parms *cmd, void *config,
     return NULL;
 }
 
-/*
- * Command handler for DAVParam directive, which is TAKE2
- */
-static const char *dav_cmd_davparam(cmd_parms *cmd, void *config,
-                                    const char *arg1, const char *arg2)
-{
-    dav_dir_conf *conf = (dav_dir_conf *) config;
-
-    apr_table_set(conf->d_params, arg1, arg2);
-
-    return NULL;
-}
-
 /*
 ** dav_error_response()
 **
@@ -4555,11 +4526,6 @@ static const command_rec dav_cmds[] =
                  ACCESS_CONF|RSRC_CONF,
                  "allow Depth infinity PROPFIND requests"),
 
-    /* per directory/location, or per server */
-    AP_INIT_TAKE2("DAVParam", dav_cmd_davparam, NULL,
-                  ACCESS_CONF|RSRC_CONF,
-                  "DAVParam <parameter name> <parameter value>"),
-
     { NULL }
 };
 

diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 92b7c5f05fd508c57c7c224f189140746120c5c1..c93598f7c6578c56d3600d8072a033967d3dc189 100644 (file)
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -2322,9 +2322,6 @@ struct dav_hooks_binding {
 ** MISCELLANEOUS STUFF
 */
 
-/* allow providers access to the per-directory parameters */
-apr_table_t *dav_get_dir_params(const request_rec *r);
-
 /* fetch the "LimitXMLRequestBody" in force for this resource */
 apr_size_t dav_get_limit_xml_body(const request_rec *r);