From 499d2e3856f0d231480c5428996551530203e81d Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Fri, 31 Oct 2008 23:30:53 +1300
Subject: [PATCH] Include XML headers in response.

---
 inc/caldav-POST.php                                     | 2 +-
 testing/tests/regression-suite/243-Moz-POST-FB.result   | 6 ++++--
 testing/tests/regression-suite/244-Moz-POST-FB.result   | 6 ++++--
 testing/tests/regression-suite/516-iCal-POST.result     | 1 +
 testing/tests/regression-suite/517-iCal-POST.result     | 1 +
 testing/tests/regression-suite/880-Freebusy-POST.result | 1 +
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/inc/caldav-POST.php b/inc/caldav-POST.php
index 04633d0e..408a81ed 100644
--- a/inc/caldav-POST.php
+++ b/inc/caldav-POST.php
@@ -182,7 +182,7 @@ function handle_freebusy_request( $ic ) {
   }
 
   $response = new XMLElement( "schedule-response", $responses, $reply->GetXmlNsArray() );
-  $request->DoResponse( 200, $response->Render() );
+  $request->XMLResponse( 200, $response );
 }
 
 
diff --git a/testing/tests/regression-suite/243-Moz-POST-FB.result b/testing/tests/regression-suite/243-Moz-POST-FB.result
index 2af7c71b..6259a7f2 100644
--- a/testing/tests/regression-suite/243-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/243-Moz-POST-FB.result
@@ -1,9 +1,11 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 970
-Content-Type: text/plain; charset="utf-8"
+ETag: "a298c032f42212c4b1fdae7f3f3b44f3"
+Content-Length: 1010
+Content-Type: text/xml; charset="utf-8"
 
+<?xml version="1.0" encoding="utf-8" ?>
 <schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <C:response>
   <C:recipient>
diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result
index 5b125bb7..e12c063c 100644
--- a/testing/tests/regression-suite/244-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/244-Moz-POST-FB.result
@@ -1,9 +1,11 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 1564
-Content-Type: text/plain; charset="utf-8"
+ETag: "f4577cb82f524d9e36fb43b7f363cbd7"
+Content-Length: 1604
+Content-Type: text/xml; charset="utf-8"
 
+<?xml version="1.0" encoding="utf-8" ?>
 <schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <C:response>
   <C:recipient>
diff --git a/testing/tests/regression-suite/516-iCal-POST.result b/testing/tests/regression-suite/516-iCal-POST.result
index 087ed346..2dce30c9 100644
--- a/testing/tests/regression-suite/516-iCal-POST.result
+++ b/testing/tests/regression-suite/516-iCal-POST.result
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <C:response>
   <C:recipient>
diff --git a/testing/tests/regression-suite/517-iCal-POST.result b/testing/tests/regression-suite/517-iCal-POST.result
index 51cda748..3531d65b 100644
--- a/testing/tests/regression-suite/517-iCal-POST.result
+++ b/testing/tests/regression-suite/517-iCal-POST.result
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <C:response>
   <C:recipient>
diff --git a/testing/tests/regression-suite/880-Freebusy-POST.result b/testing/tests/regression-suite/880-Freebusy-POST.result
index 15d495ec..28d492ce 100644
--- a/testing/tests/regression-suite/880-Freebusy-POST.result
+++ b/testing/tests/regression-suite/880-Freebusy-POST.result
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <C:response>
   <C:recipient>