Fix PR 56480: PROPFIND walker doesn't encode hrefs properly Reverts r1529559 partially (specifically the dav_xml_escape_uri) bit. Reverts r1531505 entirely. * modules/dav/main/mod_dav.c (dav_xml_escape_uri): Revert the piece of r1529559 that removes the URI escaping from this function. * modules/dav/main/props.c (dav_do_prop_subreq): Escape the URI before doing a sub request with it. This resolves some properties like getcontenttype from failing to be returned for files that contain characters that require encoding in their path. * modules/dav/main/mod_dav.h (dav_resource): Note the inconsistency in the documentation. * modules/dav/fs/repos.c (dav_fs_get_resource): Don't use the unparsed_uri to set the uri field of the resource. This is the correct fix for the double encoding in mod_dav_fs that led to the dav_xml_escape_uri() change and r1531505. (dav_fs_walker, dav_fs_append_uri): Revert r1531505 changes.

Fix PR 55397: dav_resource->uri treated as an unparsed uri. The change made for PR 54611 caused this field to be treated as unescaped. mod_dav_svn however, provided escaped URIs. Essentially breaking support for paths with non-URI safe characters in SVN. Adjust the code so that dav_resource->uri is assumed to be escaped and adjust mod_dav_fs so that it uses escaped URIs in this field. * modules/dav/fs/repos.c (dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri. * modules/dav/main/mod_dav.c (dav_xml_escape_uri): Do not uri escape, just handle xml escaping. (dav_created): Assume that locn if provided is escaped. (dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request when calling dav_created() to adjust to locn assuming it is escaped. * modules/dav/main/mod_dav.h (dav_resource): Document that uri is escaped.

mod_dav: Fix PR 55306. Makes mod_dav no longer require that the lock token be provided when the source of a COPY is locked. The prior behavior was in violating of RFC 4918 which says that the lock token is only required on resources that may be modified by the method. * modules/dav/main/mod_dav.h (DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions. * modules/dav/main/mod_dav.c (dav_method_copymove): Use the new flag when calling dav_validate_request() on the COPY source. * modules/dav/main/util.c (dav_validate_resource_state): Use the flag to decide to ignore if the lock token is not provided.

mod_dav: Improve error handling in dav_method_put(), add new dav_join_error() function. PR: 54145 Submitted by: Ben Reser <ben reser.org> Reviewed by: trawick

Removed dav_get_limit_xml_body() from mod_dav.h. This was a forgotten prototype hanging around for close to 11 years where no code for existed (see r85816); now removed from all branches per wrowe's permission.

re-order many struct members for better alignment on 64bit

Remove errno from dav_error interface. Calls to dav_new_error() and dav_new_error_tag() must be adjusted to add an apr_status_t parameter. Reviewed by: jorton

fixed dav_hooks_repository_fs struct member order, fixed comments. Submitted by brian brianfrance.com.

mod_dav: Provide a mechanism to obtain the request_rec and pathname from the dav_resource. Submitted by: Jari Urpalainen <jari.urpalainen nokia.com>, Brian France <brian brianfrance.com>

mod_dav: Allow other modules to become providers and add resource types to the DAV response. Submitted by: Jari Urpalainen <jari.urpalainen nokia.com>, Brian France <brian brianfrance.com>

mod_dav: Allow other modules to add things to the DAV or Allow headers of an OPTIONS request. Submitted by: Brian France <brian brianfrance.com>

update license header text

Update the copyright year in all .c, .h and .xml files

Fix handling of unknown state tokens in If headers: * modules/dav/main/mod_dav.h: Add dav_if_unknown to dav_if_state_type enum. * modules/dav/main/util.c (dav_add_if_state): Set returned type to dav_if_unknown for an unknown state token. (dav_validate_resource_state): Evaluate dav_if_unknown to fail match unless in a Not condition. PR: 37288

Doxygen fixup / cleanup submited by: Neale Ranns neale ranns.org reviewed by: Ian Holsman

fix 64bit build warnings in modules/dav

* modules/dav/main/mod_dav.h: Wrap all public functions in DAV_DECLARE or DAV_DECLARE_NONSTD. * modules/dav/main/liveprop.c, modules/dav/main/props.c, modules/dav/main/util_lock.c, modules/dav/main/mod_dav.c, modules/dav/main/std_liveprop.c, modules/dav/main/util.c: Update function definitions. Submitted by: Branko Čibej <brane xbc.nu> Reviewed by: Justin Erenkrantz

Update copyright year to 2005 and standardize on current copyright owner line.

fix name of The Apache Software Foundation

apply Apache License, version 2.0

update license to 2004.

mod_dav improvement: make dav_method_propfind stream its response, rather than cache every <response> object and send the whole 207 at once. Note: this patch doesn't affect the mod_dav provider API at all. Providers still return property results in text-buffers, but mod_dav then streams them out immediately. Submitted by: Ben Collins-Sussman <sussman@collab.net> Reviewed by: gstein, jerenkrantz, sander * mod_dav.h (dav_walker_ctx): add a brigade field and a scratchpool field. * mod_dav.c (dav_send_one_response): new helper function to write a <DAV:response> into a brigade/filter. this code has been factorized out of dav_send_multistatus. (dav_begin_multistatus): new factorized helper func; creates brigade and sends initial <multistatus> tag. (dav_send_multistatus): create brigade, call dav_begin_multistatus, and switch all ap_rputs calls to ap_fputs instead. call dav_send_one_response when looping over response list. use a subpool when iterating. (dav_method_propfind): initialize walker ctx's brigade. initialize ctx's scratchpool as a subpool of r->pool. Send a <multistatus> tag before calling the provider's walk() function, and a </multistatus> tag afterwards. (dav_stream_response): new function, originally based on dav_add_repsonse. don't build linked list of responses in memory; just spew each response object into the brigade via dav_send_one_response(). take an incoming pool argument to do the temporary allocation and streaming. (dav_propfind_walker): pass ctx->scratchpool to dav_stream_response, and clear the pool when finished.

finished that boring job: update license to 2003. Happy New Year! ;-))

Detabbify. With extreme prejudice.

In some application environments, the mod_dav hook structures are allocated dynamically. The structures need a context pointer to represent that dynamic "object", so a pointer was added to the end of each of the more important structures. While providers don't need to add this field to their structures (it will default to NULL), I went ahead and added it to mod_dav_fs for clarity. No MMN bump is required because Apache does not use/examine the fields (only the provider will set and use them).

The real pain. ap->apr xml and text types.

stop using APLOG_NOERRNO in calls to ap_log_[pr]error()

fix the function name in the prototype for dav_get_search_hooks()

Add DASL(SEARCH) support to mod_dav. Submitted by: Sung Kim <hunkim@cse.ucsc.edu>

Change the REPORT handling APIs to deliver the content directly into the filter stack, rather than buffering everything into memory(!).

Update our copyright for this year.

Give mod_dav the ability to output both standard and customized <D:error> responses. It's crucial for marshalling svn error messages back over to the client; and someday it will be needed to return specific <DAV:> errors as dictated by the DeltaV spec. * mod_dav.h (dav_error): add two new fields -- an optional error namespace, and an error-tag-name. Remove the 'delayed computation' function and cxt ptrs in this struct; they were never used. (dav_new_error_tag): new alternative constructor that takes new fields. * util.c (dav_new_error_tag): implement constructor. * mod_dav.c (dav_error_response_tag): new function to output 'standard' xml error response based on error struct. (dav_handle_err): if no multistatus response is passed in, and if an error-tag is defined, then call our new xml-output routine. Submitted by: Ben Collins-Sussman <sussman@collab.net>

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)

