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 2018/02/17 13:56:44 UTC
svn commit: r1824590 - in /httpd/httpd/trunk/modules/dav/main: mod_dav.c
mod_dav.h providers.c
Author: minfrin
Date: Sat Feb 17 13:56:44 2018
New Revision: 1824590
URL: http://svn.apache.org/viewvc?rev=1824590&view=rev
Log:
Make sure ACL API support in mod_dav is not dependent on the presence
or absence of apr-util v1.6. Log a message to note that ACL support
is disabled with apr-util <= 1.5.
Modified:
httpd/httpd/trunk/modules/dav/main/mod_dav.c
httpd/httpd/trunk/modules/dav/main/mod_dav.h
httpd/httpd/trunk/modules/dav/main/providers.c
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=1824590&r1=1824589&r2=1824590&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Sat Feb 17 13:56:44 2018
@@ -117,6 +117,12 @@ static int dav_init_handler(apr_pool_t *
dav_methods[DAV_M_BIND] = ap_method_register(p, "BIND");
dav_methods[DAV_M_SEARCH] = ap_method_register(p, "SEARCH");
+ /* log a warning if ACL support is unavailable */
+#ifndef APR_XML_X2T_PARSED
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO()
+ "mod_dav ACL support disabled. Compile with apr-util >= 1.6 to enable.");
+#endif
+
return OK;
}
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=1824590&r1=1824589&r2=1824590&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Sat Feb 17 13:56:44 2018
@@ -319,9 +319,7 @@ typedef enum {
*/
typedef struct dav_resource_private dav_resource_private;
-#ifdef APR_XML_X2T_PARSED
typedef struct dav_acl_provider dav_acl_provider;
-#endif
/*
** Resource descriptor, generated by a repository provider.
@@ -422,9 +420,7 @@ typedef struct dav_resource {
long as the dav_resource structure. */
apr_pool_t *pool;
-#ifdef APR_XML_X2T_PARSED
const dav_acl_provider *acls; /* acls used for this resource */
-#endif
void *ctx; /* additional parameter */
@@ -2541,7 +2537,6 @@ typedef struct {
**
** DAV ACL HOOKS
*/
-#ifdef APR_XML_X2T_PARSED
struct dav_acl_provider
{
@@ -2567,7 +2562,6 @@ DAV_DECLARE(void) dav_acl_provider_regis
DAV_DECLARE(const dav_acl_provider *) dav_get_acl_providers(void);
-#endif
/* --------------------------------------------------------------------
**
Modified: httpd/httpd/trunk/modules/dav/main/providers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/providers.c?rev=1824590&r1=1824589&r2=1824590&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/providers.c (original)
+++ httpd/httpd/trunk/modules/dav/main/providers.c Sat Feb 17 13:56:44 2018
@@ -32,7 +32,6 @@ DAV_DECLARE(const dav_provider *) dav_lo
return ap_lookup_provider(DAV_PROVIDER_GROUP, name, "0");
}
-#ifdef APR_XML_X2T_PARSED
DAV_DECLARE(void) dav_acl_provider_register(apr_pool_t *p,
const dav_acl_provider *provider)
{
@@ -43,7 +42,6 @@ DAV_DECLARE(const dav_acl_provider *) da
{
return ap_lookup_provider(DAV_PROVIDER_GROUP, "acl", "0");
}
-#endif
DAV_DECLARE(void) dav_options_provider_register(apr_pool_t *p,
const char *name,