wininet: Don't close the connection if the caller passes in zero for the number…

wininet: Don't close the connection if the caller passes in zero for the number of bytes to be read. Only close the connection when the bytes read equals the content length. Fixup HTTP_DrainContent, which relied on the previous incorrect behaviour to instead close connections with no content length manually.

wininet: Don't close the connection if the caller passes in zero for the number…
76507d47 · Rob Shearman · Alexandre Julliard · fa48cb04 · 76507d47 · 76507d47
Commit 76507d47 authored May 28, 2007 by Rob Shearman Committed by Alexandre Julliard May 29, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

http.c dlls/wininet/http.c +6 -0

internet.c dlls/wininet/internet.c +1 -1

http.c dlls/wininet/tests/http.c +1 -0

No files found.
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -738,6 +738,12 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
 static void HTTP_DrainContent(LPWININETHTTPREQW lpwhr)
 {
    DWORD bytes_read;
+
+    if (!NETCON_connected(&lpwhr->netConnection)) return;
+
+    if (lpwhr->dwContentLength == -1)
+        NETCON_close(&lpwhr->netConnection);
+
    do
    {
        char buffer[2048];

--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1724,7 +1724,7 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer,
            {
                lpwhr->dwContentRead += bytes_read;
                *pdwNumOfBytesRead = bytes_read;
-                if (!bytes_read)
+                if (!bytes_read && (lpwhr->dwContentRead == lpwhr->dwContentLength))
                    retval = HTTP_FinishedReading(lpwhr);
                else
                    retval = TRUE;

--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -444,6 +444,7 @@ static void InternetReadFileExA_test(int flags)

        length += inetbuffers.dwBufferLength;
    }
+    ok(length > 0, "failed to read any of the document\n");
    trace("Finished. Read %d bytes\n", length);

 abort: