mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Removed wininet-Redirect patchset
Fixed upstream by cee99826b62b62acb7a8cf1ff32d27633c078e8f
This commit is contained in:
parent
f03920a32a
commit
c81dad1373
@ -461,7 +461,6 @@ patch_enable_all ()
|
||||
enable_wininet_InternetCrackUrlW="$1"
|
||||
enable_wininet_Internet_Settings="$1"
|
||||
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1"
|
||||
enable_wininet_Redirect="$1"
|
||||
enable_winmm_Delay_Import_Depends="$1"
|
||||
enable_winmm_mciSendCommandA="$1"
|
||||
enable_wintrust_WinVerifyTrust="$1"
|
||||
@ -1619,9 +1618,6 @@ patch_enable ()
|
||||
wininet-ParseX509EncodedCertificateForListBoxEntry)
|
||||
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$2"
|
||||
;;
|
||||
wininet-Redirect)
|
||||
enable_wininet_Redirect="$2"
|
||||
;;
|
||||
winmm-Delay_Import_Depends)
|
||||
enable_winmm_Delay_Import_Depends="$2"
|
||||
;;
|
||||
@ -2049,13 +2045,6 @@ if test "$enable_wpcap_Dynamic_Linking" -eq 1; then
|
||||
enable_wpcap_Several_Fixes=1
|
||||
fi
|
||||
|
||||
if test "$enable_wininet_Redirect" -eq 1; then
|
||||
if test "$enable_wininet_Cleanup" -gt 1; then
|
||||
abort "Patchset wininet-Cleanup disabled, but wininet-Redirect depends on that."
|
||||
fi
|
||||
enable_wininet_Cleanup=1
|
||||
fi
|
||||
|
||||
if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
|
||||
if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
|
||||
abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but winex11-WM_WINDOWPOSCHANGING depends on that."
|
||||
|
@ -1,76 +0,0 @@
|
||||
From fdab2aea2753d94ab1e169216dccfda727e7ea8f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 29 Mar 2017 03:05:05 +0200
|
||||
Subject: wininet: Return failure when handling http redirect without hostname.
|
||||
|
||||
---
|
||||
dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++++++
|
||||
1 file changed, 32 insertions(+)
|
||||
|
||||
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
|
||||
index 3804ec7cfec..63c97e5f32e 100644
|
||||
--- a/dlls/wininet/tests/http.c
|
||||
+++ b/dlls/wininet/tests/http.c
|
||||
@@ -2111,6 +2111,12 @@ static const char ok_with_length2[] =
|
||||
"Content-Length: 19\r\n\r\n"
|
||||
"HTTP/1.1 211 OK\r\n\r\n";
|
||||
|
||||
+static const char redir_no_host[] =
|
||||
+"HTTP/1.1 302 Found\r\n"
|
||||
+"Location: http:///test1\r\n"
|
||||
+"Server: winetest\r\n"
|
||||
+"\r\n";
|
||||
+
|
||||
struct server_info {
|
||||
HANDLE hEvent;
|
||||
int port;
|
||||
@@ -2521,6 +2527,10 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
else
|
||||
send(c, noauthmsg, sizeof noauthmsg-1, 0);
|
||||
}
|
||||
+ if (strstr(buffer, "GET /test_redirect_no_host"))
|
||||
+ {
|
||||
+ send(c, redir_no_host, sizeof redir_no_host-1, 0);
|
||||
+ }
|
||||
shutdown(c, 2);
|
||||
closesocket(c);
|
||||
c = -1;
|
||||
@@ -5717,6 +5727,27 @@ static void test_remove_dot_segments(int port)
|
||||
close_request(&req);
|
||||
}
|
||||
|
||||
+static void test_redirect_no_host(int port)
|
||||
+{
|
||||
+ test_request_t req;
|
||||
+ BOOL ret;
|
||||
+
|
||||
+ open_simple_request(&req, "localhost", port, NULL, "/test_redirect_no_host");
|
||||
+ ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0);
|
||||
+ if (ret)
|
||||
+ {
|
||||
+ trace("Succeeded with status code 302\n");
|
||||
+ test_status_code(req.request, 302);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ trace("Failed with error ERROR_INTERNET_INVALID_URL\n");
|
||||
+ ok(GetLastError() == ERROR_INTERNET_INVALID_URL,
|
||||
+ "Expected error ERROR_INTERNET_INVALID_URL, got %u\n", GetLastError());
|
||||
+ }
|
||||
+ close_request(&req);
|
||||
+}
|
||||
+
|
||||
static void test_http_connection(void)
|
||||
{
|
||||
struct server_info si;
|
||||
@@ -5772,6 +5803,7 @@ static void test_http_connection(void)
|
||||
test_redirect(si.port);
|
||||
test_persistent_connection(si.port);
|
||||
test_remove_dot_segments(si.port);
|
||||
+ test_redirect_no_host(si.port);
|
||||
|
||||
/* send the basic request again to shutdown the server thread */
|
||||
test_basic_request(si.port, "GET", "/quit");
|
||||
--
|
||||
2.13.1
|
||||
|
@ -1,2 +0,0 @@
|
||||
Fixes: [41398] Return failure when handling http redirect without hostname
|
||||
Depends: wininet-Cleanup
|
Loading…
Reference in New Issue
Block a user