Commit 33102693 authored by Greg Stein's avatar Greg Stein
Browse files

liveprops are handled via hooks, not the dav_provider structure. clear it 

out of there.


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

modules/dav/fs/repos.c

+2 −2
Original line number Diff line number Diff line
@@ -1986,8 +1986,8 @@ static const dav_provider dav_fs_provider = 
    &dav_hooks_repository_fs,

    &dav_hooks_db_dbm,

    &dav_hooks_locks_fs,

    &dav_hooks_liveprop_fs,

    NULL

    NULL,               /* vsn */

    NULL                /* binding */

};



void dav_fs_gather_propsets(apr_array_header_t *uris)

modules/dav/main/mod_dav.h

+11 −10
Original line number Diff line number Diff line
@@ -59,17 +59,18 @@ 
#ifndef _MOD_DAV_H_

#define _MOD_DAV_H_



#ifdef __cplusplus

extern "C" {

#endif



#include "httpd.h"

#include "util_xml.h"

#include "ap_hooks.h"

#include "apr_hash.h"

#include "apu_dbm.h"



#include <limits.h>     /* for INT_MAX */



#ifdef __cplusplus

extern "C" {

#endif





#define DAV_VERSION		AP_SERVER_BASEREVISION
@@ -517,12 +518,16 @@ ap_xml_elem *dav_find_child(const ap_xml_elem *elem, const char *tagname); 
** Note that a provider cannot pick and choose portions. There are too many

** dependencies between a dav_resource (defined by <repos>) and the other

** functionality.

**

** Live properties are not part of the dav_provider structure because they

** are handled through the AP_HOOK interface (to allow for multiple liveprop

** providers). The core always provides some properties, and then a given

** provider will add more properties.

*/

typedef struct {

    const dav_hooks_repository *repos;

    const dav_hooks_propdb *propdb;

    const dav_hooks_locks *locks;

    const dav_hooks_liveprop *liveprop;

    const dav_hooks_vsn *vsn;

    const dav_hooks_binding *binding;
@@ -939,11 +944,7 @@ enum { 
*/



typedef struct dav_db dav_db;

typedef struct

{

    char *dptr;

    apr_size_t dsize;

} dav_datum;

typedef apu_datum_t dav_datum;



/* hook functions to enable pluggable databases */

struct dav_hooks_propdb