Francois Gouget : winetest: Don't truncate oversize reports before sending them.
Alexandre Julliard
julliard at winehq.org
Thu Oct 28 16:07:45 CDT 2021
Module: wine
Branch: master
Commit: 99d36ccfb966050cc11c1faa41b07ad0bcd5c45b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d36ccfb966050cc11c1faa41b07ad0bcd5c45b
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Thu Oct 28 12:42:59 2021 +0200
winetest: Don't truncate oversize reports before sending them.
test.winehq.org already sets $CGI::POST_MAX to reject oversize reports.
Furthermore truncated reports are rejected anyway.
So avoid the code duplication and inconsistencies between the winetest
and test.winehq.org (or other site) size limits.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/winetest/send.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/programs/winetest/send.c b/programs/winetest/send.c
index 4b575e11a34..2416faa3192 100644
--- a/programs/winetest/send.c
+++ b/programs/winetest/send.c
@@ -162,15 +162,9 @@ send_file_direct (const char * url, const char *name)
report (R_WARNING, "Can't open file '%s': %u", name, GetLastError());
goto abort1;
}
- filesize = GetFileSize( file, NULL );
- if (filesize > 1.5*1024*1024) {
- report (R_WARNING,
- "File too big (%.1f MB > 1.5 MB); submitting partial report.",
- filesize/1024.0/1024);
- filesize = (DWORD) 1.5*1024*1024;
- }
report (R_STATUS, "Sending header");
+ filesize = GetFileSize( file, NULL );
str = strmake (&total, body1, name);
ret = send_str (s, head, filesize + total + sizeof body2 - 1) ||
send_buf (s, str, total);
@@ -339,14 +333,6 @@ send_file_wininet (const char *url, const char *name)
goto done;
}
- filesize = GetFileSize( file, NULL );
- if (filesize > 1.5*1024*1024) {
- report (R_WARNING,
- "File too big (%.1f MB > 1.5 MB); submitting partial report.",
- filesize/1024.0/1024);
- filesize = 1.5*1024*1024;
- }
-
report (R_STATUS, "Opening %s connection to %s:%d",
(uc.nScheme == INTERNET_SCHEME_HTTP ? "http" : "https"),
uc.lpszHostName, uc.nPort);
@@ -369,6 +355,7 @@ send_file_wininet (const char *url, const char *name)
}
report (R_STATUS, "Sending request");
+ filesize = GetFileSize( file, NULL );
str = strmake (&total, body1, name);
memset(&buffers_in, 0, sizeof(INTERNET_BUFFERSA));
buffers_in.dwStructSize = sizeof(INTERNET_BUFFERSA);
More information about the wine-cvs
mailing list