reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 22:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wininet: Only set the content length header if it's not explicitly set by the user.

Browse Source
This commit is contained in:
Hans Leidekker 2014-05-26 14:09:10 +02:00 committed by Alexandre Julliard
parent 2b76dfba97
commit d6a59f755e
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wininet/http.c
View File

@ -4851,7 +4851,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
if (dwContentLength || strcmpW(request->verb, szGET))
{
sprintfW(contentLengthStr, szContentLength, dwContentLength);
HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_REPLACE);
HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW);
request->bytesToWrite = dwContentLength;
}
if (request->session->appInfo->agent)

33
dlls/wininet/tests/http.c
View File

@ -2654,10 +2654,10 @@ static void test_header_handling_order(int port)
{
static const char authorization[] = "Authorization: Basic dXNlcjpwd2Q=";
static const char connection[] = "Connection: Close";
static const char *types[2] = { "*", NULL };
char data[32];
HINTERNET session, connect, request;
DWORD size, status;
DWORD size, status, data_len;
BOOL ret;
session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
@ -2693,6 +2693,10 @@ static void test_header_handling_order(int port)
ok(status == 200 || status == 400 /* IE6 */, "got status %u, expected 200 or 400\n", status);
InternetCloseHandle(request);
InternetCloseHandle(connect);
connect = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);
ok(connect != NULL, "InternetConnect failed\n");
request = HttpOpenRequestA(connect, "POST", "/test7", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0);
ok(request != NULL, "HttpOpenRequest failed\n");
@ -2707,7 +2711,30 @@ static void test_header_handling_order(int port)
size = sizeof(status);
ret = HttpQueryInfoA( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL );
ok(ret, "HttpQueryInfo failed\n");
ok(status == 200 || status == 400 /* IE6 */, "got status %u, expected 200 or 400\n", status);
ok(status == 200, "got status %u, expected 200\n", status);
InternetCloseHandle(request);
InternetCloseHandle(connect);
connect = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);
ok(connect != NULL, "InternetConnect failed\n");
request = HttpOpenRequestA(connect, "POST", "/test7b", NULL, NULL, types, 0, 0);
ok(request != NULL, "HttpOpenRequest failed\n");
ret = HttpAddRequestHeadersA(request, "Content-Length: 100\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW);
ok(ret, "HttpAddRequestHeaders failed\n");
data_len = sizeof(data);
memset(data, 'a', sizeof(data));
ret = HttpSendRequestA(request, connection, ~0u, data, data_len);
ok(ret, "HttpSendRequest failed\n");
status = 0;
size = sizeof(status);
ret = HttpQueryInfoA( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL );
ok(ret, "HttpQueryInfo failed\n");
ok(status == 200, "got status %u, expected 200\n", status);
InternetCloseHandle(request);
InternetCloseHandle(connect);