wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9faa5eeddd24a057d9ff522259c9dbdc6203c098.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-11-27 11:25:44 +11:00
parent b9d3415f29
commit 3b0de86bf9
11 changed files with 103 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch
View File

@@ -1,7 +1,7 @@
From a283ad7a863862caf312843950b88bdfd9faeacc Mon Sep 17 00:00:00 2001
From 20e7de7c8f73fb27f7eeffbc5de646fc27fe1bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 May 2015 00:24:35 +0200
Subject: wininet: Strip filename if no path is set in cookie.
Subject: [PATCH] wininet: Strip filename if no path is set in cookie.
The order of the stored cookies doesn't match in /testC, so
be a bit less strict in the test.
@@ -11,10 +11,10 @@ be a bit less strict in the test.
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index c44156c..7281512 100644
index c770c312ba9..d95b39bd9ce 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -764,10 +764,18 @@ static void HTTP_ProcessCookies( http_request_t *request )
@@ -654,10 +654,18 @@ static void HTTP_ProcessCookies( http_request_t *request )
int HeaderIndex;
int numCookies = 0;
LPHTTPHEADERW setCookieHeader;
@@ -32,8 +32,8 @@ index c44156c..7281512 100644
+
EnterCriticalSection( &request->headers_section );
while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1)
@@ -786,10 +794,11 @@ static void HTTP_ProcessCookies( http_request_t *request )
while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, L"Set-Cookie", numCookies++, FALSE)) != -1)
@@ -676,10 +684,11 @@ static void HTTP_ProcessCookies( http_request_t *request )
name = substr(setCookieHeader->lpszValue, data - setCookieHeader->lpszValue);
data++;
@@ -47,10 +47,10 @@ index c44156c..7281512 100644
static void strip_spaces(LPWSTR start)
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index b3826bb..910a0b4 100644
index 510c3ac5232..b98e648c276 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2226,7 +2226,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
@@ -2363,7 +2363,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
}
if (strstr(buffer, "/testC"))
{
@@ -59,7 +59,7 @@ index b3826bb..910a0b4 100644
send(c, okmsg, sizeof okmsg-1, 0);
else
send(c, notokmsg, sizeof notokmsg-1, 0);
@@ -3196,7 +3196,7 @@ static void test_header_override(int port)
@@ -3351,7 +3351,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n");
@@ -68,7 +68,7 @@ index b3826bb..910a0b4 100644
InternetCloseHandle(req);
req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0);
@@ -3205,7 +3205,7 @@ static void test_header_override(int port)
@@ -3360,7 +3360,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n");
@@ -78,5 +78,5 @@ index b3826bb..910a0b4 100644
InternetCloseHandle(req);
InternetSetCookieA("http://test.local", "foo", "bar");
--
2.8.0
2.29.2