diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result
index ea207f0a..19cb5c40 100644
--- a/testing/tests/binding/1000-BIND.result
+++ b/testing/tests/binding/1000-BIND.result
@@ -7,7 +7,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/<
diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result
index 35a5bf24..ecadccd3 100644
--- a/testing/tests/binding/1001-BIND.result
+++ b/testing/tests/binding/1001-BIND.result
@@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8"
A resource already exists at the destination.
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/<
diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result
index f08dbc2b..461a0e64 100644
--- a/testing/tests/binding/1004-PROPFIND-bound.result
+++ b/testing/tests/binding/1004-PROPFIND-bound.result
@@ -58,6 +58,24 @@
HTTP/1.1 200 OK
+
+ /caldav.php/user4/.in/
+
+
+ User 4 Inbox
+
+ /caldav.php/.resources/1434
+
+
+
+ /caldav.php
+ user4
+
+
+
+ HTTP/1.1 200 OK
+
+
/caldav.php/user4/calendar-proxy-read/
diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result
index 5468897f..8f0b18de 100644
--- a/testing/tests/binding/1012-BIND.result
+++ b/testing/tests/binding/1012-BIND.result
@@ -7,14 +7,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
parent_container: >/user4/<
ticket_id_length: >8<
- bind_id: >1435<
+ bind_id: >1436<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result
index 27658b5c..83642af2 100644
--- a/testing/tests/binding/1022-BIND.result
+++ b/testing/tests/binding/1022-BIND.result
@@ -7,21 +7,21 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1436<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1440<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result
index b2d5e3df..c2464bac 100644
--- a/testing/tests/binding/1023-BIND.result
+++ b/testing/tests/binding/1023-BIND.result
@@ -7,28 +7,28 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1436<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1440<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1441<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result
index 092132f8..1ecaa8d3 100644
--- a/testing/tests/binding/1024-BIND.result
+++ b/testing/tests/binding/1024-BIND.result
@@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8"
A resource already exists at the destination.
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1436<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1440<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1441<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result
index 0cebf093..484a131f 100644
--- a/testing/tests/binding/1025-PROPFIND.result
+++ b/testing/tests/binding/1025-PROPFIND.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1438
@@ -90,7 +90,7 @@
A sub collection
- /caldav.php/.resources/1438
+ /caldav.php/.resources/1439
diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result
index 6734b9bd..22a7465a 100644
--- a/testing/tests/binding/1027-PROPFIND.result
+++ b/testing/tests/binding/1027-PROPFIND.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1438
diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result
index 972db535..cfcfb21e 100644
--- a/testing/tests/binding/1032-BIND-admin.result
+++ b/testing/tests/binding/1032-BIND-admin.result
@@ -7,7 +7,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1435<
bind_owner: >6<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
@@ -19,7 +19,7 @@ target_collection: >11<
target_resource_i: >NULL<
ticket_owner: >4<
- bind_id: >1435<
+ bind_id: >1436<
bind_owner: >6<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
@@ -31,7 +31,7 @@ target_collection: >10<
target_resource_i: >NULL<
ticket_owner: >3<
- bind_id: >1439<
+ bind_id: >1440<
bind_owner: >6<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
@@ -43,7 +43,7 @@ target_collection: >10<
target_resource_i: >NULL<
ticket_owner: >3<
- bind_id: >1440<
+ bind_id: >1441<
bind_owner: >6<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
@@ -55,7 +55,7 @@ target_collection: >11<
target_resource_i: >NULL<
ticket_owner: >4<
- bind_id: >1453<
+ bind_id: >1454<
bind_owner: >1<
bound_source_id: >12<
dav_displayname: >user3 home<
diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result
index ba358ad3..306b94de 100644
--- a/testing/tests/binding/1034-DELETE-admin-bind.result
+++ b/testing/tests/binding/1034-DELETE-admin-bind.result
@@ -6,14 +6,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1439<
+ bind_id: >1440<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
dav_owner_id: >6<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1441<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result
index 6750ffd5..1a317a31 100644
--- a/testing/tests/binding/1100-BIND.result
+++ b/testing/tests/binding/1100-BIND.result
@@ -7,36 +7,36 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1435<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1436<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1440<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1441<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1454<
- bound_source_id: >1437<
+ bind_id: >1455<
+ bound_source_id: >1438<
dav_displayname: >A normal collection<
dav_name: >/user4/boundbase/<
length: >NULL<
diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result
index d719614e..43fcbb0b 100644
--- a/testing/tests/binding/1101-PROPFIND-normal.result
+++ b/testing/tests/binding/1101-PROPFIND-normal.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1438
@@ -90,7 +90,7 @@
A sub collection
- /caldav.php/.resources/1438
+ /caldav.php/.resources/1439
@@ -112,7 +112,7 @@
newcalendar
- /caldav.php/.resources/1443
+ /caldav.php/.resources/1444
diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result
index 851a7142..b0bb52f3 100644
--- a/testing/tests/binding/1102-PROPFIND-bound.result
+++ b/testing/tests/binding/1102-PROPFIND-bound.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1438
@@ -99,7 +99,7 @@
A sub collection
- /caldav.php/.resources/1438
+ /caldav.php/.resources/1439
@@ -125,7 +125,7 @@
newcalendar
- /caldav.php/.resources/1443
+ /caldav.php/.resources/1444
diff --git a/testing/tests/carddav/2017-PUT-vcard.result b/testing/tests/carddav/2017-PUT-vcard.result
index 9f785a33..7a07d35d 100644
--- a/testing/tests/carddav/2017-PUT-vcard.result
+++ b/testing/tests/carddav/2017-PUT-vcard.result
@@ -36,8 +36,8 @@ Content-Type: text/plain; charset="utf-8"
country: >NULL<
locality: >Irgendwo<
postcode: >34332<
- property: >ADR;TYPE=WORK;CHARSET=utf-8:6266 AA\;andresen Holding\,
- Geschäftsleitung\;Weisenstraße 13\;Irgendwo\;Niedersachsen\;34332<
+ property: >ADR;TYPE=WORK;CHARSET=utf-8:6266 AA\;andresen Holding\, Geschäftsleitung
+ \;Weisenstraße 13\;Irgendwo\;Niedersachsen\;34332<
region: >Niedersachsen<
street_address: >Weisenstraße 13<
type: >WORK<
@@ -47,8 +47,8 @@ Content-Type: text/plain; charset="utf-8"
country: >Deutschland<
locality: >Passau<
postcode: >94036<
- property: >ADR;TYPE=WORK;CHARSET=utf-8:PO 373\;Andresen AG\, R&D\;Messegasse
- 7\;Passau\;Bayern\;94036\;Deutschland<
+ property: >ADR;TYPE=WORK;CHARSET=utf-8:PO 373\;Andresen AG\, R&D\;Messegasse 7\;Pas
+ sau\;Bayern\;94036\;Deutschland<
region: >Bayern<
street_address: >Messegasse 7<
type: >WORK<
diff --git a/testing/tests/carddav/2018-PUT-vcard.result b/testing/tests/carddav/2018-PUT-vcard.result
index 9e9a045d..a1e155ad 100644
--- a/testing/tests/carddav/2018-PUT-vcard.result
+++ b/testing/tests/carddav/2018-PUT-vcard.result
@@ -36,8 +36,8 @@ Content-Type: text/plain; charset="utf-8"
country: >Deutschland<
locality: >Hamburg-Harburg<
postcode: >21373<
- property: >ADR;TYPE=WORK;CHARSET=utf-8:\;Uni Harburg\, -\;Innstraße
- 71\;Hamburg-Harburg\;Hamburg\;21373\;Deutschland<
+ property: >ADR;TYPE=WORK;CHARSET=utf-8:\;Uni Harburg\, -\;Innstraße 71\;Hamburg-Har
+ burg\;Hamburg\;21373\;Deutschland<
region: >Hamburg<
street_address: >Innstraße 71<
type: >WORK<