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 70fbfa2cb8198f86efa19eda91cf769056b7da2c.

Browse Source
This commit is contained in:
Zebediah Figura
2018-08-24 17:37:59 -05:00
parent 74e9c4f8ce
commit 3dcb983637
5 changed files with 56 additions and 65 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 8f902d761567ba0a7972ad998ebb0ccfa5db537d Mon Sep 17 00:00:00 2001
From 1ee165b875ae718219406b1d8829986a16e3d841 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 47cc9066f89..aaa6a5e7905 100644
index 6f6de7c..b81c49d 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -401,7 +401,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -402,7 +402,7 @@ static BOOL delete_header( request_t *request, DWORD index )
return TRUE;
}
@@ -22,7 +22,7 @@ index 47cc9066f89..aaa6a5e7905 100644
{
int index;
header_t hdr;
@@ -1521,16 +1521,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
@@ -2080,16 +2080,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
WCHAR *req = NULL;
char *req_ascii;
int bytes_sent;
@@ -41,10 +41,10 @@ index 47cc9066f89..aaa6a5e7905 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 877794af45b..c4351a83b8a 100644
index 8da09a2..c94325a 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -599,8 +599,6 @@ static void request_destroy( object_header_t *hdr )
@@ -612,8 +612,6 @@ static void request_destroy( object_header_t *hdr )
heap_free( request->headers[i].value );
}
heap_free( request->headers );
@@ -53,7 +53,7 @@ index 877794af45b..c4351a83b8a 100644
for (i = 0; i < TARGET_MAX; i++)
{
for (j = 0; j < SCHEME_MAX; j++)
@@ -1026,32 +1024,14 @@ static const object_vtbl_t request_vtbl =
@@ -1048,32 +1046,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 877794af45b..c4351a83b8a 100644
}
return TRUE;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index dd8c4efd938..180b1c4ba74 100644
index 7b92afc..3e3c7bd 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -220,8 +220,6 @@ typedef struct
@@ -227,8 +227,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 dd8c4efd938..180b1c4ba74 100644
struct authinfo *authinfo;
struct authinfo *proxy_authinfo;
HANDLE task_wait;
@@ -316,6 +314,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
@@ -324,6 +322,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
void release_host( hostdata_t *host ) DECLSPEC_HIDDEN;
DWORD escape_string( WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN;
+BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) DECLSPEC_HIDDEN;
+
@@ -112,5 +112,5 @@ index dd8c4efd938..180b1c4ba74 100644
void release_typelib( void ) DECLSPEC_HIDDEN;
--
2.13.1
2.7.4