wininet: Drain content before reusing connection in open_http_connection.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wininet: Drain content before reusing connection in open_http_connection.
085ce269 · Jacek Caban · Alexandre Julliard · 59395d88 · 085ce269
Commit 085ce269 authored Aug 17, 2017 by Jacek Caban Committed by Alexandre Julliard Aug 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

http.c dlls/wininet/http.c +8 -8

No files found.
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -4745,22 +4745,22 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing)
    netconn_t *netconn = NULL;
    DWORD res;

-    reset_data_stream(request);
-
    if (request->netconn)
    {
-        if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn))
+        if (NETCON_is_alive(request->netconn) && drain_content(request, TRUE) == ERROR_SUCCESS)
        {
+            reset_data_stream(request);
            *reusing = TRUE;
            return ERROR_SUCCESS;
        }
-        else
-        {
-            free_netconn(request->netconn);
-            request->netconn = NULL;
-        }
+
+        TRACE("freeing netconn\n");
+        free_netconn(request->netconn);
+        request->netconn = NULL;
    }

+    reset_data_stream(request);
+
    res = HTTP_ResolveName(request);
    if(res != ERROR_SUCCESS)
        return res;