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
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

http.c dlls/wininet/http.c +11 -2

No files found.
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -3864,17 +3864,26 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v
 */
 BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr)
 {
-    WCHAR szConnectionResponse[20];
+    WCHAR szVersion[10];
-    DWORD dwBufferSize = sizeof(szConnectionResponse);
+    DWORD dwBufferSize = sizeof(szVersion);
    TRACE("\n");
+    /* 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(szVersion, g_szHttp1_1))
+    {
+        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 */