From c504378e8088be7814f5cba9fa7316f1c11e7520 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 6 Sep 2012 08:14:46 +0000 Subject: [PATCH] unbreak ecore's ssl connectivity SVN revision: 76230 --- legacy/ecore/ChangeLog | 1 + legacy/ecore/src/lib/ecore_con/ecore_con.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog index ce6abdf4b4..50b864a19f 100644 --- a/legacy/ecore/ChangeLog +++ b/legacy/ecore/ChangeLog @@ -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 diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index eb5249d0a3..65e5779fff 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -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);