mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-03-07 15:27:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

wrong, revert the previous "fix" and instead check that the fd_set pointer

Browse Source 
is non-NULL before we FD_CLR
This commit is contained in:
Daniel Stenberg 2007-09-27 12:04:56 +00:00
parent a739b9bc45
commit 015fc6aa17
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ares/ares_process.c
View File

@ -146,7 +146,7 @@ static void write_tcp_data(ares_channel channel,
ssize_t wcount;
size_t n;
if(!write_fds || (write_fd == ARES_SOCKET_BAD))
if(!write_fds && (write_fd == ARES_SOCKET_BAD))
/* no possible action */
return;
@ -167,6 +167,7 @@ static void write_tcp_data(ares_channel channel,
continue;
}
if(write_fds)
/* If there's an error and we close this socket, then open
* another with the same fd to talk to another server, then we
* don't want to think that it was the new socket that was
@ -267,7 +268,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds,
int i;
ssize_t count;
if(!read_fds || (read_fd == ARES_SOCKET_BAD))
if(!read_fds && (read_fd == ARES_SOCKET_BAD))
/* no possible action */
return;
@ -287,6 +288,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds,
continue;
}
if(read_fds)
/* If there's an error and we close this socket, then open
* another with the same fd to talk to another server, then we
* don't want to think that it was the new socket that was
@ -363,7 +365,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
ssize_t count;
unsigned char buf[PACKETSZ + 1];
if(!read_fds || (read_fd == ARES_SOCKET_BAD))
if(!read_fds && (read_fd == ARES_SOCKET_BAD))
/* no possible action */
return;
@ -384,6 +386,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
continue;
}
if(read_fds)
/* If there's an error and we close this socket, then open
* another with the same fd to talk to another server, then we
* don't want to think that it was the new socket that was