wininet: Assume that if we're connected to an HTTP/1.1 server then connections…

wininet: Assume that if we're connected to an HTTP/1.1 server then connections can be kept alive by default. So don't close the connection in this case in HTTP_FinishedReading.

wininet: Assume that if we're connected to an HTTP/1.1 server then connections…
e74514b1 · Rob Shearman · Alexandre Julliard · 0b168e66 · e74514b1
Commit e74514b1 authored Mar 14, 2008 by Rob Shearman Committed by Alexandre Julliard Mar 15, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

http.c dlls/wininet/http.c +14 -5

No files found.
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -3864,16 +3864,25 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v
 */
 BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr)
 {
-    WCHAR szConnectionResponse[20];
-    DWORD dwBufferSize = sizeof(szConnectionResponse);
+    WCHAR szVersion[10];
+    DWORD dwBufferSize = sizeof(szVersion);

    TRACE("\n");

-    if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse,
+    /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that
+     * the connection is keep-alive by default */
+    if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion,
                             &dwBufferSize, NULL) ||
-        strcmpiW(szConnectionResponse, szKeepAlive))
+        strcmpiW(szVersion, g_szHttp1_1))
    {
-        HTTPREQ_CloseConnection(&lpwhr->hdr);
+        WCHAR szConnectionResponse[20];
+        dwBufferSize = sizeof(szConnectionResponse);
+        if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse,
+                                 &dwBufferSize, NULL) ||
+            strcmpiW(szConnectionResponse, szKeepAlive))
+        {
+            HTTPREQ_CloseConnection(&lpwhr->hdr);
+        }
    }

    /* FIXME: store data in the URL cache here */