From b26d48fcedb8dce453551592958ba553ea252ceb Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 30 Mar 2024 18:01:01 +1300
Subject: [PATCH] Put a trailing newline on error messages

---
 inc/CalDAVRequest.php                                         | 3 ++-
 testing/tests/binding/1001-BIND.result                        | 3 ++-
 testing/tests/binding/1024-BIND.result                        | 3 ++-
 testing/tests/carddav/2001-PUT-fail.result                    | 3 ++-
 testing/tests/carddav/2002-PUT-arbitrary.result               | 3 ++-
 testing/tests/carddav/2005-PUT-arbitrary.result               | 3 ++-
 testing/tests/regression-suite/0020-Mulberry-DELETE-1.result  | 3 ++-
 .../tests/regression-suite/0309-Chandler-PROPFIND-3.result    | 4 ++--
 .../regression-suite/0546-iCLoud-PUT-encoded-fail.result      | 4 ++--
 .../regression-suite/0921-PROPFIND-supported-stuff.result     | 4 ++--
 .../regression-suite/0922-PROPFIND-supported-stuff.result     | 4 ++--
 .../regression-suite/0923-PROPFIND-supported-stuff.result     | 4 ++--
 testing/tests/regression-suite/0946-ACL-err.result            | 3 ++-
 .../tests/regression-suite/0995-REPORT-not-supported.result   | 2 +-
 testing/tests/timezone/5032-get.result                        | 4 ++--
 testing/tests/timezone/5033-get.result                        | 4 ++--
 16 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index 02021e0e..2a563320 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -1191,7 +1191,8 @@ EOSQL;
     $xmldoc = sprintf('<?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="%s">
   <%s/>%s
-</error>', $xmlns, str_replace($xmlns.':', '', $precondition), $explanation );
+</error>
+', $xmlns, str_replace($xmlns.':', '', $precondition), $explanation );
 
     $this->DoResponse( $status, $xmldoc, 'text/xml; charset="utf-8"' );
     exit(0);  // Unecessary, but might clarify things
diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result
index 923f805d..dff32ded 100644
--- a/testing/tests/binding/1001-BIND.result
+++ b/testing/tests/binding/1001-BIND.result
@@ -2,13 +2,14 @@ HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 133
+Content-Length: 134
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <can-overwrite/>A resource already exists at the destination.
 </error>
+
           bind_id: >1020<
   bound_source_id: >161<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result
index 22096bd7..b08e7ac5 100644
--- a/testing/tests/binding/1024-BIND.result
+++ b/testing/tests/binding/1024-BIND.result
@@ -2,13 +2,14 @@ HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 133
+Content-Length: 134
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <can-overwrite/>A resource already exists at the destination.
 </error>
+
           bind_id: >1020<
   bound_source_id: >161<
   dav_displayname: >Updated Displayname with PROPPATCH<
diff --git a/testing/tests/carddav/2001-PUT-fail.result b/testing/tests/carddav/2001-PUT-fail.result
index 53a4ee8f..35b88039 100644
--- a/testing/tests/carddav/2001-PUT-fail.result
+++ b/testing/tests/carddav/2001-PUT-fail.result
@@ -2,10 +2,11 @@ HTTP/1.1 409 Conflict
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 137
+Content-Length: 138
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <collection-must-exist/>The destination collection does not exist
 </error>
+
diff --git a/testing/tests/carddav/2002-PUT-arbitrary.result b/testing/tests/carddav/2002-PUT-arbitrary.result
index 84f8e183..dc8618c1 100644
--- a/testing/tests/carddav/2002-PUT-arbitrary.result
+++ b/testing/tests/carddav/2002-PUT-arbitrary.result
@@ -2,10 +2,11 @@ HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 178
+Content-Length: 179
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <urn:ietf:params:xml:ns:carddav:supported-address-data/>Incorrect content type for addressbook: text/plain
 </error>
+
diff --git a/testing/tests/carddav/2005-PUT-arbitrary.result b/testing/tests/carddav/2005-PUT-arbitrary.result
index 84f8e183..dc8618c1 100644
--- a/testing/tests/carddav/2005-PUT-arbitrary.result
+++ b/testing/tests/carddav/2005-PUT-arbitrary.result
@@ -2,10 +2,11 @@ HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 178
+Content-Length: 179
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <urn:ietf:params:xml:ns:carddav:supported-address-data/>Incorrect content type for addressbook: text/plain
 </error>
+
diff --git a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result
index 82d62930..fdda68d5 100644
--- a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result
@@ -2,13 +2,14 @@ HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 204
+Content-Length: 205
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <if-match/>Existing resource ETag of "6cff373f55c3e8318ad1c0db93205d08" does not match "bogus-etag-b000d7defa19ccb7cd21e546b54155ee"
 </error>
+
          dav_etag: >6cff373f55c3e8318ad1c0db93205d08<
          dav_name: >/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics<
 
diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result
index 1455aca8..8043cfec 100644
--- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result
@@ -2,10 +2,10 @@ HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 129
+Content-Length: 130
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <must-exist/>That resource is not present on this server.
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result
index 0a6ccdb7..a80f66ba 100644
--- a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result
+++ b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result
@@ -1,9 +1,9 @@
 HTTP/1.1 415 Unsupported Media Type
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 135
+Content-Length: 136
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <content-encoding/>Unable to decode "deflate" content encoding.
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result
index 1455aca8..8043cfec 100644
--- a/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result
@@ -2,10 +2,10 @@ HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 129
+Content-Length: 130
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <must-exist/>That resource is not present on this server.
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result
index 1455aca8..8043cfec 100644
--- a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result
@@ -2,10 +2,10 @@ HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 129
+Content-Length: 130
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <must-exist/>That resource is not present on this server.
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result
index 1455aca8..8043cfec 100644
--- a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result
@@ -2,10 +2,10 @@ HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 129
+Content-Length: 130
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <must-exist/>That resource is not present on this server.
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/regression-suite/0946-ACL-err.result b/testing/tests/regression-suite/0946-ACL-err.result
index c0ad5ef7..90a4828b 100644
--- a/testing/tests/regression-suite/0946-ACL-err.result
+++ b/testing/tests/regression-suite/0946-ACL-err.result
@@ -2,10 +2,11 @@ HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 137
+Content-Length: 138
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <recognized-principal/>Principal "/caldav.php/user40/" not found.
 </error>
+
diff --git a/testing/tests/regression-suite/0995-REPORT-not-supported.result b/testing/tests/regression-suite/0995-REPORT-not-supported.result
index 7870c549..919d2ada 100644
--- a/testing/tests/regression-suite/0995-REPORT-not-supported.result
+++ b/testing/tests/regression-suite/0995-REPORT-not-supported.result
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <supported-report/>"bogus:namespace:which:does:not:exist:non-existent-report" is not a supported report type
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/timezone/5032-get.result b/testing/tests/timezone/5032-get.result
index 950dddb3..77b0e1b2 100644
--- a/testing/tests/timezone/5032-get.result
+++ b/testing/tests/timezone/5032-get.result
@@ -1,9 +1,9 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 183
+Content-Length: 184
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="urn:ietf:params:xml:ns:timezone-service">
   <supported-format/>This server currently only supports text/calendar format.
-</error>
\ No newline at end of file
+</error>
diff --git a/testing/tests/timezone/5033-get.result b/testing/tests/timezone/5033-get.result
index 950dddb3..77b0e1b2 100644
--- a/testing/tests/timezone/5033-get.result
+++ b/testing/tests/timezone/5033-get.result
@@ -1,9 +1,9 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 183
+Content-Length: 184
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="urn:ietf:params:xml:ns:timezone-service">
   <supported-format/>This server currently only supports text/calendar format.
-</error>
\ No newline at end of file
+</error>