File tree Expand file tree Collapse file tree 1 file changed +8
-7
lines changed Expand file tree Collapse file tree 1 file changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -364,13 +364,14 @@ public static function initSession(): void {
364
364
// TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
365
365
// TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
366
366
// TODO: for further information.
367
- // $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
368
- // if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
369
- // setcookie('cookie_test', 'test', time() + 3600);
370
- // // Do not initialize the session if a request is authenticated directly
371
- // // unless there is a session cookie already sent along
372
- // return;
373
- // }
367
+ // MagentaCLOUD stays with original version of the solution from production
368
+ $ isDavRequest = strpos ($ request ->getRequestUri (), '/remote.php/dav ' ) === 0 ||
369
+ strpos ($ request ->getRequestUri (), '/remote.php/webdav ' ) === 0 ;
370
+ if ($ request ->getHeader ('Authorization ' ) !== '' && $ isDavRequest && !isset ($ _COOKIE ['nc_session_id ' ])) {
371
+ // Do not initialize the session if a request is authenticated directly
372
+ // unless there is a session cookie already sent along
373
+ return ;
374
+ }
374
375
375
376
if ($ request ->getServerProtocol () === 'https ' ) {
376
377
ini_set ('session.cookie_secure ' , 'true ' );
You can’t perform that action at this time.
0 commit comments