From f5c156a045fc427a7cf49046e5aea6e3778dc186 Mon Sep 17 00:00:00 2001
From: Paul Mehrer <p.mehrer@metaways.de>
Date: Tue, 8 Oct 2024 11:30:57 +0200
Subject: [PATCH] tweak(TB Server) webdav/activesync to drop session at end of
 request

---
 tine20/ActiveSync/Server/Http.php | 2 ++
 tine20/Tinebase/Server/WebDAV.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tine20/ActiveSync/Server/Http.php b/tine20/ActiveSync/Server/Http.php
index c99d643d947..9b5c04e6623 100644
--- a/tine20/ActiveSync/Server/Http.php
+++ b/tine20/ActiveSync/Server/Http.php
@@ -104,6 +104,8 @@ public function handle(\Laminas\Http\Request $request = null, $body = null)
             Tinebase_Controller::getInstance()->logout();
         } catch (Throwable $e) {
             $this->_handleException($e);
+        } finally {
+            Tinebase_Session::destroyAndRemoveCookie();
         }
     }
 
diff --git a/tine20/Tinebase/Server/WebDAV.php b/tine20/Tinebase/Server/WebDAV.php
index ca9d888023a..d5930ace8c4 100644
--- a/tine20/Tinebase/Server/WebDAV.php
+++ b/tine20/Tinebase/Server/WebDAV.php
@@ -316,6 +316,8 @@ public function handle(\Laminas\Http\Request $request = null, $body = null)
         } catch (Throwable $e) {
             Tinebase_Exception::log($e, false);
             @header('HTTP/1.1 500 Internal Server Error');
+        } finally {
+            Tinebase_Session::destroyAndRemoveCookie();
         }
     }