ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the processing of the lpszHeaders field in HttpSendRequest.

This commit is contained in:
Mike McCormack 2004-08-10 23:41:35 +00:00 committed by Alexandre Julliard
parent 70d400adf6
commit 08c6c698dd
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/wininet/http.c
View File

@ -170,9 +170,18 @@ static BOOL WINAPI HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr,
LPWSTR buffer; LPWSTR buffer;
WCHAR value[MAX_FIELD_VALUE_LEN], field[MAX_FIELD_LEN]; WCHAR value[MAX_FIELD_VALUE_LEN], field[MAX_FIELD_LEN];
BOOL bSuccess = FALSE; BOOL bSuccess = FALSE;
DWORD len;
TRACE("copying header: %s\n", debugstr_w(lpszHeader)); TRACE("copying header: %s\n", debugstr_w(lpszHeader));
buffer = WININET_strdupW(lpszHeader);
if( dwHeaderLength == ~0UL )
len = strlenW(lpszHeader);
else
len = dwHeaderLength;
buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR)*(len+1) );
strncpyW( buffer, lpszHeader, len );
buffer[len]=0;
lpszStart = buffer; lpszStart = buffer;
do do
@ -1512,7 +1521,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
static const WCHAR szSetCookie[] = {'S','e','t','-','C','o','o','k','i','e',0 }; static const WCHAR szSetCookie[] = {'S','e','t','-','C','o','o','k','i','e',0 };
static const WCHAR szColon[] = { ':',' ',0 }; static const WCHAR szColon[] = { ':',' ',0 };
LPCWSTR *req; LPCWSTR *req;
LPWSTR p, szCookedHeaders = NULL; LPWSTR p;
DWORD len, n; DWORD len, n;
char *ascii_req; char *ascii_req;
@ -1536,17 +1545,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
} }
/* add the headers the caller supplied */ /* add the headers the caller supplied */
if( lpszHeaders ) if( lpszHeaders && dwHeaderLength )
{ {
len = strlenW(lpszHeaders)+3; HTTP_HttpAddRequestHeadersW(lpwhr, lpszHeaders, dwHeaderLength,
szCookedHeaders = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR)*len ); HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE);
strcpyW( szCookedHeaders, lpszHeaders );
/* make sure there's exactly one linebreak at the end of the string */
p = &szCookedHeaders[len-4];
while( (szCookedHeaders <= p) && ((*p == '\n') || (*p == '\r')) )
p--;
p[1] = 0;
} }
/* allocate space for an array of all the string pointers to be added */ /* allocate space for an array of all the string pointers to be added */
@ -1559,11 +1561,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
req[n++] = szSpace; req[n++] = szSpace;
req[n++] = lpwhr->lpszPath; req[n++] = lpwhr->lpszPath;
req[n++] = HTTPHEADER; req[n++] = HTTPHEADER;
if( szCookedHeaders )
{
req[n++] = szcrlf;
req[n++] = szCookedHeaders;
}
/* Append standard request headers */ /* Append standard request headers */
for (i = 0; i <= HTTP_QUERY_MAX; i++) for (i = 0; i <= HTTP_QUERY_MAX; i++)
@ -1609,7 +1606,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
req[n] = NULL; req[n] = NULL;
requestString = HTTP_build_req( req, 4 ); requestString = HTTP_build_req( req, 4 );
HeapFree( GetProcessHeap(), 0, req ); HeapFree( GetProcessHeap(), 0, req );
HeapFree( GetProcessHeap(), 0, szCookedHeaders );
/* /*
* Set (header) termination string for request * Set (header) termination string for request