[CalendarServer-changes] [14792] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14792
          http://trac.calendarserver.org//changeset/14792
Author:   cdaboo at apple.com
Date:     2015-05-17 23:31:09 -0700 (Sun, 17 May 2015)
Log Message:
-----------
Only return DAV header on an OPTIONS request.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-dev.txt
    CalendarServer/trunk/txweb2/dav/resource.py

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-05-18 06:28:50 UTC (rev 14791)
+++ CalendarServer/trunk/requirements-dev.txt	2015-05-18 06:31:09 UTC (rev 14792)
@@ -7,5 +7,5 @@
 mockldap
 q
 tl.eggdeps
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14756#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14757#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14790#egg=CalDAVClientLibrary
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14791#egg=CalDAVTester

Modified: CalendarServer/trunk/txweb2/dav/resource.py
===================================================================
--- CalendarServer/trunk/txweb2/dav/resource.py	2015-05-18 06:28:50 UTC (rev 14791)
+++ CalendarServer/trunk/txweb2/dav/resource.py	2015-05-18 06:31:09 UTC (rev 14792)
@@ -2359,7 +2359,9 @@
         def setHeaders(response):
             response = IResponse(response)
 
-            response.headers.setHeader("dav", self.davComplianceClasses())
+            # Only set the DAV header on an OPTIONS request
+            if request.method == "OPTIONS":
+                response.headers.setHeader("dav", self.davComplianceClasses())
 
             #
             # If this is a collection and the URI doesn't end in "/",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150517/a3ef3827/attachment.html>