diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-08 17:43:17 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-09 15:20:11 +0100 |
| commit | 27aafa9b9398fce336be2b22d3ebe3fbd82c0f05 (patch) | |
| tree | 4e4f57233706c22f33412d76f479f8a001b48e3f | |
| parent | 8aab0cf5ded07ef59a0f381cccd9c8a437bd61b5 (diff) | |
wocky-dummy-xmpp-server: don't turn off non-blocking on the socket
The very next thing we did with it was to give it to GSocketConnection,
which would turn on non-blocking again; so this code wasn't doing
anything except harming our portability.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67900
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Vivek Dasmohapatra <vivek@collabora.co.uk>
| -rw-r--r-- | tests/wocky-dummy-xmpp-server.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/wocky-dummy-xmpp-server.c b/tests/wocky-dummy-xmpp-server.c index be947b0..c1ffe1a 100644 --- a/tests/wocky-dummy-xmpp-server.c +++ b/tests/wocky-dummy-xmpp-server.c @@ -40,7 +40,6 @@ client_connected (GIOChannel *channel, GSocketConnection *gconn; pid_t pid = 0; TestConnectorServer *server; - long flags; if (csock < 0) { @@ -58,9 +57,6 @@ client_connected (GIOChannel *channel, case 0: while (g_source_remove_by_user_data (loop)); g_io_channel_shutdown (channel, TRUE, NULL); - 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); server = test_connector_server_new (G_IO_STREAM (gconn), NULL, "foo", "bar", "1.0", |