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 aa475ce23fa295a8f5d0fa120d7b3dac1a5a41b5.

Browse Source 
[wininet-InternetReadFile]
Removed patch to return synchronously from InternetReadFile if there is no
more data to read (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-05-18 01:45:07 +02:00
parent 334b3cb393
commit 8a2c526e13
18 changed files with 607 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b5601ae74c8c528a2c636587a7b8678dfb717b5a Mon Sep 17 00:00:00 2001
From a283ad7a863862caf312843950b88bdfd9faeacc 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.
@@ -11,7 +11,7 @@ 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 edea9f8..f7c8f76 100644
index c44156c..7281512 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -764,10 +764,18 @@ static void HTTP_ProcessCookies( http_request_t *request )
@@ -33,13 +33,12 @@ index edea9f8..f7c8f76 100644
EnterCriticalSection( &request->headers_section );
while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1)
@@ -789,11 +797,12 @@ static void HTTP_ProcessCookies( http_request_t *request )
continue;
@@ -786,10 +794,11 @@ static void HTTP_ProcessCookies( http_request_t *request )
name = substr(setCookieHeader->lpszValue, data - setCookieHeader->lpszValue);
data++;
- set_cookie(request->server->name, request->path, name, data, INTERNET_COOKIE_HTTPONLY);
+ set_cookie(request->server->name, path, name, data, INTERNET_COOKIE_HTTPONLY);
heap_free(name);
- set_cookie(substrz(request->server->name), substrz(request->path), name, substrz(data), INTERNET_COOKIE_HTTPONLY);
+ set_cookie(substrz(request->server->name), substrz(path), name, substrz(data), INTERNET_COOKIE_HTTPONLY);
}
LeaveCriticalSection( &request->headers_section );
@@ -48,10 +47,10 @@ index edea9f8..f7c8f76 100644
static void strip_spaces(LPWSTR start)
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 1a82aba..ff76e9f 100644
index b3826bb..910a0b4 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2217,7 +2217,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
@@ -2226,7 +2226,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
}
if (strstr(buffer, "/testC"))
{
@@ -60,7 +59,7 @@ index 1a82aba..ff76e9f 100644
send(c, okmsg, sizeof okmsg-1, 0);
else
send(c, notokmsg, sizeof notokmsg-1, 0);
@@ -3159,7 +3159,7 @@ static void test_header_override(int port)
@@ -3196,7 +3196,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n");
@@ -69,7 +68,7 @@ index 1a82aba..ff76e9f 100644
InternetCloseHandle(req);
req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0);
@@ -3168,7 +3168,7 @@ static void test_header_override(int port)
@@ -3205,7 +3205,7 @@ static void test_header_override(int port)
ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n");
@@ -79,5 +78,5 @@ index 1a82aba..ff76e9f 100644
InternetCloseHandle(req);
InternetSetCookieA("http://test.local", "foo", "bar");
--
2.4.3
2.8.0