stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

httpc: use poll to check for the EINPROGRESS state

Browse source
This commit is contained in:
Jaroslav Kysela 2014-06-10 23:09:03 +02:00
parent 87a232ebb8
commit 0e29d5acba
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/httpc.c
View file

@ -26,6 +26,7 @@
#include <stdlib.h>
#include <signal.h>
#include <fcntl.h>
#include <poll.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
@ -468,13 +469,13 @@ http_client_send_partial( http_client_t *hc )
hc->hc_cmd = wcmd->wcmd;
hc->hc_rcseq = wcmd->wcseq;
if (hc->hc_einprogress) {
/* this seems like OSX specific issue */
/* send() in the EINPROGRESS state closes the file-descriptor */
int err = 0;
socklen_t errlen = sizeof(err);
getsockopt(hc->hc_fd, SOL_SOCKET, SO_ERROR, (void *)&err, &errlen);
if (err == EINPROGRESS) {
r = err;
struct pollfd fds;
memset(&fds, 0, sizeof(fds));
fds.fd = hc->hc_fd;
fds.events = POLLOUT;
if (poll(&fds, 1, 0) == 0) {
r = -1;
errno = EINPROGRESS;
goto skip;
}
hc->hc_einprogress = 0;