[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdecore
From:       Thiago Macieira <thiago.macieira () kdemail ! net>
Date:       2005-02-05 2:49:45
Message-ID: 20050205024945.5E8A41BBC5 () office ! kde ! org
[Download RAW message or body]

CVS commit by thiago: 

KExtendedSocket::lookup: Making sure the proper error codes are returned.
KExtendedSocket::connectionEvent: update d->current after failed first 
	connection. Without this, the socket would keep trying to 
	connect to the same host ad infinitum.

BUG:90809


  M +5 -0      kextsock.cpp   1.76


--- kdelibs/kdecore/kextsock.cpp  #1.75:1.76
@@ -750,4 +750,8 @@ int KExtendedSocket::lookup()
 
   d->status = lookupDone;
+  if (d->resRemote.error() != KResolver::NoError)
+    return d->resRemote.error();
+  if (d->resLocal.error() != KResolver::NoError)
+    return d->resLocal.error();
   return 0;
 }
@@ -1796,4 +1800,5 @@ void KExtendedSocket::connectionEvent()
           sockfd = -1;
           d->qsnIn = d->qsnOut = NULL;
+          d->current++;
           setError(IO_ConnectError, errcode);
         }


[prev in list] [next in list] [prev in thread] [next in thread]