Jacek Caban : wininet: Moved connected check out of NETCON_set_timeout.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4c1c5fe64c2fc9e297b3cc7c7b1ebbc480304a02
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c1c5fe64c2fc9e297b3cc7c7b...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Wed May  4 11:47:32 2011 +0000

wininet: Moved connected check out of NETCON_set_timeout.

---

 dlls/wininet/http.c          |    5 +++++
 dlls/wininet/netconnection.c |    5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer,
         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);
 
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 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value)
     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;