commit 6522393265e547c4a2711b83be07dc7988a50fc8
author Hans Leidekker <hans@codeweavers.com> Fri Jan 13 15:15:48 2012 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 16 12:16:41 2012 +0100
tree 93783cfeccda4d8712d5ca61b3c5643a628af18e
parent 848cd8a2f553a7b809dd8e8dabf5262210a7db0a

wininet: Add support for setting and retrieving the send/receive timeouts.

dlls/wininet/http.c

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index ca8cc60..3439924 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -2182,26 +2182,19 @@
         return ERROR_SUCCESS;
     }
     case INTERNET_OPTION_CONNECT_TIMEOUT:
-        if (size != sizeof(DWORD))
-            return ERROR_INVALID_PARAMETER;
-
+        if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER;
         req->connect_timeout = *(DWORD *)buffer;
         return ERROR_SUCCESS;
 
     case INTERNET_OPTION_SEND_TIMEOUT:
+        if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER;
+        req->send_timeout = *(DWORD *)buffer;
+        return ERROR_SUCCESS;
+
     case INTERNET_OPTION_RECEIVE_TIMEOUT:
-        TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n");
-
-        if (size != sizeof(DWORD))
-            return ERROR_INVALID_PARAMETER;
-
-        if(!req->netconn) {
-            FIXME("unsupported without active connection\n");
-            return ERROR_SUCCESS;
-        }
-
-        return NETCON_set_timeout(req->netconn, option == INTERNET_OPTION_SEND_TIMEOUT,
-                    *(DWORD*)buffer);
+        if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER;
+        req->receive_timeout = *(DWORD *)buffer;
+        return ERROR_SUCCESS;
 
     case INTERNET_OPTION_USERNAME:
         heap_free(req->session->userName);
@@ -3063,6 +3056,8 @@
     request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl;
     request->data_stream = &request->netconn_stream.data_stream;
     request->connect_timeout = session->connect_timeout;
+    request->send_timeout = session->send_timeout;
+    request->receive_timeout = session->receive_timeout;
 
     InitializeCriticalSection( &request->read_section );
     request->read_section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": http_request_t.read_section");
@@ -3970,6 +3965,7 @@
 
     TRACE("full request -> %s\n", debugstr_an( ascii_req, len ) );
 
+    NETCON_set_timeout( request->netconn, TRUE, request->send_timeout );
     res = NETCON_send( request->netconn, ascii_req, len, 0, &cnt );
     heap_free( ascii_req );
     if (res != ERROR_SUCCESS)
@@ -4798,6 +4794,7 @@
         INTERNET_SendCallback(&request->hdr, request->hdr.dwContext,
                               INTERNET_STATUS_SENDING_REQUEST, NULL, 0);
 
+        NETCON_set_timeout( request->netconn, TRUE, request->send_timeout );
         res = NETCON_send(request->netconn, ascii_req, len, 0, &cnt);
         heap_free( ascii_req );
         if(res != ERROR_SUCCESS) {
@@ -5473,6 +5470,26 @@
         *size = sizeof(DWORD);
         *(DWORD *)buffer = ses->connect_timeout;
         return ERROR_SUCCESS;
+
+    case INTERNET_OPTION_SEND_TIMEOUT:
+        TRACE("INTERNET_OPTION_SEND_TIMEOUT\n");
+
+        if (*size < sizeof(DWORD))
+            return ERROR_INSUFFICIENT_BUFFER;
+
+        *size = sizeof(DWORD);
+        *(DWORD *)buffer = ses->send_timeout;
+        return ERROR_SUCCESS;
+
+    case INTERNET_OPTION_RECEIVE_TIMEOUT:
+        TRACE("INTERNET_OPTION_RECEIVE_TIMEOUT\n");
+
+        if (*size < sizeof(DWORD))
+            return ERROR_INSUFFICIENT_BUFFER;
+
+        *size = sizeof(DWORD);
+        *(DWORD *)buffer = ses->receive_timeout;
+        return ERROR_SUCCESS;
     }
 
     return INET_QueryOption(hdr, option, buffer, size, unicode);
@@ -5497,9 +5514,22 @@
     }
     case INTERNET_OPTION_CONNECT_TIMEOUT:
     {
+        if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER;
         ses->connect_timeout = *(DWORD *)buffer;
         return ERROR_SUCCESS;
     }
+    case INTERNET_OPTION_SEND_TIMEOUT:
+    {
+        if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER;
+        ses->send_timeout = *(DWORD *)buffer;
+        return ERROR_SUCCESS;
+    }
+    case INTERNET_OPTION_RECEIVE_TIMEOUT:
+    {
+        if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER;
+        ses->receive_timeout = *(DWORD *)buffer;
+        return ERROR_SUCCESS;
+    }
     default: break;
     }
 
@@ -5573,6 +5603,8 @@
     session->serverPort = serverPort;
     session->hostPort = serverPort;
     session->connect_timeout = INFINITE;
+    session->send_timeout = INFINITE;
+    session->receive_timeout = INFINITE;
 
     /* Don't send a handle created callback if this handle was created with InternetOpenUrl */
     if (!(session->hdr.dwInternalFlags & INET_OPENURL))
@@ -5645,6 +5677,7 @@
     if(!request->netconn)
         goto lend;
 
+    NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout );
     do {
         static const WCHAR szHundred[] = {'1','0','0',0};
         /*