Attachment 83850 Details for Bug 67900 – wocky-dummy-xmpp-server: don't turn off non-blocking on the socket

[patch] wocky-dummy-xmpp-server: don't turn off non-blocking on the socket

0004-wocky-dummy-xmpp-server-don-t-turn-off-non-blocking-.patch (text/plain), 1.44 KB, created by Simon McVittie on 2013-08-08 16:57:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-08-08 16:57:11 UTC

Size: 1.44 KB

patch

obsolete

>From f6398c690c354e85289349a29c292f8d61f294c5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 8 Aug 2013 17:43:17 +0100
>Subject: [PATCH 4/5] 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>
>---
> tests/wocky-dummy-xmpp-server.c | 4 ----
> 1 file changed, 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",
>-- 
>1.8.4.rc1
>

Actions: View | Splinter Review

Attachments on bug 67900: 83848 | 83849 | 83850 | 83851 | 83855

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.