From bfb93a06a96af614e0f63be47aed4b4709faeed9 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Thu, 30 Nov 2006 18:37:50 +1300
Subject: [PATCH] Send an "X-RSCDS-Version" header in our response to assist
 with debugging.

---
 inc/CalDAVRequest.php                                    | 1 +
 inc/always.php                                           | 9 +++++++++
 testing/tests/regression-suite/001-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/002-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/003-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/004-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/005-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/006-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/007-Mulberry-1.result     | 1 +
 testing/tests/regression-suite/010-Mulberry-PUT-1.result | 1 +
 .../tests/regression-suite/011-Mulberry-PUT-1b.result    | 1 +
 testing/tests/regression-suite/012-Mulberry-PUT-2.result | 1 +
 .../regression-suite/013-Mulberry-PROPFIND-5.result      | 1 +
 testing/tests/regression-suite/014-Mulberry-PUT-3.result | 1 +
 .../regression-suite/015-Mulberry-PROPFIND-6.result      | 1 +
 .../regression-suite/016-Mulberry-MKCALENDAR-3.result    | 1 +
 .../regression-suite/017-Mulberry-MKCALENDAR-4.result    | 1 +
 testing/tests/regression-suite/018-Mulberry-PUT-4.result | 1 +
 .../tests/regression-suite/019-Mulberry-OPTIONS-3.result | 1 +
 .../tests/regression-suite/020-Mulberry-DELETE-1.result  | 1 +
 .../tests/regression-suite/021-Mulberry-DELETE-2.result  | 1 +
 testing/tests/regression-suite/022-Mulberry-PUT-5.result | 1 +
 .../tests/regression-suite/023-Mulberry-DELETE-3.result  | 1 +
 testing/tests/regression-suite/101-Evo-OPTIONS-1.result  | 1 +
 testing/tests/regression-suite/102-Evo-REPORT-1.result   | 1 +
 testing/tests/regression-suite/103-Evo-GET-1.result      | 1 +
 testing/tests/regression-suite/104-Evo-PUT-1.result      | 1 +
 testing/tests/regression-suite/105-Evo-REPORT-1.result   | 1 +
 testing/tests/regression-suite/106-Evo-GET-1.result      | 1 +
 testing/tests/regression-suite/107-Evo-REPORT-1.result   | 1 +
 testing/tests/regression-suite/108-Evo-REPORT-1.result   | 1 +
 testing/tests/regression-suite/201-Moz-OPTIONS-2.result  | 1 +
 testing/tests/regression-suite/203-Moz-REPORT-2.result   | 1 +
 testing/tests/regression-suite/204-Moz-REPORT-3.result   | 1 +
 testing/tests/regression-suite/205-Moz-PROPFIND-1.result | 1 +
 testing/tests/regression-suite/206-Moz-PUT-1.result      | 1 +
 testing/tests/regression-suite/207-Moz-REPORT-4.result   | 1 +
 testing/tests/regression-suite/208-Moz-REPORT-5.result   | 1 +
 .../tests/regression-suite/302-Chandler-OPTIONS-2.result | 1 +
 .../regression-suite/303-Chandler-PROPFIND-1.result      | 1 +
 .../regression-suite/304-Chandler-PROPFIND-2.result      | 1 +
 .../tests/regression-suite/305-Chandler-OPTIONS-3.result | 1 +
 .../regression-suite/305-Chandler-PROPFIND-3.result      | 1 +
 testing/tests/regression-suite/306-Chandler-PUT-1.result | 1 +
 testing/tests/regression-suite/307-Chandler-PUT-2.result | 1 +
 .../tests/regression-suite/400-Cadaver-OPTIONS-1.result  | 1 +
 .../tests/regression-suite/401-Cadaver-PROPFIND-1.result | 1 +
 47 files changed, 55 insertions(+)

diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index e244e1fd..5e76cb30 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -218,6 +218,7 @@ class CalDAVRequest
       case 505: $status_text = "HTTP Version Not Supported"; break;
     }
     header( sprintf("HTTP/1.1 %d %s", $status, $status_text) );
+    header( sprintf("X-RSCDS-Version: RSCDS/%d.%d.%d; DB/%d.%d.%d", $c->code_major, $c->code_minor, $c->code_patch, $c->schema_major, $c->schema_minor, $c->schema_patch) );
     header( "Content-type: ".$content_type );
     echo $message;
 
diff --git a/inc/always.php b/inc/always.php
index 391afe77..e9d82a6e 100644
--- a/inc/always.php
+++ b/inc/always.php
@@ -100,4 +100,13 @@ $_SERVER['SERVER_NAME'] = $c->domain_name;
 
 include_once("PgQuery.php");
 
+$c->schema_version = 0;
+$qry = new PgQuery( "SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1;" );
+if ( $qry->Exec("always") && $row = $qry->Fetch() ) {
+  $c->schema_version = doubleval( sprintf( "%d%03d.%03d", $row->schema_major, $row->schema_minor, $row->schema_patch) );
+  $c->schema_major = $row->schema_major;
+  $c->schema_minor = $row->schema_minor;
+  $c->schema_patch = $row->schema_patch;
+}
+
 ?>
\ No newline at end of file
diff --git a/testing/tests/regression-suite/001-Mulberry-1.result b/testing/tests/regression-suite/001-Mulberry-1.result
index 95a046b0..cb268b34 100644
--- a/testing/tests/regression-suite/001-Mulberry-1.result
+++ b/testing/tests/regression-suite/001-Mulberry-1.result
@@ -3,6 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR
 DAV: 1, 2, access-control
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/002-Mulberry-1.result b/testing/tests/regression-suite/002-Mulberry-1.result
index f0315ac4..6daa7141 100644
--- a/testing/tests/regression-suite/002-Mulberry-1.result
+++ b/testing/tests/regression-suite/002-Mulberry-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "babe83e6862fa165ee05cc53ef149e02"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1790
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/003-Mulberry-1.result b/testing/tests/regression-suite/003-Mulberry-1.result
index e123aebe..0dde51af 100644
--- a/testing/tests/regression-suite/003-Mulberry-1.result
+++ b/testing/tests/regression-suite/003-Mulberry-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "5050c853fe31c4f40fe0cefb3bb4d9aa"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 365
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/004-Mulberry-1.result b/testing/tests/regression-suite/004-Mulberry-1.result
index d91f3439..dc64a075 100644
--- a/testing/tests/regression-suite/004-Mulberry-1.result
+++ b/testing/tests/regression-suite/004-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/005-Mulberry-1.result b/testing/tests/regression-suite/005-Mulberry-1.result
index 8cd5eec8..af4f695a 100644
--- a/testing/tests/regression-suite/005-Mulberry-1.result
+++ b/testing/tests/regression-suite/005-Mulberry-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "a2f9456e10ec204df8badf8526eddca8"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 708
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/006-Mulberry-1.result b/testing/tests/regression-suite/006-Mulberry-1.result
index 5708aeff..49428201 100644
--- a/testing/tests/regression-suite/006-Mulberry-1.result
+++ b/testing/tests/regression-suite/006-Mulberry-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "f86e4358f5d14ec9e61ee57ae97696d9"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 483
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/007-Mulberry-1.result b/testing/tests/regression-suite/007-Mulberry-1.result
index 491091b6..aa177b50 100644
--- a/testing/tests/regression-suite/007-Mulberry-1.result
+++ b/testing/tests/regression-suite/007-Mulberry-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 45
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.result b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
index f607cf23..89d65d35 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
index f607cf23..89d65d35 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/012-Mulberry-PUT-2.result b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
index 804618e2..51b1b0d5 100644
--- a/testing/tests/regression-suite/012-Mulberry-PUT-2.result
+++ b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "22158fc45876987b2b00749a3a1684d8"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index fc55d5bf..4fc72c4c 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "145f7e7222b7b8d4f7e194244e825ebe"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1199
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/014-Mulberry-PUT-3.result b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
index f8e41b45..15516d55 100644
--- a/testing/tests/regression-suite/014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "2c32a2f8aba853654eb17fe037a4db4d"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index 916c2b56..c8a34cef 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "9f4924e81f1c237854f11d8d58e85dae"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1199
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
index d91f3439..dc64a075 100644
--- a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
+++ b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
index ddf9bc0b..242c4a76 100644
--- a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
+++ b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
@@ -1,6 +1,7 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 36
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/018-Mulberry-PUT-4.result b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
index 8e1f1a90..2a9250f6 100644
--- a/testing/tests/regression-suite/018-Mulberry-PUT-4.result
+++ b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "75a75e1c7c4546074aab7645b5323738"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
index 2da77e1c..6d8926a1 100644
--- a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
+++ b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 46
 Connection: close
 Content-Type: text/plain; charset=UTF-8
