Apache 2.4.35 stops sending Content-Type headers for 204 No Content responses

Normalize results so tests work with newer and older versions

This change is similar to e565cc0a5e4af0330fe5a1ab6f2476be7fb10df4 and
following

From the Apache 2.4.35 changelog:

  *) http: Enforce consistently no response body with both 204 and 304
     statuses.  [Yann Ylavic]
This commit is contained in:
Florian Schlichting 2018-12-21 23:17:15 +01:00
parent c3654a9d48
commit 1301b2c494
25 changed files with 3 additions and 24 deletions

View File

@ -54,6 +54,9 @@ while( <STDIN> ) {
/^Content-Length: 0/ && $no_content && do {
$_ = "";
};
/^Content-Type: / && $no_content && do {
$_ = "";
};
print;
}

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
bind_id: >1607<

View File

@ -4,7 +4,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
caladruri: >NULL<

View File

@ -3,7 +3,6 @@ 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
ETag: "6cff373f55c3e8318ad1c0db93205d08"
Content-Type: text/plain; charset="utf-8"
A1 CalDAV DATA: >BEGIN:VCALENDAR

View File

@ -3,5 +3,4 @@ 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
ETag: "2c32a2f8aba853654eb17fe037a4db4d"
Content-Type: text/plain; charset="utf-8"

View File

@ -2,6 +2,5 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"

View File

@ -2,6 +2,5 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
?column?: >Count of matching calendars (should be 0)<

View File

@ -3,7 +3,6 @@ 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
ETag: "efd0257efbc898d059c200d1391af060"
Content-Type: text/plain; charset="utf-8"
CalDAV Data: >BEGIN:VCALENDAR

View File

@ -3,7 +3,6 @@ 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
ETag: "6079c141bc189326bf2432a8426c4242"
Content-Type: text/plain; charset="utf-8"
CalDAV Data: >BEGIN:VCALENDAR

View File

@ -2,6 +2,5 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"

View File

@ -2,5 +2,4 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"

View File

@ -2,5 +2,4 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"

View File

@ -2,5 +2,4 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
dav_owner_id: >1002<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
caldav_type: >VEVENT<

View File

@ -7,7 +7,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
caldav_type: >VEVENT<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
caldav_type: >VEVENT<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<

View File

@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<

View File

@ -4,7 +4,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
caldav_type: >VEVENT<

View File

@ -5,7 +5,6 @@ HTTP/1.1 204 No Content
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-Type: text/plain; charset="utf-8"
caldav_data: >BEGIN:VCALENDAR