Daniel Lehman : wininet: Remove custom port handling in HTTP_HandleRedirect.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Oct 28 02:24:35 CDT 2014
Module: wine
Branch: master
Commit: f3455da6ffda6f1e7d70f82a4dbb7afcc200e053
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3455da6ffda6f1e7d70f82a4dbb7afcc200e053
Author: Daniel Lehman <dlehman at esri.com>
Date: Fri Oct 24 07:43:00 2014 -0700
wininet: Remove custom port handling in HTTP_HandleRedirect.
---
dlls/wininet/http.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 40f8d9a..a98ed53 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -4173,20 +4173,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
heap_free(session->hostName);
- if(custom_port) {
- int len;
- static const WCHAR fmt[] = {'%','s',':','%','u',0};
- len = lstrlenW(hostName);
- len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */
- session->hostName = heap_alloc(len*sizeof(WCHAR));
- sprintfW(session->hostName, fmt, hostName, urlComponents.nPort);
- }
- else
- session->hostName = heap_strdupW(hostName);
+ session->hostName = heap_strdupW(hostName);
session->hostPort = urlComponents.nPort;
- HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
-
heap_free(session->userName);
session->userName = NULL;
if (userName[0])
@@ -4201,6 +4190,11 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
server_release(request->server);
request->server = new_server;
}
+
+ if (custom_port)
+ HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
+ else
+ HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
}
heap_free(request->path);
request->path=NULL;
More information about the wine-cvs
mailing list