diff --git a/htdocs/caldav.php b/htdocs/caldav.php
index 0ea34be6..e52b09b8 100644
--- a/htdocs/caldav.php
+++ b/htdocs/caldav.php
@@ -81,11 +81,13 @@ function send_dav_header() {
     header( 'DAV: '.trim($v, ', '), false);
   }
 }
-send_dav_header();  // Avoid polluting global namespace
 
 require_once('CalDAVRequest.php');
 $request = new CalDAVRequest();
 
+//if ( $request->method == 'OPTIONS' || $c->always_send_dav_header )
+    send_dav_header();  // Avoid polluting global namespace
+
 $allowed = implode( ', ', array_keys($request->supported_methods) );
 // header( 'Allow: '.$allowed);