[PATCH v3 0/3] MR6882: secur32, urlmon, wininet: Fix some failing tests.
Probably caused by some winehq.org HTTP server update, it now supports HTTP/2 and sends "Upgrade, Keep-Alive" connection strings (was "Keep-Alive" before). -- v3: wininet: Parse multi-token Connection strings for Keep-Alive. https://gitlab.winehq.org/wine/wine/-/merge_requests/6882
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index eecbc41415e..85f0f0a8560 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1592,8 +1592,8 @@ static void test_application_protocol_negotiation(void) { ok(protocol.ProtoNegoStatus == SecApplicationProtocolNegotiationStatus_Success, "got %u\n", protocol.ProtoNegoStatus); ok(protocol.ProtoNegoExt == SecApplicationProtocolNegotiationExt_ALPN, "got %u\n", protocol.ProtoNegoExt); - ok(protocol.ProtocolIdSize == 8, "got %u\n", protocol.ProtocolIdSize); - ok(!memcmp(protocol.ProtocolId, "http/1.1", 8), "wrong protocol id\n"); + ok(protocol.ProtocolIdSize == 2, "got %u\n", protocol.ProtocolIdSize); + ok(!memcmp(protocol.ProtocolId, "h2", 2), "wrong protocol id\n"); } DeleteSecurityContext(&context); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6882
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 01e564b2cf7..2affa2ef12a 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -981,7 +981,7 @@ static void test_http_info(IInternetProtocol *protocol) if(tested_protocol != FTP_TEST) { ok(hres == S_OK, "QueryInfo failed: %08lx\n", hres); - ok(!strcmp(buf, "Keep-Alive"), "buf = %s\n", buf); + ok(!strcmp(buf, "Keep-Alive") || !strcmp(buf, "Upgrade, Keep-Alive"), "buf = %s\n", buf); len = strlen(buf); ok(size == len, "size = %lu, expected %lu\n", size, len); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6882
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wininet/http.c | 51 +++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 92417714fac..48bfe35866a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1915,29 +1915,45 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static BOOL has_token(const WCHAR *str, const WCHAR *token) +{ + UINT len = wcslen(token); + const WCHAR *next; + + for (; *str; str = next + wcsspn(next, L" ,")) + { + next = str + wcscspn(str, L" ,"); + if (next - str != len) continue; + if (wcsnicmp(str, token, len)) continue; + return TRUE; + } + + return FALSE; +} + +static BOOL has_keep_alive(const WCHAR *version, const WCHAR *connection) +{ + return !wcsicmp(version, L"HTTP/1.1") ? !has_token(connection, L"Close") + : has_token(connection, L"Keep-Alive"); +} + static BOOL HTTP_KeepAlive(http_request_t *request) { WCHAR szVersion[10]; WCHAR szConnectionResponse[20]; DWORD dwBufferSize = sizeof(szVersion); - BOOL keepalive = FALSE; /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that * the connection is keep-alive by default */ - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_VERSION, szVersion, &dwBufferSize, NULL) == ERROR_SUCCESS - && !wcsicmp(szVersion, L"HTTP/1.1")) - { - keepalive = TRUE; - } + if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_VERSION, szVersion, &dwBufferSize, NULL) != ERROR_SUCCESS) + *szVersion = 0; dwBufferSize = sizeof(szConnectionResponse); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) == ERROR_SUCCESS - || HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) == ERROR_SUCCESS) - { - keepalive = !wcsicmp(szConnectionResponse, L"Keep-Alive"); - } + if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) != ERROR_SUCCESS && + HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) != ERROR_SUCCESS) + *szConnectionResponse = 0; - return keepalive; + return has_keep_alive(szVersion, szConnectionResponse); } static void HTTPREQ_CloseConnection(object_header_t *hdr) @@ -4857,16 +4873,15 @@ static void HTTP_ProcessLastModified(http_request_t *request) static void http_process_keep_alive(http_request_t *req) { + const WCHAR *connection = L""; int index; EnterCriticalSection( &req->headers_section ); - if ((index = HTTP_GetCustomHeaderIndex(req, L"Connection", 0, FALSE)) != -1) - req->netconn->keep_alive = !wcsicmp(req->custHeaders[index].lpszValue, L"Keep-Alive"); - else if ((index = HTTP_GetCustomHeaderIndex(req, L"Proxy-Connection", 0, FALSE)) != -1) - req->netconn->keep_alive = !wcsicmp(req->custHeaders[index].lpszValue, L"Keep-Alive"); - else - req->netconn->keep_alive = !wcsicmp(req->version, L"HTTP/1.1"); + if ((index = HTTP_GetCustomHeaderIndex(req, L"Connection", 0, FALSE)) != -1 || + (index = HTTP_GetCustomHeaderIndex(req, L"Proxy-Connection", 0, FALSE)) != -1) + connection = req->custHeaders[index].lpszValue; + req->netconn->keep_alive = has_keep_alive(req->version, connection); LeaveCriticalSection( &req->headers_section ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6882
v3: Use the actual token length for comparison. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6882#note_88507
On Fri Nov 22 14:13:06 2024 +0000, Rémi Bernon wrote:
Hum, wininet failures are back, probably means it's not working as intended. We have a minimal internal HTTP server in wininet tests that gives us a precise control over headers in tests. Anyway, it's mostly implicitly tested with the server, so I can live with it.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6882#note_88526
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6882
participants (2)
-
Jacek Caban (＠jacek) -
Rémi Bernon