commit 4c1c5fe64c2fc9e297b3cc7c7b1ebbc480304a02
author Jacek Caban <jacek@codeweavers.com> Wed May 04 11:47:32 2011 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed May 04 17:26:51 2011 +0200
tree 16418eb9948cef2efe9d37d75e521a544efbda44
parent 0a51b005d3535ec7e6cdc196156c4d10d52372dd

wininet: Moved connected check out of NETCON_set_timeout.

dlls/wininet/http.c

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index bc1fcf4..d925975 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1995,6 +1995,11 @@
         if (size != sizeof(DWORD))
             return ERROR_INVALID_PARAMETER;
 
+        if(NETCON_connected(&req->netConnection)) {
+            FIXME("unsupported without active connection\n");
+            return ERROR_SUCCESS;
+        }
+
         return NETCON_set_timeout(&req->netConnection, option == INTERNET_OPTION_SEND_TIMEOUT,
                     *(DWORD*)buffer);
 

dlls/wininet/netconnection.c

diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 1142523..fbfb113 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -896,11 +896,6 @@
     int result;
     struct timeval tv;
 
-    /* FIXME: we should probably store the timeout in the connection to set
-     * when we do connect */
-    if (!NETCON_connected(connection))
-        return ERROR_SUCCESS;
-
     /* value is in milliseconds, convert to struct timeval */
     tv.tv_sec = value / 1000;
     tv.tv_usec = (value % 1000) * 1000;