kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-31 10:46:27 +00:00
Code Issues Projects Releases Wiki Activity

FS-5325

Browse Source
This commit is contained in:
Anthony Minessale 2013-04-24 10:12:42 -05:00
parent 66d1755b06
commit c6e9b9941c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/iksemel/.update
View File

@ -0,0 +1 @@
Wed Apr 24 10:12:23 CDT 2013

8
libs/iksemel/src/stream.c
View File

@ -93,7 +93,7 @@ static int sock_read_ready(struct stream_data *data, int ms)
int s = 0, r = 0; int s = 0, r = 0;
pfds[0].fd = SSL_get_fd(data->ssl); pfds[0].fd = SSL_get_fd(data->ssl);
pfds[0].events |= POLLIN; pfds[0].events = POLLIN | POLLHUP | POLLERR;
s = poll(pfds, 1, ms); s = poll(pfds, 1, ms);
@ -103,6 +103,8 @@ static int sock_read_ready(struct stream_data *data, int ms)
} else if (s > 0) { } else if (s > 0) {
if ((pfds[0].revents & POLLIN)) { if ((pfds[0].revents & POLLIN)) {
r = 1; r = 1;
} else if ((pfds[0].revents & POLLHUP) || (pfds[0].revents & POLLERR)) {
r = -1;
} }
} }
@ -690,7 +692,9 @@ iks_recv (iksparser *prs, int timeout)
} else if( ret == 0 ) { } else if( ret == 0 ) {
return IKS_OK; return IKS_OK;
} else { } else {
len = SSL_read(data->ssl, data->buf, NET_IO_BUF_SIZE - 1); do {
len = SSL_read(data->ssl, data->buf, NET_IO_BUF_SIZE - 1);
} while (len == -1 && (errno == EAGAIN || errno == EINTR || SSL_get_error(data->ssl, len) == SSL_ERROR_WANT_READ));
} }
if( len <= 0 ) if( len <= 0 )