From 4168f0da0859cdac522f824dace9f067ab67fc28 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Mon, 4 Jun 2012 09:16:19 +0000 Subject: [PATCH] unbreak my last commit git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@71682 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_con/ecore_con.c | 2 +- src/lib/ecore_con/ecore_con_private.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index c327873..ea54794 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -448,7 +448,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, svr->data = (void *)data; svr->created = EINA_FALSE; svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; - svr->disable_proxy = (compl_type & ECORE_CON_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; + svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; svr->reject_excess_clients = EINA_FALSE; svr->clients = NULL; svr->client_limit = -1; diff --git a/src/lib/ecore_con/ecore_con_private.h b/src/lib/ecore_con/ecore_con_private.h index 4f8fd36..e6ec5bc 100644 --- a/src/lib/ecore_con/ecore_con_private.h +++ b/src/lib/ecore_con/ecore_con_private.h @@ -9,7 +9,8 @@ #define ECORE_MAGIC_CON_URL 0x77074255 #define ECORE_CON_TYPE 0x0f -#define ECORE_CON_SSL 0xf00 +#define ECORE_CON_SSL 0xf0 +#define ECORE_CON_SUPER_SSL 0xf00 #if USE_GNUTLS # include -- 2.7.4