You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 1348d9e97b1e83c99b68e0c9b592798038dc7f41.
This commit is contained in:
Sebastian Lackner
@@ -1,4 +1,4 @@
|
||||
From ad5209b79d6309cde4a10a6bfab6dcd3e0af518d Mon Sep 17 00:00:00 2001
|
||||
From b2525450e258182b0cb426d392f1677cc7971ae4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 15 May 2015 21:18:37 +0200
|
||||
Subject: wininet/tests: Test auth credential reusage with host override.
|
||||
@@ -8,10 +8,10 @@ Subject: wininet/tests: Test auth credential reusage with host override.
|
||||
1 file changed, 92 insertions(+)
|
||||
|
||||
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
|
||||
index 64f4647..c882fc1 100644
|
||||
index 661dcc3..546e473 100644
|
||||
--- a/dlls/wininet/tests/http.c
|
||||
+++ b/dlls/wininet/tests/http.c
|
||||
@@ -2408,6 +2408,20 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
@@ -2413,6 +2413,20 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
SetEvent(server_req_rec_event);
|
||||
WaitForSingleObject(conn_wait_event, INFINITE);
|
||||
}
|
||||
@@ -32,7 +32,7 @@ index 64f4647..c882fc1 100644
|
||||
shutdown(c, 2);
|
||||
closesocket(c);
|
||||
c = -1;
|
||||
@@ -3119,6 +3133,84 @@ static void test_header_override(int port)
|
||||
@@ -3118,6 +3132,84 @@ static void test_header_override(int port)
|
||||
InternetCloseHandle(req);
|
||||
InternetCloseHandle(con);
|
||||
InternetCloseHandle(ses);
|
||||
@@ -116,7 +116,7 @@ index 64f4647..c882fc1 100644
|
||||
+ InternetCloseHandle(ses);
|
||||
}
|
||||
|
||||
static void test_http1_1(int port)
|
||||
static void test_connection_closing(int port)
|
||||
--
|
||||
2.8.0
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
From 6f8e73f6f05924035dcb731332298cc224ab8f20 Mon Sep 17 00:00:00 2001
|
||||
From 21ca3efb2a8a1f505f9e3f3ed2126a766d4a127f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 15 May 2015 23:09:20 +0200
|
||||
Subject: wininet/tests: Check cookie behaviour when overriding host.
|
||||
|
||||
---
|
||||
dlls/wininet/tests/http.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 98 insertions(+), 1 deletion(-)
|
||||
dlls/wininet/tests/http.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 95 insertions(+)
|
||||
|
||||
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
|
||||
index 58eb5cc..6d1d48f 100644
|
||||
index 546e473..0121aa5 100644
|
||||
--- a/dlls/wininet/tests/http.c
|
||||
+++ b/dlls/wininet/tests/http.c
|
||||
@@ -1998,6 +1998,14 @@ static const char okmsg_cookie_path[] =
|
||||
@@ -2000,6 +2000,14 @@ static const char okmsg_cookie_path[] =
|
||||
"Set-Cookie: subcookie2=data; path=/test_cookie_set_path\r\n"
|
||||
"\r\n";
|
||||
|
||||
@@ -26,7 +26,7 @@ index 58eb5cc..6d1d48f 100644
|
||||
static const char notokmsg[] =
|
||||
"HTTP/1.1 400 Bad Request\r\n"
|
||||
"Server: winetest\r\n"
|
||||
@@ -2387,6 +2395,25 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
@@ -2391,6 +2399,25 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
else
|
||||
send(c, notokmsg, sizeof notokmsg-1, 0);
|
||||
}
|
||||
@@ -52,8 +52,8 @@ index 58eb5cc..6d1d48f 100644
|
||||
if (strstr(buffer, "/test_host_override"))
|
||||
{
|
||||
if (strstr(buffer, host_header_override))
|
||||
@@ -3098,6 +3125,74 @@ static void test_header_override(int port)
|
||||
test_status_code_todo(req, 400);
|
||||
@@ -3130,6 +3157,74 @@ static void test_header_override(int port)
|
||||
}
|
||||
|
||||
InternetCloseHandle(req);
|
||||
+ InternetSetCookieA("http://localhost", "cookie", "biscuit");
|
||||
@@ -127,18 +127,6 @@ index 58eb5cc..6d1d48f 100644
|
||||
InternetCloseHandle(con);
|
||||
InternetCloseHandle(ses);
|
||||
|
||||
@@ -4545,8 +4640,10 @@ static void test_request_content_length(int port)
|
||||
con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);
|
||||
ok(con != NULL, "InternetConnect failed\n");
|
||||
|
||||
+ /* On XP there is a weird bug that the following tests fail if certain cookies
|
||||
+ * are set. We workaround this problem by passing INTERNET_FLAG_NO_COOKIES as flag. */
|
||||
req = HttpOpenRequestA(con, "POST", "/test_request_content_length", NULL, NULL, NULL,
|
||||
- INTERNET_FLAG_KEEP_CONNECTION, 0);
|
||||
+ INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_NO_COOKIES, 0);
|
||||
ok(req != NULL, "HttpOpenRequest failed\n");
|
||||
|
||||
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
|
||||
--
|
||||
2.4.3
|
||||
2.8.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 91c7ab52a873c9c6443443937bad998f5dc40bbd Mon Sep 17 00:00:00 2001
|
||||
From 0b022db2f23f61313004bdf0e2e42e9fd9b2f81d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 16 May 2015 03:16:15 +0200
|
||||
Subject: wininet: Replacing header fields should fail if they do not exist
|
||||
@@ -8,15 +8,14 @@ A lot of details are not properly covered by tests yet and were
|
||||
marked with FIXME comments. The implementation was written in such
|
||||
a way that it behaves identical to the old code in such situations.
|
||||
---
|
||||
dlls/wininet/http.c | 185 +++++++++++++++++++++++-----------------------
|
||||
dlls/wininet/tests/http.c | 6 +-
|
||||
2 files changed, 96 insertions(+), 95 deletions(-)
|
||||
dlls/wininet/http.c | 185 ++++++++++++++++++++++++++--------------------------
|
||||
1 file changed, 93 insertions(+), 92 deletions(-)
|
||||
|
||||
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
|
||||
index f7c8f76..85bc392 100644
|
||||
index 6f01244..5419786 100644
|
||||
--- a/dlls/wininet/http.c
|
||||
+++ b/dlls/wininet/http.c
|
||||
@@ -6115,127 +6115,128 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer)
|
||||
@@ -6166,127 +6166,128 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer)
|
||||
|
||||
static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier)
|
||||
{
|
||||
@@ -237,27 +236,6 @@ index f7c8f76..85bc392 100644
|
||||
TRACE("<-- %d\n", res);
|
||||
LeaveCriticalSection( &request->headers_section );
|
||||
return res;
|
||||
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
|
||||
index ff76e9f..8b5cdb7 100644
|
||||
--- a/dlls/wininet/tests/http.c
|
||||
+++ b/dlls/wininet/tests/http.c
|
||||
@@ -3116,13 +3116,13 @@ static void test_header_override(int port)
|
||||
|
||||
ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE);
|
||||
err = GetLastError();
|
||||
- todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n");
|
||||
- todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err);
|
||||
+ ok(!ret, "HttpAddRequestHeaders succeeded\n");
|
||||
+ ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err);
|
||||
|
||||
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
|
||||
ok(ret, "HttpSendRequest failed\n");
|
||||
|
||||
- test_status_code_todo(req, 400);
|
||||
+ test_status_code(req, 400);
|
||||
|
||||
InternetCloseHandle(req);
|
||||
InternetSetCookieA("http://localhost", "cookie", "biscuit");
|
||||
--
|
||||
2.4.3
|
||||
2.8.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user