dav_xml_get_cdata() is an exported function, so mark it as such with the DAV_DECLARE macro. [ Barry Pederson <barryp@yahoo.com> ] Apache's handling of ports is broken. Temporarily disable the port checking in the Destination: header. [ Greg Stein ]

Revamp how mod_dav asks its provider to generate a GET response. * eliminate the get_pathname and free_file vtable functions. add the deliver() function to have the provider deliver the content straight into a filter [stack]. * eliminate readable streams -- they are now obsolete. this gets rid of the read_stream vtable function and DAV_MODE_READ* * implement a deliver() function for the FS provider. this simply constructs a bucket and EOS and shoves them into the filter. note that this is debug code only, so the "large file" issue handled by the core's default handler doesn't count here. * allow the provider to handle GET for any resource type and for collections. this moves the checks into the provider.

Revamp the API that mod_dav uses to talk to back end deadprop (propdb) providers. The old API was really based on how the FS stored properties, but sucked for other types of providers (SQL databases, Subversion, etc). This new code is overall much cleaner as it moves from a DBM style API to one tuned for actual mod_dav operation; it also more flexible/clearer for future improvements (e.g. dropping props directly to the wire rather than buffering in memory). This new API allows the provider to better define namespace handling during the output of the values, how values are serialized and stored, the mapping between elements' namespaces and the internalized namespace storage, a clearer mechanism for naming properties (dav_prop_name), and an explicit rollback mechanism to deal with PROPPATCH atomicity. Updated the FS provider (fs/dbm.c) to the new API, mostly by moving code from main/props.c. Of course, with the new semantics, some big changes in the namespace mapping were made.

