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

Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream), rebased wininet patch.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-12-19 23:39:35 +01:00
parent 9efe53b3f5
commit aeedb30ca0
6 changed files with 14 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/wininet-encoding/0001-wininet-Allow-Accept-Encoding-for-HTTP-1.0-requests.patch
View File

@@ -1,4 +1,4 @@
From b8cd3a50b3b381828b3bc604a8cd6d7d69e8a9cc Mon Sep 17 00:00:00 2001
From 183a3343682b8c76613bf3801ae5e4f384102552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 8 Dec 2014 02:51:30 +0100
Subject: wininet: Allow Accept-Encoding for HTTP/1.0 requests.
@@ -9,10 +9,10 @@ Subject: wininet: Allow Accept-Encoding for HTTP/1.0 requests.
2 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index cb30b26..3cda082 100644
index 532b65a..ee89061 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -219,7 +219,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
@@ -217,7 +217,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD);
static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl);
static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin);
@@ -20,7 +20,7 @@ index cb30b26..3cda082 100644
static BOOL drain_content(http_request_t*,BOOL);
static CRITICAL_SECTION connection_pool_cs;
@@ -1321,10 +1320,8 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request,
@@ -1324,10 +1323,8 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request,
pFieldAndValue = HTTP_InterpretHttpHeader(lpszStart);
if (pFieldAndValue)
{
@@ -33,7 +33,7 @@ index cb30b26..3cda082 100644
HTTP_FreeTokens(pFieldAndValue);
}
@@ -6345,21 +6342,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index)
@@ -6335,21 +6332,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index)
/***********************************************************************
@@ -56,10 +56,10 @@ index cb30b26..3cda082 100644
*
* Undocumented
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 98c8d62..ac1b0ba 100644
index 92a6b8d..1582ac9 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2292,7 +2292,13 @@ static DWORD CALLBACK server_thread(LPVOID param)
@@ -2314,7 +2314,13 @@ static DWORD CALLBACK server_thread(LPVOID param)
}
if (strstr(buffer, "GET /test_premature_disconnect"))
trace("closing connection\n");
@@ -74,8 +74,8 @@ index 98c8d62..ac1b0ba 100644
shutdown(c, 2);
closesocket(c);
c = -1;
@@ -4111,6 +4117,43 @@ static void test_cache_control_verb(int port)
InternetCloseHandle(session);
@@ -4169,6 +4175,43 @@ static void test_request_content_length(int port)
CloseHandle(hCompleteEvent);
}
+static void test_accept_encoding(int port)
@@ -118,14 +118,14 @@ index 98c8d62..ac1b0ba 100644
static void test_http_connection(void)
{
struct server_info si;
@@ -4156,6 +4199,7 @@ static void test_http_connection(void)
test_cache_control_verb(si.port);
@@ -4215,6 +4258,7 @@ static void test_http_connection(void)
test_successive_HttpSendRequest(si.port);
test_head_request(si.port);
test_request_content_length(si.port);
+ test_accept_encoding(si.port);
/* send the basic request again to shutdown the server thread */
test_basic_request(si.port, "GET", "/quit");
--
1.9.1
2.1.3