From 3a28e85d19803fa25f6cfe88b1d122ba10876986 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Mon, 27 Nov 2006 09:04:40 +1300
Subject: [PATCH] Fix problem with PUT.

---
 inc/caldav-PUT.php                                            | 4 ++--
 testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result | 4 ++--
 testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/caldav-PUT.php b/inc/caldav-PUT.php
index f6365f67..b7b213be 100644
--- a/inc/caldav-PUT.php
+++ b/inc/caldav-PUT.php
@@ -119,12 +119,12 @@ elseif ( $qry->rows == 1 ) {
 
 if ( $put_action_type == 'INSERT' ) {
   $qry = new PgQuery( "INSERT INTO caldav_data ( user_no, dav_name, dav_etag, caldav_data, caldav_type, logged_user, created, modified ) VALUES( ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp )",
-                         $request->user_no, $request->path, $etag, $raw_post, $ic->type, $session->user_no );
+                         $request->user_no, $request->path, $etag, $request->raw_post, $ic->type, $session->user_no );
   $qry->Exec("PUT");
 }
 else {
   $qry = new PgQuery( "UPDATE caldav_data SET caldav_data=?, dav_etag=?, caldav_type=?, logged_user=?, modified=current_timestamp WHERE user_no=? AND dav_name=?",
-                         $raw_post, $etag, $ic->type, $session->user_no, $request->user_no, $request->path );
+                         $request->raw_post, $etag, $ic->type, $session->user_no, $request->user_no, $request->path );
   $qry->Exec("PUT");
 }
 
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index 49bdcd40..fc55d5bf 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -1,9 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
-ETag: "38ba0832b5ab1fd7147b102ceba0becc"
+ETag: "145f7e7222b7b8d4f7e194244e825ebe"
 Content-Length: 1199
-Content-Type: text/xml;charset=UTF-8
+Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="UTF-8" ?>
 <multistatus xmlns="DAV:">
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index fcc51297..916c2b56 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -1,9 +1,9 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
-ETag: "c9a2201f704ccb8d43f3ca5dce1ab51e"
+ETag: "9f4924e81f1c237854f11d8d58e85dae"
 Content-Length: 1199
-Content-Type: text/xml;charset=UTF-8
+Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="UTF-8" ?>
 <multistatus xmlns="DAV:">