Author: akhaldi
Date: Sat Mar 5 10:51:52 2016
New Revision: 70946
URL: http://svn.reactos.org/svn/reactos?rev=70946&view=rev
Log:
[WINHTTP] Sync with Wine Staging 1.9.4. CORE-10912
Modified:
trunk/reactos/dll/win32/winhttp/request.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/winhttp/request.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.c?rev=70946&r1=70945&r2=70946&view=diff
==============================================================================
--- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Sat Mar 5
10:51:52 2016
@@ -2411,8 +2411,8 @@
{
if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION)
break;
+ if (!handle_authorization( request, status )) break;
drain_content( request );
- if (!handle_authorization( request, status )) break;
/* recurse synchronously */
if ((ret = send_request( request, NULL, 0, request->optional,
request->optional_len, 0, 0, FALSE ))) continue;
@@ -3052,7 +3052,7 @@
DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query
supported schemes */
DWORD err = ERROR_SUCCESS;
- TRACE("%p, %s, %p\n", request, debugstr_w(username), password);
+ TRACE("%p, %s, %p, 0x%08x\n", request, debugstr_w(username), password,
flags);
EnterCriticalSection( &request->cs );
if (request->state < REQUEST_STATE_OPEN)
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=70946&r1=70945&r2=70946&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Mar 5 10:51:52 2016
@@ -204,7 +204,7 @@
reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.55
reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.55
reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55
-reactos/dll/win32/winhttp # Synced to WineStaging-1.7.55
+reactos/dll/win32/winhttp # Synced to WineStaging-1.9.4
reactos/dll/win32/wininet # Synced to WineStaging-1.7.55
reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # Forked at Wine-20050628
