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

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-13 11:52:28 +02:00
parent 830a8b9975
commit 14acf51a2d
12 changed files with 349 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/winhttp-Accept_Headers/0001-winhttp-Fix-handling-of-Accept-headers.patch
View File

@@ -1,4 +1,4 @@
From 11c32d17116fc6a9ff384aee1918b476544d8f42 Mon Sep 17 00:00:00 2001
From 9cb94401c419b2e3f9d95a8dc5ce171da398bd66 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 21 Dec 2016 00:54:37 +0100
Subject: winhttp: Fix handling of Accept headers.
@@ -10,10 +10,10 @@ Subject: winhttp: Fix handling of Accept headers.
3 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index b2b72c7..174972c 100644
index db6d12d027..2447efaec0 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -403,7 +403,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -399,7 +399,7 @@ static BOOL delete_header( request_t *request, DWORD index )
return TRUE;
}
@@ -22,7 +22,7 @@ index b2b72c7..174972c 100644
{
int index;
header_t hdr;
@@ -1130,15 +1130,10 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
@@ -1325,16 +1325,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
WCHAR *req = NULL;
char *req_ascii;
int bytes_sent;
@@ -30,6 +30,7 @@ index b2b72c7..174972c 100644
+ DWORD len;
clear_response_headers( request );
drain_content( request );
- flags = WINHTTP_ADDREQ_FLAG_ADD|WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA;
- for (i = 0; i < request->num_accept_types; i++)
@@ -40,7 +41,7 @@ index b2b72c7..174972c 100644
process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE );
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index 514a56d..a2db716 100644
index 514a56daa9..a2db716000 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -599,8 +599,6 @@ static void request_destroy( object_header_t *hdr )
@@ -89,7 +90,7 @@ index 514a56d..a2db716 100644
}
return TRUE;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 388fc33..75ba161 100644
index 46c2aaa02d..b9e2fe664d 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -207,8 +207,6 @@ typedef struct
@@ -111,5 +112,5 @@ index 388fc33..75ba161 100644
void release_typelib( void ) DECLSPEC_HIDDEN;
--
2.9.0
2.11.0