enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

fix cedric b0rk 

SVN revision: 49569
This commit is contained in:
Carsten Haitzler 2010-06-08 11:31:15 +00:00
parent f3457b3bdf
commit 194fc4c4ac
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -1222,15 +1222,16 @@ _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
int lost_server = 1;
unsigned char buf[READBUFSIZ];
if (!(svr->type & ECORE_CON_SSL))
{
if (((num = read(svr->fd, buf, READBUFSIZ)) < 0) &&
(errno == EAGAIN))
lost_server = 0;
if (!(svr->type & ECORE_CON_SSL))
{
if ((num = read(svr->fd, buf, READBUFSIZ)) <= 0)
{
if ((num < 0) && (errno == EAGAIN))
lost_server = 0;
}
}
else
if (!(num = ecore_con_ssl_server_read(svr, buf, READBUFSIZ)))
lost_server = 0;
else if (!(num = ecore_con_ssl_server_read(svr, buf, READBUFSIZ)))
lost_server = 0;
if (num < 1)
{
@ -1470,25 +1471,26 @@ _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
unsigned char *inbuf = NULL;
int inbuf_num = 0;
int lost_client = 1;
int tries;
for (tries = 0; tries < 16; tries++)
{
unsigned char buf[65536];
int num;
int num;
int lost_client = 1;
unsigned char buf[READBUFSIZ];
errno = 0;
if (!(cl->server->type & ECORE_CON_SSL))
{
if (((num = read(cl->fd, buf, 65536)) < 0) &&
(errno == EAGAIN))
lost_client = 0;
if ((num = read(cl->fd, buf, READBUFSIZ)) <= 0)
{
if ((num < 0) && (errno == EAGAIN))
lost_client = 0;
}
}
else
if (!(num = ecore_con_ssl_client_read(cl, buf, 65536)))
lost_client = 0;
else if (!(num = ecore_con_ssl_client_read(cl, buf, READBUFSIZ)))
lost_client = 0;
if (num < 1)
{