Juan Lang : wininet: Secure flag is set in the request, not in the session.
Alexandre Julliard
julliard at winehq.org
Fri Oct 1 11:38:49 CDT 2010
Module: wine
Branch: master
Commit: 80545ef966a39b4164d61d72ced4b962dd797d53
URL: http://source.winehq.org/git/wine.git/?a=commit;h=80545ef966a39b4164d61d72ced4b962dd797d53
Author: Juan Lang <juan.lang at gmail.com>
Date: Thu Sep 30 17:11:56 2010 -0700
wininet: Secure flag is set in the request, not in the session.
---
dlls/wininet/http.c | 3 +--
dlls/wininet/tests/http.c | 2 --
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 98765d9..76cf41c 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1690,7 +1690,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
case INTERNET_OPTION_SECURITY_FLAGS:
{
- http_session_t *lpwhs = req->lpHttpSession;
DWORD flags;
int bits;
@@ -1699,7 +1698,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
*size = sizeof(DWORD);
flags = 0;
- if (lpwhs->hdr.dwFlags & INTERNET_FLAG_SECURE)
+ if (req->hdr.dwFlags & INTERNET_FLAG_SECURE)
flags |= SECURITY_FLAG_SECURE;
flags |= req->netConnection.security_flags;
bits = NETCON_GetCipherStrength(&req->netConnection);
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 1236d30..d942ca4 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2598,7 +2598,6 @@ static void test_secure_connection(void)
size = sizeof(flags);
ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size);
ok(ret, "InternetQueryOption failed: %d\n", GetLastError());
- todo_wine
ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n");
ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT,
@@ -2679,7 +2678,6 @@ static void test_secure_connection(void)
size = sizeof(flags);
ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size);
ok(ret, "InternetQueryOption failed: %d\n", GetLastError());
- todo_wine
ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n");
ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT,
More information about the wine-cvs
mailing list