nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensuring we delete vigorously from the cache for DELETE is ++important!

Browse Source
This commit is contained in:
Andrew McMillan 2016-06-22 22:41:05 +01:00
parent eb80496511
commit 2a202c77a2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/caldav-DELETE.php
View File

@ -45,6 +45,7 @@ function delete_collection( $id ) {
if ( !$dav_resource->Exists() )$request->DoResponse( 404 );
if ( ! ( $dav_resource->resource_id() > 0 ) ) {
@dbg_error_log( "DELETE", ": failed: User: %d, ETag: %s, Path: %s, ResourceID: %d", $session->user_no, $request->etag_if_match, $request->path, $dav_resource->resource_id());
$request->DoResponse( 403 );
}
@ -52,11 +53,16 @@ $qry = new AwlQuery();
$qry->Begin();
if ( $dav_resource->IsCollection() ) {
$cache = getCacheInstance();
$myLock = $cache->acquireLock('collection-'.$dav_resource->parent_path());
if ( $dav_resource->IsBinding() ) {
$params = array( ':dav_name' => $dav_resource->dav_name() );
if ( $qry->QDo("DELETE FROM dav_binding WHERE dav_name = :dav_name", $params )
&& $qry->Commit() ) {
$cache->delete( 'collection-'.$dav_resource->dav_name(), null );
$cache->delete( 'collection-'.$dav_resource->parent_path(), null );
$cache->releaseLock($myLock);
@dbg_error_log( "DELETE", "DELETE: Binding: %d, ETag: %s, Path: %s", $session->user_no, $request->etag_if_match, $request->path);
$request->DoResponse( 204 );
}
@ -64,11 +70,13 @@ if ( $dav_resource->IsCollection() ) {
else {
if ( delete_collection( $dav_resource->resource_id() ) && $qry->Commit() ) {
// Uncache anything to do with the collection
$cache = getCacheInstance();
$cache->delete( 'collection-'.$dav_resource->dav_name(), null );
$cache->delete( 'collection-'.$dav_resource->parent_path(), null );
$cache->releaseLock($myLock);
$request->DoResponse( 204 );
}
}
$cache->releaseLock($myLock);
}
else {
if ( isset($request->etag_if_match) && $request->etag_if_match != $dav_resource->unique_tag() && $request->etag_if_match != "*" ) {