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 ddec23013e39b563a3a50c0fe42c2ae8b518d538

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-11-26 11:52:26 +11:00
parent 3fe9b83fa4
commit f62913bfc3
7 changed files with 50 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ index c44156c..7281512 100644
+ if (!path)
+ return;
+
+ tmp = strrchrW(path, '/');
+ tmp = wcsrchr(path, '/');
+ if (tmp && tmp[1]) tmp[1] = 0;
+
EnterCriticalSection( &request->headers_section );

28
patches/wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch
View File

@@ -1,21 +1,21 @@
From 0b022db2f23f61313004bdf0e2e42e9fd9b2f81d Mon Sep 17 00:00:00 2001
From e8ad0fb2501a0ebd489534dbf7f89af209f972bc 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
yet.
Subject: [PATCH] wininet: Replacing header fields should fail if they do not
exist yet.
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/http.c | 185 ++++++++++++++++++++++----------------------
1 file changed, 93 insertions(+), 92 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 6f01244..5419786 100644
index ec984441399..98f63a8c0a4 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -6166,127 +6166,128 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer)
@@ -6120,127 +6120,128 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer)
static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier)
{
@@ -93,11 +93,11 @@ index 6f01244..5419786 100644
- HTTP_DeleteCustomHeader( request, index );
+ res = HTTP_InsertCustomHeader( request, &hdr );
+ }
- if (value && value[0])
+
+ goto out;
+ }
+
- if (value && value[0])
+ /* do not add new header if FLAG_ADD_IF_NEW is set */
+ if (dwModifier & HTTP_ADDHDR_FLAG_ADD_IF_NEW)
{
@@ -115,8 +115,8 @@ index 6f01244..5419786 100644
+ LPWSTR lpsztmp;
+ WCHAR ch = 0;
+ INT len = 0;
+ INT origlen = strlenW(lphttpHdr->lpszValue);
+ INT valuelen = strlenW(value);
+ INT origlen = lstrlenW(lphttpHdr->lpszValue);
+ INT valuelen = lstrlenW(value);
+ /* FIXME: Should it really clear HDR_ISREQUEST? */
if (dwModifier & HTTP_ADDHDR_FLAG_REQ)
@@ -138,8 +138,8 @@ index 6f01244..5419786 100644
- LPWSTR lpsztmp;
- WCHAR ch = 0;
- INT len = 0;
- INT origlen = strlenW(lphttpHdr->lpszValue);
- INT valuelen = strlenW(value);
- INT origlen = lstrlenW(lphttpHdr->lpszValue);
- INT valuelen = lstrlenW(value);
+ if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA)
+ {
+ ch = ',';
@@ -237,5 +237,5 @@ index 6f01244..5419786 100644
LeaveCriticalSection( &request->headers_section );
return res;
--
2.8.0
2.17.1