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 ad576b6965fe9ce695bbf91ac229b04459af02d3

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-11-16 09:57:16 +11:00
parent 73c60b9896
commit 3e1acbd286
4 changed files with 11 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 6a223f7cb1fc344c3fa09490a2d72ea5db63a991 Mon Sep 17 00:00:00 2001
From 70361946ecd7e0b78ac89f97a37c862e4473b928 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 21 Dec 2016 00:54:37 +0100
Subject: [PATCH] winhttp: Fix handling of Accept headers.
@@ -10,7 +10,7 @@ Subject: [PATCH] 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 77d5315862b..76fe5ea4d14 100644
index 7f3ef4c..301dc2f 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -398,7 +398,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -22,7 +22,7 @@ index 77d5315862b..76fe5ea4d14 100644
{
int index;
struct header hdr;
@@ -2227,16 +2227,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
@@ -2179,16 +2179,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
session_t *session = connect->session;
char *wire_req;
int bytes_sent;
@@ -41,10 +41,10 @@ index 77d5315862b..76fe5ea4d14 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 93c10e06795..e134fbca956 100644
index 8804346..87413ca 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -641,8 +641,6 @@ static void request_destroy( object_header_t *hdr )
@@ -641,8 +641,6 @@ static void request_destroy( struct object_header *hdr )
heap_free( request->headers[i].value );
}
heap_free( request->headers );
@@ -53,7 +53,7 @@ index 93c10e06795..e134fbca956 100644
for (i = 0; i < TARGET_MAX; i++)
{
for (j = 0; j < SCHEME_MAX; j++)
@@ -1059,32 +1057,14 @@ static const object_vtbl_t request_vtbl =
@@ -1059,32 +1057,14 @@ static const struct object_vtbl request_vtbl =
static BOOL store_accept_types( request_t *request, const WCHAR **accept_types )
{
@@ -90,7 +90,7 @@ index 93c10e06795..e134fbca956 100644
}
return TRUE;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index cbf9a365993..0203012d351 100644
index 999f3d7..e10b052 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -198,8 +198,6 @@ typedef struct
@@ -104,7 +104,7 @@ index cbf9a365993..0203012d351 100644
HANDLE task_wait;
@@ -292,6 +290,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
void release_host( hostdata_t *host ) DECLSPEC_HIDDEN;
void release_host( struct hostdata *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 cbf9a365993..0203012d351 100644
void release_typelib( void ) DECLSPEC_HIDDEN;
--
2.19.1
1.9.1