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 9629769fe7a6fee0e5adaafad3545516ef478461

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-11-07 08:58:43 +11:00
parent e4a3b5fc9d
commit 31e20daca3
8 changed files with 16 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 241fae87cb51721d42c89990f9290097b1ee2bb2 Mon Sep 17 00:00:00 2001
From 6a223f7cb1fc344c3fa09490a2d72ea5db63a991 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,10 +10,10 @@ 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 960c755..7470883 100644
index 77d5315862b..76fe5ea4d14 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -397,7 +397,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -398,7 +398,7 @@ static BOOL delete_header( request_t *request, DWORD index )
return TRUE;
}
@@ -21,10 +21,10 @@ index 960c755..7470883 100644
+BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only )
{
int index;
header_t hdr;
@@ -2070,16 +2070,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
WCHAR *req = NULL;
char *req_ascii;
struct header hdr;
@@ -2227,16 +2227,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
session_t *session = connect->session;
char *wire_req;
int bytes_sent;
- DWORD len, i, flags;
+ DWORD len;
@@ -41,7 +41,7 @@ index 960c755..7470883 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 0610915..4a47b92 100644
index 93c10e06795..e134fbca956 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -641,8 +641,6 @@ static void request_destroy( object_header_t *hdr )
@@ -90,21 +90,21 @@ index 0610915..4a47b92 100644
}
return TRUE;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 53b3c16..6628016 100644
index cbf9a365993..0203012d351 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -212,8 +212,6 @@ typedef struct
@@ -198,8 +198,6 @@ typedef struct
char read_buf[8192]; /* buffer for already read but not returned data */
header_t *headers;
struct header *headers;
DWORD num_headers;
- WCHAR **accept_types;
- DWORD num_accept_types;
struct authinfo *authinfo;
struct authinfo *proxy_authinfo;
HANDLE task_wait;
@@ -317,6 +315,8 @@ enum escape_flags
};
DWORD escape_string( WCHAR *, const WCHAR *, DWORD, enum escape_flags ) DECLSPEC_HIDDEN;
@@ -292,6 +290,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
void release_host( hostdata_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 53b3c16..6628016 100644
void release_typelib( void ) DECLSPEC_HIDDEN;
--
1.9.1
2.19.1