From bc1aa54891b4b5158a0942cb9698752d74afbc07 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 5 Sep 2019 08:52:02 +1000 Subject: [PATCH] Rebase against 92c00c51b21594987d342b5ce00c174ab4e84595 --- patches/patchinstall.sh | 2 +- ...net-tests-Add-more-tests-for-cookies.patch | 22 ++++++++--------- ...st-auth-credential-reusage-with-host.patch | 24 ++++++++++++------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9de99a98..78a690f4 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "363b8809f37b3ea5915ea4240b3d397fd2355e2e" + echo "92c00c51b21594987d342b5ce00c174ab4e84595" } # Show version information diff --git a/patches/wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch b/patches/wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch index 2c1f96d5..f11d54bc 100644 --- a/patches/wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch +++ b/patches/wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch @@ -1,18 +1,18 @@ -From 58d5370c1a1a1e0ee44742440ebf7abcd19c148c Mon Sep 17 00:00:00 2001 +From fa5a5b2fd598b7b6f471a9479c5f2a9c684d05f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 May 2015 20:37:19 +0200 -Subject: wininet/tests: Add more tests for cookies. +Subject: [PATCH] wininet/tests: Add more tests for cookies. --- - dlls/wininet/tests/http.c | 92 +++++++++++++++++++++++++++++++++++++++++++++-- + dlls/wininet/tests/http.c | 92 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c -index b841795..559ab3e 100644 +index fcbd95b8376..b06bd6c04d1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c -@@ -1990,6 +1990,14 @@ static const char okmsg2[] = - "Set-Cookie: two\r\n" +@@ -2068,6 +2068,14 @@ static const char largemsg[] = + "Content-Length: %I64u\r\n" "\r\n"; +static const char okmsg_cookie_path[] = @@ -26,7 +26,7 @@ index b841795..559ab3e 100644 static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" -@@ -2353,6 +2361,32 @@ static DWORD CALLBACK server_thread(LPVOID param) +@@ -2431,6 +2439,32 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } @@ -59,7 +59,7 @@ index b841795..559ab3e 100644 if (strstr(buffer, "/test_host_override")) { if (strstr(buffer, host_header_override)) -@@ -3669,7 +3703,7 @@ static void test_cookie_header(int port) +@@ -3809,7 +3843,7 @@ static void test_cookie_header(int port) HINTERNET ses, con, req; DWORD size, error; BOOL ret; @@ -68,7 +68,7 @@ index b841795..559ab3e 100644 ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); -@@ -3697,7 +3731,7 @@ static void test_cookie_header(int port) +@@ -3837,7 +3871,7 @@ static void test_cookie_header(int port) size = sizeof(buffer); ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); @@ -77,7 +77,7 @@ index b841795..559ab3e 100644 ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); -@@ -3708,9 +3742,61 @@ static void test_cookie_header(int port) +@@ -3848,9 +3882,61 @@ static void test_cookie_header(int port) size = sizeof(buffer); ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); @@ -141,5 +141,5 @@ index b841795..559ab3e 100644 InternetCloseHandle(ses); } -- -2.4.3 +2.17.1 diff --git a/patches/wininet-Cleanup/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch b/patches/wininet-Cleanup/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch index 86474c0f..5348f2ba 100644 --- a/patches/wininet-Cleanup/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch +++ b/patches/wininet-Cleanup/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch @@ -1,20 +1,28 @@ -From 51ce7b90e66f38988d636ef7635e63fb231aeef6 Mon Sep 17 00:00:00 2001 +From 303a7d54eca11f350f200bf3747646349a84536f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 May 2015 21:18:37 +0200 -Subject: wininet/tests: Test auth credential reusage with host override. +Subject: [PATCH] wininet/tests: Test auth credential reusage with host + override. --- - dlls/wininet/tests/http.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 92 insertions(+) + dlls/wininet/tests/http.c | 93 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 93 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c -index 3b324c8..88aa1b1 100644 +index b06bd6c04d1..59689baf87e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c -@@ -2440,6 +2440,20 @@ static DWORD CALLBACK server_thread(LPVOID param) +@@ -2496,12 +2496,27 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, okmsg, sizeof(okmsg)-1, 0); } ++ + if (strstr(buffer, "HEAD /test_large_content")) + { + char msg[sizeof(largemsg) + 16]; + sprintf(msg, largemsg, content_length); + send(c, msg, strlen(msg), 0); + } + if (strstr(buffer, "HEAD /test_auth_host1")) + { + if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzcw==")) @@ -32,7 +40,7 @@ index 3b324c8..88aa1b1 100644 shutdown(c, 2); closesocket(c); c = -1; -@@ -3146,6 +3160,84 @@ static void test_header_override(int port) +@@ -3200,6 +3215,84 @@ static void test_header_override(int port) InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); @@ -118,5 +126,5 @@ index 3b324c8..88aa1b1 100644 static void test_connection_closing(int port) -- -2.9.0 +2.17.1