From 07efcd55cc688b4927a16372fe71d553d90bd214 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sun, 24 Oct 2010 15:37:25 -0400 Subject: [PATCH] wocky-connector-test.c: don't turn off O_NONBLOCK on the server socket This is not expected to work, and ends up causing deadlocks under gio TLS. There doesn't seem to be any point to it anyway... maybe a leftover from old code? Or maybe it's only needed for the openssl version https://bugs.freedesktop.org/show_bug.cgi?id=31447 --- tests/wocky-connector-test.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tests/wocky-connector-test.c b/tests/wocky-connector-test.c index f4fa4a0..ce9ca10 100644 --- a/tests/wocky-connector-test.c +++ b/tests/wocky-connector-test.c @@ -3134,7 +3134,6 @@ client_connected (GIOChannel *channel, ConnectorProblem *cproblem = &test->server_parameters.problem.conn; GSocketConnection *gconn; - long flags; if (csock < 0) { @@ -3146,9 +3145,6 @@ client_connected (GIOChannel *channel, if (!test->server_parameters.features.tls) cproblem->xmpp |= XMPP_PROBLEM_NO_TLS; - flags = fcntl (csock, F_GETFL ); - flags = flags & ~O_NONBLOCK; - fcntl (csock, F_SETFL, flags); gconn = g_object_new (G_TYPE_SOCKET_CONNECTION, "socket", gsock, NULL); g_object_unref (gsock); test->server = test_connector_server_new (G_IO_STREAM (gconn), -- 1.7.3.1