From eb7bec585ed4338f4d4f325273561438900c7dcc Mon Sep 17 00:00:00 2001
From: Jan Vidar Krey <janvidar@extatic.org>
Date: Wed, 18 Nov 2009 17:40:23 +0100
Subject: [PATCH] Fix problems with write events not being processed due to a
 read event taking presendence.

Conflicts:

	src/core/netevent.c
---
 src/core/netevent.c | 2 +-
 src/core/probe.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/netevent.c b/src/core/netevent.c
index af343a0..433fd61 100644
--- a/src/core/netevent.c
+++ b/src/core/netevent.c
@@ -216,7 +216,7 @@ void net_event(struct net_connection* con, int event, void *arg)
 		}
 	}
 
-	if (event & NET_EVENT_WRITE)
+	if (!flag_close && event & NET_EVENT_WRITE)
 	{
 		flag_close = handle_net_write(user);
 		if (flag_close)
diff --git a/src/core/probe.c b/src/core/probe.c
index 20988a1..e9c4792 100644
--- a/src/core/probe.c
+++ b/src/core/probe.c
@@ -96,7 +96,7 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				net_con_ssl_handshake(con, NET_CON_SSL_MODE_SERVER);
 				return;
 			}
-#endif
+#endifq
 			probe_destroy(probe);
 			return;
 		}