Put a trailing newline on error messages

This commit is contained in:
Andrew Ruthven 2024-03-30 18:01:01 +13:00
parent 0fc1abd976
commit b26d48fced
16 changed files with 31 additions and 23 deletions

View File

@ -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

View File

@ -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<

View File

@ -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<

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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<

View File

@ -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>
</error>

View File

@ -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>
</error>

View File

@ -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>
</error>

View File

@ -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>
</error>

View File

@ -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>
</error>

View File

@ -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>

View File

@ -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>
</error>

View File

@ -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>
</error>

View File

@ -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>
</error>