diff --git a/CMakeLists.txt b/CMakeLists.txt
index d68410dce085c1c3d47208f05a1180f3d55917db..8ca29d109f8fbf2bfd3aa4dfaeb0058971a42fbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,6 +260,7 @@ set(SOURCES
 	lib/base64-decode.c
 	lib/handshake.c
 	lib/libwebsockets.c
+	lib/service.c
 	lib/output.c
 	lib/parsers.c
 	lib/context.c
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index ac7d40998aed4a76f70a92ed442a30e266c1585a..362ae542ef0b4a49c92bc8898cb42264e457eee7 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -512,469 +512,6 @@ bail:
 	lws_latency(context, wsi, "libwebsockets_get_peer_addresses", ret, 1);
 }
 
-int
-lws_handle_POLLOUT_event(struct libwebsocket_context *context,
-		   struct libwebsocket *wsi, struct libwebsocket_pollfd *pollfd)
-{
-	int n;
-	struct lws_tokens eff_buf;
-	int ret;
-	int m;
-	int handled = 0;
-
-	/* pending truncated sends have uber priority */
-
-	if (wsi->truncated_send_len) {
-		lws_issue_raw(wsi, wsi->truncated_send_malloc +
-				wsi->truncated_send_offset,
-						wsi->truncated_send_len);
-		/* leave POLLOUT active either way */
-		return 0;
-	}
-
-	m = lws_ext_callback_for_each_active(wsi, LWS_EXT_CALLBACK_IS_WRITEABLE,
-								       NULL, 0);
-	if (handled == 1)
-		goto notify_action;
-#ifndef LWS_NO_EXTENSIONS
-	if (!wsi->extension_data_pending || handled == 2)
-		goto user_service;
-#endif
-	/*
-	 * check in on the active extensions, see if they
-	 * had pending stuff to spill... they need to get the
-	 * first look-in otherwise sequence will be disordered
-	 *
-	 * NULL, zero-length eff_buf means just spill pending
-	 */
-
-	ret = 1;
-	while (ret == 1) {
-
-		/* default to nobody has more to spill */
-
-		ret = 0;
-		eff_buf.token = NULL;
-		eff_buf.token_len = 0;
-
-		/* give every extension a chance to spill */
-		
-		m = lws_ext_callback_for_each_active(wsi,
-					LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
-							           &eff_buf, 0);
-		if (m < 0) {
-			lwsl_err("ext reports fatal error\n");
-			return -1;
-		}
-		if (m)
-			/*
-			 * at least one extension told us he has more
-			 * to spill, so we will go around again after
-			 */
-			ret = 1;
-
-		/* assuming they gave us something to send, send it */
-
-		if (eff_buf.token_len) {
-			n = lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
-							     eff_buf.token_len);
-			if (n < 0)
-				return -1;
-			/*
-			 * Keep amount spilled small to minimize chance of this
-			 */
-			if (n != eff_buf.token_len) {
-				lwsl_err("Unable to spill ext %d vs %s\n",
-							  eff_buf.token_len, n);
-				return -1;
-			}
-		} else
-			continue;
-
-		/* no extension has more to spill */
-
-		if (!ret)
-			continue;
-
-		/*
-		 * There's more to spill from an extension, but we just sent
-		 * something... did that leave the pipe choked?
-		 */
-
-		if (!lws_send_pipe_choked(wsi))
-			/* no we could add more */
-			continue;
-
-		lwsl_info("choked in POLLOUT service\n");
-
-		/*
-		 * Yes, he's choked.  Leave the POLLOUT masked on so we will
-		 * come back here when he is unchoked.  Don't call the user
-		 * callback to enforce ordering of spilling, he'll get called
-		 * when we come back here and there's nothing more to spill.
-		 */
-
-		return 0;
-	}
-#ifndef LWS_NO_EXTENSIONS
-	wsi->extension_data_pending = 0;
-
-user_service:
-#endif
-	/* one shot */
-
-	if (pollfd) {
-		if (lws_change_pollfd(wsi, LWS_POLLOUT, 0))
-			return 1;
-#ifdef LWS_USE_LIBEV
-		if (LWS_LIBEV_ENABLED(context))
-			ev_io_stop(context->io_loop,
-				(struct ev_io *)&wsi->w_write);
-#endif /* LWS_USE_LIBEV */
-	}
-
-notify_action:
-	if (wsi->mode == LWS_CONNMODE_WS_CLIENT)
-		n = LWS_CALLBACK_CLIENT_WRITEABLE;
-	else
-		n = LWS_CALLBACK_SERVER_WRITEABLE;
-
-	return user_callback_handle_rxflow(wsi->protocol->callback, context,
-			wsi, (enum libwebsocket_callback_reasons) n,
-						      wsi->user_space, NULL, 0);
-}
-
-
-
-int
-libwebsocket_service_timeout_check(struct libwebsocket_context *context,
-				     struct libwebsocket *wsi, unsigned int sec)
-{
-	/*
-	 * if extensions want in on it (eg, we are a mux parent)
-	 * give them a chance to service child timeouts
-	 */
-	if (lws_ext_callback_for_each_active(wsi, LWS_EXT_CALLBACK_1HZ, NULL, sec) < 0)
-		return 0;
-
-	if (!wsi->pending_timeout)
-		return 0;
-
-	/*
-	 * if we went beyond the allowed time, kill the
-	 * connection
-	 */
-	if (sec > wsi->pending_timeout_limit) {
-		lwsl_info("TIMEDOUT WAITING\n");
-		libwebsocket_close_and_free_session(context,
-						wsi, LWS_CLOSE_STATUS_NOSTATUS);
-		return 1;
-	}
-
-	return 0;
-}
-
-/**
- * libwebsocket_service_fd() - Service polled socket with something waiting
- * @context:	Websocket context
- * @pollfd:	The pollfd entry describing the socket fd and which events
- *		happened.
- *
- *	This function takes a pollfd that has POLLIN or POLLOUT activity and
- *	services it according to the state of the associated
- *	struct libwebsocket.
- *
- *	The one call deals with all "service" that might happen on a socket
- *	including listen accepts, http files as well as websocket protocol.
- *
- *	If a pollfd says it has something, you can just pass it to
- *	libwebsocket_serice_fd() whether it is a socket handled by lws or not.
- *	If it sees it is a lws socket, the traffic will be handled and
- *	pollfd->revents will be zeroed now.
- *
- *	If the socket is foreign to lws, it leaves revents alone.  So you can
- *	see if you should service yourself by checking the pollfd revents
- *	after letting lws try to service it.
- */
-
-LWS_VISIBLE int
-libwebsocket_service_fd(struct libwebsocket_context *context,
-							  struct libwebsocket_pollfd *pollfd)
-{
-	struct libwebsocket *wsi;
-	int n;
-	int m;
-	int listen_socket_fds_index = 0;
-	time_t now;
-	int timed_out = 0;
-	int our_fd = 0;
-	char draining_flow = 0;
-	int more;
-	struct lws_tokens eff_buf;
-
-	if (context->listen_service_fd)
-		listen_socket_fds_index = context->lws_lookup[
-			     context->listen_service_fd]->position_in_fds_table;
-
-	/*
-	 * you can call us with pollfd = NULL to just allow the once-per-second
-	 * global timeout checks; if less than a second since the last check
-	 * it returns immediately then.
-	 */
-
-	time(&now);
-
-	/* TODO: if using libev, we should probably use timeout watchers... */
-	if (context->last_timeout_check_s != now) {
-		context->last_timeout_check_s = now;
-
-		lws_plat_service_periodic(context);
-
-		/* global timeout check once per second */
-
-		if (pollfd)
-			our_fd = pollfd->fd;
-
-		for (n = 0; n < context->fds_count; n++) {
-			m = context->fds[n].fd;
-			wsi = context->lws_lookup[m];
-			if (!wsi)
-				continue;
-
-			if (libwebsocket_service_timeout_check(context, wsi, now))
-				/* he did time out... */
-				if (m == our_fd) {
-					/* it was the guy we came to service! */
-					timed_out = 1;
-					/* mark as handled */
-					pollfd->revents = 0;
-				}
-		}
-	}
-
-	/* the socket we came to service timed out, nothing to do */
-	if (timed_out)
-		return 0;
-
-	/* just here for timeout management? */
-	if (pollfd == NULL)
-		return 0;
-
-	/* no, here to service a socket descriptor */
-	wsi = context->lws_lookup[pollfd->fd];
-	if (wsi == NULL)
-		/* not lws connection ... leave revents alone and return */
-		return 0;
-
-	/*
-	 * so that caller can tell we handled, past here we need to
-	 * zero down pollfd->revents after handling
-	 */
-
-	/*
-	 * deal with listen service piggybacking
-	 * every listen_service_modulo services of other fds, we
-	 * sneak one in to service the listen socket if there's anything waiting
-	 *
-	 * To handle connection storms, as found in ab, if we previously saw a
-	 * pending connection here, it causes us to check again next time.
-	 */
-
-	if (context->listen_service_fd && pollfd !=
-				       &context->fds[listen_socket_fds_index]) {
-		context->listen_service_count++;
-		if (context->listen_service_extraseen ||
-				context->listen_service_count ==
-					       context->listen_service_modulo) {
-			context->listen_service_count = 0;
-			m = 1;
-			if (context->listen_service_extraseen > 5)
-				m = 2;
-			while (m--) {
-				/*
-				 * even with extpoll, we prepared this
-				 * internal fds for listen
-				 */
-				n = lws_poll_listen_fd(&context->fds[listen_socket_fds_index]);
-				if (n > 0) { /* there's a conn waiting for us */
-					libwebsocket_service_fd(context,
-						&context->
-						  fds[listen_socket_fds_index]);
-					context->listen_service_extraseen++;
-				} else {
-					if (context->listen_service_extraseen)
-						context->
-						     listen_service_extraseen--;
-					break;
-				}
-			}
-		}
-
-	}
-
-	/* handle session socket closed */
-
-	if ((!(pollfd->revents & LWS_POLLIN)) &&
-			(pollfd->revents & LWS_POLLHUP)) {
-
-		lwsl_debug("Session Socket %p (fd=%d) dead\n",
-						       (void *)wsi, pollfd->fd);
-
-		goto close_and_handled;
-	}
-
-	/* okay, what we came here to do... */
-
-	switch (wsi->mode) {
-
-#ifndef LWS_NO_SERVER
-	case LWS_CONNMODE_HTTP_SERVING:
-	case LWS_CONNMODE_HTTP_SERVING_ACCEPTED:
-	case LWS_CONNMODE_SERVER_LISTENER:
-	case LWS_CONNMODE_SSL_ACK_PENDING:
-		n = lws_server_socket_service(context, wsi, pollfd);
-		goto handled;
-#endif
-
-	case LWS_CONNMODE_WS_SERVING:
-	case LWS_CONNMODE_WS_CLIENT:
-
-		/* the guy requested a callback when it was OK to write */
-
-		if ((pollfd->revents & LWS_POLLOUT) &&
-			wsi->state == WSI_STATE_ESTABLISHED &&
-			   lws_handle_POLLOUT_event(context, wsi, pollfd) < 0) {
-			lwsl_info("libwebsocket_service_fd: closing\n");
-			goto close_and_handled;
-		}
-
-		if (wsi->u.ws.rxflow_buffer &&
-			      (wsi->u.ws.rxflow_change_to & LWS_RXFLOW_ALLOW)) {
-			lwsl_info("draining rxflow\n");
-			/* well, drain it */
-			eff_buf.token = (char *)wsi->u.ws.rxflow_buffer +
-						wsi->u.ws.rxflow_pos;
-			eff_buf.token_len = wsi->u.ws.rxflow_len -
-						wsi->u.ws.rxflow_pos;
-			draining_flow = 1;
-			goto drain;
-		}
-
-		/* any incoming data ready? */
-
-		if (!(pollfd->revents & LWS_POLLIN))
-			break;
-
-#ifdef LWS_OPENSSL_SUPPORT
-read_pending:
-		if (wsi->ssl) {
-			eff_buf.token_len = SSL_read(wsi->ssl,
-					context->service_buffer,
-					       sizeof(context->service_buffer));
-			if (!eff_buf.token_len) {
-				n = SSL_get_error(wsi->ssl, eff_buf.token_len);
-				lwsl_err("SSL_read returned 0 with reason %s\n",
-				  ERR_error_string(n,
-					      (char *)context->service_buffer));
-			}
-		} else
-#endif
-			eff_buf.token_len = recv(pollfd->fd,
-				context->service_buffer,
-					    sizeof(context->service_buffer), 0);
-
-		if (eff_buf.token_len < 0) {
-			lwsl_debug("service_fd read ret = %d, errno = %d\n",
-						  eff_buf.token_len, LWS_ERRNO);
-			if (LWS_ERRNO != LWS_EINTR && LWS_ERRNO != LWS_EAGAIN)
-				goto close_and_handled;
-			n = 0;
-			goto handled;
-		}
-		if (!eff_buf.token_len) {
-			lwsl_info("service_fd: closing due to 0 length read\n");
-			goto close_and_handled;
-		}
-
-		/*
-		 * give any active extensions a chance to munge the buffer
-		 * before parse.  We pass in a pointer to an lws_tokens struct
-		 * prepared with the default buffer and content length that's in
-		 * there.  Rather than rewrite the default buffer, extensions
-		 * that expect to grow the buffer can adapt .token to
-		 * point to their own per-connection buffer in the extension
-		 * user allocation.  By default with no extensions or no
-		 * extension callback handling, just the normal input buffer is
-		 * used then so it is efficient.
-		 */
-
-		eff_buf.token = (char *)context->service_buffer;
-drain:
-
-		do {
-
-			more = 0;
-			
-			m = lws_ext_callback_for_each_active(wsi,
-				LWS_EXT_CALLBACK_PACKET_RX_PREPARSE, &eff_buf, 0);
-			if (m < 0)
-				goto close_and_handled;
-			if (m)
-				more = 1;
-
-			/* service incoming data */
-
-			if (eff_buf.token_len) {
-				n = libwebsocket_read(context, wsi,
-					(unsigned char *)eff_buf.token,
-							    eff_buf.token_len);
-				if (n < 0) {
-					/* we closed wsi */
-					n = 0;
-					goto handled;
-				}
-			}
-
-			eff_buf.token = NULL;
-			eff_buf.token_len = 0;
-		} while (more);
-
-		if (draining_flow && wsi->u.ws.rxflow_buffer &&
-				 wsi->u.ws.rxflow_pos == wsi->u.ws.rxflow_len) {
-			lwsl_info("flow buffer: drained\n");
-			free(wsi->u.ws.rxflow_buffer);
-			wsi->u.ws.rxflow_buffer = NULL;
-			/* having drained the rxflow buffer, can rearm POLLIN */
-			_libwebsocket_rx_flow_control(wsi);
-		}
-
-#ifdef LWS_OPENSSL_SUPPORT
-		if (wsi->ssl && SSL_pending(wsi->ssl))
-			goto read_pending;
-#endif
-		break;
-
-	default:
-#ifdef LWS_NO_CLIENT
-		break;
-#else
-		n = lws_client_socket_service(context, wsi, pollfd);
-		goto handled;
-#endif
-	}
-
-	n = 0;
-	goto handled;
-
-close_and_handled:
-	libwebsocket_close_and_free_session(context, wsi,
-						LWS_CLOSE_STATUS_NOSTATUS);
-	n = 1;
-
-handled:
-	pollfd->revents = 0;
-	return n;
-}
 
 
 /**
@@ -992,43 +529,6 @@ libwebsocket_context_user(struct libwebsocket_context *context)
 	return context->user_space;
 }
 
-/**
- * libwebsocket_service() - Service any pending websocket activity
- * @context:	Websocket context
- * @timeout_ms:	Timeout for poll; 0 means return immediately if nothing needed
- *		service otherwise block and service immediately, returning
- *		after the timeout if nothing needed service.
- *
- *	This function deals with any pending websocket traffic, for three
- *	kinds of event.  It handles these events on both server and client
- *	types of connection the same.
- *
- *	1) Accept new connections to our context's server
- *
- *	2) Call the receive callback for incoming frame data received by
- *	    server or client connections.
- *
- *	You need to call this service function periodically to all the above
- *	functions to happen; if your application is single-threaded you can
- *	just call it in your main event loop.
- *
- *	Alternatively you can fork a new process that asynchronously handles
- *	calling this service in a loop.  In that case you are happy if this
- *	call blocks your thread until it needs to take care of something and
- *	would call it with a large nonzero timeout.  Your loop then takes no
- *	CPU while there is nothing happening.
- *
- *	If you are calling it in a single-threaded app, you don't want it to
- *	wait around blocking other things in your loop from happening, so you
- *	would call it with a timeout_ms of 0, so it returns immediately if
- *	nothing is pending, or as soon as it services whatever was pending.
- */
-
-LWS_VISIBLE int
-libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
-{
-	return lws_plat_service(context, timeout_ms);
-}
 
 int
 lws_change_pollfd(struct libwebsocket *wsi, int _and, int _or)
