From 640f2e64f2e6decdcde2ec218703b686a9c1a58e Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 18 Mar 2010 13:51:51 +1300 Subject: [PATCH] Remove ancient hack to cope with broken Evolution < v1.9 --- inc/caldav-DELETE.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/inc/caldav-DELETE.php b/inc/caldav-DELETE.php index 66a0f8a1..2256fc0f 100644 --- a/inc/caldav-DELETE.php +++ b/inc/caldav-DELETE.php @@ -6,24 +6,10 @@ * @subpackage caldav * @author Andrew McMillan * @copyright Catalyst .Net Ltd, Morphoss Ltd -* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 +* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later */ dbg_error_log("delete", "DELETE method handler"); -/** -* etag_none_match, if set, is telling us only to DELETE if it fails to match. Likewise etag_if_match -* is telling us only to DELETE if it successfully matches the ETag. Se Evolution's Bugzilla for the -* truth about Evolution's broken handling of this: http://bugzilla.gnome.org/show_bug.cgi?id=349573 -*/ - -if ( !isset($request->etag_if_match) && isset($request->etag_none_match) && isset($_SERVER['HTTP_USER_AGENT']) - && preg_match('#Evolution/([0-9]+[.][0-9]+)#', $_SERVER['HTTP_USER_AGENT'], $matches ) ) { - if ( doubleval($matches[1]) <= 1.9 ) { - $request->etag_if_match = $request->etag_none_match; - unset($request->etag_none_match); - } -} - $request->NeedPrivilege('DAV::unbind'); $lock_opener = $request->FailIfLocked();