Rebase against 27da4fa4498c3b6e0e46c72a9cdd13b620726e92.

This commit is contained in:
Zebediah Figura
2019-09-20 17:04:56 -05:00
parent c0389b0479
commit 7c57b6eba4
4 changed files with 9 additions and 54 deletions

View File

@@ -1,4 +1,4 @@
From fa5a5b2fd598b7b6f471a9479c5f2a9c684d05f5 Mon Sep 17 00:00:00 2001
From 915a805cabaec3cc265f4f8ad9f0005502f8fd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 15 May 2015 20:37:19 +0200
Subject: [PATCH] wininet/tests: Add more tests for cookies.
@@ -8,7 +8,7 @@ Subject: [PATCH] wininet/tests: Add more tests for cookies.
1 file changed, 89 insertions(+), 3 deletions(-)
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index fcbd95b8376..b06bd6c04d1 100644
index 90a38dc3a..55d51b299 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2068,6 +2068,14 @@ static const char largemsg[] =
@@ -26,9 +26,9 @@ index fcbd95b8376..b06bd6c04d1 100644
static const char notokmsg[] =
"HTTP/1.1 400 Bad Request\r\n"
"Server: winetest\r\n"
@@ -2431,6 +2439,32 @@ static DWORD CALLBACK server_thread(LPVOID param)
@@ -2438,6 +2446,32 @@ static DWORD CALLBACK server_thread(LPVOID param)
else
send(c, notokmsg, sizeof notokmsg-1, 0);
send(c, noauthmsg, sizeof noauthmsg-1, 0);
}
+ if (strstr(buffer, "/test_cookie_path1"))
+ {
@@ -59,7 +59,7 @@ index fcbd95b8376..b06bd6c04d1 100644
if (strstr(buffer, "/test_host_override"))
{
if (strstr(buffer, host_header_override))
@@ -3809,7 +3843,7 @@ static void test_cookie_header(int port)
@@ -3816,7 +3850,7 @@ static void test_cookie_header(int port)
HINTERNET ses, con, req;
DWORD size, error;
BOOL ret;
@@ -68,7 +68,7 @@ index fcbd95b8376..b06bd6c04d1 100644
ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
ok(ses != NULL, "InternetOpen failed\n");
@@ -3837,7 +3871,7 @@ static void test_cookie_header(int port)
@@ -3844,7 +3878,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 fcbd95b8376..b06bd6c04d1 100644
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed: %u\n", GetLastError());
@@ -3848,9 +3882,61 @@ static void test_cookie_header(int port)
@@ -3855,9 +3889,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 fcbd95b8376..b06bd6c04d1 100644
InternetCloseHandle(ses);
}
--
2.17.1
2.23.0