summaryrefslogtreecommitdiff
path: root/modules/dav
Commit message (Collapse)AuthorAgeFilesLines
* Merge r1529559, r1531505 from trunk:Jim Jagielski2013-10-183-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response. Previous commit missed encoding the names of the children of the PROPFIND request when the depth wasn't 0. * modules/dav/fs/repos.c (dav_fs_append_uri): New function (dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to use the encoded length. Submitted by: breser Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1533448 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1528718 from trunk:Jim Jagielski2013-10-183-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. Submitted by: breser Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1533447 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1506714 from trunk:Jim Jagielski2013-07-271-2/+3
| | | | | | | | | | | | | | | | Fix bug #55304 with the provided patch, slightly reformatted. In short: do not validate conditions of a COPY source's parent since it is not modified during the operation. * modules/dav/main/mod_dav.c: (dav_method_copymove): adjust params to dav_validate_request() Submitted by: gstein Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1507681 13f79535-47bb-0310-9956-ffa450edef68
* Fix indentation (plus now needed line-wrap).Rainer Jung2013-06-271-2/+3
| | | | | | | | | No functional change. Followup to r1486454. Backport of r1497588. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1497590 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Improve error handling in dav_method_put(), add newGraham Leggett2013-05-263-16/+54
| | | | | | | | | | | | dav_join_error() function. PR 54145. trunk patch: http://svn.apache.org/r1464241 2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_dav-errorhandling.patch Submitted by: Ben Reser <ben reser.org> Reviewed by: minfrin, jim, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486464 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn withGraham Leggett2013-05-261-5/+6
| | | | | | | | | | | | the source href (sent as part of the request body as XML) pointing to a URI that is not configured for DAV will trigger a segfault. trunk patch: http://svn.apache.org/r1485668 Submitted by: Ben Reser <ben reser.org> Reviewed by: minfrin, covener, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486461 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559Graham Leggett2013-05-261-1/+9
| | | | | | | | | trunk patch: http://svn.apache.org/r1476644 Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com> Reviewed by: minfrin, jim, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486459 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: When a PROPPATCH attempts to remove a non-existent deadGraham Leggett2013-05-261-0/+4
| | | | | | | | | | | | property on a resource for which there is no dead property in the same namespace httpd segfaults. PR 52559 trunk patch: http://svn.apache.org/r1476642 Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com> Reviewed by: minfrin, jim, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486458 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Sending an If or If-Match header with an invalid ETag doesn'tGraham Leggett2013-05-261-11/+11
| | | | | | | | | | | result in a 412 Precondition Failed for a COPY operation. PR54610 trunk patch: http://svn.apache.org/r1476604 Submitted by: Timothy Wood <tjw omnigroup.com> Reviewed by: minfrin, jim, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486456 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Make sure that when we prepare an If URL for Etag comparison,Graham Leggett2013-05-261-1/+10
| | | | | | | | | | | | we compare unencoded paths. PR 53910 trunk patch: http://svn.apache.org/r1470940 http://svn.apache.org/r1477530 Submitted by: Timothy Wood <tjw omnigroup.com> Reviewed by: minfrin, jim, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486454 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Ensure URI is correctly uriencoded on return. PR 54611Graham Leggett2013-05-231-1/+3
| | | | | | | | | trunk patch: http://svn.apache.org/r1476621 Submitted by: Timothy Wood <tjw omnigroup.com> Reviewed by: minfrin, jim, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1485721 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559Graham Leggett2013-05-121-4/+4
| | | | | | | | | trunk patch: http://svn.apache.org/r1476645 Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com> Reviewed by: minfrin, covener, sf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1481513 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1331110 from trunk:Jim Jagielski2013-01-081-1/+1
| | | | | | | | | | | | | | | | Replace use of apr_file_write() with apr_file_write_full() to prevent incomplete writes. Add comments in some places where error handling/logging is missing. PR: 53131. Submitted by: Nicolas Viennot <apache viennot biz>, Stefan Fritsch Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430514 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1398970, r1407853, r1398480, r1398478, r1411862, r1397320:Stefan Fritsch2012-12-091-1/+1
| | | | | | | | | | | | | | | | | 1398970: Use 'ap_strcasestr' instead of a strdup/str_tolower/strstr sequence 1407853: cppCheck: Suspicious condition. 1398480: cppcheck: arrayIndexThenCheck - change the order of the tests in order to avoid a potential out-of-bound access. 1398478: ccpcheck: duplicateExpression - 'vary_by_language' is tested twice 1411862: Use apr_is_empty_table() instead of getting a table and checking the value of the 'nelts' field. 1397320: remove extra ';' Submitted by: jailletc36 Reviewed by: jailletc36, minfrin, sf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1418945 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1234180, r1234297, r1234565:Stefan Fritsch2012-01-222-2/+2
| | | | | | | | | | | | | | | | Make APACHE_MODULE() accept an optional prerequisite module for configure. Introduce the following configure time dependencies: mod_proxy_* (except proxy_html) require mod_proxy mod_dav_* require mod_dav mod_session_* require mod_session mod_cache_disk requires mod_cache mod_heartbeat requires mod_watchdog PR: 52487 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234570 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1209766, r1210252, r1210284:Stefan Fritsch2011-12-053-49/+49
| | | | | | | | | | Add lots of unique tags to error log messages ssl_util.c: Downgrade some dynamic locking messages from level DEBUG to TRACE1-3 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68
* Remove some ap_add_version_component() calls that don't provide any informationStefan Fritsch2011-11-081-2/+0
| | | | | | | because the modules don't have separate version numbers anymore git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199532 13f79535-47bb-0310-9956-ffa450edef68
* Don't send a 500 if there is a timeoutStefan Fritsch2011-11-081-5/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199444 13f79535-47bb-0310-9956-ffa450edef68
* Change default FileETag to be "size mtime", i.e. remove the inode. Adjust theStefan Fritsch2011-11-081-2/+2
| | | | | | | | | etag generation in mod_dav_fs to the new default. PR 49623. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199086 13f79535-47bb-0310-9956-ffa450edef68
* More cleanup: Expand tabs and some more indentation fixesStefan Fritsch2011-09-231-16/+16
| | | | | | | No functional change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup effort in prep for GA push:Jim Jagielski2011-09-233-18/+18
| | | | | | | | Trim trailing whitespace... no func change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
* refactor to pull setting of Accept-Ranges header into http_protocol.c whichEric Covener2011-09-081-1/+1
| | | | | | | | had been copied to other handlers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166663 13f79535-47bb-0310-9956-ffa450edef68
* adjustments of build priorities of modules without special dependenciesStefan Fritsch2011-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all -> most: - mod_sed reallyall -> most: - mod_log_debug reallyall -> all: - mod_dav_lock - mod_echo - mod_charset_lite - mod_slotmem_plain - mod_dialup few -> all: - mod_data - mod_reflector - mod_asis most -> all: - mod_heartbeat - mod_heartmonitor - mod_watchdog most -> reallyall: - mod_imagemap - mod_cern_meta - mod_ident See thread at http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C201107052321.56063.sf@sfritsch.de%3E git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146227 13f79535-47bb-0310-9956-ffa450edef68
* Various code cleanupStefan Fritsch2011-06-222-4/+3
| | | | | | | | PR: 51398 Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138627 13f79535-47bb-0310-9956-ffa450edef68
* Avoid some memory allocations by using apr_table_setn where the string argumentsStefan Fritsch2011-06-131-3/+3
| | | | | | | | | | are allocated from the request pool and not modified later on. Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr> PR: 51358 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135084 13f79535-47bb-0310-9956-ffa450edef68
* Log the proper module name on errorsStefan Fritsch2011-06-071-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1133163 13f79535-47bb-0310-9956-ffa450edef68
* Log a more obvious message if apr cannot load its dbm shared library.Stefan Fritsch2011-06-071-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1133158 13f79535-47bb-0310-9956-ffa450edef68
* Don't return an undefined value if opening of a read-only database fails.Stefan Fritsch2011-06-071-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1133152 13f79535-47bb-0310-9956-ffa450edef68
* Fix various "variable 'x' set but not used" warnings.Stefan Fritsch2011-05-221-1/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125877 13f79535-47bb-0310-9956-ffa450edef68
* Improvements found by cppcheck:Stefan Fritsch2011-05-151-1/+1
| | | | | | | | remove some unused variables and dead assignments, reduce the scope of some variables, add some parens to improve readability git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103459 13f79535-47bb-0310-9956-ffa450edef68
* Create dav.imp dynamically from header to catch all exports.Guenter Knauf2011-03-201-64/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083540 13f79535-47bb-0310-9956-ffa450edef68
* Removed dav_get_limit_xml_body() from mod_dav.h.Guenter Knauf2011-03-201-3/+0
| | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083536 13f79535-47bb-0310-9956-ffa450edef68
* More NetWare build fixes.Guenter Knauf2011-03-203-13/+12
| | | | | | | Sorted some makefile dependencies; fixed DAV makefiles. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083478 13f79535-47bb-0310-9956-ffa450edef68
* Use a var INSTALLBASE to simplify NetWare installation rules.Guenter Knauf2011-03-183-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
* Use var for prelude so its possible to change it at one place.Guenter Knauf2011-03-183-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build overhaul in order to compile on Linux.Guenter Knauf2011-03-093-3/+5
| | | | | | | Some more fixes ... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079614 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build overhaul in order to compile on Linux.Guenter Knauf2011-03-083-3/+3
| | | | | | | Removed absolute paths to imp files. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build overhaul in order to compile on Linux.Guenter Knauf2011-03-083-21/+21
| | | | | | | Take 1. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
* revert r1026746:Stefan Fritsch2011-02-121-32/+0
| | | | | | | | | | | | | If an unknown Content-* header is received for a PUT request, we must not ignore it but reply with 501 per RFC 2616 9.6. PR: 42978 Vetoed by Roy T. Fielding: http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C9A5A8B62-ED16-4BD3-97DA-8475026BB81D@gbiv.com%3E git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070061 13f79535-47bb-0310-9956-ffa450edef68
* Remove mis-placed period.Daniel Earl Poirier2010-11-021-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029935 13f79535-47bb-0310-9956-ffa450edef68
* Add to modules' help text (displayed by ./configure -h) moreDaniel Earl Poirier2010-11-013-3/+3
| | | | | | | | information that will be useful in deciding whether to enable them or not. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029814 13f79535-47bb-0310-9956-ffa450edef68
* If an unknown Content-* header is received for a PUT request, we must notStefan Fritsch2010-10-241-0/+32
| | | | | | | | | ignore it but reply with 501 per RFC 2616 9.6. PR: 42978 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026746 13f79535-47bb-0310-9956-ffa450edef68
* If a malformed Content-Range header is received for a PUT request, weStefan Fritsch2010-10-241-15/+27
| | | | | | | | | | must not use the supplied content per RFC 2616 14.16. Send 400 response instead of ignoring the Content-Range. PR: 49825 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026743 13f79535-47bb-0310-9956-ffa450edef68
* Fix broken "creationdate" property in mod_dav_fs andRainer Jung2010-08-203-19/+14
| | | | | | | | | | | remove remaining uses of sprintf() in the dav modules. This is a regression in 2.3.7 introduced by r931434. It calls sizeof() for a function parameter, which only returns the pointer size, not the size of the char array. Thus the "creationdate" property got truncated to three characters. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987484 13f79535-47bb-0310-9956-ffa450edef68
* Intel's compiler warns about assigning the non-enum value 0 to the Jeff Trawick2010-08-061-4/+4
| | | | | | | | | | | | | | enumeration apr_finfo_t.filetype, which is done when forgetting the previously-derived file type use the appropriate enum value APR_NOFILE instead Also change comparisons of the field with 0 to use APR_NOFILE instead, as is the practice of some existing code. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983065 13f79535-47bb-0310-9956-ffa450edef68
* - Remove a load of unused variables (or variables that are set but never read).Stefan Fritsch2010-08-031-5/+3
| | | | | | | | | - Move some declarations into the correct #ifdef scope. I couldn't compile/test netware, but the changes look obvious enough. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982016 13f79535-47bb-0310-9956-ffa450edef68
* Removed obsolete include paths from NetWare makefiles.Guenter Knauf2010-07-221-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68
* CVE-2010-1452: Fix handling of missing path segments in the parsed URI ↵Paul Querna2010-07-211-1/+2
| | | | | | | | | | | | | | | structure. If a specially crafted request was sent, it is possible to crash mod_dav, mod_cache or mod_session, as they accessed a field that is set to NULL by the URI parser, assuming that it always put in a valid string. PR: 49246 Submitted by: Mark Drayton Patch by: Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966348 13f79535-47bb-0310-9956-ffa450edef68
* re-order many struct members for better alignment on 64bitStefan Fritsch2010-06-301-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@959464 13f79535-47bb-0310-9956-ffa450edef68
* Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to takeStefan Fritsch2010-06-064-2/+5
| | | | | | | advantage of per-module loglevels git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68