From 6412bcd2219d2a5c1f8193d8f394ddb1279dee2b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 11 Sep 2020 09:44:49 +0200 Subject: Fix xmlhttprequest autotest after HTTP/2 changes in qtbase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I32029f4f70da909b0b0d088899ac0c3138454792 Reviewed-by: Mårten Nordheim Reviewed-by: Timur Pocheptsov --- .../data/WebDAV/propfind.collection.allprop.expect | 4 +++- .../qqmlxmlhttprequest/data/WebDAV/propfind.file.expect | 4 +++- tests/auto/qml/qqmlxmlhttprequest/data/abort.expect | 8 +++++--- tests/auto/qml/qqmlxmlhttprequest/data/abort.qml | 2 +- .../qqmlxmlhttprequest/data/getResponseHeader.expect | 4 +++- .../qml/qqmlxmlhttprequest/data/open_network.expect | 4 +++- .../qqmlxmlhttprequest/data/receive_binary_data.expect | 4 +++- .../qqmlxmlhttprequest/data/receive_json_data.expect | 4 +++- .../auto/qml/qqmlxmlhttprequest/data/send_data.1.expect | 8 +++++--- tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml | 2 +- .../qml/qqmlxmlhttprequest/data/send_data.10.expect | 8 +++++--- .../qml/qqmlxmlhttprequest/data/send_data.11.expect | Bin 220 -> 286 bytes tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml | 2 +- tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml | 2 +- tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml | 2 +- .../auto/qml/qqmlxmlhttprequest/data/send_data.4.expect | 8 +++++--- tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml | 2 +- tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml | 2 +- .../auto/qml/qqmlxmlhttprequest/data/send_data.6.expect | 8 +++++--- tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml | 2 +- tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml | 2 +- .../auto/qml/qqmlxmlhttprequest/data/send_data.8.expect | 4 +++- .../auto/qml/qqmlxmlhttprequest/data/send_data.9.expect | 4 +++- tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.qml | 2 +- .../data/send_ignoreData_DELETE.expect | 4 +++- .../qqmlxmlhttprequest/data/send_ignoreData_GET.expect | 4 +++- .../qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect | 4 +++- .../auto/qml/qqmlxmlhttprequest/data/send_patch.expect | 4 +++- .../qml/qqmlxmlhttprequest/data/setRequestHeader.expect | 4 +++- tests/auto/qml/qqmlxmlhttprequest/data/status.expect | 4 +++- .../qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp | 12 +++++++++--- 31 files changed, 86 insertions(+), 42 deletions(-) (limited to 'tests/auto/qml/qqmlxmlhttprequest') diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect index 420ba41d9a..69330e441a 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect @@ -1,7 +1,9 @@ PROPFIND /container/ HTTP/1.1 Depth: 1 Content-Length: 95 -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} Accept-Language: en-US,* Content-type:i application/xml; charset="utf-8" diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect index f7dcb2b0c6..d752cf203a 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect @@ -1,6 +1,8 @@ PROPFIND /file HTTP/1.1 Content-Length: 192 -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} Accept-Language: en-US,* Content-type: text/xml; charset="utf-8" diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect b/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect index 44e4c77a8e..d317f51b73 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect @@ -1,10 +1,12 @@ PUT /testdocument.html HTTP/1.1 Accept-Language: en-US Content-Type: text/plain;charset=UTF-8 -Content-Length: 9 -Connection: Keep-Alive +Content-Length: 10 +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} -Test Data \ No newline at end of file +Test Data diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml index 9ba97fac4b..c8d8382c8f 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml @@ -37,7 +37,7 @@ QtObject { } x.open("PUT", url); x.setRequestHeader("Accept-Language", "en-US"); - x.send("Test Data"); + x.send("Test Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect index 312421ba79..dbc37463f5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect @@ -1,6 +1,8 @@ GET /testdocument.html HTTP/1.1 Accept-Language: en-US -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect b/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect index 312421ba79..dbc37463f5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect @@ -1,6 +1,8 @@ GET /testdocument.html HTTP/1.1 Accept-Language: en-US -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect b/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect index 1eebf23868..e56c2eec41 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect @@ -1,7 +1,9 @@ GET /gml_logo.png HTTP/1.1 Accept-Language: en-US,* Content-Type: image/png -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect b/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect index 6d80181053..38a9ffd705 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect @@ -1,7 +1,9 @@ GET /json.data HTTP/1.1 Accept-Language: en-US,* Content-Type: application/jsonrequest -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect index 786c73d32e..e24608d7c3 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect @@ -1,10 +1,12 @@ POST /testdocument.html HTTP/1.1 Accept-Language: en-US Content-Type: text/plain;charset=UTF-8 -Content-Length: 12 -Connection: Keep-Alive +Content-Length: 13 +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} -My Sent Data \ No newline at end of file +My Sent Data diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml index 6faac0242f..57203433c0 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml @@ -17,6 +17,6 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect index 6e3bea4d52..29828c06d0 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect @@ -1,10 +1,12 @@ OPTIONS /testdocument.html HTTP/1.1 Accept-Language: en-US,* Content-Type: text/plain;charset=UTF-8 -Content-Length: 12 -Connection: Keep-Alive +Content-Length: 13 +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} -My Sent Data \ No newline at end of file +My Sent Data diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect index 0ed73db70e..e3a9aae9e2 100644 Binary files a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect and b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect differ diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml index ba9761201e..25584a662b 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml @@ -17,7 +17,7 @@ QtObject { } } - var data = new Uint8Array([1, 2, 3, 0, 3, 2, 1]) + var data = new Uint8Array([1, 2, 3, 0, 3, 2, 1, 10]) x.send(data.buffer); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml index 383a76e75e..e63d58fdb6 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml @@ -18,7 +18,7 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml index 5cb8c926c2..cfd67a6a72 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml @@ -18,7 +18,7 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect index b9ea620f2d..02f48d0abb 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect @@ -1,10 +1,12 @@ POST /testdocument.html HTTP/1.1 Accept-Language: en-US Content-Type: charset=UTF-8;text/plain -Content-Length: 12 -Connection: Keep-Alive +Content-Length: 13 +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} -My Sent Data \ No newline at end of file +My Sent Data diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml index 884661c8ce..808fb3a18d 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml @@ -18,7 +18,7 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml index c031b84418..c8735173d3 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml @@ -18,7 +18,7 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect index 160bc35fda..2b60a6db86 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect @@ -1,10 +1,12 @@ PUT /testdocument.html HTTP/1.1 Accept-Language: en-US Content-Type: text/plain;charset=UTF-8 -Content-Length: 12 -Connection: Keep-Alive +Content-Length: 13 +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} -My Sent Data \ No newline at end of file +My Sent Data diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml index 42eb360d14..ee6a9caa06 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml @@ -17,6 +17,6 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml index 5dc252f970..003a912818 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml @@ -18,7 +18,7 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect index c849514cc7..f3db27c891 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect @@ -1,6 +1,8 @@ OPTIONS / HTTP/1.1 Content-Length: 0 -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} Accept-Language: en-US,* User-Agent: Mozilla/5.0 diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect index 189e0b27ca..347181efae 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect @@ -1,6 +1,8 @@ OPTIONS /testdocument.html HTTP/1.1 Content-Length: 0 -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} Accept-Language: en-US,* User-Agent: Mozilla/5.0 diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.qml index 834916f96c..17b12ab4b1 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.qml @@ -19,6 +19,6 @@ QtObject { } } - x.send("My Sent Data"); + x.send("My Sent Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect index dd1c84c401..0f13fc0bf9 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect @@ -1,6 +1,8 @@ DELETE /testdocument.html HTTP/1.1 Accept-Language: en-US -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect index 312421ba79..dbc37463f5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect @@ -1,6 +1,8 @@ GET /testdocument.html HTTP/1.1 Accept-Language: en-US -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect index 1bb5ddc979..9d2d6bc475 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect @@ -1,6 +1,8 @@ HEAD /testdocument.html HTTP/1.1 Accept-Language: en-US -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect index 7b640a408f..3ff8a42028 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect @@ -3,7 +3,9 @@ Accept-Language: en-US If-Match: "ETagNumber" Content-Type: application/example Content-Length: 247 -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect index 56455e2b23..a676062ec0 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect @@ -2,7 +2,9 @@ GET /testdocument.html HTTP/1.1 Accept-Language: en-US Test-header: value Test-header2: value,value2 -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/status.expect b/tests/auto/qml/qqmlxmlhttprequest/data/status.expect index 312421ba79..dbc37463f5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/status.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/status.expect @@ -1,6 +1,8 @@ GET /testdocument.html HTTP/1.1 Accept-Language: en-US -Connection: Keep-Alive +Connection: Keep-Alive, Upgrade, HTTP2-Settings +Upgrade: h2c +HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp index 2c08c33fc8..27d626bd77 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp +++ b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp @@ -1280,9 +1280,15 @@ void tst_qqmlxmlhttprequest::sendPropfind_data() QTest::addColumn("replyHeader"); QTest::addColumn("replyBody"); - QTest::newRow("Send PROPFIND for file (bigbox, author, DingALing, Random properties). Get response with responseXML.") << "sendPropfind.responseXML.qml" << "/file" << "propfind.file.expect" << "propfind.file.reply.header" << "propfind.file.reply.body"; - QTest::newRow("Send PROPFIND for file (bigbox, author, DingALing, Random properties). Get response with response.") << "sendPropfind.response.qml" << "/file" << "propfind.file.expect" << "propfind.file.reply.header" << "propfind.file.reply.body"; - QTest::newRow("Send PROPFIND \"allprop\" request for collection.") << "sendPropfind.collection.allprop.qml" << "/container/" << "propfind.collection.allprop.expect" << "propfind.file.reply.header" << "propfind.collection.allprop.reply.body"; + QTest::newRow("Send PROPFIND for file (bigbox, author, DingALing, Random properties). Get response with responseXML.") + << "sendPropfind.responseXML.qml" << "/file" << "propfind.file.expect" + << "propfind.file.reply.header" << "propfind.file.reply.body"; + QTest::newRow("Send PROPFIND for file (bigbox, author, DingALing, Random properties). Get response with response.") + << "sendPropfind.response.qml" << "/file" << "propfind.file.expect" + << "propfind.file.reply.header" << "propfind.file.reply.body"; + QTest::newRow("Send PROPFIND \"allprop\" request for collection.") + << "sendPropfind.collection.allprop.qml" << "/container/" << "propfind.collection.allprop.expect" + << "propfind.file.reply.header" << "propfind.collection.allprop.reply.body"; } // Test that calling hte XMLHttpRequest methods on a non-XMLHttpRequest object -- cgit v1.2.3