wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9118512135a1aac6969bf575a0656855ba84ef11.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-07-19 13:21:54 +02:00
parent d9d149f369
commit a05970ca53
8 changed files with 248 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 9cb94401c419b2e3f9d95a8dc5ce171da398bd66 Mon Sep 17 00:00:00 2001
From 8f902d761567ba0a7972ad998ebb0ccfa5db537d 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 db6d12d027..2447efaec0 100644
index 47cc9066f89..aaa6a5e7905 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -399,7 +399,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -401,7 +401,7 @@ static BOOL delete_header( request_t *request, DWORD index )
return TRUE;
}
@@ -22,7 +22,7 @@ index db6d12d027..2447efaec0 100644
{
int index;
header_t hdr;
@@ -1325,16 +1325,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
@@ -1521,16 +1521,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
WCHAR *req = NULL;
char *req_ascii;
int bytes_sent;
@@ -41,7 +41,7 @@ index db6d12d027..2447efaec0 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 514a56daa9..a2db716000 100644
index 877794af45b..c4351a83b8a 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -599,8 +599,6 @@ static void request_destroy( object_header_t *hdr )
@@ -53,7 +53,7 @@ index 514a56daa9..a2db716000 100644
for (i = 0; i < TARGET_MAX; i++)
{
for (j = 0; j < SCHEME_MAX; j++)
@@ -1023,32 +1021,14 @@ static const object_vtbl_t request_vtbl =
@@ -1026,32 +1024,14 @@ static const object_vtbl_t request_vtbl =
static BOOL store_accept_types( request_t *request, const WCHAR **accept_types )
{
@@ -90,10 +90,10 @@ index 514a56daa9..a2db716000 100644
}
return TRUE;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 46c2aaa02d..b9e2fe664d 100644
index dd8c4efd938..180b1c4ba74 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -207,8 +207,6 @@ typedef struct
@@ -220,8 +220,6 @@ typedef struct
char read_buf[8192]; /* buffer for already read but not returned data */
header_t *headers;
DWORD num_headers;
@@ -102,9 +102,9 @@ index 46c2aaa02d..b9e2fe664d 100644
struct authinfo *authinfo;
struct authinfo *proxy_authinfo;
HANDLE task_wait;
@@ -303,6 +301,8 @@ void delete_domain( domain_t * ) DECLSPEC_HIDDEN;
BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN;
void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
@@ -316,6 +314,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
void release_host( host_t *host ) DECLSPEC_HIDDEN;
+BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) DECLSPEC_HIDDEN;
+
@@ -112,5 +112,5 @@ index 46c2aaa02d..b9e2fe664d 100644
void release_typelib( void ) DECLSPEC_HIDDEN;
--
2.11.0
2.13.1