diff --git a/lib/service.c b/lib/service.c
new file mode 100644
index 0000000000000000000000000000000000000000..9b23c16d0ebf2f92b260abcc46ccebf8969f6521
--- /dev/null
+++ b/lib/service.c
@@ -0,0 +1,525 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2014 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+int
+lws_handle_POLLOUT_event(struct libwebsocket_context *context,
+		   struct libwebsocket *wsi, struct libwebsocket_pollfd *pollfd)
+{
+	int n;
+	struct lws_tokens eff_buf;
+	int ret;
+	int m;
+	int handled = 0;
+
+	/* pending truncated sends have uber priority */
+
+	if (wsi->truncated_send_len) {
+		lws_issue_raw(wsi, wsi->truncated_send_malloc +
+				wsi->truncated_send_offset,
+						wsi->truncated_send_len);
+		/* leave POLLOUT active either way */
+		return 0;
+	}
+
+	m = lws_ext_callback_for_each_active(wsi, LWS_EXT_CALLBACK_IS_WRITEABLE,
+								       NULL, 0);
+	if (handled == 1)
+		goto notify_action;
+#ifndef LWS_NO_EXTENSIONS
+	if (!wsi->extension_data_pending || handled == 2)
+		goto user_service;
+#endif
+	/*
+	 * check in on the active extensions, see if they
+	 * had pending stuff to spill... they need to get the
+	 * first look-in otherwise sequence will be disordered
+	 *
+	 * NULL, zero-length eff_buf means just spill pending
+	 */
+
+	ret = 1;
+	while (ret == 1) {
+
+		/* default to nobody has more to spill */
+
+		ret = 0;
+		eff_buf.token = NULL;
+		eff_buf.token_len = 0;
+
+		/* give every extension a chance to spill */
+		
+		m = lws_ext_callback_for_each_active(wsi,
+					LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
+							           &eff_buf, 0);
+		if (m < 0) {
+			lwsl_err("ext reports fatal error\n");
+			return -1;
+		}
+		if (m)
+			/*
+			 * at least one extension told us he has more
+			 * to spill, so we will go around again after
+			 */
+			ret = 1;
+
+		/* assuming they gave us something to send, send it */
+
+		if (eff_buf.token_len) {
+			n = lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
+							     eff_buf.token_len);
+			if (n < 0)
+				return -1;
+			/*
+			 * Keep amount spilled small to minimize chance of this
+			 */
+			if (n != eff_buf.token_len) {
+				lwsl_err("Unable to spill ext %d vs %s\n",
+							  eff_buf.token_len, n);
+				return -1;
+			}
+		} else
+			continue;
+
+		/* no extension has more to spill */
+
+		if (!ret)
+			continue;
+
+		/*
+		 * There's more to spill from an extension, but we just sent
+		 * something... did that leave the pipe choked?
+		 */
+
+		if (!lws_send_pipe_choked(wsi))
+			/* no we could add more */
+			continue;
+
+		lwsl_info("choked in POLLOUT service\n");
+
+		/*
+		 * Yes, he's choked.  Leave the POLLOUT masked on so we will
+		 * come back here when he is unchoked.  Don't call the user
+		 * callback to enforce ordering of spilling, he'll get called
+		 * when we come back here and there's nothing more to spill.
+		 */
+
+		return 0;
+	}
+#ifndef LWS_NO_EXTENSIONS
+	wsi->extension_data_pending = 0;
+
+user_service:
+#endif
+	/* one shot */
+
+	if (pollfd) {
+		if (lws_change_pollfd(wsi, LWS_POLLOUT, 0))
+			return 1;
+#ifdef LWS_USE_LIBEV
+		if (LWS_LIBEV_ENABLED(context))
+			ev_io_stop(context->io_loop,
+				(struct ev_io *)&wsi->w_write);
+#endif /* LWS_USE_LIBEV */
+	}
+
+notify_action:
+	if (wsi->mode == LWS_CONNMODE_WS_CLIENT)
+		n = LWS_CALLBACK_CLIENT_WRITEABLE;
+	else
+		n = LWS_CALLBACK_SERVER_WRITEABLE;
+
+	return user_callback_handle_rxflow(wsi->protocol->callback, context,
+			wsi, (enum libwebsocket_callback_reasons) n,
+						      wsi->user_space, NULL, 0);
+}
+
+
+
+int
+libwebsocket_service_timeout_check(struct libwebsocket_context *context,
+				     struct libwebsocket *wsi, unsigned int sec)
+{
+	/*
+	 * if extensions want in on it (eg, we are a mux parent)
+	 * give them a chance to service child timeouts
+	 */
+	if (lws_ext_callback_for_each_active(wsi, LWS_EXT_CALLBACK_1HZ, NULL, sec) < 0)
+		return 0;
+
+	if (!wsi->pending_timeout)
+		return 0;
+
+	/*
+	 * if we went beyond the allowed time, kill the
+	 * connection
+	 */
+	if (sec > wsi->pending_timeout_limit) {
+		lwsl_info("TIMEDOUT WAITING\n");
+		libwebsocket_close_and_free_session(context,
+						wsi, LWS_CLOSE_STATUS_NOSTATUS);
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * libwebsocket_service_fd() - Service polled socket with something waiting
+ * @context:	Websocket context
+ * @pollfd:	The pollfd entry describing the socket fd and which events
+ *		happened.
+ *
+ *	This function takes a pollfd that has POLLIN or POLLOUT activity and
+ *	services it according to the state of the associated
+ *	struct libwebsocket.
+ *
+ *	The one call deals with all "service" that might happen on a socket
+ *	including listen accepts, http files as well as websocket protocol.
+ *
+ *	If a pollfd says it has something, you can just pass it to
+ *	libwebsocket_serice_fd() whether it is a socket handled by lws or not.
+ *	If it sees it is a lws socket, the traffic will be handled and
+ *	pollfd->revents will be zeroed now.
+ *
+ *	If the socket is foreign to lws, it leaves revents alone.  So you can
+ *	see if you should service yourself by checking the pollfd revents
+ *	after letting lws try to service it.
+ */
+
+LWS_VISIBLE int
+libwebsocket_service_fd(struct libwebsocket_context *context,
+							  struct libwebsocket_pollfd *pollfd)
+{
+	struct libwebsocket *wsi;
+	int n;
+	int m;
+	int listen_socket_fds_index = 0;
+	time_t now;
+	int timed_out = 0;
+	int our_fd = 0;
+	char draining_flow = 0;
+	int more;
+	struct lws_tokens eff_buf;
+
+	if (context->listen_service_fd)
+		listen_socket_fds_index = context->lws_lookup[
+			     context->listen_service_fd]->position_in_fds_table;
+
+	/*
+	 * you can call us with pollfd = NULL to just allow the once-per-second
+	 * global timeout checks; if less than a second since the last check
+	 * it returns immediately then.
+	 */
+
+	time(&now);
+
+	/* TODO: if using libev, we should probably use timeout watchers... */
+	if (context->last_timeout_check_s != now) {
+		context->last_timeout_check_s = now;
+
+		lws_plat_service_periodic(context);
+
+		/* global timeout check once per second */
+
+		if (pollfd)
+			our_fd = pollfd->fd;
+
+		for (n = 0; n < context->fds_count; n++) {
+			m = context->fds[n].fd;
+			wsi = context->lws_lookup[m];
+			if (!wsi)
+				continue;
+
+			if (libwebsocket_service_timeout_check(context, wsi, now))
+				/* he did time out... */
+				if (m == our_fd) {
+					/* it was the guy we came to service! */
+					timed_out = 1;
+					/* mark as handled */
+					pollfd->revents = 0;
+				}
+		}
+	}
+
+	/* the socket we came to service timed out, nothing to do */
+	if (timed_out)
+		return 0;
+
+	/* just here for timeout management? */
+	if (pollfd == NULL)
+		return 0;
+
+	/* no, here to service a socket descriptor */
+	wsi = context->lws_lookup[pollfd->fd];
+	if (wsi == NULL)
+		/* not lws connection ... leave revents alone and return */
+		return 0;
+
+	/*
+	 * so that caller can tell we handled, past here we need to
+	 * zero down pollfd->revents after handling
+	 */
+
+	/*
+	 * deal with listen service piggybacking
+	 * every listen_service_modulo services of other fds, we
+	 * sneak one in to service the listen socket if there's anything waiting
+	 *
+	 * To handle connection storms, as found in ab, if we previously saw a
+	 * pending connection here, it causes us to check again next time.
+	 */
+
+	if (context->listen_service_fd && pollfd !=
+				       &context->fds[listen_socket_fds_index]) {
+		context->listen_service_count++;
+		if (context->listen_service_extraseen ||
+				context->listen_service_count ==
+					       context->listen_service_modulo) {
+			context->listen_service_count = 0;
+			m = 1;
+			if (context->listen_service_extraseen > 5)
+				m = 2;
+			while (m--) {
+				/*
+				 * even with extpoll, we prepared this
+				 * internal fds for listen
+				 */
+				n = lws_poll_listen_fd(&context->fds[listen_socket_fds_index]);
+				if (n > 0) { /* there's a conn waiting for us */
+					libwebsocket_service_fd(context,
+						&context->
+						  fds[listen_socket_fds_index]);
+					context->listen_service_extraseen++;
+				} else {
+					if (context->listen_service_extraseen)
+						context->
+						     listen_service_extraseen--;
+					break;
+				}
+			}
+		}
+
+	}
+
+	/* handle session socket closed */
+
+	if ((!(pollfd->revents & LWS_POLLIN)) &&
+			(pollfd->revents & LWS_POLLHUP)) {
+
+		lwsl_debug("Session Socket %p (fd=%d) dead\n",
+						       (void *)wsi, pollfd->fd);
+
+		goto close_and_handled;
+	}
+
+	/* okay, what we came here to do... */
+
+	switch (wsi->mode) {
+
+#ifndef LWS_NO_SERVER
+	case LWS_CONNMODE_HTTP_SERVING:
+	case LWS_CONNMODE_HTTP_SERVING_ACCEPTED:
+	case LWS_CONNMODE_SERVER_LISTENER:
+	case LWS_CONNMODE_SSL_ACK_PENDING:
+		n = lws_server_socket_service(context, wsi, pollfd);
+		goto handled;
+#endif
+
+	case LWS_CONNMODE_WS_SERVING:
+	case LWS_CONNMODE_WS_CLIENT:
+
+		/* the guy requested a callback when it was OK to write */
+
+		if ((pollfd->revents & LWS_POLLOUT) &&
+			wsi->state == WSI_STATE_ESTABLISHED &&
+			   lws_handle_POLLOUT_event(context, wsi, pollfd) < 0) {
+			lwsl_info("libwebsocket_service_fd: closing\n");
+			goto close_and_handled;
+		}
+
+		if (wsi->u.ws.rxflow_buffer &&
+			      (wsi->u.ws.rxflow_change_to & LWS_RXFLOW_ALLOW)) {
+			lwsl_info("draining rxflow\n");
+			/* well, drain it */
+			eff_buf.token = (char *)wsi->u.ws.rxflow_buffer +
+						wsi->u.ws.rxflow_pos;
+			eff_buf.token_len = wsi->u.ws.rxflow_len -
+						wsi->u.ws.rxflow_pos;
+			draining_flow = 1;
+			goto drain;
+		}
+
+		/* any incoming data ready? */
+
+		if (!(pollfd->revents & LWS_POLLIN))
+			break;
+
+#ifdef LWS_OPENSSL_SUPPORT
+read_pending:
+		if (wsi->ssl) {
+			eff_buf.token_len = SSL_read(wsi->ssl,
+					context->service_buffer,
+					       sizeof(context->service_buffer));
+			if (!eff_buf.token_len) {
+				n = SSL_get_error(wsi->ssl, eff_buf.token_len);
+				lwsl_err("SSL_read returned 0 with reason %s\n",
+				  ERR_error_string(n,
+					      (char *)context->service_buffer));
+			}
+		} else
+#endif
+			eff_buf.token_len = recv(pollfd->fd,
+				context->service_buffer,
+					    sizeof(context->service_buffer), 0);
+
+		if (eff_buf.token_len < 0) {
+			lwsl_debug("service_fd read ret = %d, errno = %d\n",
+						  eff_buf.token_len, LWS_ERRNO);
+			if (LWS_ERRNO != LWS_EINTR && LWS_ERRNO != LWS_EAGAIN)
+				goto close_and_handled;
+			n = 0;
+			goto handled;
+		}
+		if (!eff_buf.token_len) {
+			lwsl_info("service_fd: closing due to 0 length read\n");
+			goto close_and_handled;
+		}
+
+		/*
+		 * give any active extensions a chance to munge the buffer
+		 * before parse.  We pass in a pointer to an lws_tokens struct
+		 * prepared with the default buffer and content length that's in
+		 * there.  Rather than rewrite the default buffer, extensions
+		 * that expect to grow the buffer can adapt .token to
+		 * point to their own per-connection buffer in the extension
+		 * user allocation.  By default with no extensions or no
+		 * extension callback handling, just the normal input buffer is
+		 * used then so it is efficient.
+		 */
+
+		eff_buf.token = (char *)context->service_buffer;
+drain:
+
+		do {
+
+			more = 0;
+			
+			m = lws_ext_callback_for_each_active(wsi,
+				LWS_EXT_CALLBACK_PACKET_RX_PREPARSE, &eff_buf, 0);
+			if (m < 0)
+				goto close_and_handled;
+			if (m)
+				more = 1;
+
+			/* service incoming data */
+
+			if (eff_buf.token_len) {
+				n = libwebsocket_read(context, wsi,
+					(unsigned char *)eff_buf.token,
+							    eff_buf.token_len);
+				if (n < 0) {
+					/* we closed wsi */
+					n = 0;
+					goto handled;
+				}
+			}
+
+			eff_buf.token = NULL;
+			eff_buf.token_len = 0;
+		} while (more);
+
+		if (draining_flow && wsi->u.ws.rxflow_buffer &&
+				 wsi->u.ws.rxflow_pos == wsi->u.ws.rxflow_len) {
+			lwsl_info("flow buffer: drained\n");
+			free(wsi->u.ws.rxflow_buffer);
+			wsi->u.ws.rxflow_buffer = NULL;
+			/* having drained the rxflow buffer, can rearm POLLIN */
+			_libwebsocket_rx_flow_control(wsi);
+		}
+
+#ifdef LWS_OPENSSL_SUPPORT
+		if (wsi->ssl && SSL_pending(wsi->ssl))
+			goto read_pending;
+#endif
+		break;
+
+	default:
+#ifdef LWS_NO_CLIENT
+		break;
+#else
+		n = lws_client_socket_service(context, wsi, pollfd);
+		goto handled;
+#endif
+	}
+
+	n = 0;
+	goto handled;
+
+close_and_handled:
+	libwebsocket_close_and_free_session(context, wsi,
+						LWS_CLOSE_STATUS_NOSTATUS);
+	n = 1;
+
+handled:
+	pollfd->revents = 0;
+	return n;
+}
+
+/**
+ * libwebsocket_service() - Service any pending websocket activity
+ * @context:	Websocket context
+ * @timeout_ms:	Timeout for poll; 0 means return immediately if nothing needed
+ *		service otherwise block and service immediately, returning
+ *		after the timeout if nothing needed service.
+ *
+ *	This function deals with any pending websocket traffic, for three
+ *	kinds of event.  It handles these events on both server and client
+ *	types of connection the same.
+ *
+ *	1) Accept new connections to our context's server
+ *
+ *	2) Call the receive callback for incoming frame data received by
+ *	    server or client connections.
+ *
+ *	You need to call this service function periodically to all the above
+ *	functions to happen; if your application is single-threaded you can
+ *	just call it in your main event loop.
+ *
+ *	Alternatively you can fork a new process that asynchronously handles
+ *	calling this service in a loop.  In that case you are happy if this
+ *	call blocks your thread until it needs to take care of something and
+ *	would call it with a large nonzero timeout.  Your loop then takes no
+ *	CPU while there is nothing happening.
+ *
+ *	If you are calling it in a single-threaded app, you don't want it to
+ *	wait around blocking other things in your loop from happening, so you
+ *	would call it with a timeout_ms of 0, so it returns immediately if
+ *	nothing is pending, or as soon as it services whatever was pending.
+ */
+
+LWS_VISIBLE int
+libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
+{
+	return lws_plat_service(context, timeout_ms);
+}
+