* Copyright 2002 TransGaming Technologies Inc.
* Copyright 2004 Mike McCormack for CodeWeavers
* Copyright 2005 Aric Stewart for CodeWeavers
+ * Copyright 2006 Robert Shearman for CodeWeavers
*
* Ulrich Czekalla
* David Hammerton
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "windef.h"
#include "winbase.h"
#include "wininet.h"
-#include "winreg.h"
#include "winerror.h"
#define NO_SHLWAPI_STREAM
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_STRFCNS
#define NO_SHLWAPI_GDI
#include "shlwapi.h"
+#include "sspi.h"
+#include "wincrypt.h"
#include "internet.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-static const WCHAR g_szHttp1_0[] = {' ','H','T','T','P','/','1','.','0',0 };
-static const WCHAR g_szHttp1_1[] = {' ','H','T','T','P','/','1','.','1',0 };
+static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0};
+static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0};
static const WCHAR g_szReferer[] = {'R','e','f','e','r','e','r',0};
static const WCHAR g_szAccept[] = {'A','c','c','e','p','t',0};
static const WCHAR g_szUserAgent[] = {'U','s','e','r','-','A','g','e','n','t',0};
static const WCHAR szHost[] = { 'H','o','s','t',0 };
+static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t','i','o','n',0 };
static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 };
static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 };
+static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0};
+static const WCHAR szGET[] = { 'G','E','T', 0 };
#define MAXHOSTNAME 100
#define MAX_FIELD_VALUE_LEN 256
#define HTTP_ADDHDR_FLAG_REPLACE 0x80000000
#define HTTP_ADDHDR_FLAG_REQ 0x02000000
+#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0]))
+
+struct HttpAuthInfo
+{
+ LPWSTR scheme;
+ CredHandle cred;
+ CtxtHandle ctx;
+ TimeStamp exp;
+ ULONG attr;
+ ULONG max_token;
+ void *auth_data;
+ unsigned int auth_data_len;
+ BOOL finished; /* finished authenticating */
+};
-static void HTTP_CloseHTTPRequestHandle(LPWININETHANDLEHEADER hdr);
-static void HTTP_CloseHTTPSessionHandle(LPWININETHANDLEHEADER hdr);
static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr);
-static BOOL HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr);
+static BOOL HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear);
static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR value, DWORD dwModifier);
static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer);
static BOOL HTTP_InsertCustomHeader(LPWININETHTTPREQW lpwhr, LPHTTPHEADERW lpHdr);
static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField, INT index, BOOL Request);
static BOOL HTTP_DeleteCustomHeader(LPWININETHTTPREQW lpwhr, DWORD index);
static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
-static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr,
- LPCWSTR username, LPCWSTR password );
static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD
dwInfoLevel, LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD
lpdwIndex);
-static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl,
- LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD
- dwOptionalLength, DWORD dwContentLength);
-
+static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl);
+static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin);
+static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field);
+static void HTTP_DrainContent(WININETHTTPREQW *req);
LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head)
{
}
/* **********************************************************************
- *
+ *
* Helper functions for the HttpSendRequest(Ex) functions
- *
+ *
*/
-static void HTTP_FixVerb( LPWININETHTTPREQW lpwhr )
+static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest)
{
- /* if the verb is NULL default to GET */
- if (NULL == lpwhr->lpszVerb)
- {
- static const WCHAR szGET[] = { 'G','E','T', 0 };
- lpwhr->lpszVerb = WININET_strdupW(szGET);
- }
+ struct WORKREQ_HTTPSENDREQUESTW const *req = &workRequest->u.HttpSendRequestW;
+ LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) workRequest->hdr;
+
+ TRACE("%p\n", lpwhr);
+
+ HTTP_HttpSendRequestW(lpwhr, req->lpszHeader,
+ req->dwHeaderLength, req->lpOptional, req->dwOptionalLength,
+ req->dwContentLength, req->bEndRequest);
+
+ HeapFree(GetProcessHeap(), 0, req->lpszHeader);
}
static void HTTP_FixURL( LPWININETHTTPREQW lpwhr)
}
if(CSTR_EQUAL != CompareStringW( LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
- lpwhr->lpszPath, strlenW(szHttp), szHttp, strlenW(szHttp) )
+ lpwhr->lpszPath, strlenW(lpwhr->lpszPath), szHttp, strlenW(szHttp) )
&& lpwhr->lpszPath[0] != '/') /* not an absolute path ?? --> fix it !! */
{
- WCHAR *fixurl = HeapAlloc(GetProcessHeap(), 0,
+ WCHAR *fixurl = HeapAlloc(GetProcessHeap(), 0,
(strlenW(lpwhr->lpszPath) + 2)*sizeof(WCHAR));
*fixurl = '/';
strcpyW(fixurl + 1, lpwhr->lpszPath);
}
}
-static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path, BOOL http1_1 )
+static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path, LPCWSTR version )
{
LPWSTR requestString;
DWORD len, n;
LPCWSTR *req;
- INT i;
+ UINT i;
LPWSTR p;
static const WCHAR szSpace[] = { ' ',0 };
static const WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0};
/* allocate space for an array of all the string pointers to be added */
- len = (lpwhr->nCustHeaders)*4 + 9;
+ len = (lpwhr->nCustHeaders)*4 + 10;
req = HeapAlloc( GetProcessHeap(), 0, len*sizeof(LPCWSTR) );
/* add the verb, path and HTTP version string */
req[n++] = verb;
req[n++] = szSpace;
req[n++] = path;
- req[n++] = http1_1 ? g_szHttp1_1 : g_szHttp1_0;
+ req[n++] = szSpace;
+ req[n++] = version;
- /* Append custom request heades */
+ /* Append custom request headers */
for (i = 0; i < lpwhr->nCustHeaders; i++)
{
if (lpwhr->pCustHeaders[i].wFlags & HDR_ISREQUEST)
while ( (*p == '\n') || (*p == '\r') )
p--;
strcpyW( p+1, sztwocrlf );
-
+
return requestString;
}
-static void HTTP_ProcessHeaders( LPWININETHTTPREQW lpwhr )
+static void HTTP_ProcessCookies( LPWININETHTTPREQW lpwhr )
{
static const WCHAR szSet_Cookie[] = { 'S','e','t','-','C','o','o','k','i','e',0 };
int HeaderIndex;
cookie_data = &buf_cookie[nEqualPos + 1];
Host = HTTP_GetHeader(lpwhr,szHost);
- len = lstrlenW((domain ? domain : (Host?Host->lpszValue:NULL))) +
+ len = lstrlenW((domain ? domain : (Host?Host->lpszValue:NULL))) +
strlenW(lpwhr->lpszPath) + 9;
buf_url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
sprintfW(buf_url, szFmt, (domain ? domain : (Host?Host->lpszValue:NULL))); /* FIXME PATH!!! */
}
}
-static void HTTP_AddProxyInfo( LPWININETHTTPREQW lpwhr )
+static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue )
+{
+ static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */
+ return !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) &&
+ ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]);
+}
+
+static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue,
+ struct HttpAuthInfo **ppAuthInfo,
+ LPWSTR domain_and_username, LPWSTR password )
{
- LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent;
- LPWININETAPPINFOW hIC = (LPWININETAPPINFOW)lpwhs->hdr.lpwhparent;
+ SECURITY_STATUS sec_status;
+ struct HttpAuthInfo *pAuthInfo = *ppAuthInfo;
+ BOOL first = FALSE;
- assert(lpwhs->hdr.htype == WH_HHTTPSESSION);
- assert(hIC->hdr.htype == WH_HINIT);
+ TRACE("%s\n", debugstr_w(pszAuthValue));
+
+ if (!pAuthInfo)
+ {
+ TimeStamp exp;
+
+ first = TRUE;
+ pAuthInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*pAuthInfo));
+ if (!pAuthInfo)
+ return FALSE;
+
+ SecInvalidateHandle(&pAuthInfo->cred);
+ SecInvalidateHandle(&pAuthInfo->ctx);
+ memset(&pAuthInfo->exp, 0, sizeof(pAuthInfo->exp));
+ pAuthInfo->attr = 0;
+ pAuthInfo->auth_data = NULL;
+ pAuthInfo->auth_data_len = 0;
+ pAuthInfo->finished = FALSE;
+
+ if (is_basic_auth_value(pszAuthValue))
+ {
+ static const WCHAR szBasic[] = {'B','a','s','i','c',0};
+ pAuthInfo->scheme = WININET_strdupW(szBasic);
+ if (!pAuthInfo->scheme)
+ {
+ HeapFree(GetProcessHeap(), 0, pAuthInfo);
+ return FALSE;
+ }
+ }
+ else
+ {
+ PVOID pAuthData;
+ SEC_WINNT_AUTH_IDENTITY_W nt_auth_identity;
+
+ pAuthInfo->scheme = WININET_strdupW(pszAuthValue);
+ if (!pAuthInfo->scheme)
+ {
+ HeapFree(GetProcessHeap(), 0, pAuthInfo);
+ return FALSE;
+ }
+
+ if (domain_and_username)
+ {
+ WCHAR *user = strchrW(domain_and_username, '\\');
+ WCHAR *domain = domain_and_username;
+
+ /* FIXME: make sure scheme accepts SEC_WINNT_AUTH_IDENTITY before calling AcquireCredentialsHandle */
+
+ pAuthData = &nt_auth_identity;
+
+ if (user) user++;
+ else
+ {
+ user = domain_and_username;
+ domain = NULL;
+ }
+
+ nt_auth_identity.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;
+ nt_auth_identity.User = user;
+ nt_auth_identity.UserLength = strlenW(nt_auth_identity.User);
+ nt_auth_identity.Domain = domain;
+ nt_auth_identity.DomainLength = domain ? user - domain - 1 : 0;
+ nt_auth_identity.Password = password;
+ nt_auth_identity.PasswordLength = strlenW(nt_auth_identity.Password);
+ }
+ else
+ /* use default credentials */
+ pAuthData = NULL;
+
+ sec_status = AcquireCredentialsHandleW(NULL, pAuthInfo->scheme,
+ SECPKG_CRED_OUTBOUND, NULL,
+ pAuthData, NULL,
+ NULL, &pAuthInfo->cred,
+ &exp);
+ if (sec_status == SEC_E_OK)
+ {
+ PSecPkgInfoW sec_pkg_info;
+ sec_status = QuerySecurityPackageInfoW(pAuthInfo->scheme, &sec_pkg_info);
+ if (sec_status == SEC_E_OK)
+ {
+ pAuthInfo->max_token = sec_pkg_info->cbMaxToken;
+ FreeContextBuffer(sec_pkg_info);
+ }
+ }
+ if (sec_status != SEC_E_OK)
+ {
+ WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n",
+ debugstr_w(pAuthInfo->scheme), sec_status);
+ HeapFree(GetProcessHeap(), 0, pAuthInfo->scheme);
+ HeapFree(GetProcessHeap(), 0, pAuthInfo);
+ return FALSE;
+ }
+ }
+ *ppAuthInfo = pAuthInfo;
+ }
+ else if (pAuthInfo->finished)
+ return FALSE;
+
+ if ((strlenW(pszAuthValue) < strlenW(pAuthInfo->scheme)) ||
+ strncmpiW(pszAuthValue, pAuthInfo->scheme, strlenW(pAuthInfo->scheme)))
+ {
+ ERR("authentication scheme changed from %s to %s\n",
+ debugstr_w(pAuthInfo->scheme), debugstr_w(pszAuthValue));
+ return FALSE;
+ }
+
+ if (is_basic_auth_value(pszAuthValue))
+ {
+ int userlen;
+ int passlen;
+ char *auth_data;
+
+ TRACE("basic authentication\n");
- if (hIC && (hIC->lpszProxyUsername || hIC->lpszProxyPassword ))
- HTTP_InsertProxyAuthorization(lpwhr, hIC->lpszProxyUsername,
- hIC->lpszProxyPassword);
+ /* we don't cache credentials for basic authentication, so we can't
+ * retrieve them if the application didn't pass us any credentials */
+ if (!domain_and_username) return FALSE;
+
+ userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, NULL);
+ passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL);
+
+ /* length includes a nul terminator, which will be re-used for the ':' */
+ auth_data = HeapAlloc(GetProcessHeap(), 0, userlen + 1 + passlen);
+ if (!auth_data)
+ return FALSE;
+
+ WideCharToMultiByte(CP_UTF8, 0, domain_and_username, -1, auth_data, userlen, NULL, NULL);
+ auth_data[userlen] = ':';
+ WideCharToMultiByte(CP_UTF8, 0, password, -1, &auth_data[userlen+1], passlen, NULL, NULL);
+
+ pAuthInfo->auth_data = auth_data;
+ pAuthInfo->auth_data_len = userlen + 1 + passlen;
+ pAuthInfo->finished = TRUE;
+
+ return TRUE;
+ }
+ else
+ {
+ LPCWSTR pszAuthData;
+ SecBufferDesc out_desc, in_desc;
+ SecBuffer out, in;
+ unsigned char *buffer;
+ ULONG context_req = ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE |
+ ISC_REQ_MUTUAL_AUTH | ISC_REQ_DELEGATE;
+
+ in.BufferType = SECBUFFER_TOKEN;
+ in.cbBuffer = 0;
+ in.pvBuffer = NULL;
+
+ in_desc.ulVersion = 0;
+ in_desc.cBuffers = 1;
+ in_desc.pBuffers = ∈
+
+ pszAuthData = pszAuthValue + strlenW(pAuthInfo->scheme);
+ if (*pszAuthData == ' ')
+ {
+ pszAuthData++;
+ in.cbBuffer = HTTP_DecodeBase64(pszAuthData, NULL);
+ in.pvBuffer = HeapAlloc(GetProcessHeap(), 0, in.cbBuffer);
+ HTTP_DecodeBase64(pszAuthData, in.pvBuffer);
+ }
+
+ buffer = HeapAlloc(GetProcessHeap(), 0, pAuthInfo->max_token);
+
+ out.BufferType = SECBUFFER_TOKEN;
+ out.cbBuffer = pAuthInfo->max_token;
+ out.pvBuffer = buffer;
+
+ out_desc.ulVersion = 0;
+ out_desc.cBuffers = 1;
+ out_desc.pBuffers = &out;
+
+ sec_status = InitializeSecurityContextW(first ? &pAuthInfo->cred : NULL,
+ first ? NULL : &pAuthInfo->ctx,
+ first ? lpwhr->lpHttpSession->lpszServerName : NULL,
+ context_req, 0, SECURITY_NETWORK_DREP,
+ in.pvBuffer ? &in_desc : NULL,
+ 0, &pAuthInfo->ctx, &out_desc,
+ &pAuthInfo->attr, &pAuthInfo->exp);
+ if (sec_status == SEC_E_OK)
+ {
+ pAuthInfo->finished = TRUE;
+ pAuthInfo->auth_data = out.pvBuffer;
+ pAuthInfo->auth_data_len = out.cbBuffer;
+ TRACE("sending last auth packet\n");
+ }
+ else if (sec_status == SEC_I_CONTINUE_NEEDED)
+ {
+ pAuthInfo->auth_data = out.pvBuffer;
+ pAuthInfo->auth_data_len = out.cbBuffer;
+ TRACE("sending next auth packet\n");
+ }
+ else
+ {
+ ERR("InitializeSecurityContextW returned error 0x%08x\n", sec_status);
+ pAuthInfo->finished = TRUE;
+ HeapFree(GetProcessHeap(), 0, out.pvBuffer);
+ return FALSE;
+ }
+ }
+
+ return TRUE;
}
/***********************************************************************
BOOL bSuccess = FALSE;
DWORD len;
- TRACE("copying header: %s\n", debugstr_w(lpszHeader));
+ TRACE("copying header: %s\n", debugstr_wn(lpszHeader, dwHeaderLength));
if( dwHeaderLength == ~0U )
len = strlenW(lpszHeader);
pFieldAndValue = HTTP_InterpretHttpHeader(lpszStart);
if (pFieldAndValue)
{
- bSuccess = HTTP_ProcessHeader(lpwhr, pFieldAndValue[0],
- pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ);
+ bSuccess = HTTP_VerifyValidHeader(lpwhr, pFieldAndValue[0]);
+ if (bSuccess)
+ bSuccess = HTTP_ProcessHeader(lpwhr, pFieldAndValue[0],
+ pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ);
HTTP_FreeTokens(pFieldAndValue);
}
*
* Adds one or more HTTP header to the request handler
*
+ * NOTE
+ * On Windows if dwHeaderLength includes the trailing '\0', then
+ * HttpAddRequestHeadersW() adds it too. However this results in an
+ * invalid Http header which is rejected by some servers so we probably
+ * don't need to match Windows on that point.
+ *
* RETURNS
* TRUE on success
* FALSE on failure
BOOL bSuccess = FALSE;
LPWININETHTTPREQW lpwhr;
- TRACE("%p, %s, %li, %li\n", hHttpRequest, debugstr_w(lpszHeader), dwHeaderLength,
- dwModifier);
+ TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
- if (!lpszHeader)
+ if (!lpszHeader)
return TRUE;
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hHttpRequest );
LPWSTR hdr;
BOOL r;
- TRACE("%p, %s, %li, %li\n", hHttpRequest, debugstr_a(lpszHeader), dwHeaderLength,
- dwModifier);
+ TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
len = MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, NULL, 0 );
hdr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
* FALSE on failure
*
*/
-BOOL WINAPI HttpEndRequestA(HINTERNET hRequest,
- LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD dwContext)
+BOOL WINAPI HttpEndRequestA(HINTERNET hRequest,
+ LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext)
{
LPINTERNET_BUFFERSA ptr;
LPINTERNET_BUFFERSW lpBuffersOutW,ptrW;
BOOL rc = FALSE;
- TRACE("(%p, %p, %08lx, %08lx): stub\n", hRequest, lpBuffersOut, dwFlags,
+ TRACE("(%p, %p, %08x, %08lx): stub\n", hRequest, lpBuffersOut, dwFlags,
dwContext);
ptr = lpBuffersOut;
FIXME("Do we need to translate info out of these buffer?\n");
- HeapFree(GetProcessHeap(),0,(LPVOID)ptrW->lpvBuffer);
+ HeapFree(GetProcessHeap(),0,ptrW->lpvBuffer);
ptrW2 = ptrW->Next;
HeapFree(GetProcessHeap(),0,ptrW);
ptrW = ptrW2;
* FALSE on failure
*
*/
-BOOL WINAPI HttpEndRequestW(HINTERNET hRequest,
- LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD dwContext)
+BOOL WINAPI HttpEndRequestW(HINTERNET hRequest,
+ LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext)
{
BOOL rc = FALSE;
LPWININETHTTPREQW lpwhr;
INT responseLen;
+ DWORD dwBufferSize;
TRACE("-->\n");
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest );
if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ)
{
INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
+ if (lpwhr)
+ WININET_Release( &lpwhr->hdr );
return FALSE;
}
lpwhr->hdr.dwFlags |= dwFlags;
lpwhr->hdr.dwContext = dwContext;
+ /* We appear to do nothing with lpBuffersOut.. is that correct? */
+
SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
- responseLen = HTTP_GetResponseHeaders(lpwhr);
+ responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE);
if (responseLen)
rc = TRUE;
SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD));
- /* process headers here. Is this right? */
- HTTP_ProcessHeaders(lpwhr);
+ /* process cookies here. Is this right? */
+ HTTP_ProcessCookies(lpwhr);
+
+ dwBufferSize = sizeof(lpwhr->dwContentLength);
+ if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH,
+ &lpwhr->dwContentLength,&dwBufferSize,NULL))
+ lpwhr->dwContentLength = -1;
- /* We appear to do nothing with the buffer.. is that correct? */
+ if (lpwhr->dwContentLength == 0)
+ HTTP_FinishedReading(lpwhr);
if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT))
{
- DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0;
- if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) &&
+ DWORD dwCode,dwCodeLength=sizeof(DWORD);
+ if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) &&
(dwCode==302 || dwCode==301))
{
- WCHAR szNewLocation[2048];
- DWORD dwBufferSize=2048;
- dwIndex=0;
- if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex))
+ WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH];
+ dwBufferSize=sizeof(szNewLocation);
+ if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL))
{
- static const WCHAR szGET[] = { 'G','E','T', 0 };
/* redirects are always GETs */
HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb);
- lpwhr->lpszVerb = WININET_strdupW(szGET);
- return HTTP_HandleRedirect(lpwhr, szNewLocation, NULL, 0, NULL, 0, 0);
+ lpwhr->lpszVerb = WININET_strdupW(szGET);
+ HTTP_DrainContent(lpwhr);
+ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+ INTERNET_STATUS_REDIRECT, szNewLocation,
+ dwBufferSize);
+ rc = HTTP_HandleRedirect(lpwhr, szNewLocation);
+ if (rc)
+ rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE);
}
}
}
+ WININET_Release( &lpwhr->hdr );
TRACE("%i <--\n",rc);
return rc;
}
HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession,
LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion,
LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes,
- DWORD dwFlags, DWORD dwContext)
+ DWORD dwFlags, DWORD_PTR dwContext)
{
LPWININETHTTPSESSIONW lpwhs;
HINTERNET handle = NULL;
- TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08lx)\n", hHttpSession,
+ TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession,
debugstr_w(lpszVerb), debugstr_w(lpszObjectName),
debugstr_w(lpszVersion), debugstr_w(lpszReferrer), lpszAcceptTypes,
dwFlags, dwContext);
int i;
for(i=0;lpszAcceptTypes[i]!=NULL;i++)
TRACE("\taccept type: %s\n",debugstr_w(lpszAcceptTypes[i]));
- }
+ }
lpwhs = (LPWININETHTTPSESSIONW) WININET_GetObject( hHttpSession );
if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION)
HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession,
LPCSTR lpszVerb, LPCSTR lpszObjectName, LPCSTR lpszVersion,
LPCSTR lpszReferrer , LPCSTR *lpszAcceptTypes,
- DWORD dwFlags, DWORD dwContext)
+ DWORD dwFlags, DWORD_PTR dwContext)
{
LPWSTR szVerb = NULL, szObjectName = NULL;
LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL;
- INT len;
- INT acceptTypesCount;
+ INT len, acceptTypesCount;
HINTERNET rc = FALSE;
- TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08lx)\n", hHttpSession,
+ LPCSTR *types;
+
+ TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession,
debugstr_a(lpszVerb), debugstr_a(lpszObjectName),
debugstr_a(lpszVersion), debugstr_a(lpszReferrer), lpszAcceptTypes,
dwFlags, dwContext);
MultiByteToWideChar(CP_ACP, 0, lpszReferrer, -1, szReferrer, len );
}
- acceptTypesCount = 0;
if (lpszAcceptTypes)
{
- /* find out how many there are */
- while (lpszAcceptTypes[acceptTypesCount])
- acceptTypesCount++;
+ acceptTypesCount = 0;
+ types = lpszAcceptTypes;
+ while (*types)
+ {
+ /* find out how many there are */
+ if (((ULONG_PTR)*types >> 16) && **types)
+ {
+ TRACE("accept type: %s\n", debugstr_a(*types));
+ acceptTypesCount++;
+ }
+ types++;
+ }
szAcceptTypes = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * (acceptTypesCount+1));
+ if (!szAcceptTypes) goto end;
+
acceptTypesCount = 0;
- while (lpszAcceptTypes[acceptTypesCount])
- {
- len = MultiByteToWideChar(CP_ACP, 0, lpszAcceptTypes[acceptTypesCount],
- -1, NULL, 0 );
- szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
- if (!szAcceptTypes[acceptTypesCount] )
- goto end;
- MultiByteToWideChar(CP_ACP, 0, lpszAcceptTypes[acceptTypesCount],
- -1, szAcceptTypes[acceptTypesCount], len );
- acceptTypesCount++;
+ types = lpszAcceptTypes;
+ while (*types)
+ {
+ if (((ULONG_PTR)*types >> 16) && **types)
+ {
+ len = MultiByteToWideChar(CP_ACP, 0, *types, -1, NULL, 0 );
+ szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+ if (!szAcceptTypes[acceptTypesCount]) goto end;
+
+ MultiByteToWideChar(CP_ACP, 0, *types, -1, szAcceptTypes[acceptTypesCount], len);
+ acceptTypesCount++;
+ }
+ types++;
}
szAcceptTypes[acceptTypesCount] = NULL;
}
}
/***********************************************************************
- * HTTP_Base64
+ * HTTP_EncodeBase64
*/
-static UINT HTTP_Base64( LPCWSTR bin, LPWSTR base64 )
+static UINT HTTP_EncodeBase64( LPCSTR bin, unsigned int len, LPWSTR base64 )
{
UINT n = 0, x;
- static LPCSTR HTTP_Base64Enc =
+ static const CHAR HTTP_Base64Enc[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- while( bin[0] )
+ while( len > 0 )
{
/* first 6 bits, all from bin[0] */
base64[n++] = HTTP_Base64Enc[(bin[0] & 0xfc) >> 2];
x = (bin[0] & 3) << 4;
/* next 6 bits, 2 from bin[0] and 4 from bin[1] */
- if( !bin[1] )
+ if( len == 1 )
{
base64[n++] = HTTP_Base64Enc[x];
base64[n++] = '=';
x = ( bin[1] & 0x0f ) << 2;
/* next 6 bits 4 from bin[1] and 2 from bin[2] */
- if( !bin[2] )
+ if( len == 2 )
{
base64[n++] = HTTP_Base64Enc[x];
base64[n++] = '=';
/* last 6 bits, all from bin [2] */
base64[n++] = HTTP_Base64Enc[ bin[2] & 0x3f ];
bin += 3;
+ len -= 3;
}
base64[n] = 0;
return n;
}
+#define CH(x) (((x) >= 'A' && (x) <= 'Z') ? (x) - 'A' : \
+ ((x) >= 'a' && (x) <= 'z') ? (x) - 'a' + 26 : \
+ ((x) >= '0' && (x) <= '9') ? (x) - '0' + 52 : \
+ ((x) == '+') ? 62 : ((x) == '/') ? 63 : -1)
+static const signed char HTTP_Base64Dec[256] =
+{
+ CH( 0),CH( 1),CH( 2),CH( 3),CH( 4),CH( 5),CH( 6),CH( 7),CH( 8),CH( 9),
+ CH(10),CH(11),CH(12),CH(13),CH(14),CH(15),CH(16),CH(17),CH(18),CH(19),
+ CH(20),CH(21),CH(22),CH(23),CH(24),CH(25),CH(26),CH(27),CH(28),CH(29),
+ CH(30),CH(31),CH(32),CH(33),CH(34),CH(35),CH(36),CH(37),CH(38),CH(39),
+ CH(40),CH(41),CH(42),CH(43),CH(44),CH(45),CH(46),CH(47),CH(48),CH(49),
+ CH(50),CH(51),CH(52),CH(53),CH(54),CH(55),CH(56),CH(57),CH(58),CH(59),
+ CH(60),CH(61),CH(62),CH(63),CH(64),CH(65),CH(66),CH(67),CH(68),CH(69),
+ CH(70),CH(71),CH(72),CH(73),CH(74),CH(75),CH(76),CH(77),CH(78),CH(79),
+ CH(80),CH(81),CH(82),CH(83),CH(84),CH(85),CH(86),CH(87),CH(88),CH(89),
+ CH(90),CH(91),CH(92),CH(93),CH(94),CH(95),CH(96),CH(97),CH(98),CH(99),
+ CH(100),CH(101),CH(102),CH(103),CH(104),CH(105),CH(106),CH(107),CH(108),CH(109),
+ CH(110),CH(111),CH(112),CH(113),CH(114),CH(115),CH(116),CH(117),CH(118),CH(119),
+ CH(120),CH(121),CH(122),CH(123),CH(124),CH(125),CH(126),CH(127),CH(128),CH(129),
+ CH(130),CH(131),CH(132),CH(133),CH(134),CH(135),CH(136),CH(137),CH(138),CH(139),
+ CH(140),CH(141),CH(142),CH(143),CH(144),CH(145),CH(146),CH(147),CH(148),CH(149),
+ CH(150),CH(151),CH(152),CH(153),CH(154),CH(155),CH(156),CH(157),CH(158),CH(159),
+ CH(160),CH(161),CH(162),CH(163),CH(164),CH(165),CH(166),CH(167),CH(168),CH(169),
+ CH(170),CH(171),CH(172),CH(173),CH(174),CH(175),CH(176),CH(177),CH(178),CH(179),
+ CH(180),CH(181),CH(182),CH(183),CH(184),CH(185),CH(186),CH(187),CH(188),CH(189),
+ CH(190),CH(191),CH(192),CH(193),CH(194),CH(195),CH(196),CH(197),CH(198),CH(199),
+ CH(200),CH(201),CH(202),CH(203),CH(204),CH(205),CH(206),CH(207),CH(208),CH(209),
+ CH(210),CH(211),CH(212),CH(213),CH(214),CH(215),CH(216),CH(217),CH(218),CH(219),
+ CH(220),CH(221),CH(222),CH(223),CH(224),CH(225),CH(226),CH(227),CH(228),CH(229),
+ CH(230),CH(231),CH(232),CH(233),CH(234),CH(235),CH(236),CH(237),CH(238),CH(239),
+ CH(240),CH(241),CH(242),CH(243),CH(244),CH(245),CH(246),CH(247),CH(248), CH(249),
+ CH(250),CH(251),CH(252),CH(253),CH(254),CH(255),
+};
+#undef CH
+
/***********************************************************************
- * HTTP_EncodeBasicAuth
- *
- * Encode the basic authentication string for HTTP 1.1
+ * HTTP_DecodeBase64
*/
-static LPWSTR HTTP_EncodeBasicAuth( LPCWSTR username, LPCWSTR password)
+static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin )
{
- UINT len;
- LPWSTR in, out;
- static const WCHAR szBasic[] = {'B','a','s','i','c',' ',0};
- static const WCHAR szColon[] = {':',0};
+ unsigned int n = 0;
- len = lstrlenW( username ) + 1 + lstrlenW ( password ) + 1;
- in = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
- if( !in )
- return NULL;
-
- len = lstrlenW(szBasic) +
- (lstrlenW( username ) + 1 + lstrlenW ( password ))*2 + 1 + 1;
- out = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
- if( out )
+ while(*base64)
{
- lstrcpyW( in, username );
- lstrcatW( in, szColon );
- lstrcatW( in, password );
- lstrcpyW( out, szBasic );
- HTTP_Base64( in, &out[strlenW(out)] );
+ signed char in[4];
+
+ if (base64[0] >= ARRAYSIZE(HTTP_Base64Dec) ||
+ ((in[0] = HTTP_Base64Dec[base64[0]]) == -1) ||
+ base64[1] >= ARRAYSIZE(HTTP_Base64Dec) ||
+ ((in[1] = HTTP_Base64Dec[base64[1]]) == -1))
+ {
+ WARN("invalid base64: %s\n", debugstr_w(base64));
+ return 0;
+ }
+ if (bin)
+ bin[n] = (unsigned char) (in[0] << 2 | in[1] >> 4);
+ n++;
+
+ if ((base64[2] == '=') && (base64[3] == '='))
+ break;
+ if (base64[2] > ARRAYSIZE(HTTP_Base64Dec) ||
+ ((in[2] = HTTP_Base64Dec[base64[2]]) == -1))
+ {
+ WARN("invalid base64: %s\n", debugstr_w(&base64[2]));
+ return 0;
+ }
+ if (bin)
+ bin[n] = (unsigned char) (in[1] << 4 | in[2] >> 2);
+ n++;
+
+ if (base64[3] == '=')
+ break;
+ if (base64[3] > ARRAYSIZE(HTTP_Base64Dec) ||
+ ((in[3] = HTTP_Base64Dec[base64[3]]) == -1))
+ {
+ WARN("invalid base64: %s\n", debugstr_w(&base64[3]));
+ return 0;
+ }
+ if (bin)
+ bin[n] = (unsigned char) (((in[2] << 6) & 0xc0) | in[3]);
+ n++;
+
+ base64 += 4;
}
- HeapFree( GetProcessHeap(), 0, in );
- return out;
+ return n;
}
/***********************************************************************
- * HTTP_InsertProxyAuthorization
+ * HTTP_InsertAuthorization
*
- * Insert the basic authorization field in the request header
+ * Insert or delete the authorization field in the request header.
*/
-static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr,
- LPCWSTR username, LPCWSTR password )
+static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header )
{
- WCHAR *authorization = HTTP_EncodeBasicAuth( username, password );
- BOOL ret = TRUE;
+ if (pAuthInfo)
+ {
+ static const WCHAR wszSpace[] = {' ',0};
+ static const WCHAR wszBasic[] = {'B','a','s','i','c',0};
+ unsigned int len;
+ WCHAR *authorization = NULL;
- if (!authorization)
- return FALSE;
+ if (pAuthInfo->auth_data_len)
+ {
+ /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */
+ len = strlenW(pAuthInfo->scheme)+1+((pAuthInfo->auth_data_len+2)*4)/3;
+ authorization = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR));
+ if (!authorization)
+ return FALSE;
- TRACE( "Inserting authorization: %s\n", debugstr_w( authorization ) );
+ strcpyW(authorization, pAuthInfo->scheme);
+ strcatW(authorization, wszSpace);
+ HTTP_EncodeBase64(pAuthInfo->auth_data,
+ pAuthInfo->auth_data_len,
+ authorization+strlenW(authorization));
- HTTP_ProcessHeader(lpwhr, szProxy_Authorization, authorization,
- HTTP_ADDHDR_FLAG_REPLACE);
+ /* clear the data as it isn't valid now that it has been sent to the
+ * server, unless it's Basic authentication which doesn't do
+ * connection tracking */
+ if (strcmpiW(pAuthInfo->scheme, wszBasic))
+ {
+ HeapFree(GetProcessHeap(), 0, pAuthInfo->auth_data);
+ pAuthInfo->auth_data = NULL;
+ pAuthInfo->auth_data_len = 0;
+ }
+ }
- HeapFree( GetProcessHeap(), 0, authorization );
+ TRACE("Inserting authorization: %s\n", debugstr_w(authorization));
- return ret;
+ HTTP_ProcessHeader(lpwhr, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE);
+
+ HeapFree(GetProcessHeap(), 0, authorization);
+ }
+ return TRUE;
+}
+
+static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req)
+{
+ WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url;
+ DWORD size;
+
+ size = sizeof(new_location);
+ if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_LOCATION, new_location, &size, NULL))
+ {
+ if (!(url = HeapAlloc( GetProcessHeap(), 0, size + sizeof(WCHAR) ))) return NULL;
+ strcpyW( url, new_location );
+ }
+ else
+ {
+ static const WCHAR slash[] = { '/',0 };
+ static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 };
+ static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','d',0 };
+ WININETHTTPSESSIONW *session = req->lpHttpSession;
+
+ size = 16; /* "https://" + sizeof(port#) + ":/\0" */
+ size += strlenW( session->lpszHostName ) + strlenW( req->lpszPath );
+
+ if (!(url = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return NULL;
+
+ if (req->hdr.dwFlags & INTERNET_FLAG_SECURE)
+ sprintfW( url, formatSSL, session->lpszHostName, session->nHostPort );
+ else
+ sprintfW( url, format, session->lpszHostName, session->nHostPort );
+ if (req->lpszPath[0] != '/') strcatW( url, slash );
+ strcatW( url, req->lpszPath );
+ }
+ TRACE("url=%s\n", debugstr_w(url));
+ return url;
}
/***********************************************************************
{
WCHAR buf[MAXHOSTNAME];
WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */
- WCHAR* url;
- static const WCHAR szNul[] = { 0 };
+ static WCHAR szNul[] = { 0 };
URL_COMPONENTSW UrlComponents;
- static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }, szSlash[] = { '/',0 } ;
- static const WCHAR szFormat1[] = { 'h','t','t','p',':','/','/','%','s',0 };
- static const WCHAR szFormat2[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 };
- int len;
+ static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 };
+ static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 };
memset( &UrlComponents, 0, sizeof UrlComponents );
UrlComponents.dwStructSize = sizeof UrlComponents;
if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
hIC->lpszProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) )
- sprintfW(proxy, szFormat1, hIC->lpszProxy);
+ sprintfW(proxy, szFormat, hIC->lpszProxy);
else
strcpyW(proxy, hIC->lpszProxy);
if( !InternetCrackUrlW(proxy, 0, 0, &UrlComponents) )
return FALSE;
if( !lpwhr->lpszPath )
- lpwhr->lpszPath = (LPWSTR)szNul;
- TRACE("server='%s' path='%s'\n",
- debugstr_w(lpwhs->lpszHostName), debugstr_w(lpwhr->lpszPath));
- /* for constant 15 see above */
- len = strlenW(lpwhs->lpszHostName) + strlenW(lpwhr->lpszPath) + 15;
- url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
+ lpwhr->lpszPath = szNul;
if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT;
- sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nHostPort);
-
- if( lpwhr->lpszPath[0] != '/' )
- strcatW( url, szSlash );
- strcatW(url, lpwhr->lpszPath);
- if(lpwhr->lpszPath != szNul)
- HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);
- lpwhr->lpszPath = url;
-
HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);
lpwhs->lpszServerName = WININET_strdupW(UrlComponents.lpszHostName);
lpwhs->nServerPort = UrlComponents.nPort;
+ TRACE("proxy server=%s port=%d\n", debugstr_w(lpwhs->lpszServerName), lpwhs->nServerPort);
+ return TRUE;
+}
+
+static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr)
+{
+ char szaddr[32];
+ LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession;
+
+ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+ INTERNET_STATUS_RESOLVING_NAME,
+ lpwhs->lpszServerName,
+ strlenW(lpwhs->lpszServerName)+1);
+
+ if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort,
+ &lpwhs->socketAddress))
+ {
+ INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED);
+ return FALSE;
+ }
+
+ inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr,
+ szaddr, sizeof(szaddr));
+ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+ INTERNET_STATUS_NAME_RESOLVED,
+ szaddr, strlen(szaddr)+1);
return TRUE;
}
+
+/***********************************************************************
+ * HTTPREQ_Destroy (internal)
+ *
+ * Deallocate request handle
+ *
+ */
+static void HTTPREQ_Destroy(WININETHANDLEHEADER *hdr)
+{
+ LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr;
+ DWORD i;
+
+ TRACE("\n");
+
+ if(lpwhr->hCacheFile)
+ CloseHandle(lpwhr->hCacheFile);
+
+ if(lpwhr->lpszCacheFile) {
+ DeleteFileW(lpwhr->lpszCacheFile); /* FIXME */
+ HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile);
+ }
+
+ WININET_Release(&lpwhr->lpHttpSession->hdr);
+
+ HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);
+ HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb);
+ HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders);
+ HeapFree(GetProcessHeap(), 0, lpwhr->lpszVersion);
+ HeapFree(GetProcessHeap(), 0, lpwhr->lpszStatusText);
+
+ for (i = 0; i < lpwhr->nCustHeaders; i++)
+ {
+ HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszField);
+ HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszValue);
+ }
+
+ HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders);
+ HeapFree(GetProcessHeap(), 0, lpwhr);
+}
+
+static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr)
+{
+ LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr;
+ LPWININETHTTPSESSIONW lpwhs = NULL;
+
+ TRACE("%p\n",lpwhr);
+
+ if (!NETCON_connected(&lpwhr->netConnection))
+ return;
+
+ if (lpwhr->pAuthInfo)
+ {
+ if (SecIsValidHandle(&lpwhr->pAuthInfo->ctx))
+ DeleteSecurityContext(&lpwhr->pAuthInfo->ctx);
+ if (SecIsValidHandle(&lpwhr->pAuthInfo->cred))
+ FreeCredentialsHandle(&lpwhr->pAuthInfo->cred);
+
+ HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->auth_data);
+ HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->scheme);
+ HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo);
+ lpwhr->pAuthInfo = NULL;
+ }
+ if (lpwhr->pProxyAuthInfo)
+ {
+ if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->ctx))
+ DeleteSecurityContext(&lpwhr->pProxyAuthInfo->ctx);
+ if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->cred))
+ FreeCredentialsHandle(&lpwhr->pProxyAuthInfo->cred);
+
+ HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo->auth_data);
+ HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo->scheme);
+ HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo);
+ lpwhr->pProxyAuthInfo = NULL;
+ }
+
+ lpwhs = lpwhr->lpHttpSession;
+
+ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+ INTERNET_STATUS_CLOSING_CONNECTION, 0, 0);
+
+ NETCON_close(&lpwhr->netConnection);
+
+ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+ INTERNET_STATUS_CONNECTION_CLOSED, 0, 0);
+}
+
+static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
+{
+ WININETHTTPREQW *req = (WININETHTTPREQW*)hdr;
+
+ switch(option) {
+ case INTERNET_OPTION_HANDLE_TYPE:
+ TRACE("INTERNET_OPTION_HANDLE_TYPE\n");
+
+ if (*size < sizeof(ULONG))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *size = sizeof(DWORD);
+ *(DWORD*)buffer = INTERNET_HANDLE_TYPE_HTTP_REQUEST;
+ return ERROR_SUCCESS;
+
+ case INTERNET_OPTION_URL: {
+ WCHAR url[INTERNET_MAX_URL_LENGTH];
+ HTTPHEADERW *host;
+ DWORD len;
+
+ static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0};
+ static const WCHAR hostW[] = {'H','o','s','t',0};
+
+ TRACE("INTERNET_OPTION_URL\n");
+
+ host = HTTP_GetHeader(req, hostW);
+ sprintfW(url, formatW, host->lpszValue, req->lpszPath);
+ TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url));
+
+ if(unicode) {
+ len = (strlenW(url)+1) * sizeof(WCHAR);
+ if(*size < len)
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *size = len;
+ strcpyW(buffer, url);
+ return ERROR_SUCCESS;
+ }else {
+ len = WideCharToMultiByte(CP_ACP, 0, url, -1, buffer, *size, NULL, NULL);
+ if(len > *size)
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *size = len;
+ return ERROR_SUCCESS;
+ }
+ }
+
+ case INTERNET_OPTION_DATAFILE_NAME: {
+ DWORD req_size;
+
+ TRACE("INTERNET_OPTION_DATAFILE_NAME\n");
+
+ if(!req->lpszCacheFile) {
+ *size = 0;
+ return ERROR_INTERNET_ITEM_NOT_FOUND;
+ }
+
+ if(unicode) {
+ req_size = (lstrlenW(req->lpszCacheFile)+1) * sizeof(WCHAR);
+ if(*size < req_size)
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *size = req_size;
+ memcpy(buffer, req->lpszCacheFile, *size);
+ return ERROR_SUCCESS;
+ }else {
+ req_size = WideCharToMultiByte(CP_ACP, 0, req->lpszCacheFile, -1, NULL, 0, NULL, NULL);
+ if (req_size > *size)
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *size = WideCharToMultiByte(CP_ACP, 0, req->lpszCacheFile,
+ -1, buffer, *size, NULL, NULL);
+ return ERROR_SUCCESS;
+ }
+ }
+
+ case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: {
+ PCCERT_CONTEXT context;
+
+ if(*size < sizeof(INTERNET_CERTIFICATE_INFOW)) {
+ *size = sizeof(INTERNET_CERTIFICATE_INFOW);
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+
+ context = (PCCERT_CONTEXT)NETCON_GetCert(&(req->netConnection));
+ if(context) {
+ INTERNET_CERTIFICATE_INFOW *info = (INTERNET_CERTIFICATE_INFOW*)buffer;
+ DWORD len;
+
+ memset(info, 0, sizeof(INTERNET_CERTIFICATE_INFOW));
+ info->ftExpiry = context->pCertInfo->NotAfter;
+ info->ftStart = context->pCertInfo->NotBefore;
+ if(unicode) {
+ len = CertNameToStrW(context->dwCertEncodingType,
+ &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0);
+ info->lpszSubjectInfo = LocalAlloc(0, len*sizeof(WCHAR));
+ if(info->lpszSubjectInfo)
+ CertNameToStrW(context->dwCertEncodingType,
+ &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR,
+ info->lpszSubjectInfo, len);
+ len = CertNameToStrW(context->dwCertEncodingType,
+ &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0);
+ info->lpszIssuerInfo = LocalAlloc(0, len*sizeof(WCHAR));
+ if (info->lpszIssuerInfo)
+ CertNameToStrW(context->dwCertEncodingType,
+ &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR,
+ info->lpszIssuerInfo, len);
+ }else {
+ INTERNET_CERTIFICATE_INFOA *infoA = (INTERNET_CERTIFICATE_INFOA*)info;
+
+ len = CertNameToStrA(context->dwCertEncodingType,
+ &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0);
+ infoA->lpszSubjectInfo = LocalAlloc(0, len);
+ if(infoA->lpszSubjectInfo)
+ CertNameToStrA(context->dwCertEncodingType,
+ &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR,
+ infoA->lpszSubjectInfo, len);
+ len = CertNameToStrA(context->dwCertEncodingType,
+ &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0);
+ infoA->lpszIssuerInfo = LocalAlloc(0, len);
+ if(infoA->lpszIssuerInfo)
+ CertNameToStrA(context->dwCertEncodingType,
+ &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR,
+ infoA->lpszIssuerInfo, len);
+ }
+
+ /*
+ * Contrary to MSDN, these do not appear to be set.
+ * lpszProtocolName
+ * lpszSignatureAlgName
+ * lpszEncryptionAlgName
+ * dwKeySize
+ */
+ CertFreeCertificateContext(context);
+ return ERROR_SUCCESS;
+ }
+ }
+ }
+
+ FIXME("Not implemented option %d\n", option);
+ return ERROR_INTERNET_INVALID_OPTION;
+}
+
+static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD size)
+{
+ WININETHTTPREQW *req = (WININETHTTPREQW*)hdr;
+
+ switch(option) {
+ case INTERNET_OPTION_SEND_TIMEOUT:
+ case INTERNET_OPTION_RECEIVE_TIMEOUT:
+ TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n");
+
+ if (size != sizeof(DWORD))
+ return ERROR_INVALID_PARAMETER;
+
+ return NETCON_set_timeout(&req->netConnection, option == INTERNET_OPTION_SEND_TIMEOUT,
+ *(DWORD*)buffer);
+ }
+
+ return ERROR_INTERNET_INVALID_OPTION;
+}
+
+static DWORD HTTP_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync)
+{
+ int bytes_read;
+
+ if(!NETCON_recv(&req->netConnection, buffer, min(size, req->dwContentLength - req->dwContentRead),
+ sync ? MSG_WAITALL : 0, &bytes_read)) {
+ if(req->dwContentLength != -1 && req->dwContentRead != req->dwContentLength)
+ ERR("not all data received %d/%d\n", req->dwContentRead, req->dwContentLength);
+
+ /* always return success, even if the network layer returns an error */
+ *read = 0;
+ HTTP_FinishedReading(req);
+ return ERROR_SUCCESS;
+ }
+
+ req->dwContentRead += bytes_read;
+ *read = bytes_read;
+
+ if(req->lpszCacheFile) {
+ BOOL res;
+ DWORD dwBytesWritten;
+
+ res = WriteFile(req->hCacheFile, buffer, bytes_read, &dwBytesWritten, NULL);
+ if(!res)
+ WARN("WriteFile failed: %u\n", GetLastError());
+ }
+
+ if(!bytes_read && (req->dwContentRead == req->dwContentLength))
+ HTTP_FinishedReading(req);
+
+ return ERROR_SUCCESS;
+}
+
+static DWORD get_chunk_size(const char *buffer)
+{
+ const char *p;
+ DWORD size = 0;
+
+ for (p = buffer; *p; p++)
+ {
+ if (*p >= '0' && *p <= '9') size = size * 16 + *p - '0';
+ else if (*p >= 'a' && *p <= 'f') size = size * 16 + *p - 'a' + 10;
+ else if (*p >= 'A' && *p <= 'F') size = size * 16 + *p - 'A' + 10;
+ else if (*p == ';') break;
+ }
+ return size;
+}
+
+static DWORD HTTP_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync)
+{
+ char reply[MAX_REPLY_LEN], *p = buffer;
+ DWORD buflen, to_read, to_write = size;
+ int bytes_read;
+
+ *read = 0;
+ for (;;)
+ {
+ if (*read == size) break;
+
+ if (req->dwContentLength == ~0UL) /* new chunk */
+ {
+ buflen = sizeof(reply);
+ if (!NETCON_getNextLine(&req->netConnection, reply, &buflen)) break;
+
+ if (!(req->dwContentLength = get_chunk_size(reply)))
+ {
+ /* zero sized chunk marks end of transfer; read any trailing headers and return */
+ HTTP_GetResponseHeaders(req, FALSE);
+ break;
+ }
+ }
+ to_read = min(to_write, req->dwContentLength - req->dwContentRead);
+
+ if (!NETCON_recv(&req->netConnection, p, to_read, sync ? MSG_WAITALL : 0, &bytes_read))
+ {
+ if (bytes_read != to_read)
+ ERR("Not all data received %d/%d\n", bytes_read, to_read);
+
+ /* always return success, even if the network layer returns an error */
+ *read = 0;
+ break;
+ }
+ if (!bytes_read) break;
+
+ req->dwContentRead += bytes_read;
+ to_write -= bytes_read;
+ *read += bytes_read;
+
+ if (req->lpszCacheFile)
+ {
+ DWORD dwBytesWritten;
+
+ if (!WriteFile(req->hCacheFile, p, bytes_read, &dwBytesWritten, NULL))
+ WARN("WriteFile failed: %u\n", GetLastError());
+ }
+ p += bytes_read;
+
+ if (req->dwContentRead == req->dwContentLength) /* chunk complete */
+ {
+ req->dwContentRead = 0;
+ req->dwContentLength = ~0UL;
+
+ buflen = sizeof(reply);
+ if (!NETCON_getNextLine(&req->netConnection, reply, &buflen))
+ {
+ ERR("Malformed chunk\n");
+ *read = 0;
+ break;
+ }
+ }
+ }
+ if (!*read) HTTP_FinishedReading(req);
+ return ERROR_SUCCESS;
+}
+
+static DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync)
+{
+ WCHAR encoding[20];
+ DWORD buflen = sizeof(encoding);
+ static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0};
+
+ if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_TRANSFER_ENCODING, encoding, &buflen, NULL) &&
+ !strcmpiW(encoding, szChunked))
+ {
+ return HTTP_ReadChunked(req, buffer, size, read, sync);
+ }
+ else
+ return HTTP_Read(req, buffer, size, read, sync);
+}
+
+static DWORD HTTPREQ_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read)
+{
+ WININETHTTPREQW *req = (WININETHTTPREQW*)hdr;
+ return HTTPREQ_Read(req, buffer, size, read, TRUE);
+}
+
+static void HTTPREQ_AsyncReadFileExProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_INTERNETREADFILEEXA const *data = &workRequest->u.InternetReadFileExA;
+ WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr;
+ INTERNET_ASYNC_RESULT iar;
+ DWORD res;
+
+ TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr);
+
+ res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer,
+ data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE);
+
+ iar.dwResult = res == ERROR_SUCCESS;
+ iar.dwError = res;
+
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext,
+ INTERNET_STATUS_REQUEST_COMPLETE, &iar,
+ sizeof(INTERNET_ASYNC_RESULT));
+}
+
+static DWORD HTTPREQ_ReadFileExA(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSA *buffers,
+ DWORD flags, DWORD_PTR context)
+{
+
+ WININETHTTPREQW *req = (WININETHTTPREQW*)hdr;
+ DWORD res;
+
+ if (flags & ~(IRF_ASYNC|IRF_NO_WAIT))
+ FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
+
+ if (buffers->dwStructSize != sizeof(*buffers))
+ return ERROR_INVALID_PARAMETER;
+
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
+
+ if (hdr->dwFlags & INTERNET_FLAG_ASYNC) {
+ DWORD available = 0;
+
+ NETCON_query_data_available(&req->netConnection, &available);
+ if (!available)
+ {
+ WORKREQUEST workRequest;
+
+ workRequest.asyncproc = HTTPREQ_AsyncReadFileExProc;
+ workRequest.hdr = WININET_AddRef(&req->hdr);
+ workRequest.u.InternetReadFileExA.lpBuffersOut = buffers;
+
+ INTERNET_AsyncCall(&workRequest);
+
+ return ERROR_IO_PENDING;
+ }
+ }
+
+ res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength,
+ !(flags & IRF_NO_WAIT));
+
+ if (res == ERROR_SUCCESS) {
+ DWORD size = buffers->dwBufferLength;
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED,
+ &size, sizeof(size));
+ }
+
+ return res;
+}
+
+static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written)
+{
+ LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW)hdr;
+
+ return NETCON_send(&lpwhr->netConnection, buffer, size, 0, (LPINT)written);
+}
+
+static void HTTPREQ_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest)
+{
+ WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr;
+ INTERNET_ASYNC_RESULT iar;
+ char buffer[4048];
+
+ TRACE("%p\n", workRequest->hdr);
+
+ iar.dwResult = NETCON_recv(&req->netConnection, buffer,
+ min(sizeof(buffer), req->dwContentLength - req->dwContentRead),
+ MSG_PEEK, (int *)&iar.dwError);
+
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar,
+ sizeof(INTERNET_ASYNC_RESULT));
+}
+
+static DWORD HTTPREQ_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx)
+{
+ WININETHTTPREQW *req = (WININETHTTPREQW*)hdr;
+ BYTE buffer[4048];
+ BOOL async;
+
+ TRACE("(%p %p %x %lx)\n", req, available, flags, ctx);
+
+ if(!NETCON_query_data_available(&req->netConnection, available) || *available)
+ return ERROR_SUCCESS;
+
+ /* Even if we are in async mode, we need to determine whether
+ * there is actually more data available. We do this by trying
+ * to peek only a single byte in async mode. */
+ async = (req->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) != 0;
+
+ if (NETCON_recv(&req->netConnection, buffer,
+ min(async ? 1 : sizeof(buffer), req->dwContentLength - req->dwContentRead),
+ MSG_PEEK, (int *)available) && async && *available)
+ {
+ WORKREQUEST workRequest;
+
+ *available = 0;
+ workRequest.asyncproc = HTTPREQ_AsyncQueryDataAvailableProc;
+ workRequest.hdr = WININET_AddRef( &req->hdr );
+
+ INTERNET_AsyncCall(&workRequest);
+
+ return ERROR_IO_PENDING;
+ }
+
+ return ERROR_SUCCESS;
+}
+
+static const HANDLEHEADERVtbl HTTPREQVtbl = {
+ HTTPREQ_Destroy,
+ HTTPREQ_CloseConnection,
+ HTTPREQ_QueryOption,
+ HTTPREQ_SetOption,
+ HTTPREQ_ReadFile,
+ HTTPREQ_ReadFileExA,
+ HTTPREQ_WriteFile,
+ HTTPREQ_QueryDataAvailable,
+ NULL
+};
+
/***********************************************************************
* HTTP_HttpOpenRequestW (internal)
*
HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion,
LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes,
- DWORD dwFlags, DWORD dwContext)
+ DWORD dwFlags, DWORD_PTR dwContext)
{
LPWININETAPPINFOW hIC = NULL;
LPWININETHTTPREQW lpwhr;
static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0};
DWORD len;
LPHTTPHEADERW Host;
- char szaddr[32];
TRACE("-->\n");
assert( lpwhs->hdr.htype == WH_HHTTPSESSION );
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
+ hIC = lpwhs->lpAppInfo;
lpwhr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPREQW));
if (NULL == lpwhr)
goto lend;
}
lpwhr->hdr.htype = WH_HHTTPREQ;
- lpwhr->hdr.lpwhparent = WININET_AddRef( &lpwhs->hdr );
+ lpwhr->hdr.vtbl = &HTTPREQVtbl;
lpwhr->hdr.dwFlags = dwFlags;
lpwhr->hdr.dwContext = dwContext;
- lpwhr->hdr.dwRefCount = 1;
- lpwhr->hdr.destroy = HTTP_CloseHTTPRequestHandle;
+ lpwhr->hdr.refs = 1;
lpwhr->hdr.lpfnStatusCB = lpwhs->hdr.lpfnStatusCB;
+ lpwhr->hdr.dwInternalFlags = lpwhs->hdr.dwInternalFlags & INET_CALLBACKW;
+
+ WININET_AddRef( &lpwhs->hdr );
+ lpwhr->lpHttpSession = lpwhs;
+ list_add_head( &lpwhs->hdr.children, &lpwhr->hdr.entry );
handle = WININET_AllocHandle( &lpwhr->hdr );
if (NULL == handle)
goto lend;
}
- if (NULL != lpszObjectName && strlenW(lpszObjectName)) {
+ if (lpszObjectName && *lpszObjectName) {
HRESULT rc;
len = 0;
URL_ESCAPE_SPACES_ONLY);
if (rc)
{
- ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(lpszObjectName),rc);
+ ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc);
strcpyW(lpwhr->lpszPath,lpszObjectName);
}
}
- if (NULL != lpszReferrer && strlenW(lpszReferrer))
- HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDHDR_FLAG_COALESCE);
+ if (lpszReferrer && *lpszReferrer)
+ HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);
- if(lpszAcceptTypes!=NULL)
+ if (lpszAcceptTypes)
{
int i;
- for(i=0;lpszAcceptTypes[i]!=NULL;i++)
- HTTP_ProcessHeader(lpwhr, HTTP_ACCEPT, lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_REQ|HTTP_ADDHDR_FLAG_ADD_IF_NEW);
- }
-
- if (NULL == lpszVerb)
- {
- static const WCHAR szGet[] = {'G','E','T',0};
- lpwhr->lpszVerb = WININET_strdupW(szGet);
+ for (i = 0; lpszAcceptTypes[i]; i++)
+ {
+ if (!*lpszAcceptTypes[i]) continue;
+ HTTP_ProcessHeader(lpwhr, HTTP_ACCEPT, lpszAcceptTypes[i],
+ HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA |
+ HTTP_ADDHDR_FLAG_REQ |
+ (i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0));
+ }
}
- else if (strlenW(lpszVerb))
- lpwhr->lpszVerb = WININET_strdupW(lpszVerb);
-
- if (NULL != lpszReferrer && strlenW(lpszReferrer))
- {
- WCHAR buf[MAXHOSTNAME];
- URL_COMPONENTSW UrlComponents;
- memset( &UrlComponents, 0, sizeof UrlComponents );
- UrlComponents.dwStructSize = sizeof UrlComponents;
- UrlComponents.lpszHostName = buf;
- UrlComponents.dwHostNameLength = MAXHOSTNAME;
+ lpwhr->lpszVerb = WININET_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET);
- InternetCrackUrlW(lpszReferrer, 0, 0, &UrlComponents);
- if (strlenW(UrlComponents.lpszHostName))
- HTTP_ProcessHeader(lpwhr, szHost, UrlComponents.lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
- }
+ if (lpszVersion)
+ lpwhr->lpszVersion = WININET_strdupW(lpszVersion);
else
- HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
+ lpwhr->lpszVersion = WININET_strdupW(g_szHttp1_1);
+
+ HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);
if (lpwhs->nServerPort == INTERNET_INVALID_PORT_NUMBER)
lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ?
INTERNET_DEFAULT_HTTPS_PORT :
INTERNET_DEFAULT_HTTP_PORT);
- lpwhs->nHostPort = lpwhs->nServerPort;
+
+ if (lpwhs->nHostPort == INTERNET_INVALID_PORT_NUMBER)
+ lpwhs->nHostPort = (dwFlags & INTERNET_FLAG_SECURE ?
+ INTERNET_DEFAULT_HTTPS_PORT :
+ INTERNET_DEFAULT_HTTP_PORT);
if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0)
HTTP_DealWithProxy( hIC, lpwhs, lpwhr );
- if (hIC->lpszAgent)
- {
- WCHAR *agent_header;
- static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0 };
-
- len = strlenW(hIC->lpszAgent) + strlenW(user_agent);
- agent_header = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
- sprintfW(agent_header, user_agent, hIC->lpszAgent );
-
- HTTP_HttpAddRequestHeadersW(lpwhr, agent_header, strlenW(agent_header),
- HTTP_ADDREQ_FLAG_ADD);
- HeapFree(GetProcessHeap(), 0, agent_header);
- }
-
Host = HTTP_GetHeader(lpwhr,szHost);
len = lstrlenW(Host->lpszValue) + strlenW(szUrlForm);
* A STATUS_REQUEST_COMPLETE is NOT sent here as per my tests on windows
*/
- /*
- * According to my tests. The name is not resolved until a request is Opened
- */
- INTERNET_SendCallback(&lpwhr->hdr, dwContext,
- INTERNET_STATUS_RESOLVING_NAME,
- lpwhs->lpszServerName,
- strlenW(lpwhs->lpszServerName)+1);
-
- if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort,
- &lpwhs->socketAddress))
+ if (!HTTP_ResolveName(lpwhr))
{
- INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED);
InternetCloseHandle( handle );
handle = NULL;
- goto lend;
}
- inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr,
- szaddr, sizeof(szaddr));
- INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
- INTERNET_STATUS_NAME_RESOLVED,
- szaddr, strlen(szaddr)+1);
-
lend:
if( lpwhr )
WININET_Release( &lpwhr->hdr );
return handle;
}
-typedef struct std_hdr_data
+/* read any content returned by the server so that the connection can be
+ * reused */
+static void HTTP_DrainContent(WININETHTTPREQW *req)
{
- const WCHAR* hdrStr;
- INT hdrIndex;
-} std_hdr_data;
+ DWORD bytes_read;
+
+ if (!NETCON_connected(&req->netConnection)) return;
+
+ if (req->dwContentLength == -1)
+ NETCON_close(&req->netConnection);
+
+ do
+ {
+ char buffer[2048];
+ if (HTTP_Read(req, buffer, sizeof(buffer), &bytes_read, TRUE) != ERROR_SUCCESS)
+ return;
+ } while (bytes_read);
+}
static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 };
static const WCHAR szAccept_Charset[] = { 'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0 };
static const WCHAR szAccept_Ranges[] = { 'A','c','c','e','p','t','-','R','a','n','g','e','s',0 };
static const WCHAR szAge[] = { 'A','g','e',0 };
static const WCHAR szAllow[] = { 'A','l','l','o','w',0 };
-static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t','i','o','n',0 };
static const WCHAR szCache_Control[] = { 'C','a','c','h','e','-','C','o','n','t','r','o','l',0 };
static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 };
static const WCHAR szContent_Base[] = { 'C','o','n','t','e','n','t','-','B','a','s','e',0 };
static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 };
static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 };
-static const std_hdr_data SORTED_STANDARD_HEADERS[] = {
- {szAccept, HTTP_QUERY_ACCEPT,},
- {szAccept_Charset, HTTP_QUERY_ACCEPT_CHARSET,},
- {szAccept_Encoding, HTTP_QUERY_ACCEPT_ENCODING,},
- {szAccept_Language, HTTP_QUERY_ACCEPT_LANGUAGE,},
- {szAccept_Ranges, HTTP_QUERY_ACCEPT_RANGES,},
- {szAge, HTTP_QUERY_AGE,},
- {szAllow, HTTP_QUERY_ALLOW,},
- {szAuthorization, HTTP_QUERY_AUTHORIZATION,},
- {szCache_Control, HTTP_QUERY_CACHE_CONTROL,},
- {szConnection, HTTP_QUERY_CONNECTION,},
- {szContent_Base, HTTP_QUERY_CONTENT_BASE,},
- {szContent_Encoding, HTTP_QUERY_CONTENT_ENCODING,},
- {szContent_ID, HTTP_QUERY_CONTENT_ID,},
- {szContent_Language, HTTP_QUERY_CONTENT_LANGUAGE,},
- {szContent_Length, HTTP_QUERY_CONTENT_LENGTH,},
- {szContent_Location, HTTP_QUERY_CONTENT_LOCATION,},
- {szContent_MD5, HTTP_QUERY_CONTENT_MD5,},
- {szContent_Range, HTTP_QUERY_CONTENT_RANGE,},
- {szContent_Transfer_Encoding,HTTP_QUERY_CONTENT_TRANSFER_ENCODING,},
- {szContent_Type, HTTP_QUERY_CONTENT_TYPE,},
- {szCookie, HTTP_QUERY_COOKIE,},
- {szDate, HTTP_QUERY_DATE,},
- {szETag, HTTP_QUERY_ETAG,},
- {szExpect, HTTP_QUERY_EXPECT,},
- {szExpires, HTTP_QUERY_EXPIRES,},
- {szFrom, HTTP_QUERY_DERIVED_FROM,},
- {szHost, HTTP_QUERY_HOST,},
- {szIf_Match, HTTP_QUERY_IF_MATCH,},
- {szIf_Modified_Since, HTTP_QUERY_IF_MODIFIED_SINCE,},
- {szIf_None_Match, HTTP_QUERY_IF_NONE_MATCH,},
- {szIf_Range, HTTP_QUERY_IF_RANGE,},
- {szIf_Unmodified_Since, HTTP_QUERY_IF_UNMODIFIED_SINCE,},
- {szLast_Modified, HTTP_QUERY_LAST_MODIFIED,},
- {szLocation, HTTP_QUERY_LOCATION,},
- {szMax_Forwards, HTTP_QUERY_MAX_FORWARDS,},
- {szMime_Version, HTTP_QUERY_MIME_VERSION,},
- {szPragma, HTTP_QUERY_PRAGMA,},
- {szProxy_Authenticate, HTTP_QUERY_PROXY_AUTHENTICATE,},
- {szProxy_Authorization, HTTP_QUERY_PROXY_AUTHORIZATION,},
- {szProxy_Connection, HTTP_QUERY_PROXY_CONNECTION,},
- {szPublic, HTTP_QUERY_PUBLIC,},
- {szRange, HTTP_QUERY_RANGE,},
- {szReferer, HTTP_QUERY_REFERER,},
- {szRetry_After, HTTP_QUERY_RETRY_AFTER,},
- {szServer, HTTP_QUERY_SERVER,},
- {szSet_Cookie, HTTP_QUERY_SET_COOKIE,},
- {szStatus, HTTP_QUERY_STATUS_CODE,},
- {szTransfer_Encoding, HTTP_QUERY_TRANSFER_ENCODING,},
- {szUnless_Modified_Since, HTTP_QUERY_UNLESS_MODIFIED_SINCE,},
- {szUpgrade, HTTP_QUERY_UPGRADE,},
- {szURI, HTTP_QUERY_URI,},
- {szUser_Agent, HTTP_QUERY_USER_AGENT,},
- {szVary, HTTP_QUERY_VARY,},
- {szVia, HTTP_QUERY_VIA,},
- {szWarning, HTTP_QUERY_WARNING,},
- {szWWW_Authenticate, HTTP_QUERY_WWW_AUTHENTICATE,},
+static const LPCWSTR header_lookup[] = {
+ szMime_Version, /* HTTP_QUERY_MIME_VERSION = 0 */
+ szContent_Type, /* HTTP_QUERY_CONTENT_TYPE = 1 */
+ szContent_Transfer_Encoding,/* HTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */
+ szContent_ID, /* HTTP_QUERY_CONTENT_ID = 3 */
+ NULL, /* HTTP_QUERY_CONTENT_DESCRIPTION = 4 */
+ szContent_Length, /* HTTP_QUERY_CONTENT_LENGTH = 5 */
+ szContent_Language, /* HTTP_QUERY_CONTENT_LANGUAGE = 6 */
+ szAllow, /* HTTP_QUERY_ALLOW = 7 */
+ szPublic, /* HTTP_QUERY_PUBLIC = 8 */
+ szDate, /* HTTP_QUERY_DATE = 9 */
+ szExpires, /* HTTP_QUERY_EXPIRES = 10 */
+ szLast_Modified, /* HTTP_QUERY_LAST_MODIFIED = 11 */
+ NULL, /* HTTP_QUERY_MESSAGE_ID = 12 */
+ szURI, /* HTTP_QUERY_URI = 13 */
+ szFrom, /* HTTP_QUERY_DERIVED_FROM = 14 */
+ NULL, /* HTTP_QUERY_COST = 15 */
+ NULL, /* HTTP_QUERY_LINK = 16 */
+ szPragma, /* HTTP_QUERY_PRAGMA = 17 */
+ NULL, /* HTTP_QUERY_VERSION = 18 */
+ szStatus, /* HTTP_QUERY_STATUS_CODE = 19 */
+ NULL, /* HTTP_QUERY_STATUS_TEXT = 20 */
+ NULL, /* HTTP_QUERY_RAW_HEADERS = 21 */
+ NULL, /* HTTP_QUERY_RAW_HEADERS_CRLF = 22 */
+ szConnection, /* HTTP_QUERY_CONNECTION = 23 */
+ szAccept, /* HTTP_QUERY_ACCEPT = 24 */
+ szAccept_Charset, /* HTTP_QUERY_ACCEPT_CHARSET = 25 */
+ szAccept_Encoding, /* HTTP_QUERY_ACCEPT_ENCODING = 26 */
+ szAccept_Language, /* HTTP_QUERY_ACCEPT_LANGUAGE = 27 */
+ szAuthorization, /* HTTP_QUERY_AUTHORIZATION = 28 */
+ szContent_Encoding, /* HTTP_QUERY_CONTENT_ENCODING = 29 */
+ NULL, /* HTTP_QUERY_FORWARDED = 30 */
+ NULL, /* HTTP_QUERY_FROM = 31 */
+ szIf_Modified_Since, /* HTTP_QUERY_IF_MODIFIED_SINCE = 32 */
+ szLocation, /* HTTP_QUERY_LOCATION = 33 */
+ NULL, /* HTTP_QUERY_ORIG_URI = 34 */
+ szReferer, /* HTTP_QUERY_REFERER = 35 */
+ szRetry_After, /* HTTP_QUERY_RETRY_AFTER = 36 */
+ szServer, /* HTTP_QUERY_SERVER = 37 */
+ NULL, /* HTTP_TITLE = 38 */
+ szUser_Agent, /* HTTP_QUERY_USER_AGENT = 39 */
+ szWWW_Authenticate, /* HTTP_QUERY_WWW_AUTHENTICATE = 40 */
+ szProxy_Authenticate, /* HTTP_QUERY_PROXY_AUTHENTICATE = 41 */
+ szAccept_Ranges, /* HTTP_QUERY_ACCEPT_RANGES = 42 */
+ szSet_Cookie, /* HTTP_QUERY_SET_COOKIE = 43 */
+ szCookie, /* HTTP_QUERY_COOKIE = 44 */
+ NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */
+ NULL, /* HTTP_QUERY_REFRESH = 46 */
+ NULL, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */
+ szAge, /* HTTP_QUERY_AGE = 48 */
+ szCache_Control, /* HTTP_QUERY_CACHE_CONTROL = 49 */
+ szContent_Base, /* HTTP_QUERY_CONTENT_BASE = 50 */
+ szContent_Location, /* HTTP_QUERY_CONTENT_LOCATION = 51 */
+ szContent_MD5, /* HTTP_QUERY_CONTENT_MD5 = 52 */
+ szContent_Range, /* HTTP_QUERY_CONTENT_RANGE = 53 */
+ szETag, /* HTTP_QUERY_ETAG = 54 */
+ szHost, /* HTTP_QUERY_HOST = 55 */
+ szIf_Match, /* HTTP_QUERY_IF_MATCH = 56 */
+ szIf_None_Match, /* HTTP_QUERY_IF_NONE_MATCH = 57 */
+ szIf_Range, /* HTTP_QUERY_IF_RANGE = 58 */
+ szIf_Unmodified_Since, /* HTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */
+ szMax_Forwards, /* HTTP_QUERY_MAX_FORWARDS = 60 */
+ szProxy_Authorization, /* HTTP_QUERY_PROXY_AUTHORIZATION = 61 */
+ szRange, /* HTTP_QUERY_RANGE = 62 */
+ szTransfer_Encoding, /* HTTP_QUERY_TRANSFER_ENCODING = 63 */
+ szUpgrade, /* HTTP_QUERY_UPGRADE = 64 */
+ szVary, /* HTTP_QUERY_VARY = 65 */
+ szVia, /* HTTP_QUERY_VIA = 66 */
+ szWarning, /* HTTP_QUERY_WARNING = 67 */
+ szExpect, /* HTTP_QUERY_EXPECT = 68 */
+ szProxy_Connection, /* HTTP_QUERY_PROXY_CONNECTION = 69 */
+ szUnless_Modified_Since, /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */
};
+#define LAST_TABLE_HEADER (sizeof(header_lookup)/sizeof(header_lookup[0]))
+
/***********************************************************************
* HTTP_HttpQueryInfoW (internal)
*/
LPHTTPHEADERW lphttpHdr = NULL;
BOOL bSuccess = FALSE;
BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS;
-
+ INT requested_index = lpdwIndex ? *lpdwIndex : 0;
+ INT level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK);
+ INT index = -1;
/* Find requested header structure */
- if ((dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK) == HTTP_QUERY_CUSTOM)
+ switch (level)
{
- INT requested_index = (lpdwIndex)?(*lpdwIndex):0;
- INT index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)lpBuffer,
- requested_index,request_only);
+ case HTTP_QUERY_CUSTOM:
+ index = HTTP_GetCustomHeaderIndex(lpwhr, lpBuffer, requested_index, request_only);
+ break;
- if (index < 0)
- return bSuccess;
- else
- lphttpHdr = &lpwhr->pCustHeaders[index];
+ case HTTP_QUERY_RAW_HEADERS_CRLF:
+ {
+ LPWSTR headers;
+ DWORD len;
+ BOOL ret = FALSE;
- if (lpdwIndex)
- (*lpdwIndex)++;
- }
- else
- {
- INT index = dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK;
+ if (request_only)
+ headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion);
+ else
+ headers = lpwhr->lpszRawHeaders;
- if (index == HTTP_QUERY_RAW_HEADERS_CRLF)
- {
- DWORD len = strlenW(lpwhr->lpszRawHeaders);
- if (len + 1 > *lpdwBufferLength/sizeof(WCHAR))
+ len = (strlenW(headers) + 1) * sizeof(WCHAR);
+ if (len > *lpdwBufferLength)
{
- *lpdwBufferLength = (len + 1) * sizeof(WCHAR);
INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER);
- return FALSE;
+ ret = FALSE;
}
- memcpy(lpBuffer, lpwhr->lpszRawHeaders, (len+1)*sizeof(WCHAR));
- *lpdwBufferLength = len * sizeof(WCHAR);
-
- TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len));
+ else if (lpBuffer)
+ {
+ memcpy(lpBuffer, headers, len);
+ TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len / sizeof(WCHAR)));
+ ret = TRUE;
+ }
+ *lpdwBufferLength = len;
- return TRUE;
+ if (request_only)
+ HeapFree(GetProcessHeap(), 0, headers);
+ return ret;
}
- else if (index == HTTP_QUERY_RAW_HEADERS)
+ case HTTP_QUERY_RAW_HEADERS:
{
static const WCHAR szCrLf[] = {'\r','\n',0};
LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(lpwhr->lpszRawHeaders, szCrLf);
return TRUE;
}
- else if (index == HTTP_QUERY_STATUS_TEXT)
+ case HTTP_QUERY_STATUS_TEXT:
+ if (lpwhr->lpszStatusText)
{
DWORD len = strlenW(lpwhr->lpszStatusText);
if (len + 1 > *lpdwBufferLength/sizeof(WCHAR))
return TRUE;
}
- else if (index == HTTP_QUERY_VERSION)
+ break;
+ case HTTP_QUERY_VERSION:
+ if (lpwhr->lpszVersion)
{
DWORD len = strlenW(lpwhr->lpszVersion);
if (len + 1 > *lpdwBufferLength/sizeof(WCHAR))
return TRUE;
}
- else if (index >= 0 && index <= HTTP_QUERY_MAX )
- {
- int i;
- for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++)
- {
- if (SORTED_STANDARD_HEADERS[i].hdrIndex == index)
- {
- INT requested_index = (lpdwIndex)?(*lpdwIndex):0;
- INT index = HTTP_GetCustomHeaderIndex(lpwhr,
- (LPWSTR)SORTED_STANDARD_HEADERS[i].hdrStr,
- requested_index,request_only);
-
- if (index < 0)
- return bSuccess;
- else
- lphttpHdr = &lpwhr->pCustHeaders[index];
-
- if (lpdwIndex)
- (*lpdwIndex)++;
-
- break;
- }
- }
+ break;
+ default:
+ assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1));
- if (!lphttpHdr)
- {
- SetLastError(ERROR_HTTP_HEADER_NOT_FOUND);
- return bSuccess;
- }
- }
- else
- {
- SetLastError(ERROR_HTTP_HEADER_NOT_FOUND);
- return bSuccess;
- }
+ if (level >= 0 && level < LAST_TABLE_HEADER && header_lookup[level])
+ index = HTTP_GetCustomHeaderIndex(lpwhr, header_lookup[level],
+ requested_index,request_only);
}
- /* Ensure header satisifies requested attributes */
- if ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) &&
- (~lphttpHdr->wFlags & HDR_ISREQUEST))
+ if (index >= 0)
+ lphttpHdr = &lpwhr->pCustHeaders[index];
+
+ /* Ensure header satisfies requested attributes */
+ if (!lphttpHdr ||
+ ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) &&
+ (~lphttpHdr->wFlags & HDR_ISREQUEST)))
{
- SetLastError(ERROR_HTTP_HEADER_NOT_FOUND);
- return bSuccess;
+ INTERNET_SetLastError(ERROR_HTTP_HEADER_NOT_FOUND);
+ return bSuccess;
}
- /* coalesce value to reuqested type */
+ if (lpdwIndex)
+ (*lpdwIndex)++;
+
+ /* coalesce value to requested type */
if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER)
{
*(int *)lpBuffer = atoiW(lphttpHdr->lpszValue);
STHook->wMonth = tmpTM.tm_mon + 1;
STHook->wSecond = tmpTM.tm_sec;
STHook->wYear = tmpTM.tm_year;
-
+
bSuccess = TRUE;
-
- TRACE(" returning time : %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n",
+
+ TRACE(" returning time : %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n",
STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek,
STHook->wHour, STHook->wMinute, STHook->wSecond, STHook->wMilliseconds);
}
- else if (dwInfoLevel & HTTP_QUERY_FLAG_COALESCE)
- {
- if (*lpdwIndex >= lphttpHdr->wCount)
- {
- INTERNET_SetLastError(ERROR_HTTP_HEADER_NOT_FOUND);
- }
- else
- {
- /* Copy strncpyW(lpBuffer, lphttpHdr[*lpdwIndex], len); */
- (*lpdwIndex)++;
- }
- }
else if (lphttpHdr->lpszValue)
{
DWORD len = (strlenW(lphttpHdr->lpszValue) + 1) * sizeof(WCHAR);
*lpdwBufferLength = len - sizeof(WCHAR);
bSuccess = TRUE;
- TRACE(" returning string : '%s'\n", debugstr_w(lpBuffer));
+ TRACE(" returning string : %s\n", debugstr_w(lpBuffer));
}
return bSuccess;
}
DWORD info = dwInfoLevel & HTTP_QUERY_HEADER_MASK;
DWORD i;
- TRACE("(%p, 0x%08lx)--> %ld\n", hHttpRequest, dwInfoLevel, dwInfoLevel);
+ TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, dwInfoLevel);
TRACE(" Attribute:");
for (i = 0; i < (sizeof(query_flags) / sizeof(query_flags[0])); i++) {
if (query_flags[i].val == info) {
}
}
if (i == (sizeof(query_flags) / sizeof(query_flags[0]))) {
- TRACE(" Unknown (%08lx)", info);
+ TRACE(" Unknown (%08x)", info);
}
TRACE(" Modifier:");
info_mod &= ~ modifier_flags[i].val;
}
}
-
+
if (info_mod) {
- TRACE(" Unknown (%08lx)", info_mod);
+ TRACE(" Unknown (%08x)", info_mod);
}
TRACE("\n");
}
-
+
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hHttpRequest );
if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ)
{
goto lend;
}
+ if (lpBuffer == NULL)
+ *lpdwBufferLength = 0;
bSuccess = HTTP_HttpQueryInfoW( lpwhr, dwInfoLevel,
lpBuffer, lpdwBufferLength, lpdwIndex);
lpdwBufferLength, lpdwIndex );
}
- len = (*lpdwBufferLength)*sizeof(WCHAR);
- bufferW = HeapAlloc( GetProcessHeap(), 0, len );
- /* buffer is in/out because of HTTP_QUERY_CUSTOM */
- if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM)
- MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len);
+ if (lpBuffer)
+ {
+ DWORD alloclen;
+ len = (*lpdwBufferLength)*sizeof(WCHAR);
+ if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM)
+ {
+ alloclen = MultiByteToWideChar( CP_ACP, 0, lpBuffer, -1, NULL, 0 ) * sizeof(WCHAR);
+ if (alloclen < len)
+ alloclen = len;
+ }
+ else
+ alloclen = len;
+ bufferW = HeapAlloc( GetProcessHeap(), 0, alloclen );
+ /* buffer is in/out because of HTTP_QUERY_CUSTOM */
+ if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM)
+ MultiByteToWideChar( CP_ACP, 0, lpBuffer, -1, bufferW, alloclen / sizeof(WCHAR) );
+ } else
+ {
+ bufferW = NULL;
+ len = 0;
+ }
+
result = HttpQueryInfoW( hHttpRequest, dwInfoLevel, bufferW,
&len, lpdwIndex );
if( result )
BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest,
LPINTERNET_BUFFERSA lpBuffersIn,
LPINTERNET_BUFFERSA lpBuffersOut,
- DWORD dwFlags, DWORD dwContext)
+ DWORD dwFlags, DWORD_PTR dwContext)
{
INTERNET_BUFFERSW BuffersInW;
BOOL rc = FALSE;
DWORD headerlen;
+ LPWSTR header = NULL;
- TRACE("(%p, %p, %p, %08lx, %08lx): stub\n", hRequest, lpBuffersIn,
+ TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn,
lpBuffersOut, dwFlags, dwContext);
if (lpBuffersIn)
{
headerlen = MultiByteToWideChar(CP_ACP,0,lpBuffersIn->lpcszHeader,
lpBuffersIn->dwHeadersLength,0,0);
- BuffersInW.lpcszHeader = HeapAlloc(GetProcessHeap(),0,headerlen*
- sizeof(WCHAR));
- if (!BuffersInW.lpcszHeader)
+ header = HeapAlloc(GetProcessHeap(),0,headerlen*sizeof(WCHAR));
+ if (!(BuffersInW.lpcszHeader = header))
{
- SetLastError(ERROR_OUTOFMEMORY);
+ INTERNET_SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0,
lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength,
- (LPWSTR)BuffersInW.lpcszHeader, headerlen);
+ header, headerlen);
}
else
BuffersInW.lpcszHeader = NULL;
rc = HttpSendRequestExW(hRequest, lpBuffersIn ? &BuffersInW : NULL, NULL, dwFlags, dwContext);
- if (lpBuffersIn)
- HeapFree(GetProcessHeap(),0,(LPVOID)BuffersInW.lpcszHeader);
+ HeapFree(GetProcessHeap(),0,header);
return rc;
}
BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest,
LPINTERNET_BUFFERSW lpBuffersIn,
LPINTERNET_BUFFERSW lpBuffersOut,
- DWORD dwFlags, DWORD dwContext)
+ DWORD dwFlags, DWORD_PTR dwContext)
{
- BOOL ret;
+ BOOL ret = FALSE;
LPWININETHTTPREQW lpwhr;
LPWININETHTTPSESSIONW lpwhs;
LPWININETAPPINFOW hIC;
- TRACE("(%p, %p, %p, %08lx, %08lx)\n", hRequest, lpBuffersIn,
+ TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn,
lpBuffersOut, dwFlags, dwContext);
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest );
if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ)
{
INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
- return FALSE;
+ goto lend;
}
- lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
+ lpwhs = lpwhr->lpHttpSession;
assert(lpwhs->hdr.htype == WH_HHTTPSESSION);
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
+ hIC = lpwhs->lpAppInfo;
assert(hIC->hdr.htype == WH_HINIT);
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
WORKREQUEST workRequest;
struct WORKREQ_HTTPSENDREQUESTW *req;
- workRequest.asyncall = HTTPSENDREQUESTW;
+ workRequest.asyncproc = AsyncHttpSendRequestProc;
workRequest.hdr = WININET_AddRef( &lpwhr->hdr );
req = &workRequest.u.HttpSendRequestW;
if (lpBuffersIn)
/*
* This is from windows.
*/
- SetLastError(ERROR_IO_PENDING);
- ret = FALSE;
+ INTERNET_SetLastError(ERROR_IO_PENDING);
}
else
{
- ret = HTTP_HttpSendRequestW(lpwhr, lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength,
- lpBuffersIn->lpvBuffer, lpBuffersIn->dwBufferLength,
- lpBuffersIn->dwBufferTotal, FALSE);
+ if (lpBuffersIn)
+ ret = HTTP_HttpSendRequestW(lpwhr, lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength,
+ lpBuffersIn->lpvBuffer, lpBuffersIn->dwBufferLength,
+ lpBuffersIn->dwBufferTotal, FALSE);
+ else
+ ret = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, FALSE);
}
- WININET_Release(&lpwhr->hdr);
+lend:
+ if ( lpwhr )
+ WININET_Release( &lpwhr->hdr );
+
TRACE("<---\n");
return ret;
}
LPWININETAPPINFOW hIC = NULL;
BOOL r;
- TRACE("%p, %p (%s), %li, %p, %li)\n", hHttpRequest,
- lpszHeaders, debugstr_w(lpszHeaders), dwHeaderLength, lpOptional, dwOptionalLength);
+ TRACE("%p, %s, %i, %p, %i)\n", hHttpRequest,
+ debugstr_wn(lpszHeaders, dwHeaderLength), dwHeaderLength, lpOptional, dwOptionalLength);
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hHttpRequest );
if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ)
goto lend;
}
- lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
+ lpwhs = lpwhr->lpHttpSession;
if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION)
{
INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
goto lend;
}
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
+ hIC = lpwhs->lpAppInfo;
if (NULL == hIC || hIC->hdr.htype != WH_HINIT)
{
INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
WORKREQUEST workRequest;
struct WORKREQ_HTTPSENDREQUESTW *req;
- workRequest.asyncall = HTTPSENDREQUESTW;
- workRequest.hdr = WININET_AddRef( &lpwhr->hdr );
+ workRequest.asyncproc = AsyncHttpSendRequestProc;
+ workRequest.hdr = WININET_AddRef( &lpwhr->hdr );
req = &workRequest.u.HttpSendRequestW;
if (lpszHeaders)
- req->lpszHeader = WININET_strdupW(lpszHeaders);
+ {
+ req->lpszHeader = HeapAlloc(GetProcessHeap(), 0, dwHeaderLength * sizeof(WCHAR));
+ memcpy(req->lpszHeader, lpszHeaders, dwHeaderLength * sizeof(WCHAR));
+ }
else
req->lpszHeader = 0;
req->dwHeaderLength = dwHeaderLength;
/*
* This is from windows.
*/
- SetLastError(ERROR_IO_PENDING);
+ INTERNET_SetLastError(ERROR_IO_PENDING);
r = FALSE;
}
else
return result;
}
+static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf)
+{
+ LPHTTPHEADERW host_header;
+
+ static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0};
+
+ host_header = HTTP_GetHeader(req, szHost);
+ if(!host_header)
+ return FALSE;
+
+ sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */
+ return TRUE;
+}
+
/***********************************************************************
* HTTP_HandleRedirect (internal)
*/
-static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWSTR lpszHeaders,
- DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength,
- DWORD dwContentLength)
+static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl)
{
- LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
- LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
- WCHAR path[2048];
- char szaddr[32];
+ static const WCHAR szContentType[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0};
+ static const WCHAR szContentLength[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0};
+ LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession;
+ LPWININETAPPINFOW hIC = lpwhs->lpAppInfo;
+ BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0];
+ WCHAR path[INTERNET_MAX_URL_LENGTH];
+ int index;
if(lpszUrl[0]=='/')
{
/* if it's an absolute path, keep the same session info */
- lstrcpynW(path, lpszUrl, 2048);
- }
- else if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0)
- {
- TRACE("Redirect through proxy\n");
- lstrcpynW(path, lpszUrl, 2048);
+ lstrcpynW(path, lpszUrl, INTERNET_MAX_URL_LENGTH);
}
else
{
URL_COMPONENTSW urlComponents;
WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024];
- static const WCHAR szHttp[] = {'h','t','t','p',0};
- static const WCHAR szHttps[] = {'h','t','t','p','s',0};
+ static WCHAR szHttp[] = {'h','t','t','p',0};
+ static WCHAR szHttps[] = {'h','t','t','p','s',0};
DWORD url_length = 0;
LPWSTR orig_url;
LPWSTR combined_url;
urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
- urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? (LPWSTR)szHttps : (LPWSTR)szHttp;
+ urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp;
urlComponents.dwSchemeLength = 0;
urlComponents.lpszHostName = lpwhs->lpszHostName;
urlComponents.dwHostNameLength = 0;
(GetLastError() != ERROR_INSUFFICIENT_BUFFER))
return FALSE;
- url_length++; /* for nul terminating character */
- orig_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR));
+ orig_url = HeapAlloc(GetProcessHeap(), 0, url_length);
+ /* convert from bytes to characters */
+ url_length = url_length / sizeof(WCHAR) - 1;
if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length))
{
HeapFree(GetProcessHeap(), 0, orig_url);
HeapFree(GetProcessHeap(), 0, combined_url);
return FALSE;
}
+
HeapFree(GetProcessHeap(), 0, combined_url);
if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) &&
#if 0
/*
- * This upsets redirects to binary files on sourceforge.net
+ * This upsets redirects to binary files on sourceforge.net
* and gives an html page instead of the target file
* Examination of the HTTP request sent by native wininet.dll
* reveals that it doesn't send a referrer in that case.
*/
/* consider the current host as the referrer */
- if (NULL != lpwhs->lpszServerName && strlenW(lpwhs->lpszServerName))
+ if (lpwhs->lpszServerName && *lpwhs->lpszServerName)
HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpwhs->lpszServerName,
HTTP_ADDHDR_FLAG_REQ|HTTP_ADDREQ_FLAG_REPLACE|
HTTP_ADDHDR_FLAG_ADD_IF_NEW);
#endif
-
- HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);
- lpwhs->lpszServerName = WININET_strdupW(hostName);
+
HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName);
if (urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT &&
- urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT)
+ urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT)
{
int len;
- static WCHAR fmt[] = {'%','s',':','%','i',0};
+ static const WCHAR fmt[] = {'%','s',':','%','i',0};
len = lstrlenW(hostName);
len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */
lpwhs->lpszHostName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
-
HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName);
lpwhs->lpszUserName = NULL;
if (userName[0])
lpwhs->lpszUserName = WININET_strdupW(userName);
- lpwhs->nServerPort = urlComponents.nPort;
- INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
- INTERNET_STATUS_RESOLVING_NAME,
- lpwhs->lpszServerName,
- strlenW(lpwhs->lpszServerName)+1);
-
- if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort,
- &lpwhs->socketAddress))
+ if (!using_proxy)
{
- INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED);
- return FALSE;
- }
+ HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);
+ lpwhs->lpszServerName = WININET_strdupW(hostName);
+ lpwhs->nServerPort = urlComponents.nPort;
- inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr,
- szaddr, sizeof(szaddr));
- INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
- INTERNET_STATUS_NAME_RESOLVED,
- szaddr, strlen(szaddr)+1);
+ if (!HTTP_ResolveName(lpwhr))
+ return FALSE;
- NETCON_close(&lpwhr->netConnection);
+ NETCON_close(&lpwhr->netConnection);
- if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE))
- return FALSE;
+ if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE))
+ return FALSE;
+ }
+ else
+ TRACE("Redirect through proxy\n");
}
HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);
lpwhr->lpszPath=NULL;
- if (strlenW(path))
+ if (*path)
{
DWORD needed = 0;
HRESULT rc;
URL_ESCAPE_SPACES_ONLY);
if (rc)
{
- ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(path),rc);
+ ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc);
strcpyW(lpwhr->lpszPath,path);
}
}
- return HTTP_HttpSendRequestW(lpwhr, lpszHeaders, dwHeaderLength, lpOptional,
- dwOptionalLength, dwContentLength, TRUE);
+ /* Remove custom content-type/length headers on redirects. */
+ index = HTTP_GetCustomHeaderIndex(lpwhr, szContentType, 0, TRUE);
+ if (0 <= index)
+ HTTP_DeleteCustomHeader(lpwhr, index);
+ index = HTTP_GetCustomHeaderIndex(lpwhr, szContentLength, 0, TRUE);
+ if (0 <= index)
+ HTTP_DeleteCustomHeader(lpwhr, index);
+
+ return TRUE;
}
/***********************************************************************
BOOL ret;
static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0};
static const WCHAR szFormat[] = {'%','s',':','%','d',0};
- LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent;
+ LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession;
TRACE("\n");
lpszPath = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( lpwhs->lpszHostName ) + 13)*sizeof(WCHAR) );
sprintfW( lpszPath, szFormat, lpwhs->lpszHostName, lpwhs->nHostPort );
- requestString = HTTP_BuildHeaderRequestString( lpwhr, szConnect, lpszPath, FALSE );
+ requestString = HTTP_BuildHeaderRequestString( lpwhr, szConnect, lpszPath, g_szHttp1_1 );
HeapFree( GetProcessHeap(), 0, lpszPath );
len = WideCharToMultiByte( CP_ACP, 0, requestString, -1,
if (!ret || cnt < 0)
return FALSE;
- responseLen = HTTP_GetResponseHeaders( lpwhr );
+ responseLen = HTTP_GetResponseHeaders( lpwhr, TRUE );
if (!responseLen)
return FALSE;
BOOL bSuccess = FALSE;
LPWSTR requestString = NULL;
INT responseLen;
- BOOL loop_next = FALSE;
+ BOOL loop_next;
INTERNET_ASYNC_RESULT iar;
- LPHTTPHEADERW Host;
+ static const WCHAR szClose[] = { 'C','l','o','s','e',0 };
+ static const WCHAR szPost[] = { 'P','O','S','T',0 };
+ static const WCHAR szContentLength[] =
+ { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 };
+ WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ];
TRACE("--> %p\n", lpwhr);
/* Clear any error information */
INTERNET_SetLastError(0);
- HTTP_FixVerb(lpwhr);
+ /* if the verb is NULL default to GET */
+ if (!lpwhr->lpszVerb)
+ lpwhr->lpszVerb = WININET_strdupW(szGET);
- /* if we are using optional stuff, we must add the fixed header of that option length */
- if (dwContentLength > 0)
+ if (dwContentLength || !strcmpW(lpwhr->lpszVerb, szPost))
{
- static const WCHAR szContentLength[] = {
- 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0};
- WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \n\r */ + 20 /* int */ ];
sprintfW(contentLengthStr, szContentLength, dwContentLength);
- HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD);
+ HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW);
+ }
+ if (lpwhr->lpHttpSession->lpAppInfo->lpszAgent)
+ {
+ WCHAR *agent_header;
+ static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0};
+ int len;
+
+ len = strlenW(lpwhr->lpHttpSession->lpAppInfo->lpszAgent) + strlenW(user_agent);
+ agent_header = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+ sprintfW(agent_header, user_agent, lpwhr->lpHttpSession->lpAppInfo->lpszAgent);
+
+ HTTP_HttpAddRequestHeadersW(lpwhr, agent_header, strlenW(agent_header), HTTP_ADDREQ_FLAG_ADD_IF_NEW);
+ HeapFree(GetProcessHeap(), 0, agent_header);
}
- Host = HTTP_GetHeader(lpwhr,szHost);
do
{
DWORD len;
char *ascii_req;
- TRACE("Going to url %s %s\n", debugstr_w(Host->lpszValue), debugstr_w(lpwhr->lpszPath));
loop_next = FALSE;
+ /* like native, just in case the caller forgot to call InternetReadFile
+ * for all the data */
+ HTTP_DrainContent(lpwhr);
+ lpwhr->dwContentRead = 0;
+
+ if (TRACE_ON(wininet))
+ {
+ LPHTTPHEADERW Host = HTTP_GetHeader(lpwhr,szHost);
+ TRACE("Going to url %s %s\n", debugstr_w(Host->lpszValue), debugstr_w(lpwhr->lpszPath));
+ }
+
HTTP_FixURL(lpwhr);
+ HTTP_ProcessHeader(lpwhr, szConnection,
+ lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose,
+ HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE);
+
+ HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization);
+ HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization);
/* add the headers the caller supplied */
if( lpszHeaders && dwHeaderLength )
HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE);
}
- /* if there's a proxy username and password, add it to the headers */
- HTTP_AddProxyInfo(lpwhr);
-
- requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE);
+ if (lpwhr->lpHttpSession->lpAppInfo->lpszProxy && lpwhr->lpHttpSession->lpAppInfo->lpszProxy[0])
+ {
+ WCHAR *url = HTTP_BuildProxyRequestUrl(lpwhr);
+ requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, url, lpwhr->lpszVersion);
+ HeapFree(GetProcessHeap(), 0, url);
+ }
+ else
+ requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion);
+
TRACE("Request header -> %s\n", debugstr_w(requestString) );
/* Send the request and store the results */
if (bEndRequest)
{
+ DWORD dwBufferSize;
+ DWORD dwStatusCode;
+ WCHAR encoding[20];
+ static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0};
+
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
-
+
if (cnt < 0)
goto lend;
-
- responseLen = HTTP_GetResponseHeaders(lpwhr);
+
+ responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE);
if (responseLen)
bSuccess = TRUE;
-
+
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen,
sizeof(DWORD));
- HTTP_ProcessHeaders(lpwhr);
+ HTTP_ProcessCookies(lpwhr);
+
+ dwBufferSize = sizeof(lpwhr->dwContentLength);
+ if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH,
+ &lpwhr->dwContentLength,&dwBufferSize,NULL))
+ lpwhr->dwContentLength = -1;
+
+ if (lpwhr->dwContentLength == 0)
+ HTTP_FinishedReading(lpwhr);
+
+ /* Correct the case where both a Content-Length and Transfer-encoding = chunked are set */
+
+ dwBufferSize = sizeof(encoding);
+ if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &dwBufferSize, NULL) &&
+ !strcmpiW(encoding, szChunked))
+ {
+ lpwhr->dwContentLength = -1;
+ }
+
+ dwBufferSize = sizeof(dwStatusCode);
+ if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,
+ &dwStatusCode,&dwBufferSize,NULL))
+ dwStatusCode = 0;
+
+ if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess)
+ {
+ WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH];
+ dwBufferSize=sizeof(szNewLocation);
+ if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) &&
+ HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL))
+ {
+ HTTP_DrainContent(lpwhr);
+ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+ INTERNET_STATUS_REDIRECT, szNewLocation,
+ dwBufferSize);
+ bSuccess = HTTP_HandleRedirect(lpwhr, szNewLocation);
+ if (bSuccess)
+ {
+ HeapFree(GetProcessHeap(), 0, requestString);
+ loop_next = TRUE;
+ }
+ }
+ }
+ if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTH) && bSuccess)
+ {
+ WCHAR szAuthValue[2048];
+ dwBufferSize=2048;
+ if (dwStatusCode == HTTP_STATUS_DENIED)
+ {
+ DWORD dwIndex = 0;
+ while (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_WWW_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex))
+ {
+ if (HTTP_DoAuthorization(lpwhr, szAuthValue,
+ &lpwhr->pAuthInfo,
+ lpwhr->lpHttpSession->lpszUserName,
+ lpwhr->lpHttpSession->lpszPassword))
+ {
+ loop_next = TRUE;
+ break;
+ }
+ }
+ }
+ if (dwStatusCode == HTTP_STATUS_PROXY_AUTH_REQ)
+ {
+ DWORD dwIndex = 0;
+ while (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_PROXY_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex))
+ {
+ if (HTTP_DoAuthorization(lpwhr, szAuthValue,
+ &lpwhr->pProxyAuthInfo,
+ lpwhr->lpHttpSession->lpAppInfo->lpszProxyUsername,
+ lpwhr->lpHttpSession->lpAppInfo->lpszProxyPassword))
+ {
+ loop_next = TRUE;
+ break;
+ }
+ }
+ }
+ }
}
else
bSuccess = TRUE;
}
while (loop_next);
-lend:
-
- HeapFree(GetProcessHeap(), 0, requestString);
+ /* FIXME: Better check, when we have to create the cache file */
+ if(bSuccess && (lpwhr->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) {
+ WCHAR url[INTERNET_MAX_URL_LENGTH];
+ WCHAR cacheFileName[MAX_PATH+1];
+ BOOL b;
- /* TODO: send notification for P3P header */
+ b = HTTP_GetRequestURL(lpwhr, url);
+ if(!b) {
+ WARN("Could not get URL\n");
+ goto lend;
+ }
- if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess && bEndRequest)
- {
- DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0;
- if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) &&
- (dwCode==302 || dwCode==301))
- {
- WCHAR szNewLocation[2048];
- DWORD dwBufferSize=2048;
- dwIndex=0;
- if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex))
- {
- INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
- INTERNET_STATUS_REDIRECT, szNewLocation,
- dwBufferSize);
- return HTTP_HandleRedirect(lpwhr, szNewLocation, lpszHeaders,
- dwHeaderLength, lpOptional, dwOptionalLength,
- dwContentLength);
+ b = CreateUrlCacheEntryW(url, lpwhr->dwContentLength > 0 ? lpwhr->dwContentLength : 0, NULL, cacheFileName, 0);
+ if(b) {
+ lpwhr->lpszCacheFile = WININET_strdupW(cacheFileName);
+ lpwhr->hCacheFile = CreateFileW(lpwhr->lpszCacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
+ NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ if(lpwhr->hCacheFile == INVALID_HANDLE_VALUE) {
+ WARN("Could not create file: %u\n", GetLastError());
+ lpwhr->hCacheFile = NULL;
}
+ }else {
+ WARN("Could not create cache entry: %08x\n", GetLastError());
}
}
+lend:
+
+ HeapFree(GetProcessHeap(), 0, requestString);
+
+ /* TODO: send notification for P3P header */
- iar.dwResult = (DWORD)bSuccess;
+ iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet;
iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError();
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
return bSuccess;
}
+/***********************************************************************
+ * HTTPSESSION_Destroy (internal)
+ *
+ * Deallocate session handle
+ *
+ */
+static void HTTPSESSION_Destroy(WININETHANDLEHEADER *hdr)
+{
+ LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) hdr;
+
+ TRACE("%p\n", lpwhs);
+
+ WININET_Release(&lpwhs->lpAppInfo->hdr);
+
+ HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName);
+ HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);
+ HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword);
+ HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName);
+ HeapFree(GetProcessHeap(), 0, lpwhs);
+}
+
+static DWORD HTTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
+{
+ switch(option) {
+ case INTERNET_OPTION_HANDLE_TYPE:
+ TRACE("INTERNET_OPTION_HANDLE_TYPE\n");
+
+ if (*size < sizeof(ULONG))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *size = sizeof(DWORD);
+ *(DWORD*)buffer = INTERNET_HANDLE_TYPE_CONNECT_HTTP;
+ return ERROR_SUCCESS;
+ }
+
+ FIXME("Not implemented option %d\n", option);
+ return ERROR_INTERNET_INVALID_OPTION;
+}
+
+static const HANDLEHEADERVtbl HTTPSESSIONVtbl = {
+ HTTPSESSION_Destroy,
+ NULL,
+ HTTPSESSION_QueryOption,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
+};
+
/***********************************************************************
* HTTP_Connect (internal)
*/
HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
INTERNET_PORT nServerPort, LPCWSTR lpszUserName,
- LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext,
+ LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext,
DWORD dwInternalFlags)
{
- BOOL bSuccess = FALSE;
LPWININETHTTPSESSIONW lpwhs = NULL;
HINTERNET handle = NULL;
TRACE("-->\n");
- assert( hIC->hdr.htype == WH_HINIT );
+ if (!lpszServerName || !lpszServerName[0])
+ {
+ INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
+ goto lerror;
+ }
- hIC->hdr.dwContext = dwContext;
+ assert( hIC->hdr.htype == WH_HINIT );
lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPSESSIONW));
if (NULL == lpwhs)
*/
lpwhs->hdr.htype = WH_HHTTPSESSION;
- lpwhs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr );
+ lpwhs->hdr.vtbl = &HTTPSESSIONVtbl;
lpwhs->hdr.dwFlags = dwFlags;
lpwhs->hdr.dwContext = dwContext;
- lpwhs->hdr.dwInternalFlags = dwInternalFlags;
- lpwhs->hdr.dwRefCount = 1;
- lpwhs->hdr.destroy = HTTP_CloseHTTPSessionHandle;
+ lpwhs->hdr.dwInternalFlags = dwInternalFlags | (hIC->hdr.dwInternalFlags & INET_CALLBACKW);
+ lpwhs->hdr.refs = 1;
lpwhs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB;
+ WININET_AddRef( &hIC->hdr );
+ lpwhs->lpAppInfo = hIC;
+ list_add_head( &hIC->hdr.children, &lpwhs->hdr.entry );
+
handle = WININET_AllocHandle( &lpwhs->hdr );
if (NULL == handle)
{
}
if (lpszUserName && lpszUserName[0])
lpwhs->lpszUserName = WININET_strdupW(lpszUserName);
+ if (lpszPassword && lpszPassword[0])
+ lpwhs->lpszPassword = WININET_strdupW(lpszPassword);
lpwhs->nServerPort = nServerPort;
lpwhs->nHostPort = nServerPort;
sizeof(handle));
}
- bSuccess = TRUE;
-
lerror:
if( lpwhs )
WININET_Release( &lpwhs->hdr );
goto lend;
}
- lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent;
+ if (NETCON_connected(&lpwhr->netConnection))
+ {
+ bSuccess = TRUE;
+ goto lend;
+ }
+
+ lpwhs = lpwhr->lpHttpSession;
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
+ hIC = lpwhs->lpAppInfo;
inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr,
szaddr, sizeof(szaddr));
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
* TRUE on success
* FALSE on error
*/
-static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr)
+static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear)
{
INT cbreaks = 0;
WCHAR buffer[MAX_REPLY_LEN];
BOOL bSuccess = FALSE;
INT rc = 0;
static const WCHAR szCrLf[] = {'\r','\n',0};
+ static const WCHAR szHundred[] = {'1','0','0',0};
char bufferA[MAX_REPLY_LEN];
LPWSTR status_code, status_text;
DWORD cchMaxRawHeaders = 1024;
TRACE("-->\n");
/* clear old response headers (eg. from a redirect response) */
- HTTP_clear_response_headers( lpwhr );
+ if (clear) HTTP_clear_response_headers( lpwhr );
if (!NETCON_connected(&lpwhr->netConnection))
goto lend;
- /*
- * HACK peek at the buffer
- */
-#if 0
- /* This is Wine code, we don't support MSG_PEEK yet so we have to do it
- a bit different */
- NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc);
-#endif
+ do {
+ /*
+ * HACK peek at the buffer
+ */
+ buflen = MAX_REPLY_LEN;
+ NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc);
- /*
- * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code.
- */
- buflen = MAX_REPLY_LEN;
- memset(buffer, 0, MAX_REPLY_LEN);
- if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen))
- goto lend;
-#if 1
- rc = buflen;
-#endif
- MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN );
+ /*
+ * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code.
+ */
+ memset(buffer, 0, MAX_REPLY_LEN);
+ if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen))
+ goto lend;
+ MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN );
- /* regenerate raw headers */
- while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders)
- {
- cchMaxRawHeaders *= 2;
- lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));
- }
- memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR));
- cchRawHeaders += (buflen-1);
- memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf));
- cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1;
- lpszRawHeaders[cchRawHeaders] = '\0';
+ /* split the version from the status code */
+ status_code = strchrW( buffer, ' ' );
+ if( !status_code )
+ goto lend;
+ *status_code++=0;
- /* split the version from the status code */
- status_code = strchrW( buffer, ' ' );
- if( !status_code )
- goto lend;
- *status_code++=0;
+ /* split the status code from the status text */
+ status_text = strchrW( status_code, ' ' );
+ if( !status_text )
+ goto lend;
+ *status_text++=0;
- /* split the status code from the status text */
- status_text = strchrW( status_code, ' ' );
- if( !status_text )
- goto lend;
- *status_text++=0;
+ TRACE("version [%s] status code [%s] status text [%s]\n",
+ debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) );
- TRACE("version [%s] status code [%s] status text [%s]\n",
- debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) );
+ } while (!strcmpW(status_code, szHundred)); /* ignore "100 Continue" responses */
+ /* Add status code */
HTTP_ProcessHeader(lpwhr, szStatus, status_code,
HTTP_ADDHDR_FLAG_REPLACE);
lpwhr->lpszVersion= WININET_strdupW(buffer);
lpwhr->lpszStatusText = WININET_strdupW(status_text);
+ /* Restore the spaces */
+ *(status_code-1) = ' ';
+ *(status_text-1) = ' ';
+
+ /* regenerate raw headers */
+ while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders)
+ {
+ cchMaxRawHeaders *= 2;
+ lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));
+ }
+ memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR));
+ cchRawHeaders += (buflen-1);
+ memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf));
+ cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1;
+ lpszRawHeaders[cchRawHeaders] = '\0';
+
/* Parse each response line */
do
{
{
LPWSTR * pFieldAndValue;
-#if 1
- rc += buflen;
-#endif
TRACE("got line %s, now interpreting\n", debugstr_a(bufferA));
MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN );
if (!pFieldAndValue)
break;
- HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1],
+ HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1],
HTTP_ADDREQ_FLAG_ADD );
HTTP_FreeTokens(pFieldAndValue);
*
*/
-#define COALESCEFLASG (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON)
+#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON)
static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR value, DWORD dwModifier)
{
LPHTTPHEADERW lphttpHdr = NULL;
BOOL bSuccess = FALSE;
INT index = -1;
- static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 };
BOOL request_only = dwModifier & HTTP_ADDHDR_FLAG_REQ;
- TRACE("--> %s: %s - 0x%08lx\n", debugstr_w(field), debugstr_w(value), dwModifier);
-
- /* Don't let applications add Connection header to request */
- if (strcmpW(szConnection,field)==0 && (dwModifier & HTTP_ADDHDR_FLAG_REQ))
- {
- return FALSE;
- }
+ TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier);
/* REPLACE wins out over ADD */
if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE)
dwModifier &= ~HTTP_ADDHDR_FLAG_ADD;
-
+
if (dwModifier & HTTP_ADDHDR_FLAG_ADD)
index = -1;
else
return HTTP_InsertCustomHeader(lpwhr, &hdr);
}
+ /* no value to delete */
+ else return TRUE;
if (dwModifier & HTTP_ADDHDR_FLAG_REQ)
lphttpHdr->wFlags |= HDR_ISREQUEST;
return TRUE;
}
- else if (dwModifier & COALESCEFLASG)
+ else if (dwModifier & COALESCEFLAGS)
{
LPWSTR lpsztmp;
WCHAR ch = 0;
len = origlen + valuelen + ((ch > 0) ? 2 : 0);
- lpsztmp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
+ lpsztmp = HeapReAlloc(GetProcessHeap(), 0, lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
if (lpsztmp)
{
lphttpHdr->lpszValue = lpsztmp;
/***********************************************************************
- * HTTP_CloseConnection (internal)
- *
- * Close socket connection
- *
- */
-static VOID HTTP_CloseConnection(LPWININETHTTPREQW lpwhr)
-{
- LPWININETHTTPSESSIONW lpwhs = NULL;
- LPWININETAPPINFOW hIC = NULL;
-
- TRACE("%p\n",lpwhr);
-
- lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
-
- INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
- INTERNET_STATUS_CLOSING_CONNECTION, 0, 0);
-
- if (NETCON_connected(&lpwhr->netConnection))
- {
- NETCON_close(&lpwhr->netConnection);
- }
-
- INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
- INTERNET_STATUS_CONNECTION_CLOSED, 0, 0);
-}
-
-
-/***********************************************************************
- * HTTP_CloseHTTPRequestHandle (internal)
+ * HTTP_FinishedReading (internal)
*
- * Deallocate request handle
+ * Called when all content from server has been read by client.
*
*/
-static void HTTP_CloseHTTPRequestHandle(LPWININETHANDLEHEADER hdr)
+BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr)
{
- DWORD i;
- LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr;
+ WCHAR szVersion[10];
+ DWORD dwBufferSize = sizeof(szVersion);
TRACE("\n");
- if (NETCON_connected(&lpwhr->netConnection))
- HTTP_CloseConnection(lpwhr);
-
- HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);
- HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb);
- HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders);
- HeapFree(GetProcessHeap(), 0, lpwhr->lpszVersion);
- HeapFree(GetProcessHeap(), 0, lpwhr->lpszStatusText);
-
- for (i = 0; i < lpwhr->nCustHeaders; i++)
+ /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that
+ * the connection is keep-alive by default */
+ if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion,
+ &dwBufferSize, NULL) ||
+ strcmpiW(szVersion, g_szHttp1_1))
{
- HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszField);
- HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszValue);
+ WCHAR szConnectionResponse[20];
+ dwBufferSize = sizeof(szConnectionResponse);
+ if ((!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) ||
+ strcmpiW(szConnectionResponse, szKeepAlive)) &&
+ (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) ||
+ strcmpiW(szConnectionResponse, szKeepAlive)))
+ {
+ HTTPREQ_CloseConnection(&lpwhr->hdr);
+ }
}
- HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders);
- HeapFree(GetProcessHeap(), 0, lpwhr);
-}
-
-
-/***********************************************************************
- * HTTP_CloseHTTPSessionHandle (internal)
- *
- * Deallocate session handle
- *
- */
-static void HTTP_CloseHTTPSessionHandle(LPWININETHANDLEHEADER hdr)
-{
- LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) hdr;
-
- TRACE("%p\n", lpwhs);
+ /* FIXME: store data in the URL cache here */
- HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName);
- HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);
- HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName);
- HeapFree(GetProcessHeap(), 0, lpwhs);
+ return TRUE;
}
* Return index of custom header from header array
*
*/
-static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField,int requested_index, BOOL request_only)
+static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField,
+ int requested_index, BOOL request_only)
{
DWORD index;
for (index = 0; index < lpwhr->nCustHeaders; index++)
{
- if (!strcmpiW(lpwhr->pCustHeaders[index].lpszField, lpszField))
- {
- if ((request_only &&
- !(lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))||
- (!request_only &&
- (lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST)))
+ if (strcmpiW(lpwhr->pCustHeaders[index].lpszField, lpszField))
+ continue;
+
+ if (request_only && !(lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))
+ continue;
+
+ if (!request_only && (lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))
continue;
if (requested_index == 0)
- break;
- else
- requested_index --;
- }
+ break;
+ requested_index --;
}
if (index >= lpwhr->nCustHeaders)
index = -1;
- TRACE("Return: %ld\n", index);
+ TRACE("Return: %d\n", index);
return index;
}
return TRUE;
}
+
+/***********************************************************************
+ * HTTP_VerifyValidHeader (internal)
+ *
+ * Verify the given header is not invalid for the given http request
+ *
+ */
+static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field)
+{
+ /* Accept-Encoding is stripped from HTTP/1.0 requests. It is invalid */
+ if (!strcmpW(lpwhr->lpszVersion, g_szHttp1_0) && !strcmpiW(field, szAccept_Encoding))
+ return FALSE;
+
+ return TRUE;
+}
+
/***********************************************************************
* IsHostInProxyBypassList (@)
*
*/
BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length)
{
- FIXME("STUB: flags=%ld host=%s length=%ld\n",flags,szHost,length);
+ FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length);
return FALSE;
}
projects / reactos.git / blobdiff