Add an opaque datatype for managing a set of XML namespace declarations. Part of an upcoming propdb API improvement.

Clean up mod_dav error reporting to HTML/XHTML cross-compliance.

clarify the use of some of the members of the dav_provider structure.

allow non-absolute URIs to occur in some of the requests. RFC 2518 states that the Destination: header (used in MOVE/COPY) must be an absolute URI, so it keeps that constraint.

Fix up the auto-versioning stuff. The new scheme more closely matches the intent of DeltaV draft 14, simplifying some previous assumptions. Includes some heavy fixes to MOVE/COPY in a versioning world. Fix to CHECKOUT when a working resource is not created (checkout in place) Submitted by: John Vasta <jvasta@rational.com>

Implement the MERGE method: fill in dav_method_merge(); add merge() function to dav_hooks_vsn.

clean up some warnings dealing with 1) mismatches between printf format strings and arguments 2) wrong type for last parm to ap[r]_xml_to_text 3) missing time.h decls

Patch to sync with some changes to mod_dav 1.1: *) revamp the set_target stuff -- latest draft calls this UPDATE *) update the CHECKIN method handling *) liveprop providers can catch/define "core" properties before the core gets a chance. Submitted by: John Vasta <jvasta@rational.com> Reviewed by: Greg Stein

revise the set of predefined PROPID values based on DeltaV Internet Draft #14

Update copyright to 2001

trailing commas in enum declarations aren't portable

Revamp the CHECKOUT method handling and various support functions for it. Basically, the original CHECKOUT was based on a really old draft of the DeltaV specification. This brings it up to date. *) get_resource hook now takes an optional label name and/or a flag on whether to use the DAV:checked-in property; if either one is provided, then a version resource is looked up and returned. WARNING: the parameter types are now the same, but have very different semantics. this means you won't get a compile error to figure out that something needs to be changed here. *) mod_dav.c::dav_get_resource no longer cahces the fetched resource in the request userdata. Some requests will call this function multiple times, for different resources -- we don't want to keep returning the same resource (no idea how this ended up working). *) dav_get_resource()'s parameters have been updated. target_allowed is old terminology; it is now label_allowed. The target paramter is obsoleted by the simple use_checked_in flag. *) dav_get_target_selector() is obsolete. XML element processing is done within the CHECKOUT method (i.e. only where it occurs). The other half of the old function was to simply fetch the Label: header. *) DAV_TARGET_SELECTOR_HDR is now DAV_LABEL_HDR *) dav_method_checkout() now processes all the various options for a CHECKOUT method and either modifies the initial resource lookup, or passes the data to the checkout hook function. *) the checkout hook grew a bunch of new parameters *) new utility function: dav_xml_get_cdata() to gather up all the CDATA from an XML element. this is used to extract DAV:href values. (probably move to util_xml.c at some point)

*) add activity handling: OPTIONS and MKACTIVITY *) fix HTTP status code in MKWORKSPACE handling *) add can_be_activity and make_activity hooks to dav_hooks_vsn

Provide a way to allow get_resource and get_parent_resource to return errors that might occur during the parsing of the URI and/or the lookup of the resource in the repository. Specifically: return a dav_error* and move the returned dav_resource* to an "out" parameter of the hook function.

some stylistic tweaks post- John's patch

- implement DeltaV OPTIONS extensions - let live prop providers get first crack at PROPFIND - work around MS Web Folders limit on DAV header length Submitted by: John Vasta <jvasta@rational.com> Reviewed by: Greg Stein

The big change. This is part 3 of the apr-util symbols rename, please see the first commit of srclib/apr-util/include (cvs apr-util/include) for the quick glance at symbols changed.

Fix a problem found by Ryan when deleting collections, which triggered an underlying (broad) bug. dav_add_response() was assuming the walk params were a dav_walker_ctx. During the walker cleanup in Nov00, that assumption was removed, so response errors that occurred in the cleaned sections (such as dav_fs_delete_resource) could trigger a segfault. Solution: add a pool to dav_walk_resource and alter dav_add_response to use that, rather than assume the ctx is a dav_walker_ctx. [ note there is also a pool in dav_walk_resource.resource, but that pool is associated with the *resource* rather than the process of walking, so we introduced another field. currently they are the same, however. ] Found by: Ryan Bloom

switch to apr_dbm.h and the updated naming

*) make find_liveprop() hook take a dav_resource rather than "r" *) repos.c: liveprop hooks shouldn't respond if the resource is not an FS resource. *) std_liveprop.c: use empty-elem form if value=="". return NOTDEF for the properties that we aren't ready to insert yet

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

fix spelling: "writable" is the proper form

shift some processing of "core" WebDAV properties out of the generic property handling code, and into a new, core liveprop handler. *) add std_liveprop.c to deal with the core DAV properties *) move DAV:resourcetype, DAV:supported-method-set, DAV:supported-live-property-set, and DAV:supported-report-set over to the new handler *) props.c::dav_get_allprops() should not look in the deadprop database for the DAV:resourcetype -- it is readonly, so should never be in there. *) strip vsn_hooks from the propdb; only the core liveprops need it now *) mod_dav.c: register the core liveprop hooks and URIs *) fs/repos.c: stripped DAV:displayname and DAV:source, in favor of letting the core handler deal with them.

dav_resource should carry around a pool for allocations related to it

More revamping of live properties. Focused around the fact that a provider's hooks are only called if that provider defines the prop (e.g. NOTME return values are no longer needed). Also refactored some code to simplify liveprop management for providers (assuming they don't have "funny" stuff). *) enumerate all known DAV properties (DAV_PROPID_* in mod_dav.h) - use these in fs/repos.c rather than DAV_PROPID_FS_* - will use in SVN and a second-round whack on the "core" props in props.c *) refactor dav_fs_liveprop_name to dav_liveprop_spec and add a writeable flag *) add dav_liveprop_group to hold a number of "top-level" items to pass to the new liveprop utility functions *) add dav_do_find_liveprop() as a util for the find_liveprop hook function - toss repos.c::dav_fs_find_prop - use the new function for repos.c::dav_fs_find_liveprop *) rebuild dav_register_liveprop_namespace() as a full "group" registration which will handle all the namespaces in a liveprop provider. The new func is called dav_register_liveprop_group(). *) add dav_get_liveprop_info() to look up liveprop info given a provider's propid. used in dav_fs_insert_prop() and dav_fs_is_writeable() *) fold dav_fs_insert_all() directly into dav_fs_insert_all_liveprops() since the former wasn't called by anything else *) rename var in dav_fs_insert_prop() to "global_ns" to clarify its purpose. torch a couple out-of-date comments in there. *) toss dav_prop_rw type and simplify is_writeable hook. fix up calling of hook in props.c::dav_rw_liveprop(). dav_rw_liveprop() should also call the provider *first*, if one has stated it is handling the property. *) toss DAV_PROP_INSERT_NOTME since we can't call a provider's insert_prop with somebody else's liveprop *) remove DAV_IS_CORE_PROP() in props.c. a core prop is not defined by its propid, but by provider==NULL. add comments to clarify when that happens. *) fix sub-request creation to include new next-filter arg

clean out some liveprop hooks which are now handled by AP_HOOK functions

add some docco from John Vasta

