wine/dlls/wininet http.c internet.h
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 28 05:06:57 CST 2005
ChangeSet ID: 21494
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/28 05:06:57
Modified files:
dlls/wininet : http.c internet.h
Log message:
Robert Shearman <rob at codeweavers.com>
Add a host port field that preserves the requested port of the
destination URL.
Patch: http://cvs.winehq.org/patch.py?id=21494
Old revision New revision Changes Path
1.120 1.121 +3 -1 wine/dlls/wininet/http.c
1.43 1.44 +2 -1 wine/dlls/wininet/internet.h
Index: wine/dlls/wininet/http.c
diff -u -p wine/dlls/wininet/http.c:1.120 wine/dlls/wininet/http.c:1.121
--- wine/dlls/wininet/http.c:1.120 28 Nov 2005 11: 6:57 -0000
+++ wine/dlls/wininet/http.c 28 Nov 2005 11: 6:57 -0000
@@ -918,7 +918,7 @@ static BOOL HTTP_DealWithProxy( LPWININE
if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT;
- sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nServerPort);
+ sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nHostPort);
if( lpwhr->lpszPath[0] != '/' )
strcatW( url, szSlash );
@@ -1042,6 +1042,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L
lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ?
INTERNET_DEFAULT_HTTPS_PORT :
INTERNET_DEFAULT_HTTP_PORT);
+ lpwhs->nHostPort = lpwhs->nServerPort;
if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0)
HTTP_DealWithProxy( hIC, lpwhs, lpwhr );
@@ -2112,6 +2113,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW
if (NULL != lpszUserName)
lpwhs->lpszUserName = WININET_strdupW(lpszUserName);
lpwhs->nServerPort = nServerPort;
+ lpwhs->nHostPort = nServerPort;
/* Don't send a handle created callback if this handle was created with InternetOpenUrl */
if (!(lpwhs->hdr.dwInternalFlags & INET_OPENURL))
Index: wine/dlls/wininet/internet.h
diff -u -p wine/dlls/wininet/internet.h:1.43 wine/dlls/wininet/internet.h:1.44
--- wine/dlls/wininet/internet.h:1.43 28 Nov 2005 11: 6:57 -0000
+++ wine/dlls/wininet/internet.h 28 Nov 2005 11: 6:57 -0000
@@ -167,7 +167,8 @@ typedef struct
LPWSTR lpszHostName; /* the final destination of the request */
LPWSTR lpszServerName; /* the name of the server we directly connect to */
LPWSTR lpszUserName;
- INTERNET_PORT nServerPort;
+ INTERNET_PORT nHostPort; /* the final destination port of the request */
+ INTERNET_PORT nServerPort; /* the port of the server we directly connect to */
struct sockaddr_in socketAddress;
} WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW;
More information about the wine-cvs
mailing list