diff --git a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
index efe872e4..90da4675 100644
--- a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 55
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
index 4e1eec04..7be7f89e 100644
--- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/022-Mulberry-PUT-5.result b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
index de1f666c..0cb88768 100644
--- a/testing/tests/regression-suite/022-Mulberry-PUT-5.result
+++ b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "81979ab45975368d619171a4c3e1e5e2"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
index 4e1eec04..7be7f89e 100644
--- a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
index 7ec32f38..074b9a9c 100644
--- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
@@ -3,6 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/102-Evo-REPORT-1.result b/testing/tests/regression-suite/102-Evo-REPORT-1.result
index 9b7de397..0ab7d29f 100644
--- a/testing/tests/regression-suite/102-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/102-Evo-REPORT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "f9fa1b47eff2ea9f94e6fa54b07198d8"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 341
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/103-Evo-GET-1.result b/testing/tests/regression-suite/103-Evo-GET-1.result
index 2af1590f..8b74e91d 100644
--- a/testing/tests/regression-suite/103-Evo-GET-1.result
+++ b/testing/tests/regression-suite/103-Evo-GET-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 747
 Content-Type: text/calendar; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/104-Evo-PUT-1.result b/testing/tests/regression-suite/104-Evo-PUT-1.result
index ebcbbd84..273b1e6d 100644
--- a/testing/tests/regression-suite/104-Evo-PUT-1.result
+++ b/testing/tests/regression-suite/104-Evo-PUT-1.result
@@ -4,6 +4,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "c3658901fd4689d4a1e1d6f08601ef4f"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/105-Evo-REPORT-1.result b/testing/tests/regression-suite/105-Evo-REPORT-1.result
index 6f0d5e3b..129370a6 100644
--- a/testing/tests/regression-suite/105-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/105-Evo-REPORT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "9d3605b5b78ea1f7f2273b3251f23b61"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 582
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/106-Evo-GET-1.result b/testing/tests/regression-suite/106-Evo-GET-1.result
index 123868d8..b511eb79 100644
--- a/testing/tests/regression-suite/106-Evo-GET-1.result
+++ b/testing/tests/regression-suite/106-Evo-GET-1.result
@@ -1,6 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1059
 Content-Type: text/calendar; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/107-Evo-REPORT-1.result b/testing/tests/regression-suite/107-Evo-REPORT-1.result
index f7092495..2b2012d6 100644
--- a/testing/tests/regression-suite/107-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/107-Evo-REPORT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "daca68be14cb0969dd84f1410a2764ed"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 560
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/108-Evo-REPORT-1.result b/testing/tests/regression-suite/108-Evo-REPORT-1.result
index c81f5141..94e344f9 100644
--- a/testing/tests/regression-suite/108-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/108-Evo-REPORT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "5940fad8fc254eb229f36f3176385154"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 596
 Content-Type: text/xml; 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 7ec32f38..074b9a9c 100644
--- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@@ -3,6 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/203-Moz-REPORT-2.result b/testing/tests/regression-suite/203-Moz-REPORT-2.result
index ca949cd1..a2c82f76 100644
--- a/testing/tests/regression-suite/203-Moz-REPORT-2.result
+++ b/testing/tests/regression-suite/203-Moz-REPORT-2.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "9a2b860b7650f72b1e0760312adac2b4"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 2420
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/204-Moz-REPORT-3.result b/testing/tests/regression-suite/204-Moz-REPORT-3.result
index c7205d27..61767348 100644
--- a/testing/tests/regression-suite/204-Moz-REPORT-3.result
+++ b/testing/tests/regression-suite/204-Moz-REPORT-3.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "e111c4ad26b709f9f5010d8767e66660"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1110
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
index 79de9d6e..c0040580 100644
--- a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
+++ b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "d8ecc54eb92c9d4552b4968f5a4f0edc"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 343
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/206-Moz-PUT-1.result b/testing/tests/regression-suite/206-Moz-PUT-1.result
index 2470de4e..aa7e4207 100644
--- a/testing/tests/regression-suite/206-Moz-PUT-1.result
+++ b/testing/tests/regression-suite/206-Moz-PUT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "a1c6404d61190f9574e2bfd69383f144"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/207-Moz-REPORT-4.result b/testing/tests/regression-suite/207-Moz-REPORT-4.result
index c741e059..9c6bcb75 100644
--- a/testing/tests/regression-suite/207-Moz-REPORT-4.result
+++ b/testing/tests/regression-suite/207-Moz-REPORT-4.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "3c6079aca32c2bbcff3f4091dcd38168"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1358
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/208-Moz-REPORT-5.result b/testing/tests/regression-suite/208-Moz-REPORT-5.result
index 78146911..8e5fa72e 100644
--- a/testing/tests/regression-suite/208-Moz-REPORT-5.result
+++ b/testing/tests/regression-suite/208-Moz-REPORT-5.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "bd7f155447f7ae232ebf4093b2c7dbc6"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 68
 Content-Type: text/xml; 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 7ec32f38..074b9a9c 100644
--- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
@@ -3,6 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
index 6527e45d..1b3e8e91 100644
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "2fe1affa2720f00af1c4765534fb4334"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 443
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
index f4fbedbd..be8d9aec 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "d0133346b5582da2156dcc6d20ed461a"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 558
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result b/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result
index 7ec32f38..074b9a9c 100644
--- a/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result
+++ b/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result
@@ -3,6 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result
index e924d81a..1929f53e 100644
--- a/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "5e9b9ac288ac9f551817297c07178c71"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1498
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/306-Chandler-PUT-1.result b/testing/tests/regression-suite/306-Chandler-PUT-1.result
index bd0ac036..b237df96 100644
--- a/testing/tests/regression-suite/306-Chandler-PUT-1.result
+++ b/testing/tests/regression-suite/306-Chandler-PUT-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "0d7a68984bf525342d22b8924a57e8e2"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/307-Chandler-PUT-2.result b/testing/tests/regression-suite/307-Chandler-PUT-2.result
index 1822d64d..cd68ee94 100644
--- a/testing/tests/regression-suite/307-Chandler-PUT-2.result
+++ b/testing/tests/regression-suite/307-Chandler-PUT-2.result
@@ -2,6 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "421abf7e4848d2fecbf64217ed205d4b"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 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 7ec32f38..074b9a9c 100644
--- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
@@ -3,6 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
index 34219c3c..ce42edde 100644
--- a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
+++ b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
@@ -2,6 +2,7 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "3100aa09a91541170a59fa9bd268f77d"
+X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 412
 Content-Type: text/xml; charset="utf-8"