Apply a patch from John Vasta for adding (some/more) DeltaV support to mod_dav. The patch applied and compiled cleanly, so I'm committing. Any necessary changes from a review will come later, so that we can easily track what needed to change (and can be back-ported to mod_dav 1.1). Submitted by: John Vasta <jvasta@rational.com>

final round of walker cleanup: fix the provider API to match what is Right.

one more round of walker cleanup: remove some items that are internal to the FS provider from the public API; bang up the FS internals for the now-private items and mechanisms; a bit more revamp to the FS walker top-level APIs to narrow in on obsoleting dav_walker_ctx.

first round whack at cleaning up the walker interface

Here it is, mod_dav should build quite nicely on Win32 (two last mild warnings to contend with.)

add DAV_RESOURCE_TYPE_PRIVATE. some minor reformatting.

use the APR type

clean up the provider stuff some more: don't allow pick-and-choose of pieces, but just a complete provider. they aren't really separable anyways.

forward-port John Vasta's checkin to mod_dav 1.1.x (on Sep 25, 2000). this begins some work to upgrade the versioning support to some of the more recent drafts. - get_resource hook has new params - create_collection hook no longer takes a pool - new dav_auto_version_info structure to group up autoversion rollback/commit handling data - new functions for getting workspace, target-selector, etc - supportedlock hook now takes the resource in question (since different resources may have different locks) - new resource types; tweaks in props.c to support them - some tweaks with resource creation, Location header, etc.

The "get resource" functionality is no longer a hook. Instead, providers register themselves by name with mod_dav. The user configures a particular provider for a location/directory. mod_dav looks up that provider and uses it explicitly. (the prior behavior simply asked "anybody" to satisfy the get_resource, but it did not mesh well with user-specified providers) *) add providers.c to deal with provider registration *) rejigger mod_dav.c to toss the hook and use the provider *) clean out dav/fs/ of the old scheme and have it register itself

update the WebDAV versioning support: - recognize and dispatch the latest set of DeltaV methods - refine the CHECKOUT provider hook - add avail_reports provider hook - fix the "target" resolution mechanism

prefix libapr functions and types with apr_

complete the removal of the old dav_dyn crap. dav plugins are now implemented entirely through standard Apache modules, hooks, and some additional registration.

torch just about all of the old dav_dyn stuff. temporarily hard-wire the liveprop provider setup. this will go away momentarily (another pass).

new liveprop namespace registration and lookup. modules register each namespace they will use, which then receives a process-wide index. get rid of old dav_liveprop_uris global (and minor cleaning in dav_dyn); encapsulate liveprop handling in liveprop.c. do not build/use an ns_map; use dav_get_liveprop_ns_index().

get rid of more of the old module/provider mechanisms -- use ap_hooks to look up the plugins' function hook tables.

do the "get resource" via a hook rather than through the repository hook structure. once the resource is retrieved, then we have the relevant repository hooks and can dispatch through those. some additional tweaks to use lockdb->hooks rather than fetching them

turn dav/fs/ into a real module move the DAVLockDB directive to the dav_fs module

use ap_size_t rather than plain size_t

Joe Orton writes: This updates mod_dav for the util_xml changes posted previously: * dav_xml -> ap_xml, and dav_text -> ap_text renaming * Add 'dav_elem_private' to hook mod_dav-specific info up to the parsed XML tree. Initialize this in several places, I think I got all necessary? [gjs: yes, you did] * Removal of the old "gross_hack", and all the XML code that was moved into util_xml Submitted by: Joe Orton <joe@orton.demon.co.uk> Reviewed by: Greg Stein

run DAV's type_checker first so that it can grab the non-GET methods (it will pass thru GET for normal processing) fix the DBGn() macros for Apache 2.0

always include limits.h for the INT_MAX value. Submitted by: Jeff Trawick

get the DAV stuff to compile for Apache 2.0. some unpleasantries are in there, but it *does* compile.

first, obvious step: alter the license/copyright on all mod_dav files.

initial checkin of the new Apache DAV code. this is a pristine copy of mod_dav 1.0.1 (tag "V1_0_1" in the mod_dav CVS repository). For historical information about these files, see the (old) mod_dav web site at http://www.webdav.org/mod_dav/. CVS repository information can be located from those pages.