From 477ced30128039116cf3472ad5feedf27169a220 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Wed, 4 Nov 2009 08:52:16 +1300
Subject: [PATCH] Options response changes with MOVE available.

---
 testing/tests/regression-suite/101-Evo-OPTIONS-1.result      | 2 +-
 testing/tests/regression-suite/201-Moz-OPTIONS-2.result      | 2 +-
 testing/tests/regression-suite/302-Chandler-OPTIONS-2.result | 2 +-
 testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result  | 2 +-
 testing/tests/regression-suite/601-Soho-OPTIONS.result       | 2 +-
 testing/tests/regression-suite/910-Space-OPTIONS.result      | 2 +-
 .../regression-suite/917-PROPFIND-supported-stuff.result     | 5 +++--
 .../regression-suite/918-PROPFIND-supported-stuff.result     | 5 +++--
 .../regression-suite/919-PROPFIND-supported-stuff.result     | 5 +++--
 .../regression-suite/920-PROPFIND-supported-stuff.result     | 5 +++--
 10 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
index d316261e..ff95d7c1 100644
--- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
index d316261e..ff95d7c1 100644
--- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
index d316261e..ff95d7c1 100644
--- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
index d316261e..ff95d7c1 100644
--- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/601-Soho-OPTIONS.result b/testing/tests/regression-suite/601-Soho-OPTIONS.result
index d316261e..006c38d2 100644
--- a/testing/tests/regression-suite/601-Soho-OPTIONS.result
+++ b/testing/tests/regression-suite/601-Soho-OPTIONS.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/910-Space-OPTIONS.result b/testing/tests/regression-suite/910-Space-OPTIONS.result
index d316261e..ff95d7c1 100644
--- a/testing/tests/regression-suite/910-Space-OPTIONS.result
+++ b/testing/tests/regression-suite/910-Space-OPTIONS.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result
index 083588e7..d6ebd0d9 100644
--- a/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "d0b4d2ea75d0b115c8b3c8bb0d5c6391"
-Content-Length: 1247
+ETag: "d80266305dfb9db661c081bbccb6184c"
+Content-Length: 1284
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -23,6 +23,7 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="DELETE"/>
      <supported-method name="LOCK"/>
      <supported-method name="UNLOCK"/>
+     <supported-method name="MOVE"/>
      <supported-method name="GET"/>
      <supported-method name="PUT"/>
      <supported-method name="HEAD"/>
diff --git a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
index b756ecc3..3970e95e 100644
--- a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "7ab339431007ed0a57ad3bd440868790"
-Content-Length: 1474
+ETag: "715df5d03cab642c1ad154ce5f8d1215"
+Content-Length: 1511
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="DELETE"/>
      <supported-method name="LOCK"/>
      <supported-method name="UNLOCK"/>
+     <supported-method name="MOVE"/>
      <supported-method name="GET"/>
      <supported-method name="PUT"/>
      <supported-method name="HEAD"/>
diff --git a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
index bf77b744..2eddef84 100644
--- a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "8a5e441890faec00d4749e0e30ee1733"
-Content-Length: 1259
+ETag: "e344ccee2e02d032cd5381aeb0a285a1"
+Content-Length: 1296
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -28,6 +28,7 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="DELETE"/>
      <supported-method name="LOCK"/>
      <supported-method name="UNLOCK"/>
+     <supported-method name="MOVE"/>
      <supported-method name="POST"/>
      <supported-method name="GET"/>
      <supported-method name="PUT"/>
diff --git a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
index 736637e4..2f9523f6 100644
--- a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule, extended-mkcol
-ETag: "ad2a58b8693cf42c755a5533108f64ef"
-Content-Length: 1262
+ETag: "56d6f5437eb9a2251cad35964d5908ca"
+Content-Length: 1299
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -28,6 +28,7 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="DELETE"/>
      <supported-method name="LOCK"/>
      <supported-method name="UNLOCK"/>
+     <supported-method name="MOVE"/>
      <supported-method name="POST"/>
      <supported-method name="GET"/>
      <supported-method name="PUT"/>