wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ee206a37609f99e9dc024dbe19d4a9b842433813

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-10-05 09:06:15 +10:00
parent faf8498490
commit f17ad5a016
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "adf451279837743a3b19787eb1e1b9c2b239bcd7"
echo "ee206a37609f99e9dc024dbe19d4a9b842433813"
}
# Show version information

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

@ -1,7 +1,7 @@
From 1ee165b875ae718219406b1d8829986a16e3d841 Mon Sep 17 00:00:00 2001
From 241fae87cb51721d42c89990f9290097b1ee2bb2 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.
Subject: [PATCH] winhttp: Fix handling of Accept headers.
---
dlls/winhttp/request.c | 9 ++-------
@ -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 6f6de7c..b81c49d 100644
index 960c755..7470883 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -402,7 +402,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -397,7 +397,7 @@ static BOOL delete_header( request_t *request, DWORD index )
return TRUE;
}
@ -22,7 +22,7 @@ index 6f6de7c..b81c49d 100644
{
int index;
header_t hdr;
@@ -2080,16 +2080,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
@@ -2070,16 +2070,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 6f6de7c..b81c49d 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 8da09a2..c94325a 100644
index 0610915..4a47b92 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -612,8 +612,6 @@ static void request_destroy( object_header_t *hdr )
@@ -641,8 +641,6 @@ static void request_destroy( object_header_t *hdr )
heap_free( request->headers[i].value );
}
heap_free( request->headers );
@ -53,7 +53,7 @@ index 8da09a2..c94325a 100644
for (i = 0; i < TARGET_MAX; i++)
{
for (j = 0; j < SCHEME_MAX; j++)
@@ -1048,32 +1046,14 @@ static const object_vtbl_t request_vtbl =
@@ -1059,32 +1057,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 8da09a2..c94325a 100644
}
return TRUE;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 7b92afc..3e3c7bd 100644
index 53b3c16..6628016 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -227,8 +227,6 @@ typedef struct
@@ -212,8 +212,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 7b92afc..3e3c7bd 100644
struct authinfo *authinfo;
struct authinfo *proxy_authinfo;
HANDLE task_wait;
@@ -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;
@@ -317,6 +315,8 @@ enum escape_flags
};
DWORD escape_string( WCHAR *, const WCHAR *, DWORD, enum escape_flags ) DECLSPEC_HIDDEN;
+BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) DECLSPEC_HIDDEN;
+
@ -112,5 +112,5 @@ index 7b92afc..3e3c7bd 100644
void release_typelib( void ) DECLSPEC_HIDDEN;
--
2.7.4
1.9.1