From 7f83ffc31a0631527877e073841bc09d96d6c7bd Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Thu, 26 Sep 2013 16:26:46 +0200
Subject: [PATCH] Changes to sending of DAV header.

---
 testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result   | 2 --
 testing/tests/regression-suite/0212-Moz-PROPFIND.result         | 2 +-
 testing/tests/regression-suite/0248-Bad-PROPFIND.result         | 2 --
 testing/tests/regression-suite/0523-iCal-PROPFIND.result        | 2 +-
 .../tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result  | 2 --
 testing/tests/regression-suite/0606-Soho-PROPPATCH.result       | 2 +-
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result
index a851a182..8d572551 100644
--- a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result
+++ b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result
@@ -1,7 +1,5 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 Content-Length: 46
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0212-Moz-PROPFIND.result b/testing/tests/regression-suite/0212-Moz-PROPFIND.result
index 9b07563e..31ce598e 100644
--- a/testing/tests/regression-suite/0212-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/0212-Moz-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+Content-Location: /caldav.php/user1/home/
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Location: /caldav.php/user1/home/
 ETag: "334c8abc0ac73261cdbf963fc7269d76"
 Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0248-Bad-PROPFIND.result b/testing/tests/regression-suite/0248-Bad-PROPFIND.result
index 8c8fc55d..96be41d1 100644
--- a/testing/tests/regression-suite/0248-Bad-PROPFIND.result
+++ b/testing/tests/regression-suite/0248-Bad-PROPFIND.result
@@ -1,7 +1,5 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 Content-Location: /caldav.php/user1/home/
 ETag: "567b0424ecca3303b030d882be2093ef"
 Content-Length: 86
diff --git a/testing/tests/regression-suite/0523-iCal-PROPFIND.result b/testing/tests/regression-suite/0523-iCal-PROPFIND.result
index d35cd3b7..ee08fd7e 100644
--- a/testing/tests/regression-suite/0523-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0523-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+Content-Location: /caldav.php/user2/
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Location: /caldav.php/user2/
 ETag: "cb2395b4d4b229e5ea994113535bf173"
 Content-Length: 989
 Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result
index 634928f0..0a6ccdb7 100644
--- a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result
+++ b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result
@@ -1,7 +1,5 @@
 HTTP/1.1 415 Unsupported Media Type
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 Content-Length: 135
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
index f6a53a0b..7d04328e 100644
--- a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
+++ b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+Content-Location: /caldav.php/user1/SOHO%20collection/
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Location: /caldav.php/user1/SOHO%20collection/
 Content-Length: 424
 Content-Type: text/xml; charset="utf-8"