enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

unbreak ecore's ssl connectivity 

SVN revision: 76230
This commit is contained in:
Mike Blumenkrantz 2012-09-06 08:14:46 +00:00
parent c14ede1a73
commit c504378e80
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ecore/ChangeLog
View File

@ -914,3 +914,4 @@
* Fix race condition in ecore-con where events could sometimes be sent for freed clients
* Fix ssl servers using openssl
* Fix ssl connections overall

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

@ -2135,7 +2135,7 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *cl)
_ecore_con_cl_timer_update(cl);
}
if (!(cl->host_server->type & ECORE_CON_SSL) || (!cl->upgrade))
if (!(cl->host_server->type & ECORE_CON_SSL) && (!cl->upgrade))
{
num = read(cl->fd, buf, sizeof(buf));
/* 0 is not a valid return value for a tcp socket */
@ -2311,7 +2311,7 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
if (!cl->buf) return;
num = eina_binbuf_length_get(cl->buf) - cl->buf_offset;
if (num <= 0) return;
if (!(cl->host_server->type & ECORE_CON_SSL) || (!cl->upgrade))
if (!(cl->host_server->type & ECORE_CON_SSL) && (!cl->upgrade))
count = write(cl->fd, eina_binbuf_string_get(cl->buf) + cl->buf_offset, num);
else
count = ecore_con_ssl_client_write(cl, eina_binbuf_string_get(cl->buf) + cl->buf_offset, num);