[PATCH 0/4] MR622: winhttp: Allow custom headers to be separated by any sequence of \r and \n.
Patches 3 and 4 are simply extra attempts to improve code, and can be discarded if deemed undesirable.
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/winhttp/tests/winhttp.c | 76 +++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 18 deletions(-)
diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3c615656373..4e03a3752fd 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2529,6 +2529,18 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, page1, sizeof page1 - 1, 0); last_request = 1; } + if (strstr(buffer, "POST /bad_headers")) + { + ok(!!strstr(buffer, "Content-Type: text/html\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + todo_wine ok(!!strstr(buffer, "Test1: Value1\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + todo_wine ok(!!strstr(buffer, "Test2: Value2\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test3: Value3\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test4: Value4\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test5: Value5\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test6: Value6\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Cookie: 111\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + send(c, okmsg, sizeof(okmsg) - 1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -3597,37 +3609,65 @@ static void test_bad_header( int port ) WCHAR buffer[32]; HINTERNET ses, con, req; DWORD index, len; + unsigned int i; BOOL ret;
+ static const WCHAR bad_headers[] = + L"Content-Type: text/html\n\r" + L"Test1: Value1\n" + L"Test2: Value2\n\n\n" + L"Test3: Value3\r\r\r" + L"Test4: Value4\r\n\r\n" + L"Cookie: 111"; + + static const struct + { + const WCHAR *header; + const WCHAR *value; + } + header_tests[] = + { + {L"Content-Type", L"text/html"}, + {L"Test1", L"Value1"}, + {L"Test2", L"Value2"}, + {L"Test3", L"Value3"}, + {L"Test4", L"Value4"}, + {L"Cookie", L"111"}, + }; + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %lu\n", GetLastError() );
con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %lu\n", GetLastError() );
- req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, L"POST", L"/bad_headers", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %lu\n", GetLastError() );
- ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\rContent-Length:6\rCookie:111", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ret = WinHttpAddRequestHeaders( req, bad_headers, ~0u, WINHTTP_ADDREQ_FLAG_ADD ); ok( ret, "failed to add header %lu\n", GetLastError() );
- index = 0; - buffer[0] = 0; - len = sizeof(buffer); - ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - L"Content-Type", buffer, &len, &index ); - ok( ret, "failed to query headers %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %lu\n", index ); + for (i = 0; i < ARRAY_SIZE(header_tests); ++i) + { + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + header_tests[i].header, buffer, &len, &index ); + todo_wine_if (i >= 1 && i <= 3) + { + ok( ret, "header %s: failed to query headers %lu\n", debugstr_w(header_tests[i].header), GetLastError() ); + ok( !wcscmp( buffer, header_tests[i].value ), "header %s: got %s\n", + debugstr_w(header_tests[i].header), debugstr_w(buffer) ); + ok( index == 1, "header %s: index = %lu\n", debugstr_w(header_tests[i].header), index ); + } + }
- index = 0; - buffer[0] = 0; - len = sizeof(buffer); - ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - L"Cookie", buffer, &len, &index ); - ok( ret, "failed to query headers %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, L"111" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %lu\n", index ); + ret = WinHttpSendRequest( req, L"Test5: Value5\rTest6: Value6", ~0u, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %lu\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %lu\n", GetLastError() );
WinHttpCloseHandle( req ); WinHttpCloseHandle( con );
From: Zebediah Figura zfigura@codeweavers.com
This fixes connecting to multiplayer game servers in Riptide GP: Renegade. --- dlls/winhttp/request.c | 26 +++++++------------------- dlls/winhttp/tests/winhttp.c | 15 ++++++--------- 2 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ece4e34f0b8..2331c30b58c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -467,26 +467,14 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = buffer; do { - q = p; - while (*q) - { - if (q[0] == '\n' && q[1] == '\r') - { - q[0] = '\r'; - q[1] = '\n'; - } - if (q[0] == '\r') break; - q++; - } if (!*p) break; - if (*q == '\r') - { - *q = 0; - if (q[1] == '\n') - q += 2; /* jump over \r\n */ - else - q++; /* jump over \r */ - } + + for (q = p; *q && *q != '\r' && *q != '\n'; ++q) + ; + *q++ = 0; + while (*q == '\r' || *q == '\n') + ++q; + if ((header = parse_header( p ))) { ret = process_header( request, header->field, header->value, flags, TRUE ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4e03a3752fd..17720611547 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2532,8 +2532,8 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "POST /bad_headers")) { ok(!!strstr(buffer, "Content-Type: text/html\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); - todo_wine ok(!!strstr(buffer, "Test1: Value1\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); - todo_wine ok(!!strstr(buffer, "Test2: Value2\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test1: Value1\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test2: Value2\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test3: Value3\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test4: Value4\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test5: Value5\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); @@ -3654,13 +3654,10 @@ static void test_bad_header( int port ) len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, header_tests[i].header, buffer, &len, &index ); - todo_wine_if (i >= 1 && i <= 3) - { - ok( ret, "header %s: failed to query headers %lu\n", debugstr_w(header_tests[i].header), GetLastError() ); - ok( !wcscmp( buffer, header_tests[i].value ), "header %s: got %s\n", - debugstr_w(header_tests[i].header), debugstr_w(buffer) ); - ok( index == 1, "header %s: index = %lu\n", debugstr_w(header_tests[i].header), index ); - } + ok( ret, "header %s: failed to query headers %lu\n", debugstr_w(header_tests[i].header), GetLastError() ); + ok( !wcscmp( buffer, header_tests[i].value ), "header %s: got %s\n", + debugstr_w(header_tests[i].header), debugstr_w(buffer) ); + ok( index == 1, "header %s: index = %lu\n", debugstr_w(header_tests[i].header), index ); }
ret = WinHttpSendRequest( req, L"Test5: Value5\rTest6: Value6", ~0u, NULL, 0, 0, 0 );
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/winhttp/request.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2331c30b58c..e846676041e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -286,7 +286,7 @@ static BOOL valid_token_char( WCHAR c ) } }
-static struct header *parse_header( const WCHAR *string ) +static struct header *parse_header( const WCHAR *string, size_t string_len ) { const WCHAR *p, *q; struct header *header; @@ -324,7 +324,7 @@ static struct header *parse_header( const WCHAR *string )
q++; /* skip past colon */ while (*q == ' ') q++; - len = lstrlenW( q ); + len = (string + string_len) - q;
if (!(header->value = malloc( (len + 1) * sizeof(WCHAR) ))) { @@ -467,15 +467,17 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = buffer; do { + const WCHAR *end; + if (!*p) break;
for (q = p; *q && *q != '\r' && *q != '\n'; ++q) ; - *q++ = 0; + end = q; while (*q == '\r' || *q == '\n') ++q;
- if ((header = parse_header( p ))) + if ((header = parse_header( p, end - p ))) { ret = process_header( request, header->field, header->value, flags, TRUE ); free_header( header ); @@ -2559,6 +2561,7 @@ static DWORD read_reply( struct request *request ) for (;;) { struct header *header; + int lenW;
buflen = MAX_REPLY_LEN; if (read_line( request, buffer, &buflen )) return ERROR_SUCCESS; @@ -2576,9 +2579,9 @@ static DWORD read_reply( struct request *request ) memcpy( raw_headers + offset, L"\r\n", sizeof(L"\r\n") ); break; } - MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); + lenW = MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen );
- if (!(header = parse_header( raw_headers + offset ))) break; + if (!(header = parse_header( raw_headers + offset, lenW - 1 ))) break; if ((ret = process_header( request, header->field, header->value, WINHTTP_ADDREQ_FLAG_ADD, FALSE ))) { free_header( header );
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/winhttp/request.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e846676041e..9f769f3dc35 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -455,23 +455,20 @@ DWORD process_header( struct request *request, const WCHAR *field, const WCHAR * DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD len, DWORD flags ) { DWORD ret = ERROR_WINHTTP_INVALID_HEADER; - WCHAR *buffer, *p, *q; struct header *header; + const WCHAR *p, *q;
if (len == ~0u) len = lstrlenW( headers ); if (!len) return ERROR_SUCCESS; - if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; - memcpy( buffer, headers, len * sizeof(WCHAR) ); - buffer[len] = 0;
- p = buffer; + p = headers; do { const WCHAR *end;
- if (!*p) break; + if (p >= headers + len) break;
- for (q = p; *q && *q != '\r' && *q != '\n'; ++q) + for (q = p; q < headers + len && *q != '\r' && *q != '\n'; ++q) ; end = q; while (*q == '\r' || *q == '\n') @@ -485,7 +482,6 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = q; } while (!ret);
- free( buffer ); return ret; }
This merge request was approved by Hans Leidekker.
-
Hans Leidekker (＠hans) -
Zebediah Figura
-
Zebediah Figura (＠zfigura)