Rob Shearman : wininet: Fix proxy authentication by using the data in lpwhr-> pProxyAuthInfo in HTTP_InsertAuthorization instead of lpwhr-> pAuthInfo when inserting the Proxy-Authentication header.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b8ad4dee86ce432c7e7b5328beee1000dd3a9d9c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8ad4dee86ce432c7e7b5328be...

Author: Rob Shearman 
Date:   Wed Mar 12 13:27:28 2008 +0000

wininet: Fix proxy authentication by using the data in lpwhr->pProxyAuthInfo in HTTP_InsertAuthorization instead of lpwhr->pAuthInfo when inserting the Proxy-Authentication header.

---

dlls/wininet/http.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 5ea8a45..64d527b 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1186,10 +1186,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin )
  *
  *   Insert or delete the authorization field in the request header.
  */
-static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR header, BOOL first )
+static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header, BOOL first )
 {
     WCHAR *authorization = NULL;
-    struct HttpAuthInfo *pAuthInfo = lpwhr->pAuthInfo;
     DWORD flags;

if (pAuthInfo && pAuthInfo->auth_data_len)
@@ -3077,8 +3076,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
                            lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose,
                            HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE);

-        HTTP_InsertAuthorization(lpwhr, szAuthorization, !loop_next);
-        HTTP_InsertAuthorization(lpwhr, szProxy_Authorization, !loop_next);
+        HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization, !loop_next);
+        HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization, !loop_next);

/* add the headers the caller supplied */
         if( lpszHeaders && dwHeaderLength )