You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2022/11/29 18:24:38 UTC
svn commit: r1905613 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/DAVReadOnly_in_dav_method_propfind.txt modules/dav/main/mod_dav.c
Author: covener
Date: Tue Nov 29 18:24:38 2022
New Revision: 1905613
URL: http://svn.apache.org/viewvc?rev=1905613&view=rev
Log:
merge r1905229,r1905404 from trunk;
*) mod_dav: Open the lock database read-only when possible
2.4.x patch: trunk works
Submitted by: manu
Reviewed by: manu, jailletc36, covener
Added:
httpd/httpd/branches/2.4.x/changes-entries/DAVReadOnly_in_dav_method_propfind.txt
- copied unchanged from r1905404, httpd/httpd/trunk/changes-entries/DAVReadOnly_in_dav_method_propfind.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1905229,1905404
Modified: httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?rev=1905613&r1=1905612&r2=1905613&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c Tue Nov 29 18:24:38 2022
@@ -1405,8 +1405,7 @@ static dav_error *dav_gen_supported_live
dav_error *err;
/* open lock database, to report on supported lock properties */
- /* ### should open read-only */
- if ((err = dav_open_lockdb(r, 0, &lockdb)) != NULL) {
+ if ((err = dav_open_lockdb(r, 1, &lockdb)) != NULL) {
return dav_push_error(r->pool, err->status, 0,
"The lock database could not be opened, "
"preventing the reporting of supported lock "
@@ -2171,8 +2170,7 @@ static int dav_method_propfind(request_r
apr_pool_create(&ctx.scratchpool, r->pool);
apr_pool_tag(ctx.scratchpool, "mod_dav-scratch");
- /* ### should open read-only */
- if ((err = dav_open_lockdb(r, 0, &ctx.w.lockdb)) != NULL) {
+ if ((err = dav_open_lockdb(r, 1, &ctx.w.lockdb)) != NULL) {
err = dav_push_error(r->pool, err->status, 0,
"The lock database could not be opened, "
"preventing access to the various lock "