Jacek Caban : wininet: Use proxy settings directly from http_request_t in a few more places.
Alexandre Julliard
julliard at winehq.org
Mon Nov 19 13:38:38 CST 2012
Module: wine
Branch: master
Commit: 3e23b5e589739a7a580361dcaca0566498eebb28
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e23b5e589739a7a580361dcaca0566498eebb28
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Nov 19 11:48:08 2012 +0100
wininet: Use proxy settings directly from http_request_t in a few more places.
---
dlls/wininet/http.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 9df90a9..39978b2 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1950,7 +1950,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
switch(option) {
case INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO:
{
- http_session_t *session = req->session;
INTERNET_DIAGNOSTIC_SOCKET_INFO *info = buffer;
FIXME("INTERNET_DIAGNOSTIC_SOCKET_INFO stub\n");
@@ -1964,11 +1963,11 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
info->Socket = 0;
/* FIXME: get source port from req->netConnection */
info->SourcePort = 0;
- info->DestPort = session->hostPort;
+ info->DestPort = req->server->port;
info->Flags = 0;
if (HTTP_KeepAlive(req))
info->Flags |= IDSI_FLAG_KEEP_ALIVE;
- if (session->appInfo->proxy && session->appInfo->proxy[0] != 0)
+ if (req->proxy)
info->Flags |= IDSI_FLAG_PROXY;
if (req->netconn->useSSL)
info->Flags |= IDSI_FLAG_SECURE;
@@ -2159,7 +2158,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
* INTERNET_REQFLAG_CACHE_WRITE_DISABLED
*/
- if(req->session->appInfo->proxy)
+ if(req->proxy)
flags |= INTERNET_REQFLAG_VIA_PROXY;
if(!req->rawHeaders)
flags |= INTERNET_REQFLAG_NO_HEADERS;
@@ -4838,7 +4837,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES))
HTTP_InsertCookies(request);
- if (request->session->appInfo->proxy && request->session->appInfo->proxy[0])
+ if (request->proxy)
{
WCHAR *url = build_proxy_path_url(request);
requestString = HTTP_BuildHeaderRequestString(request, request->verb, url, request->version);
More information about the wine-cvs
mailing list