ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Allow passing INTERNET_INVALID_PORT_NUMBER port to get_server.

This commit is contained in:
Jacek Caban 2012-11-19 11:47:06 +01:00 committed by Alexandre Julliard
parent cdf25ee469
commit e1d26a24ed
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/wininet/http.c
View File

@ -255,6 +255,9 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL
{ {
server_t *iter, *server = NULL; server_t *iter, *server = NULL;
if(port == INTERNET_INVALID_PORT_NUMBER)
port = is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT;
EnterCriticalSection(&connection_pool_cs); EnterCriticalSection(&connection_pool_cs);
LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) { LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) {
@ -1723,9 +1726,6 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req
if( !request->path ) if( !request->path )
request->path = szNul; request->path = szNul;
if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT;
new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE);
if(!new_server) if(!new_server)
return FALSE; return FALSE;
@ -3164,7 +3164,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
{ {
appinfo_t *hIC = session->appInfo; appinfo_t *hIC = session->appInfo;
http_request_t *request; http_request_t *request;
INTERNET_PORT port;
DWORD len, res = ERROR_SUCCESS; DWORD len, res = ERROR_SUCCESS;
TRACE("-->\n"); TRACE("-->\n");
@ -3191,11 +3190,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
request->session = session; request->session = session;
list_add_head( &session->hdr.children, &request->hdr.entry ); list_add_head( &session->hdr.children, &request->hdr.entry );
port = session->hostPort; request->server = get_server(session->hostName, session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE);
if(port == INTERNET_INVALID_PORT_NUMBER)
port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT;
request->server = get_server(session->hostName, port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE);
if(!request->server) { if(!request->server) {
WININET_Release(&request->hdr); WININET_Release(&request->hdr);
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;

3
dlls/wininet/internet.c
View File

@ -4428,9 +4428,6 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT
return FALSE; return FALSE;
} }
if(url.nPort == INTERNET_INVALID_PORT_NUMBER)
url.nPort = INTERNET_DEFAULT_HTTPS_PORT;
server = get_server(hostname, url.nPort, TRUE, FALSE); server = get_server(hostname, url.nPort, TRUE, FALSE);
if(!server) { if(!server) {
SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND);