Merge lp:~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623 into lp:ubuntu/vivid/libwebsockets

[Roger Light]

[Daniel Holbach (dholbach)]

Contents conflict in lib/Makefile.am
Text conflict in lib/base64-decode.c
Text conflict in lib/extension.c
Text conflict in lib/libwebsockets.c
Text conflict in lib/libwebsockets.h
Text conflict in lib/output.c

review: Needs Fixing

[lp:~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623]

3. By Roger Light on 2015-02-19

New upstream release 1.3.

4. By Roger Light on 2015-02-19

* New upstream release, including SO version bump. (LP: #1422623)
* Build changed to cmake.
* New binary package libwebsockets-test-server-data to hold large
  architecture independent data for libwebsockets-test-server.
* Bump standards version to 3.9.5, no changes needed.

[Roger Light (roger.light)]

Sorry, I must have made a commit without unapplying the quilt patches. I have redone the upstream merge, and overwritten the branch.

[Daniel Holbach (dholbach)]

I'm still seeing this issue. Maybe you can try to run these steps locally as well?

daniel@daydream:~$ bzr branch lp:ubuntu/libwebsockets
Most recent Ubuntu version: 1.2.2-1
Packaging branch status: CURRENT
Branched 2 revisions.
daniel@daydream:~$ cd libwebsockets/
daniel@daydream:~/libwebsockets$ bzr merge lp:~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623
Unapplying quilt patches to prevent spurious conflicts
+N Android.mk
+N cmake/FindGit.cmake
+N cmake/LibwebsocketsConfig.cmake.in
+N cmake/LibwebsocketsConfigVersion.cmake.in
+N cmake/UseRPMTools.cmake
+N cross-arm-linux-gnueabihf.cmake
+N cross-ming.cmake
+N cross-openwrt-makefile
+N debian/libwebsockets-test-server-data.install
+N debian/patches/cmake.patch
+N debian/patches/soversion.patch
+N lib/context.c
+N lib/lextable.h
+N lib/libev.c
+N lib/lws-plat-unix.c
+N lib/lws-plat-win.c
+N lib/pollfd.c
+N lib/service.c
+N lib/ssl-http2.c
+N lib/ssl.c
+N scripts/FindLibWebSockets.cmake
+N test-server/leaf.jpg
 M .gitignore
 M CMakeLists.txt
-D COPYING
-D INSTALL
-D Makefile.am
 M README.build
 M README.coding
-D autogen.sh
 M changelog
 M cmake/FindOpenSSLbins.cmake
 M config.h.cmake
-D configure.ac
 M debian/changelog
 M debian/control
 M debian/copyright
 M debian/libwebsockets-dev.doc-base
 M debian/libwebsockets-dev.docs
 M debian/libwebsockets-test-server.install
R debian/libwebsockets3.install => debian/libwebsockets4.install
RM debian/libwebsockets3.lintian-overrides => debian/libwebsockets4.lintian-overrides
RM debian/libwebsockets3.symbols => debian/libwebsockets4.symbols
-D debian/patches/0001-getnameinfo.patch
-D debian/patches/0002-keepalive.patch
-D debian/patches/01-visibility.patch
 M debian/patches/series
 M debian/rules
RM lib/Makefile.am => lib/Makefile.am.THIS
 M lib/base64-decode.c
 M lib/client-handshake.c
 M lib/client-parser.c
 M* lib/client.c
 M lib/extension-deflate-frame.c
 M lib/extension.c
 M lib/getifaddrs.h
 M lib/handshake.c
 M lib/libwebsockets.c
 M lib/libwebsockets.h
 M lib/minilex.c
 M lib/output.c
 M lib/parsers.c
 M* lib/private-libwebsockets.h
 M lib/server-handshake.c
 M lib/server.c
 M lib/sha-1.c
 M libwebsockets-api-doc.html
-D libwebsockets.pc.in
 M libwebsockets.spec
-D m4/
-D m4/ignore-me
-D test-server/Makefile.am
 M test-server/attack.sh
 M test-server/test-client.c
 M test-server/test-echo.c
 M test-server/test-fraggle.c
 M test-server/test-ping.c
 M test-server/test-server.c
 M test-server/test.html
-D win32port/client/
-D win32port/client/client.vcxproj
-D win32port/client/client.vcxproj.filters
-D win32port/libwebsocketswin32/
-D win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters
-D win32port/server/
-D win32port/server/server.vcxproj
-D win32port/server/server.vcxproj.filters
 M win32port/win32helpers/gettimeofday.c
 M win32port/win32helpers/gettime...

review: Needs Fixing

[Roger Light (roger.light)]

> I'm still seeing this issue. Maybe you can try to run these steps locally as
> well?

Will do, thanks for the pointer on what I need to do.

[Roger Light (roger.light)]

> I'm still seeing this issue. Maybe you can try to run these steps locally as
> well?

I see the same thing, but nothing I've tried has been able to remove the conflicts. The file conflicts are only those files that have quilt patches. The patches are applied in the bzr repo. I have tried removing the patches, committing and then carrying out merge-upstream. That doesn't work. I've tried merge-upstream with the patches applied, that doesn't work. I've tried removing the contents of the .pc directory, so quilt doesn't think the patches are applied. This means when I run merge-upstream I need to resolve conflicts immediately. Having done that, I still get text conflicts when I try to merge back to the clean branch (no surprise really). I've tried to manually apply the updated upstream source, which works ok but then when I try to merge back bzr tells me the tree transform is malformed.

I think it's out of time now, thanks for looking anyway.

Unmerged revisions

4. By Roger Light on 2015-02-19

* New upstream release, including SO version bump. (LP: #1422623)
* Build changed to cmake.
* New binary package libwebsockets-test-server-data to hold large
  architecture independent data for libwebsockets-test-server.
* Bump standards version to 3.9.5, no changes needed.

3. By Roger Light on 2015-02-19

New upstream release 1.3.

=== modified file '.gitignore'
--- .gitignore	2013-03-28 19:10:28 +0000
+++ .gitignore	2015-02-19 16:44:02 +0000
@@ -29,7 +29,6 @@
 configure
 compile
 config.guess
-*.in
 *~
 *.orig
 autom4te.cache/
 
=== removed directory '.pc/0001-getnameinfo.patch'
=== removed directory '.pc/0001-getnameinfo.patch/lib'
=== removed file '.pc/0001-getnameinfo.patch/lib/libwebsockets.c'
--- .pc/0001-getnameinfo.patch/lib/libwebsockets.c	2013-03-28 19:10:28 +0000
+++ .pc/0001-getnameinfo.patch/lib/libwebsockets.c	1970-01-01 00:00:00 +0000
@@ -1,2283 +0,0 @@
-/*
- * libwebsockets - small server side websockets and web server implementation
- *
- * Copyright (C) 2010 Andy Green <[e-mail]>
- *
- *  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"
-
-#ifdef WIN32
-#include <tchar.h>
-#include <io.h>
-#include <mstcpip.h>
-#else
-#ifdef LWS_BUILTIN_GETIFADDRS
-#include <getifaddrs.h>
-#else
-#include <ifaddrs.h>
-#endif
-#include <syslog.h>
-#include <sys/un.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-int openssl_websocket_private_data_index;
-#endif
-
-#ifdef __MINGW32__
-#include "../win32port/win32helpers/websock-w32.c"
-#else
-#ifdef __MINGW64__
-#include "../win32port/win32helpers/websock-w32.c"
-#endif
-#endif
-
-#ifndef LWS_BUILD_HASH
-#define LWS_BUILD_HASH "unknown-build-hash"
-#endif
-
-static int log_level = LLL_ERR | LLL_WARN | LLL_NOTICE;
-static void lwsl_emit_stderr(int level, const char *line);
-static void (*lwsl_emit)(int level, const char *line) = lwsl_emit_stderr;
-
-static const char *library_version = LWS_LIBRARY_VERSION " " LWS_BUILD_HASH;
-
-static const char * const log_level_names[] = {
-	"ERR",
-	"WARN",
-	"NOTICE",
-	"INFO",
-	"DEBUG",
-	"PARSER",
-	"HEADER",
-	"EXTENSION",
-	"CLIENT",
-	"LATENCY",
-};
-
-#ifndef LWS_NO_CLIENT
-	extern int lws_client_socket_service(
-		struct libwebsocket_context *context,
-		struct libwebsocket *wsi, struct pollfd *pollfd);
-#endif
-#ifndef LWS_NO_SERVER
-	extern int lws_server_socket_service(
-		struct libwebsocket_context *context,
-		struct libwebsocket *wsi, struct pollfd *pollfd);
-#endif
-
-/**
- * lws_get_library_version: get version and git hash library built from
- *
- *	returns a const char * to a string like "1.1 178d78c"
- *	representing the library version followed by the git head hash it
- *	was built from
- */
-
-const char *
-lws_get_library_version(void)
-{
-	return library_version;
-}
-
-int
-insert_wsi_socket_into_fds(struct libwebsocket_context *context,
-						       struct libwebsocket *wsi)
-{
-	if (context->fds_count >= context->max_fds) {
-		lwsl_err("Too many fds (%d)\n", context->max_fds);
-		return 1;
-	}
-
-	if (wsi->sock > context->max_fds) {
-		lwsl_err("Socket fd %d is too high (%d)\n",
-						wsi->sock, context->max_fds);
-		return 1;
-	}
-
-	assert(wsi);
-	assert(wsi->sock);
-
-	lwsl_info("insert_wsi_socket_into_fds: wsi=%p, sock=%d, fds pos=%d\n",
-					    wsi, wsi->sock, context->fds_count);
-
-	context->lws_lookup[wsi->sock] = wsi;
-	wsi->position_in_fds_table = context->fds_count;
-	context->fds[context->fds_count].fd = wsi->sock;
-	context->fds[context->fds_count].events = POLLIN;
-	context->fds[context->fds_count++].revents = 0;
-
-	/* external POLL support via protocol 0 */
-	context->protocols[0].callback(context, wsi,
-		LWS_CALLBACK_ADD_POLL_FD,
-		(void *)(long)wsi->sock, NULL, POLLIN);
-
-	return 0;
-}
-
-static int
-remove_wsi_socket_from_fds(struct libwebsocket_context *context,
-						      struct libwebsocket *wsi)
-{
-	int m;
-
-	if (!--context->fds_count)
-		goto do_ext;
-
-	if (wsi->sock > context->max_fds) {
-		lwsl_err("Socket fd %d too high (%d)\n",
-						   wsi->sock, context->max_fds);
-		return 1;
-	}
-
-	lwsl_info("remove_wsi_socket_from_fds: wsi=%p, sock=%d, fds pos=%d\n",
-				    wsi, wsi->sock, wsi->position_in_fds_table);
-
-	m = wsi->position_in_fds_table; /* replace the contents for this */
-
-	/* have the last guy take up the vacant slot */
-	context->fds[m] = context->fds[context->fds_count];
-	/*
-	 * end guy's fds_lookup entry remains unchanged
-	 * (still same fd pointing to same wsi)
-	 */
-	/* end guy's "position in fds table" changed */
-	context->lws_lookup[context->fds[context->fds_count].fd]->
-						position_in_fds_table = m;
-	/* deletion guy's lws_lookup entry needs nuking */
-	context->lws_lookup[wsi->sock] = NULL;
-	/* removed wsi has no position any more */
-	wsi->position_in_fds_table = -1;
-
-do_ext:
-	/* remove also from external POLL support via protocol 0 */
-	if (wsi->sock)
-		context->protocols[0].callback(context, wsi,
-		    LWS_CALLBACK_DEL_POLL_FD, (void *)(long)wsi->sock, NULL, 0);
-
-	return 0;
-}
-
-
-void
-libwebsocket_close_and_free_session(struct libwebsocket_context *context,
-			 struct libwebsocket *wsi, enum lws_close_status reason)
-{
-	int n;
-	int old_state;
-	unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 2 +
-						  LWS_SEND_BUFFER_POST_PADDING];
-#ifndef LWS_NO_EXTENSIONS
-	int ret;
-	int m;
-	struct lws_tokens eff_buf;
-	struct libwebsocket_extension *ext;
-#endif
-
-	if (!wsi)
-		return;
-
-	old_state = wsi->state;
-
-	if (old_state == WSI_STATE_DEAD_SOCKET)
-		return;
-
-	wsi->u.ws.close_reason = reason;
-
-	if (wsi->mode == LWS_CONNMODE_HTTP_SERVING && wsi->u.http.fd) {
-		close(wsi->u.http.fd);
-		wsi->u.http.fd = 0;
-	}
-
-#ifndef LWS_NO_EXTENSIONS
-	/*
-	 * are his extensions okay with him closing?  Eg he might be a mux
-	 * parent and just his ch1 aspect is closing?
-	 */
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		m = wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			LWS_EXT_CALLBACK_CHECK_OK_TO_REALLY_CLOSE,
-				       wsi->active_extensions_user[n], NULL, 0);
-
-		/*
-		 * if somebody vetoed actually closing him at this time....
-		 * up to the extension to track the attempted close, let's
-		 * just bail
-		 */
-
-		if (m) {
-			lwsl_ext("extension vetoed close\n");
-			return;
-		}
-	}
-
-	/*
-	 * flush any tx pending from extensions, since we may send close packet
-	 * if there are problems with send, just nuke the connection
-	 */
-
-	ret = 1;
-	while (ret == 1) {
-
-		/* default to nobody has more to spill */
-
-		ret = 0;
-		eff_buf.token = NULL;
-		eff_buf.token_len = 0;
-
-		/* show every extension the new incoming data */
-
-		for (n = 0; n < wsi->count_active_extensions; n++) {
-			m = wsi->active_extensions[n]->callback(
-					wsi->protocol->owning_server,
-					wsi->active_extensions[n], wsi,
-					LWS_EXT_CALLBACK_FLUSH_PENDING_TX,
-				   wsi->active_extensions_user[n], &eff_buf, 0);
-			if (m < 0) {
-				lwsl_ext("Extension reports fatal error\n");
-				goto just_kill_connection;
-			}
-			if (m)
-				/*
-				 * at least one extension told us he has more
-				 * to spill, so we will go around again after
-				 */
-				ret = 1;
-		}
-
-		/* assuming they left us something to send, send it */
-
-		if (eff_buf.token_len)
-			if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
-							   eff_buf.token_len)) {
-				lwsl_debug("close: ext spill failed\n");
-				goto just_kill_connection;
-			}
-	}
-#endif
-
-	/*
-	 * signal we are closing, libsocket_write will
-	 * add any necessary version-specific stuff.  If the write fails,
-	 * no worries we are closing anyway.  If we didn't initiate this
-	 * close, then our state has been changed to
-	 * WSI_STATE_RETURNED_CLOSE_ALREADY and we will skip this.
-	 *
-	 * Likewise if it's a second call to close this connection after we
-	 * sent the close indication to the peer already, we are in state
-	 * WSI_STATE_AWAITING_CLOSE_ACK and will skip doing this a second time.
-	 */
-
-	if (old_state == WSI_STATE_ESTABLISHED &&
-					  reason != LWS_CLOSE_STATUS_NOSTATUS) {
-
-		lwsl_debug("sending close indication...\n");
-
-		/* make valgrind happy */
-		memset(buf, 0, sizeof(buf));
-		n = libwebsocket_write(wsi,
-				&buf[LWS_SEND_BUFFER_PRE_PADDING + 2],
-							    0, LWS_WRITE_CLOSE);
-		if (!n) {
-			/*
-			 * we have sent a nice protocol level indication we
-			 * now wish to close, we should not send anything more
-			 */
-
-			wsi->state = WSI_STATE_AWAITING_CLOSE_ACK;
-
-			/*
-			 * ...and we should wait for a reply for a bit
-			 * out of politeness
-			 */
-
-			libwebsocket_set_timeout(wsi,
-						  PENDING_TIMEOUT_CLOSE_ACK, 1);
-
-			lwsl_debug("sent close indication, awaiting ack\n");
-
-			return;
-		}
-
-		lwsl_info("close: sending close packet failed, hanging up\n");
-
-		/* else, the send failed and we should just hang up */
-	}
-
-#ifndef LWS_NO_EXTENSIONS
-just_kill_connection:
-#endif
-
-	lwsl_debug("close: just_kill_connection\n");
-
-	/*
-	 * we won't be servicing or receiving anything further from this guy
-	 * delete socket from the internal poll list if still present
-	 */
-
-	remove_wsi_socket_from_fds(context, wsi);
-
-	wsi->state = WSI_STATE_DEAD_SOCKET;
-
-	if ((old_state == WSI_STATE_ESTABLISHED ||
-	     wsi->mode == LWS_CONNMODE_WS_SERVING ||
-	     wsi->mode == LWS_CONNMODE_WS_CLIENT)) {
-
-		if (wsi->u.ws.rx_user_buffer) {
-			free(wsi->u.ws.rx_user_buffer);
-			wsi->u.ws.rx_user_buffer = NULL;
-		}
-		if (wsi->u.ws.rxflow_buffer) {
-			free(wsi->u.ws.rxflow_buffer);
-			wsi->u.ws.rxflow_buffer = NULL;
-		}
-	}
-
-	/* tell the user it's all over for this guy */
-
-	if (wsi->protocol && wsi->protocol->callback &&
-			((old_state == WSI_STATE_ESTABLISHED) ||
-			 (old_state == WSI_STATE_RETURNED_CLOSE_ALREADY) ||
-			 (old_state == WSI_STATE_AWAITING_CLOSE_ACK))) {
-		lwsl_debug("calling back CLOSED\n");
-		wsi->protocol->callback(context, wsi, LWS_CALLBACK_CLOSED,
-						      wsi->user_space, NULL, 0);
-	} else
-		lwsl_debug("not calling back closed\n");
-
-#ifndef LWS_NO_EXTENSIONS
-	/* deallocate any active extension contexts */
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-				LWS_EXT_CALLBACK_DESTROY,
-				       wsi->active_extensions_user[n], NULL, 0);
-
-		free(wsi->active_extensions_user[n]);
-	}
-
-	/*
-	 * inform all extensions in case they tracked this guy out of band
-	 * even though not active on him specifically
-	 */
-
-	ext = context->extensions;
-	while (ext && ext->callback) {
-		ext->callback(context, ext, wsi,
-				LWS_EXT_CALLBACK_DESTROY_ANY_WSI_CLOSING,
-				       NULL, NULL, 0);
-		ext++;
-	}
-#endif
-
-/*	lwsl_info("closing fd=%d\n", wsi->sock); */
-
-#ifdef LWS_OPENSSL_SUPPORT
-	if (wsi->ssl) {
-		n = SSL_get_fd(wsi->ssl);
-		SSL_shutdown(wsi->ssl);
-		compatible_close(n);
-		SSL_free(wsi->ssl);
-	} else {
-#endif
-		if (wsi->sock) {
-			n = shutdown(wsi->sock, SHUT_RDWR);
-			if (n)
-				lwsl_debug("closing: shutdown returned %d\n",
-									errno);
-
-			n = compatible_close(wsi->sock);
-			if (n)
-				lwsl_debug("closing: close returned %d\n",
-									errno);
-		}
-#ifdef LWS_OPENSSL_SUPPORT
-	}
-#endif
-	if (wsi->protocol && wsi->protocol->per_session_data_size &&
-					wsi->user_space) /* user code may own */
-		free(wsi->user_space);
-
-	free(wsi);
-}
-
-/**
- * libwebsockets_get_peer_addresses() - Get client address information
- * @context:	Libwebsockets context
- * @wsi:	Local struct libwebsocket associated with
- * @fd:		Connection socket descriptor
- * @name:	Buffer to take client address name
- * @name_len:	Length of client address name buffer
- * @rip:	Buffer to take client address IP qotted quad
- * @rip_len:	Length of client address IP buffer
- *
- *	This function fills in @name and @rip with the name and IP of
- *	the client connected with socket descriptor @fd.  Names may be
- *	truncated if there is not enough room.  If either cannot be
- *	determined, they will be returned as valid zero-length strings.
- */
-
-void
-libwebsockets_get_peer_addresses(struct libwebsocket_context *context,
-	struct libwebsocket *wsi, int fd, char *name, int name_len,
-					char *rip, int rip_len)
-{
-	unsigned int len;
-	struct sockaddr_in sin;
-	struct hostent *host;
-	struct hostent *host1;
-	char ip[128];
-	unsigned char *p;
-	int n;
-	int ret = -1;
-#ifdef AF_LOCAL
-	struct sockaddr_un *un;
-#endif
-
-	rip[0] = '\0';
-	name[0] = '\0';
-
-	lws_latency_pre(context, wsi);
-
-	len = sizeof(sin);
-	if (getpeername(fd, (struct sockaddr *) &sin, &len) < 0) {
-		perror("getpeername");
-		goto bail;
-	}
-
-	host = gethostbyaddr((char *) &sin.sin_addr, sizeof(sin.sin_addr),
-								       AF_INET);
-	if (host == NULL) {
-		perror("gethostbyaddr");
-		goto bail;
-	}
-
-	strncpy(name, host->h_name, name_len);
-	name[name_len - 1] = '\0';
-
-	host1 = gethostbyname(host->h_name);
-	if (host1 == NULL)
-		goto bail;
-	p = (unsigned char *)host1;
-	n = 0;
-	while (p != NULL) {
-		p = (unsigned char *)host1->h_addr_list[n++];
-		if (p == NULL)
-			continue;
-		if ((host1->h_addrtype != AF_INET)
-#ifdef AF_LOCAL
-			&& (host1->h_addrtype != AF_LOCAL)
-#endif
-			)
-			continue;
-
-		if (host1->h_addrtype == AF_INET)
-			sprintf(ip, "%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
-#ifdef AF_LOCAL
-		else {
-			un = (struct sockaddr_un *)p;
-			strncpy(ip, un->sun_path, sizeof(ip) - 1);
-			ip[sizeof(ip) - 1] = '\0';
-		}
-#endif
-		p = NULL;
-		strncpy(rip, ip, rip_len);
-		rip[rip_len - 1] = '\0';
-	}
-
-	ret = 0;
-bail:
-	lws_latency(context, wsi, "libwebsockets_get_peer_addresses", ret, 1);
-}
-
-int libwebsockets_get_random(struct libwebsocket_context *context,
-							     void *buf, int len)
-{
-	int n;
-	char *p = (char *)buf;
-
-#ifdef WIN32
-	for (n = 0; n < len; n++)
-		p[n] = (unsigned char)rand();
-#else
-	n = read(context->fd_random, p, len);
-#endif
-
-	return n;
-}
-
-int lws_set_socket_options(struct libwebsocket_context *context, int fd)
-{
-	int optval = 1;
-	socklen_t optlen = sizeof(optval);
-#ifdef WIN32
-	unsigned long optl = 0;
-#endif
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-	struct protoent *tcp_proto;
-#endif
-
-	if (context->ka_time) {
-		/* enable keepalive on this socket */
-		optval = 1;
-		if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-
-		/*
-		 * didn't find a way to set these per-socket, need to
-		 * tune kernel systemwide values
-		 */
-#elif WIN32
-		{
-			DWORD dwBytesRet;
-			struct tcp_keepalive alive;
-			alive.onoff = TRUE;
-			alive.keepalivetime = context->ka_time;
-			alive.keepaliveinterval = context->ka_interval;
-
-			if (WSAIoctl(fd, SIO_KEEPALIVE_VALS, &alive, sizeof(alive), 
-									NULL, 0, &dwBytesRet, NULL, NULL))
-				return 1;
-		}
-#else
-		/* set the keepalive conditions we want on it too */
-		optval = context->ka_time;
-		if (setsockopt(fd, IPPROTO_IP, TCP_KEEPIDLE,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-
-		optval = context->ka_probes;
-		if (setsockopt(fd, IPPROTO_IP, TCP_KEEPINTVL,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-
-		optval = context->ka_interval;
-		if (setsockopt(fd, IPPROTO_IP, TCP_KEEPCNT,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-#endif
-	}
-
-	/* Disable Nagle */
-	optval = 1;
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-	setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen);
-#else
-	tcp_proto = getprotobyname("TCP");
-	setsockopt(fd, tcp_proto->p_proto, TCP_NODELAY, &optval, optlen);
-#endif
-
-	/* We are nonblocking... */
-#ifdef WIN32
-	ioctlsocket(fd, FIONBIO, &optl);
-#else
-	fcntl(fd, F_SETFL, O_NONBLOCK);
-#endif
-
-	return 0;
-}
-
-int lws_send_pipe_choked(struct libwebsocket *wsi)
-{
-	struct pollfd fds;
-
-	fds.fd = wsi->sock;
-	fds.events = POLLOUT;
-	fds.revents = 0;
-
-	if (poll(&fds, 1, 0) != 1)
-		return 1;
-
-	if ((fds.revents & POLLOUT) == 0)
-		return 1;
-
-	/* okay to send another packet without blocking */
-
-	return 0;
-}
-
-int
-lws_handle_POLLOUT_event(struct libwebsocket_context *context,
-				struct libwebsocket *wsi, struct pollfd *pollfd)
-{
-	int n;
-
-#ifndef LWS_NO_EXTENSIONS
-	struct lws_tokens eff_buf;
-	int ret;
-	int m;
-	int handled = 0;
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		m = wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			LWS_EXT_CALLBACK_IS_WRITEABLE,
-				       wsi->active_extensions_user[n], NULL, 0);
-		if (m > handled)
-			handled = m;
-	}
-
-	if (handled == 1)
-		goto notify_action;
-
-	if (!wsi->extension_data_pending || handled == 2)
-		goto user_service;
-
-	/*
-	 * 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 */
-
-		for (n = 0; n < wsi->count_active_extensions; n++) {
-			m = wsi->active_extensions[n]->callback(
-				wsi->protocol->owning_server,
-				wsi->active_extensions[n], wsi,
-					LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
-				   wsi->active_extensions_user[n], &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) {
-			if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
-							     eff_buf.token_len))
-				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;
-	}
-
-	wsi->extension_data_pending = 0;
-
-user_service:
-#endif
-	/* one shot */
-
-	if (pollfd) {
-		pollfd->events &= ~POLLOUT;
-
-		/* external POLL support via protocol 0 */
-		context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_CLEAR_MODE_POLL_FD,
-			(void *)(long)wsi->sock, NULL, POLLOUT);
-	}
-#ifndef LWS_NO_EXTENSIONS
-notify_action:
-#endif
-
-	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);
-}
-
-
-
-void
-libwebsocket_service_timeout_check(struct libwebsocket_context *context,
-				     struct libwebsocket *wsi, unsigned int sec)
-{
-#ifndef LWS_NO_EXTENSIONS
-	int n;
-
-	/*
-	 * if extensions want in on it (eg, we are a mux parent)
-	 * give them a chance to service child timeouts
-	 */
-
-	for (n = 0; n < wsi->count_active_extensions; n++)
-		wsi->active_extensions[n]->callback(
-				    context, wsi->active_extensions[n],
-				    wsi, LWS_EXT_CALLBACK_1HZ,
-				    wsi->active_extensions_user[n], NULL, sec);
-
-#endif
-	if (!wsi->pending_timeout)
-		return;
-
-	/*
-	 * 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);
-	}
-}
-
-/**
- * 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.
- */
-
-int
-libwebsocket_service_fd(struct libwebsocket_context *context,
-							  struct pollfd *pollfd)
-{
-	struct libwebsocket *wsi;
-	int n;
-	int m;
-	int listen_socket_fds_index = 0;
-	struct timeval tv;
-
-#ifndef LWS_NO_EXTENSIONS
-	int more = 1;
-#endif
-	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.
-	 */
-
-	gettimeofday(&tv, NULL);
-
-	if (context->last_timeout_check_s != tv.tv_sec) {
-		context->last_timeout_check_s = tv.tv_sec;
-
-		#ifndef WIN32
-		/* if our parent went down, don't linger around */
-		if (context->started_with_parent &&
-				      kill(context->started_with_parent, 0) < 0)
-			kill(getpid(), SIGTERM);
-		#endif
-
-		/* global timeout check once per second */
-
-		for (n = 0; n < context->fds_count; n++) {
-			struct libwebsocket *new_wsi =
-					context->lws_lookup[context->fds[n].fd];
-			if (!new_wsi)
-				continue;
-			libwebsocket_service_timeout_check(context,
-				new_wsi, tv.tv_sec);
-		}
-	}
-
-	/* just here for timeout management? */
-
-	if (pollfd == NULL)
-		return 0;
-
-	/* no, here to service a socket descriptor */
-
-	/*
-	 * 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 = poll(&context->fds[listen_socket_fds_index],
-									  1, 0);
-				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;
-				}
-			}
-		}
-
-	}
-
-	/* okay, what we came here to do... */
-
-	wsi = context->lws_lookup[pollfd->fd];
-	if (wsi == NULL) {
-		if (pollfd->fd > 11)
-			lwsl_err("unexpected NULL wsi fd=%d fds_count=%d\n",
-						pollfd->fd, context->fds_count);
-		return 0;
-	}
-
-	switch (wsi->mode) {
-
-#ifndef LWS_NO_SERVER
-	case LWS_CONNMODE_HTTP_SERVING:
-	case LWS_CONNMODE_SERVER_LISTENER:
-	case LWS_CONNMODE_SSL_ACK_PENDING:
-		return lws_server_socket_service(context, wsi, pollfd);
-#endif
-
-	case LWS_CONNMODE_WS_SERVING:
-	case LWS_CONNMODE_WS_CLIENT:
-
-		/* handle session socket closed */
-
-		if (pollfd->revents & (POLLERR | POLLHUP)) {
-
-			lwsl_debug("Session Socket %p (fd=%d) dead\n",
-				(void *)wsi, pollfd->fd);
-
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-
-		/* the guy requested a callback when it was OK to write */
-
-		if ((pollfd->revents & POLLOUT) &&
-					    wsi->state == WSI_STATE_ESTABLISHED)
-			if (lws_handle_POLLOUT_event(context, wsi,
-								  pollfd) < 0) {
-				lwsl_info("libwebsocket_service_fd: closing\n");
-				libwebsocket_close_and_free_session(
-					 context, wsi, LWS_CLOSE_STATUS_NORMAL);
-				return 0;
-			}
-
-
-		/* any incoming data ready? */
-
-		if (!(pollfd->revents & 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("Socket read returned %d\n",
-							    eff_buf.token_len);
-			if (errno != EINTR && errno != EAGAIN)
-				libwebsocket_close_and_free_session(context,
-					       wsi, LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-		if (!eff_buf.token_len) {
-			lwsl_info("closing connection due to 0 length read\n");
-			libwebsocket_close_and_free_session(context, wsi,
-						    LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-
-		/*
-		 * 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;
-#ifndef LWS_NO_EXTENSIONS
-		more = 1;
-		while (more) {
-
-			more = 0;
-
-			for (n = 0; n < wsi->count_active_extensions; n++) {
-				m = wsi->active_extensions[n]->callback(context,
-					wsi->active_extensions[n], wsi,
-					LWS_EXT_CALLBACK_PACKET_RX_PREPARSE,
-					wsi->active_extensions_user[n],
-								   &eff_buf, 0);
-				if (m < 0) {
-					lwsl_ext(
-					    "Extension reports fatal error\n");
-					libwebsocket_close_and_free_session(
-						context, wsi,
-						    LWS_CLOSE_STATUS_NOSTATUS);
-					return 0;
-				}
-				if (m)
-					more = 1;
-			}
-#endif
-			/* 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 */
-					return 0;
-			}
-#ifndef LWS_NO_EXTENSIONS
-			eff_buf.token = NULL;
-			eff_buf.token_len = 0;
-		}
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-		if (wsi->ssl && SSL_pending(wsi->ssl))
-			goto read_pending;
-#endif
-		break;
-
-	default:
-#ifdef LWS_NO_CLIENT
-		break;
-#else
-		return  lws_client_socket_service(context, wsi, pollfd);
-#endif
-	}
-
-	return 0;
-}
-
-
-/**
- * libwebsocket_context_destroy() - Destroy the websocket context
- * @context:	Websocket context
- *
- *	This function closes any active connections and then frees the
- *	context.  After calling this, any further use of the context is
- *	undefined.
- */
-void
-libwebsocket_context_destroy(struct libwebsocket_context *context)
-{
-#ifndef LWS_NO_EXTENSIONS
-	int n;
-	int m;
-	struct libwebsocket_extension *ext;
-	struct libwebsocket_protocols *protocol = context->protocols;
-
-#ifdef LWS_LATENCY
-	if (context->worst_latency_info[0])
-		lwsl_notice("Worst latency: %s\n", context->worst_latency_info);
-#endif
-
-	for (n = 0; n < context->fds_count; n++) {
-		struct libwebsocket *wsi =
-					context->lws_lookup[context->fds[n].fd];
-		libwebsocket_close_and_free_session(context,
-			wsi, LWS_CLOSE_STATUS_NOSTATUS /* no protocol close */);
-		n--;
-	}
-
-	/*
-	 * give all extensions a chance to clean up any per-context
-	 * allocations they might have made
-	 */
-
-	ext = context->extensions;
-	m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT;
-	if (context->listen_port)
-		m = LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT;
-	while (ext && ext->callback) {
-		ext->callback(context, ext, NULL,
-			(enum libwebsocket_extension_callback_reasons)m,
-								 NULL, NULL, 0);
-		ext++;
-	}
-
-	/*
-	 * inform all the protocols that they are done and will have no more
-	 * callbacks
-	 */
-
-	while (protocol->callback) {
-		protocol->callback(context, NULL, LWS_CALLBACK_PROTOCOL_DESTROY,
-				NULL, NULL, 0);
-		protocol++;
-	}
-
-#endif
-
-#ifdef WIN32
-#else
-	close(context->fd_random);
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-	if (context->ssl_ctx)
-		SSL_CTX_free(context->ssl_ctx);
-	if (context->ssl_client_ctx)
-		SSL_CTX_free(context->ssl_client_ctx);
-
-	ERR_remove_state(0);
-	ERR_free_strings();
-	EVP_cleanup();
-	CRYPTO_cleanup_all_ex_data();
-#endif
-
-	if (context->fds)
-		free(context->fds);
-	if (context->lws_lookup)
-		free(context->lws_lookup);
-
-	free(context);
-
-#ifdef WIN32
-	WSACleanup();
-#endif
-}
-
-/**
- * libwebsocket_context_user() - get the user data associated with the context
- * @context: Websocket context
- *
- *	This returns the optional user allocation that can be attached to
- *	the context the sockets live in at context_create time.  It's a way
- *	to let all sockets serviced in the same context share data without
- *	using globals statics in the user code.
- */
-LWS_EXTERN void *
-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.
- */
-
-int
-libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
-{
-	int n;
-
-	/* stay dead once we are dead */
-
-	if (context == NULL)
-		return 1;
-
-	/* wait for something to need service */
-
-	n = poll(context->fds, context->fds_count, timeout_ms);
-	if (n == 0) /* poll timeout */
-		return 0;
-
-	if (n < 0)
-		return -1;
-
-	/* any socket with events to service? */
-
-	for (n = 0; n < context->fds_count; n++)
-		if (context->fds[n].revents)
-			if (libwebsocket_service_fd(context,
-							&context->fds[n]) < 0)
-				return -1;
-	return 0;
-}
-
-#ifndef LWS_NO_EXTENSIONS
-int
-lws_any_extension_handled(struct libwebsocket_context *context,
-			  struct libwebsocket *wsi,
-			  enum libwebsocket_extension_callback_reasons r,
-						       void *v, size_t len)
-{
-	int n;
-	int handled = 0;
-
-	/* maybe an extension will take care of it for us */
-
-	for (n = 0; n < wsi->count_active_extensions && !handled; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		handled |= wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			r, wsi->active_extensions_user[n], v, len);
-	}
-
-	return handled;
-}
-
-
-void *
-lws_get_extension_user_matching_ext(struct libwebsocket *wsi,
-					   struct libwebsocket_extension *ext)
-{
-	int n = 0;
-
-	if (wsi == NULL)
-		return NULL;
-
-	while (n < wsi->count_active_extensions) {
-		if (wsi->active_extensions[n] != ext) {
-			n++;
-			continue;
-		}
-		return wsi->active_extensions_user[n];
-	}
-
-	return NULL;
-}
-#endif
-
-/**
- * libwebsocket_callback_on_writable() - Request a callback when this socket
- *					 becomes able to be written to without
- *					 blocking
- *
- * @context:	libwebsockets context
- * @wsi:	Websocket connection instance to get callback for
- */
-
-int
-libwebsocket_callback_on_writable(struct libwebsocket_context *context,
-						      struct libwebsocket *wsi)
-{
-#ifndef LWS_NO_EXTENSIONS
-	int n;
-	int handled = 0;
-
-	/* maybe an extension will take care of it for us */
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		handled |= wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			LWS_EXT_CALLBACK_REQUEST_ON_WRITEABLE,
-				       wsi->active_extensions_user[n], NULL, 0);
-	}
-
-	if (handled)
-		return 1;
-#endif
-	if (wsi->position_in_fds_table < 0) {
-		lwsl_err("libwebsocket_callback_on_writable: failed to find socket %d\n",
-								     wsi->sock);
-		return -1;
-	}
-
-	context->fds[wsi->position_in_fds_table].events |= POLLOUT;
-
-	/* external POLL support via protocol 0 */
-	context->protocols[0].callback(context, wsi,
-		LWS_CALLBACK_SET_MODE_POLL_FD,
-		(void *)(long)wsi->sock, NULL, POLLOUT);
-
-	return 1;
-}
-
-/**
- * libwebsocket_callback_on_writable_all_protocol() - Request a callback for
- *			all connections using the given protocol when it
- *			becomes possible to write to each socket without
- *			blocking in turn.
- *
- * @protocol:	Protocol whose connections will get callbacks
- */
-
-int
-libwebsocket_callback_on_writable_all_protocol(
-				  const struct libwebsocket_protocols *protocol)
-{
-	struct libwebsocket_context *context = protocol->owning_server;
-	int n;
-	struct libwebsocket *wsi;
-
-	for (n = 0; n < context->fds_count; n++) {
-		wsi = context->lws_lookup[context->fds[n].fd];
-		if (!wsi)
-			continue;
-		if (wsi->protocol == protocol)
-			libwebsocket_callback_on_writable(context, wsi);
-	}
-
-	return 0;
-}
-
-/**
- * libwebsocket_set_timeout() - marks the wsi as subject to a timeout
- *
- * You will not need this unless you are doing something special
- *
- * @wsi:	Websocket connection instance
- * @reason:	timeout reason
- * @secs:	how many seconds
- */
-
-void
-libwebsocket_set_timeout(struct libwebsocket *wsi,
-					  enum pending_timeout reason, int secs)
-{
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-
-	wsi->pending_timeout_limit = tv.tv_sec + secs;
-	wsi->pending_timeout = reason;
-}
-
-
-/**
- * libwebsocket_get_socket_fd() - returns the socket file descriptor
- *
- * You will not need this unless you are doing something special
- *
- * @wsi:	Websocket connection instance
- */
-
-int
-libwebsocket_get_socket_fd(struct libwebsocket *wsi)
-{
-	return wsi->sock;
-}
-
-#ifdef LWS_LATENCY
-void
-lws_latency(struct libwebsocket_context *context, struct libwebsocket *wsi,
-				     const char *action, int ret, int completed)
-{
-	struct timeval tv;
-	unsigned long u;
-	char buf[256];
-
-	gettimeofday(&tv, NULL);
-
-	u = (tv.tv_sec * 1000000) + tv.tv_usec;
-
-	if (action) {
-		if (completed) {
-			if (wsi->action_start == wsi->latency_start)
-				sprintf(buf,
-			"Completion first try lat %luus: %p: ret %d: %s\n",
-					u - wsi->latency_start,
-					(void *)wsi, ret, action);
-			else
-				sprintf(buf,
-			"Completion %luus: lat %luus: %p: ret %d: %s\n",
-					u - wsi->action_start,
-					u - wsi->latency_start,
-					(void *)wsi, ret, action);
-			wsi->action_start = 0;
-		} else
-			sprintf(buf, "lat %luus: %p: ret %d: %s\n",
-					u - wsi->latency_start,
-						      (void *)wsi, ret, action);
-		if (u - wsi->latency_start > context->worst_latency) {
-			context->worst_latency = u - wsi->latency_start;
-			strcpy(context->worst_latency_info, buf);
-		}
-		lwsl_latency("%s", buf);
-	} else {
-		wsi->latency_start = u;
-		if (!wsi->action_start)
-			wsi->action_start = u;
-	}
-}
-#endif
-
-#ifdef LWS_NO_SERVER
-int
-_libwebsocket_rx_flow_control(struct libwebsocket *wsi)
-{
-	return 0;
-}
-#else
-int
-_libwebsocket_rx_flow_control(struct libwebsocket *wsi)
-{
-	struct libwebsocket_context *context = wsi->protocol->owning_server;
-	int n;
-
-	if (!(wsi->u.ws.rxflow_change_to & 2))
-		return 0;
-
-	wsi->u.ws.rxflow_change_to &= ~2;
-
-	lwsl_info("rxflow: wsi %p change_to %d\n",
-					wsi, wsi->u.ws.rxflow_change_to);
-
-	/* if we're letting it come again, did we interrupt anything? */
-	if ((wsi->u.ws.rxflow_change_to & 1) && wsi->u.ws.rxflow_buffer) {
-		n = libwebsocket_interpret_incoming_packet(wsi, NULL, 0);
-		if (n < 0) {
-			lwsl_info("libwebsocket_rx_flow_control: close req\n");
-			return -1;
-		}
-		if (n)
-			/* oh he stuck again, do nothing */
-			return 0;
-	}
-
-	if (wsi->u.ws.rxflow_change_to & 1)
-		context->fds[wsi->position_in_fds_table].events |= POLLIN;
-	else
-		context->fds[wsi->position_in_fds_table].events &= ~POLLIN;
-
-	if (wsi->u.ws.rxflow_change_to & 1)
-		/* external POLL support via protocol 0 */
-		context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_SET_MODE_POLL_FD,
-			(void *)(long)wsi->sock, NULL, POLLIN);
-	else
-		/* external POLL support via protocol 0 */
-		context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_CLEAR_MODE_POLL_FD,
-			(void *)(long)wsi->sock, NULL, POLLIN);
-
-	return 1;
-}
-#endif
-
-/**
- * libwebsocket_rx_flow_control() - Enable and disable socket servicing for
- *				receieved packets.
- *
- * If the output side of a server process becomes choked, this allows flow
- * control for the input side.
- *
- * @wsi:	Websocket connection instance to get callback for
- * @enable:	0 = disable read servicing for this connection, 1 = enable
- */
-
-int
-libwebsocket_rx_flow_control(struct libwebsocket *wsi, int enable)
-{
-	wsi->u.ws.rxflow_change_to = 2 | !!enable;
-
-	return 0;
-}
-
-
-/**
- * libwebsocket_canonical_hostname() - returns this host's hostname
- *
- * This is typically used by client code to fill in the host parameter
- * when making a client connection.  You can only call it after the context
- * has been created.
- *
- * @context:	Websocket context
- */
-
-
-extern const char *
-libwebsocket_canonical_hostname(struct libwebsocket_context *context)
-{
-	return (const char *)context->canonical_hostname;
-}
-
-
-static void sigpipe_handler(int x)
-{
-}
-
-#ifdef LWS_OPENSSL_SUPPORT
-static int
-OpenSSL_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
-{
-
-	SSL *ssl;
-	int n;
-	struct libwebsocket_context *context;
-
-	ssl = X509_STORE_CTX_get_ex_data(x509_ctx,
-		SSL_get_ex_data_X509_STORE_CTX_idx());
-
-	/*
-	 * !!! nasty openssl requires the index to come as a library-scope
-	 * static
-	 */
-	context = SSL_get_ex_data(ssl, openssl_websocket_private_data_index);
-
-	n = context->protocols[0].callback(NULL, NULL,
-		LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION,
-						   x509_ctx, ssl, preverify_ok);
-
-	/* convert return code from 0 = OK to 1 = OK */
-
-	if (!n)
-		n = 1;
-	else
-		n = 0;
-
-	return n;
-}
-#endif
-
-int user_callback_handle_rxflow(callback_function callback_function,
-		struct libwebsocket_context *context,
-			struct libwebsocket *wsi,
-			 enum libwebsocket_callback_reasons reason, void *user,
-							  void *in, size_t len)
-{
-	int n;
-
-	n = callback_function(context, wsi, reason, user, in, len);
-	if (!n)
-		n = _libwebsocket_rx_flow_control(wsi);
-
-	return n;
-}
-
-
-/**
- * libwebsocket_create_context() - Create the websocket handler
- * @info:	pointer to struct with parameters
- *
- *	This function creates the listening socket (if serving) and takes care
- *	of all initialization in one step.
- *
- *	After initialization, it returns a struct libwebsocket_context * that
- *	represents this server.  After calling, user code needs to take care
- *	of calling libwebsocket_service() with the context pointer to get the
- *	server's sockets serviced.  This can be done in the same process context
- *	or a forked process, or another thread,
- *
- *	The protocol callback functions are called for a handful of events
- *	including http requests coming in, websocket connections becoming
- *	established, and data arriving; it's also called periodically to allow
- *	async transmission.
- *
- *	HTTP requests are sent always to the FIRST protocol in @protocol, since
- *	at that time websocket protocol has not been negotiated.  Other
- *	protocols after the first one never see any HTTP callack activity.
- *
- *	The server created is a simple http server by default; part of the
- *	websocket standard is upgrading this http connection to a websocket one.
- *
- *	This allows the same server to provide files like scripts and favicon /
- *	images or whatever over http and dynamic data over websockets all in
- *	one place; they're all handled in the user callback.
- */
-
-struct libwebsocket_context *
-libwebsocket_create_context(struct lws_context_creation_info *info)
-{
-	struct libwebsocket_context *context = NULL;
-	char *p;
-#ifndef LWS_NO_SERVER
-	int n;
-	int opt = 1;
-	struct libwebsocket *wsi;
-	struct sockaddr_in serv_addr;
-#endif
-#ifndef LWS_NO_EXTENSIONS
-	int m;
-	struct libwebsocket_extension *ext;
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-	SSL_METHOD *method;
-#endif
-
-#ifndef LWS_NO_DAEMONIZE
-	int pid_daemon = get_daemonize_pid();
-#endif
-
-	lwsl_notice("Initial logging level %d\n", log_level);
-	lwsl_notice("Library version: %s\n", library_version);
-	lwsl_info(" LWS_MAX_HEADER_NAME_LENGTH: %u\n",
-						LWS_MAX_HEADER_NAME_LENGTH);
-	lwsl_info(" LWS_MAX_HEADER_LEN: %u\n", LWS_MAX_HEADER_LEN);
-	lwsl_info(" LWS_MAX_PROTOCOLS: %u\n", LWS_MAX_PROTOCOLS);
-#ifndef LWS_NO_EXTENSIONS
-	lwsl_info(" LWS_MAX_EXTENSIONS_ACTIVE: %u\n",
-						LWS_MAX_EXTENSIONS_ACTIVE);
-#else
-	lwsl_notice(" Configured without extension support\n");
-#endif
-	lwsl_info(" SPEC_LATEST_SUPPORTED: %u\n", SPEC_LATEST_SUPPORTED);
-	lwsl_info(" AWAITING_TIMEOUT: %u\n", AWAITING_TIMEOUT);
-	lwsl_info(" CIPHERS_LIST_STRING: '%s'\n", CIPHERS_LIST_STRING);
-	lwsl_info(" SYSTEM_RANDOM_FILEPATH: '%s'\n", SYSTEM_RANDOM_FILEPATH);
-	lwsl_info(" LWS_MAX_ZLIB_CONN_BUFFER: %u\n", LWS_MAX_ZLIB_CONN_BUFFER);
-
-#ifdef _WIN32
-	{
-		WORD wVersionRequested;
-		WSADATA wsaData;
-		int err;
-		HMODULE wsdll;
-
-		/* Use the MAKEWORD(lowbyte, highbyte) macro from Windef.h */
-		wVersionRequested = MAKEWORD(2, 2);
-
-		err = WSAStartup(wVersionRequested, &wsaData);
-		if (err != 0) {
-			/* Tell the user that we could not find a usable */
-			/* Winsock DLL.                                  */
-			lwsl_err("WSAStartup failed with error: %d\n", err);
-			return NULL;
-		}
-
-		/* default to a poll() made out of select() */
-		poll = emulated_poll;
-
-		/* if windows socket lib available, use his WSAPoll */
-		wsdll = GetModuleHandle(_T("Ws2_32.dll"));
-		if (wsdll)
-			poll = (PFNWSAPOLL)GetProcAddress(wsdll, "WSAPoll");
-
-		/* Finally fall back to emulated poll if all else fails */
-		if (!poll)
-			poll = emulated_poll;
-	}
-#endif
-
-	context = (struct libwebsocket_context *)
-				malloc(sizeof(struct libwebsocket_context));
-	if (!context) {
-		lwsl_err("No memory for websocket context\n");
-		return NULL;
-	}
-	memset(context, 0, sizeof(*context));
-#ifndef LWS_NO_DAEMONIZE
-	context->started_with_parent = pid_daemon;
-	lwsl_notice(" Started with daemon pid %d\n", pid_daemon);
-#endif
-
-	context->listen_service_extraseen = 0;
-	context->protocols = info->protocols;
-	context->listen_port = info->port;
-	context->http_proxy_port = 0;
-	context->http_proxy_address[0] = '\0';
-	context->options = info->options;
-	/* to reduce this allocation, */
-	context->max_fds = getdtablesize();
-	lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",
-		sizeof(struct libwebsocket_context),
-		sizeof(struct pollfd) + sizeof(struct libwebsocket *),
-		context->max_fds,
-		sizeof(struct libwebsocket_context) +
-		((sizeof(struct pollfd) + sizeof(struct libwebsocket *)) *
-							     context->max_fds));
-
-	context->fds = (struct pollfd *)malloc(sizeof(struct pollfd) *
-							      context->max_fds);
-	if (context->fds == NULL) {
-		lwsl_err("Unable to allocate fds array for %d connections\n",
-							      context->max_fds);
-		free(context);
-		return NULL;
-	}
-	context->lws_lookup = (struct libwebsocket **)
-		      malloc(sizeof(struct libwebsocket *) * context->max_fds);
-	if (context->lws_lookup == NULL) {
-		lwsl_err(
-		  "Unable to allocate lws_lookup array for %d connections\n",
-							      context->max_fds);
-		free(context->fds);
-		free(context);
-		return NULL;
-	}
-
-	context->fds_count = 0;
-#ifndef LWS_NO_EXTENSIONS
-	context->extensions = info->extensions;
-#endif
-	context->last_timeout_check_s = 0;
-	context->user_space = info->user;
-
-#ifdef WIN32
-	context->fd_random = 0;
-#else
-	context->fd_random = open(SYSTEM_RANDOM_FILEPATH, O_RDONLY);
-	if (context->fd_random < 0) {
-		lwsl_err("Unable to open random device %s %d\n",
-				    SYSTEM_RANDOM_FILEPATH, context->fd_random);
-		goto bail;
-	}
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-	context->use_ssl = 0;
-	context->ssl_ctx = NULL;
-	context->ssl_client_ctx = NULL;
-	openssl_websocket_private_data_index = 0;
-#endif
-
-	strcpy(context->canonical_hostname, "unknown");
-
-#ifndef LWS_NO_SERVER
-	if (!(info->options & LWS_SERVER_OPTION_SKIP_SERVER_CANONICAL_NAME)) {
-		struct sockaddr sa;
-		context->service_buffer[0] = '\0';
-
-		/* find canonical hostname */
-
-		context->service_buffer[
-				   sizeof(context->service_buffer) - 1] = '\0';
-		memset(&sa, 0, sizeof(sa));
-		sa.sa_family = AF_INET;
-		sa.sa_data[sizeof(sa.sa_data) - 1] = '\0';
-		gethostname((char *)context->service_buffer,
-					  sizeof(context->service_buffer) - 1);
-
-		n = 0;
-
-		if (strlen((char *)context->service_buffer) <
-						       sizeof(sa.sa_data) - 1) {
-			strcpy(sa.sa_data, (char *)context->service_buffer);
-			lwsl_debug("my host name is %s\n", sa.sa_data);
-			n = getnameinfo(&sa, sizeof(sa),
-				(char *)context->service_buffer,
-				sizeof(context->service_buffer) - 1,
-							  NULL, 0, NI_NAMEREQD);
-		}
-
-		if (!n) {
-			strncpy(context->canonical_hostname,
-				(char *)context->service_buffer,
-				       sizeof(context->canonical_hostname) - 1);
-			context->canonical_hostname[
-				sizeof(context->canonical_hostname) - 1] = '\0';
-		} else
-			strncpy(context->canonical_hostname,
-				(char *)context->service_buffer,
-				       sizeof(context->canonical_hostname) - 1);
-
-		lwsl_notice(" canonical_hostname = %s\n",
-					context->canonical_hostname);
-	}
-#endif
-
-	/* split the proxy ads:port if given */
-
-	p = getenv("http_proxy");
-	if (p) {
-		strncpy(context->http_proxy_address, p,
-				      sizeof(context->http_proxy_address) - 1);
-		context->http_proxy_address[
-				sizeof(context->http_proxy_address) - 1] = '\0';
-
-		p = strchr(context->http_proxy_address, ':');
-		if (p == NULL) {
-			lwsl_err("http_proxy needs to be ads:port\n");
-			goto bail;
-		}
-		*p = '\0';
-		context->http_proxy_port = atoi(p + 1);
-
-		lwsl_notice(" Proxy %s:%u\n",
-				context->http_proxy_address,
-						      context->http_proxy_port);
-	}
-
-#ifndef LWS_NO_SERVER
-	if (info->port) {
-
-#ifdef LWS_OPENSSL_SUPPORT
-		context->use_ssl = info->ssl_cert_filepath != NULL &&
-					 info->ssl_private_key_filepath != NULL;
-#ifdef USE_CYASSL
-		lwsl_notice(" Compiled with CYASSL support\n");
-#else
-		lwsl_notice(" Compiled with OpenSSL support\n");
-#endif
-		if (context->use_ssl)
-			lwsl_notice(" Using SSL mode\n");
-		else
-			lwsl_notice(" Using non-SSL mode\n");
-
-#else
-		if (info->ssl_cert_filepath != NULL &&
-				       info->ssl_private_key_filepath != NULL) {
-			lwsl_notice(" Not compiled for OpenSSl support!\n");
-			goto bail;
-		}
-		lwsl_notice(" Compiled without SSL support\n");
-#endif
-
-		lwsl_notice(
-			" per-conn mem: %u + %u headers + protocol rx buf\n",
-				sizeof(struct libwebsocket),
-					      sizeof(struct allocated_headers));
-	}
-#endif
-
-	/* ignore SIGPIPE */
-#ifdef WIN32
-#else
-	signal(SIGPIPE, sigpipe_handler);
-#endif
-
-
-#ifdef LWS_OPENSSL_SUPPORT
-
-	/* basic openssl init */
-
-	SSL_library_init();
-
-	OpenSSL_add_all_algorithms();
-	SSL_load_error_strings();
-
-	openssl_websocket_private_data_index =
-		SSL_get_ex_new_index(0, "libwebsockets", NULL, NULL, NULL);
-
-	/*
-	 * Firefox insists on SSLv23 not SSLv3
-	 * Konq disables SSLv2 by default now, SSLv23 works
-	 */
-
-	method = (SSL_METHOD *)SSLv23_server_method();
-	if (!method) {
-		lwsl_err("problem creating ssl method: %s\n",
-			ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-		goto bail;
-	}
-	context->ssl_ctx = SSL_CTX_new(method);	/* create context */
-	if (!context->ssl_ctx) {
-		lwsl_err("problem creating ssl context: %s\n",
-			ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-		goto bail;
-	}
-
-#ifdef SSL_OP_NO_COMPRESSION
-	SSL_CTX_set_options(context->ssl_ctx, SSL_OP_NO_COMPRESSION);
-#endif
-	SSL_CTX_set_options(context->ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
-	SSL_CTX_set_cipher_list(context->ssl_ctx, CIPHERS_LIST_STRING);
-
-#ifndef LWS_NO_CLIENT
-
-	/* client context */
-
-	if (info->port == CONTEXT_PORT_NO_LISTEN) {
-		method = (SSL_METHOD *)SSLv23_client_method();
-		if (!method) {
-			lwsl_err("problem creating ssl method: %s\n",
-				ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-		/* create context */
-		context->ssl_client_ctx = SSL_CTX_new(method);
-		if (!context->ssl_client_ctx) {
-			lwsl_err("problem creating ssl context: %s\n",
-				ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-
-#ifdef SSL_OP_NO_COMPRESSION
-		SSL_CTX_set_options(context->ssl_client_ctx,
-							 SSL_OP_NO_COMPRESSION);
-#endif
-		SSL_CTX_set_options(context->ssl_client_ctx,
-					       SSL_OP_CIPHER_SERVER_PREFERENCE);
-		SSL_CTX_set_cipher_list(context->ssl_client_ctx,
-							   CIPHERS_LIST_STRING);
-
-		/* openssl init for cert verification (for client sockets) */
-		if (!info->ssl_ca_filepath) {
-			if (!SSL_CTX_load_verify_locations(
-				context->ssl_client_ctx, NULL,
-						     LWS_OPENSSL_CLIENT_CERTS))
-				lwsl_err(
-				    "Unable to load SSL Client certs from %s "
-				    "(set by --with-client-cert-dir= "
-				    "in configure) --  client ssl isn't "
-				    "going to work", LWS_OPENSSL_CLIENT_CERTS);
-		} else
-			if (!SSL_CTX_load_verify_locations(
-				context->ssl_client_ctx, info->ssl_ca_filepath,
-								  NULL))
-				lwsl_err(
-					"Unable to load SSL Client certs "
-					"file from %s -- client ssl isn't "
-					"going to work", info->ssl_ca_filepath);
-
-		/*
-		 * callback allowing user code to load extra verification certs
-		 * helping the client to verify server identity
-		 */
-
-		context->protocols[0].callback(context, NULL,
-			LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS,
-			context->ssl_client_ctx, NULL, 0);
-	}
-#endif
-
-	/* as a server, are we requiring clients to identify themselves? */
-
-	if (info->options &
-			LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT) {
-
-		/* absolutely require the client cert */
-
-		SSL_CTX_set_verify(context->ssl_ctx,
-		       SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-						       OpenSSL_verify_callback);
-
-		/*
-		 * give user code a chance to load certs into the server
-		 * allowing it to verify incoming client certs
-		 */
-
-		context->protocols[0].callback(context, NULL,
-			LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS,
-						     context->ssl_ctx, NULL, 0);
-	}
-
-	if (context->use_ssl) {
-
-		/* openssl init for server sockets */
-
-		/* set the local certificate from CertFile */
-		n = SSL_CTX_use_certificate_chain_file(context->ssl_ctx,
-					info->ssl_cert_filepath);
-		if (n != 1) {
-			lwsl_err("problem getting cert '%s': %s\n",
-				info->ssl_cert_filepath,
-				ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-		/* set the private key from KeyFile */
-		if (SSL_CTX_use_PrivateKey_file(context->ssl_ctx,
-			     info->ssl_private_key_filepath,
-						       SSL_FILETYPE_PEM) != 1) {
-			lwsl_err("ssl problem getting key '%s': %s\n",
-				info->ssl_private_key_filepath,
-					ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-		/* verify private key */
-		if (!SSL_CTX_check_private_key(context->ssl_ctx)) {
-			lwsl_err("Private SSL key doesn't match cert\n");
-			goto bail;
-		}
-
-		/* SSL is happy and has a cert it's content with */
-	}
-#endif
-
-	/* selftest */
-
-	if (lws_b64_selftest())
-		goto bail;
-
-#ifndef LWS_NO_SERVER
-	/* set up our external listening socket we serve on */
-
-	if (info->port) {
-		int sockfd;
-
-		sockfd = socket(AF_INET, SOCK_STREAM, 0);
-		if (sockfd < 0) {
-			lwsl_err("ERROR opening socket\n");
-			goto bail;
-		}
-
-#ifndef WIN32
-		/*
-		 * allow us to restart even if old sockets in TIME_WAIT
-		 * (REUSEADDR on Unix means, "don't hang on to this
-		 * address after the listener is closed."  On Windows, though,
-		 * it means "don't keep other processes from binding to
-		 * this address while we're using it)
-		 */
-		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
-					      (const void *)&opt, sizeof(opt));
-#endif
-
-		/* Disable Nagle */
-		opt = 1;
-		setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
-					      (const void *)&opt, sizeof(opt));
-
-		#ifdef WIN32
-		opt = 0;
-		ioctlsocket(sockfd, FIONBIO, (unsigned long *)&opt);
-		#else
-		fcntl(sockfd, F_SETFL, O_NONBLOCK);
-		#endif
-
-		bzero((char *) &serv_addr, sizeof(serv_addr));
-		serv_addr.sin_family = AF_INET;
-		if (info->iface == NULL)
-			serv_addr.sin_addr.s_addr = INADDR_ANY;
-		else
-			interface_to_sa(info->iface, &serv_addr,
-						sizeof(serv_addr));
-		serv_addr.sin_port = htons(info->port);
-
-		n = bind(sockfd, (struct sockaddr *) &serv_addr,
-							     sizeof(serv_addr));
-		if (n < 0) {
-			lwsl_err("ERROR on binding to port %d (%d %d)\n",
-							info->port, n, errno);
-			close(sockfd);
-			goto bail;
-		}
-
-		wsi = (struct libwebsocket *)malloc(
-					sizeof(struct libwebsocket));
-		if (wsi == NULL) {
-			lwsl_err("Out of mem\n");
-			close(sockfd);
-			goto bail;
-		}
-		memset(wsi, 0, sizeof(struct libwebsocket));
-		wsi->sock = sockfd;
-#ifndef LWS_NO_EXTENSIONS
-		wsi->count_active_extensions = 0;
-#endif
-		wsi->mode = LWS_CONNMODE_SERVER_LISTENER;
-
-		insert_wsi_socket_into_fds(context, wsi);
-
-		context->listen_service_modulo = LWS_LISTEN_SERVICE_MODULO;
-		context->listen_service_count = 0;
-		context->listen_service_fd = sockfd;
-
-		listen(sockfd, LWS_SOMAXCONN);
-		lwsl_notice(" Listening on port %d\n", info->port);
-	}
-#endif
-
-	/*
-	 * drop any root privs for this process
-	 * to listen on port < 1023 we would have needed root, but now we are
-	 * listening, we don't want the power for anything else
-	 */
-#ifdef WIN32
-#else
-	if (info->gid != -1)
-		if (setgid(info->gid))
-			lwsl_warn("setgid: %s\n", strerror(errno));
-	if (info->uid != -1)
-		if (setuid(info->uid))
-			lwsl_warn("setuid: %s\n", strerror(errno));
-#endif
-
-	/* initialize supported protocols */
-
-	for (context->count_protocols = 0;
-		info->protocols[context->count_protocols].callback;
-						   context->count_protocols++) {
-
-		lwsl_parser("  Protocol: %s\n",
-				info->protocols[context->count_protocols].name);
-
-		info->protocols[context->count_protocols].owning_server =
-									context;
-		info->protocols[context->count_protocols].protocol_index =
-						       context->count_protocols;
-
-		/*
-		 * inform all the protocols that they are doing their one-time
-		 * initialization if they want to
-		 */
-		info->protocols[context->count_protocols].callback(context,
-			       NULL, LWS_CALLBACK_PROTOCOL_INIT, NULL, NULL, 0);
-	}
-
-#ifndef LWS_NO_EXTENSIONS
-	/*
-	 * give all extensions a chance to create any per-context
-	 * allocations they need
-	 */
-
-	m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT;
-	if (info->port)
-		m = LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT;
-
-	if (info->extensions) {
-		ext = info->extensions;
-		while (ext->callback) {
-			lwsl_ext("  Extension: %s\n", ext->name);
-			ext->callback(context, ext, NULL,
-			(enum libwebsocket_extension_callback_reasons)m,
-								NULL, NULL, 0);
-			ext++;
-		}
-	}
-#endif
-	return context;
-
-bail:
-	libwebsocket_context_destroy(context);
-	return NULL;
-}
-
-/**
- * libwebsockets_get_protocol() - Returns a protocol pointer from a websocket
- *				  connection.
- * @wsi:	pointer to struct websocket you want to know the protocol of
- *
- *
- *	Some apis can act on all live connections of a given protocol,
- *	this is how you can get a pointer to the active protocol if needed.
- */
-
-const struct libwebsocket_protocols *
-libwebsockets_get_protocol(struct libwebsocket *wsi)
-{
-	return wsi->protocol;
-}
-
-int
-libwebsocket_is_final_fragment(struct libwebsocket *wsi)
-{
-	return wsi->u.ws.final;
-}
-
-unsigned char
-libwebsocket_get_reserved_bits(struct libwebsocket *wsi)
-{
-	return wsi->u.ws.rsv;
-}
-
-void *
-libwebsocket_ensure_user_space(struct libwebsocket *wsi)
-{
-	/* allocate the per-connection user memory (if any) */
-
-	if (wsi->protocol->per_session_data_size && !wsi->user_space) {
-		wsi->user_space = malloc(
-				  wsi->protocol->per_session_data_size);
-		if (wsi->user_space  == NULL) {
-			lwsl_err("Out of memory for conn user space\n");
-			return NULL;
-		}
-		memset(wsi->user_space, 0,
-					 wsi->protocol->per_session_data_size);
-	}
-	return wsi->user_space;
-}
-
-static void lwsl_emit_stderr(int level, const char *line)
-{
-	char buf[300];
-	struct timeval tv;
-	int n;
-
-	gettimeofday(&tv, NULL);
-
-	buf[0] = '\0';
-	for (n = 0; n < LLL_COUNT; n++)
-		if (level == (1 << n)) {
-			sprintf(buf, "[%ld:%04d] %s: ", tv.tv_sec,
-				(int)(tv.tv_usec / 100), log_level_names[n]);
-			break;
-		}
-
-	fprintf(stderr, "%s%s", buf, line);
-}
-
-#ifdef WIN32
-void lwsl_emit_syslog(int level, const char *line)
-{
-	lwsl_emit_stderr(level, line);
-}
-#else
-void lwsl_emit_syslog(int level, const char *line)
-{
-	int syslog_level = LOG_DEBUG;
-
-	switch (level) {
-	case LLL_ERR:
-		syslog_level = LOG_ERR;
-		break;
-	case LLL_WARN:
-		syslog_level = LOG_WARNING;
-		break;
-	case LLL_NOTICE:
-		syslog_level = LOG_NOTICE;
-		break;
-	case LLL_INFO:
-		syslog_level = LOG_INFO;
-		break;
-	}
-	syslog(syslog_level, "%s", line);
-}
-#endif
-
-void _lws_log(int filter, const char *format, ...)
-{
-	char buf[256];
-	va_list ap;
-
-	if (!(log_level & filter))
-		return;
-
-	va_start(ap, format);
-	vsnprintf(buf, sizeof(buf), format, ap);
-	buf[sizeof(buf) - 1] = '\0';
-	va_end(ap);
-
-	lwsl_emit(filter, buf);
-}
-
-/**
- * lws_set_log_level() - Set the logging bitfield
- * @level:	OR together the LLL_ debug contexts you want output from
- * @log_emit_function:	NULL to leave it as it is, or a user-supplied
- *			function to perform log string emission instead of
- *			the default stderr one.
- *
- *	log level defaults to "err" and "warn" contexts enabled only and
- *	emission on stderr.
- */
-
-void lws_set_log_level(int level, void (*log_emit_function)(int level,
-							      const char *line))
-{
-	log_level = level;
-	if (log_emit_function)
-		lwsl_emit = log_emit_function;
-}
 
=== removed directory '.pc/0002-keepalive.patch'
=== removed directory '.pc/0002-keepalive.patch/lib'
=== removed file '.pc/0002-keepalive.patch/lib/libwebsockets.c'
--- .pc/0002-keepalive.patch/lib/libwebsockets.c	2013-03-28 19:10:28 +0000
+++ .pc/0002-keepalive.patch/lib/libwebsockets.c	1970-01-01 00:00:00 +0000
@@ -1,2251 +0,0 @@
-/*
- * libwebsockets - small server side websockets and web server implementation
- *
- * Copyright (C) 2010 Andy Green <[e-mail]>
- *
- *  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"
-
-#ifdef WIN32
-#include <tchar.h>
-#include <io.h>
-#include <mstcpip.h>
-#else
-#ifdef LWS_BUILTIN_GETIFADDRS
-#include <getifaddrs.h>
-#else
-#include <ifaddrs.h>
-#endif
-#include <syslog.h>
-#include <sys/un.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-int openssl_websocket_private_data_index;
-#endif
-
-#ifdef __MINGW32__
-#include "../win32port/win32helpers/websock-w32.c"
-#else
-#ifdef __MINGW64__
-#include "../win32port/win32helpers/websock-w32.c"
-#endif
-#endif
-
-#ifndef LWS_BUILD_HASH
-#define LWS_BUILD_HASH "unknown-build-hash"
-#endif
-
-static int log_level = LLL_ERR | LLL_WARN | LLL_NOTICE;
-static void lwsl_emit_stderr(int level, const char *line);
-static void (*lwsl_emit)(int level, const char *line) = lwsl_emit_stderr;
-
-static const char *library_version = LWS_LIBRARY_VERSION " " LWS_BUILD_HASH;
-
-static const char * const log_level_names[] = {
-	"ERR",
-	"WARN",
-	"NOTICE",
-	"INFO",
-	"DEBUG",
-	"PARSER",
-	"HEADER",
-	"EXTENSION",
-	"CLIENT",
-	"LATENCY",
-};
-
-#ifndef LWS_NO_CLIENT
-	extern int lws_client_socket_service(
-		struct libwebsocket_context *context,
-		struct libwebsocket *wsi, struct pollfd *pollfd);
-#endif
-#ifndef LWS_NO_SERVER
-	extern int lws_server_socket_service(
-		struct libwebsocket_context *context,
-		struct libwebsocket *wsi, struct pollfd *pollfd);
-#endif
-
-/**
- * lws_get_library_version: get version and git hash library built from
- *
- *	returns a const char * to a string like "1.1 178d78c"
- *	representing the library version followed by the git head hash it
- *	was built from
- */
-
-const char *
-lws_get_library_version(void)
-{
-	return library_version;
-}
-
-int
-insert_wsi_socket_into_fds(struct libwebsocket_context *context,
-						       struct libwebsocket *wsi)
-{
-	if (context->fds_count >= context->max_fds) {
-		lwsl_err("Too many fds (%d)\n", context->max_fds);
-		return 1;
-	}
-
-	if (wsi->sock > context->max_fds) {
-		lwsl_err("Socket fd %d is too high (%d)\n",
-						wsi->sock, context->max_fds);
-		return 1;
-	}
-
-	assert(wsi);
-	assert(wsi->sock);
-
-	lwsl_info("insert_wsi_socket_into_fds: wsi=%p, sock=%d, fds pos=%d\n",
-					    wsi, wsi->sock, context->fds_count);
-
-	context->lws_lookup[wsi->sock] = wsi;
-	wsi->position_in_fds_table = context->fds_count;
-	context->fds[context->fds_count].fd = wsi->sock;
-	context->fds[context->fds_count].events = POLLIN;
-	context->fds[context->fds_count++].revents = 0;
-
-	/* external POLL support via protocol 0 */
-	context->protocols[0].callback(context, wsi,
-		LWS_CALLBACK_ADD_POLL_FD,
-		(void *)(long)wsi->sock, NULL, POLLIN);
-
-	return 0;
-}
-
-static int
-remove_wsi_socket_from_fds(struct libwebsocket_context *context,
-						      struct libwebsocket *wsi)
-{
-	int m;
-
-	if (!--context->fds_count)
-		goto do_ext;
-
-	if (wsi->sock > context->max_fds) {
-		lwsl_err("Socket fd %d too high (%d)\n",
-						   wsi->sock, context->max_fds);
-		return 1;
-	}
-
-	lwsl_info("remove_wsi_socket_from_fds: wsi=%p, sock=%d, fds pos=%d\n",
-				    wsi, wsi->sock, wsi->position_in_fds_table);
-
-	m = wsi->position_in_fds_table; /* replace the contents for this */
-
-	/* have the last guy take up the vacant slot */
-	context->fds[m] = context->fds[context->fds_count];
-	/*
-	 * end guy's fds_lookup entry remains unchanged
-	 * (still same fd pointing to same wsi)
-	 */
-	/* end guy's "position in fds table" changed */
-	context->lws_lookup[context->fds[context->fds_count].fd]->
-						position_in_fds_table = m;
-	/* deletion guy's lws_lookup entry needs nuking */
-	context->lws_lookup[wsi->sock] = NULL;
-	/* removed wsi has no position any more */
-	wsi->position_in_fds_table = -1;
-
-do_ext:
-	/* remove also from external POLL support via protocol 0 */
-	if (wsi->sock)
-		context->protocols[0].callback(context, wsi,
-		    LWS_CALLBACK_DEL_POLL_FD, (void *)(long)wsi->sock, NULL, 0);
-
-	return 0;
-}
-
-
-void
-libwebsocket_close_and_free_session(struct libwebsocket_context *context,
-			 struct libwebsocket *wsi, enum lws_close_status reason)
-{
-	int n;
-	int old_state;
-	unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 2 +
-						  LWS_SEND_BUFFER_POST_PADDING];
-#ifndef LWS_NO_EXTENSIONS
-	int ret;
-	int m;
-	struct lws_tokens eff_buf;
-	struct libwebsocket_extension *ext;
-#endif
-
-	if (!wsi)
-		return;
-
-	old_state = wsi->state;
-
-	if (old_state == WSI_STATE_DEAD_SOCKET)
-		return;
-
-	wsi->u.ws.close_reason = reason;
-
-	if (wsi->mode == LWS_CONNMODE_HTTP_SERVING && wsi->u.http.fd) {
-		close(wsi->u.http.fd);
-		wsi->u.http.fd = 0;
-	}
-
-#ifndef LWS_NO_EXTENSIONS
-	/*
-	 * are his extensions okay with him closing?  Eg he might be a mux
-	 * parent and just his ch1 aspect is closing?
-	 */
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		m = wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			LWS_EXT_CALLBACK_CHECK_OK_TO_REALLY_CLOSE,
-				       wsi->active_extensions_user[n], NULL, 0);
-
-		/*
-		 * if somebody vetoed actually closing him at this time....
-		 * up to the extension to track the attempted close, let's
-		 * just bail
-		 */
-
-		if (m) {
-			lwsl_ext("extension vetoed close\n");
-			return;
-		}
-	}
-
-	/*
-	 * flush any tx pending from extensions, since we may send close packet
-	 * if there are problems with send, just nuke the connection
-	 */
-
-	ret = 1;
-	while (ret == 1) {
-
-		/* default to nobody has more to spill */
-
-		ret = 0;
-		eff_buf.token = NULL;
-		eff_buf.token_len = 0;
-
-		/* show every extension the new incoming data */
-
-		for (n = 0; n < wsi->count_active_extensions; n++) {
-			m = wsi->active_extensions[n]->callback(
-					wsi->protocol->owning_server,
-					wsi->active_extensions[n], wsi,
-					LWS_EXT_CALLBACK_FLUSH_PENDING_TX,
-				   wsi->active_extensions_user[n], &eff_buf, 0);
-			if (m < 0) {
-				lwsl_ext("Extension reports fatal error\n");
-				goto just_kill_connection;
-			}
-			if (m)
-				/*
-				 * at least one extension told us he has more
-				 * to spill, so we will go around again after
-				 */
-				ret = 1;
-		}
-
-		/* assuming they left us something to send, send it */
-
-		if (eff_buf.token_len)
-			if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
-							   eff_buf.token_len)) {
-				lwsl_debug("close: ext spill failed\n");
-				goto just_kill_connection;
-			}
-	}
-#endif
-
-	/*
-	 * signal we are closing, libsocket_write will
-	 * add any necessary version-specific stuff.  If the write fails,
-	 * no worries we are closing anyway.  If we didn't initiate this
-	 * close, then our state has been changed to
-	 * WSI_STATE_RETURNED_CLOSE_ALREADY and we will skip this.
-	 *
-	 * Likewise if it's a second call to close this connection after we
-	 * sent the close indication to the peer already, we are in state
-	 * WSI_STATE_AWAITING_CLOSE_ACK and will skip doing this a second time.
-	 */
-
-	if (old_state == WSI_STATE_ESTABLISHED &&
-					  reason != LWS_CLOSE_STATUS_NOSTATUS) {
-
-		lwsl_debug("sending close indication...\n");
-
-		/* make valgrind happy */
-		memset(buf, 0, sizeof(buf));
-		n = libwebsocket_write(wsi,
-				&buf[LWS_SEND_BUFFER_PRE_PADDING + 2],
-							    0, LWS_WRITE_CLOSE);
-		if (!n) {
-			/*
-			 * we have sent a nice protocol level indication we
-			 * now wish to close, we should not send anything more
-			 */
-
-			wsi->state = WSI_STATE_AWAITING_CLOSE_ACK;
-
-			/*
-			 * ...and we should wait for a reply for a bit
-			 * out of politeness
-			 */
-
-			libwebsocket_set_timeout(wsi,
-						  PENDING_TIMEOUT_CLOSE_ACK, 1);
-
-			lwsl_debug("sent close indication, awaiting ack\n");
-
-			return;
-		}
-
-		lwsl_info("close: sending close packet failed, hanging up\n");
-
-		/* else, the send failed and we should just hang up */
-	}
-
-#ifndef LWS_NO_EXTENSIONS
-just_kill_connection:
-#endif
-
-	lwsl_debug("close: just_kill_connection\n");
-
-	/*
-	 * we won't be servicing or receiving anything further from this guy
-	 * delete socket from the internal poll list if still present
-	 */
-
-	remove_wsi_socket_from_fds(context, wsi);
-
-	wsi->state = WSI_STATE_DEAD_SOCKET;
-
-	if ((old_state == WSI_STATE_ESTABLISHED ||
-	     wsi->mode == LWS_CONNMODE_WS_SERVING ||
-	     wsi->mode == LWS_CONNMODE_WS_CLIENT)) {
-
-		if (wsi->u.ws.rx_user_buffer) {
-			free(wsi->u.ws.rx_user_buffer);
-			wsi->u.ws.rx_user_buffer = NULL;
-		}
-		if (wsi->u.ws.rxflow_buffer) {
-			free(wsi->u.ws.rxflow_buffer);
-			wsi->u.ws.rxflow_buffer = NULL;
-		}
-	}
-
-	/* tell the user it's all over for this guy */
-
-	if (wsi->protocol && wsi->protocol->callback &&
-			((old_state == WSI_STATE_ESTABLISHED) ||
-			 (old_state == WSI_STATE_RETURNED_CLOSE_ALREADY) ||
-			 (old_state == WSI_STATE_AWAITING_CLOSE_ACK))) {
-		lwsl_debug("calling back CLOSED\n");
-		wsi->protocol->callback(context, wsi, LWS_CALLBACK_CLOSED,
-						      wsi->user_space, NULL, 0);
-	} else
-		lwsl_debug("not calling back closed\n");
-
-#ifndef LWS_NO_EXTENSIONS
-	/* deallocate any active extension contexts */
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-				LWS_EXT_CALLBACK_DESTROY,
-				       wsi->active_extensions_user[n], NULL, 0);
-
-		free(wsi->active_extensions_user[n]);
-	}
-
-	/*
-	 * inform all extensions in case they tracked this guy out of band
-	 * even though not active on him specifically
-	 */
-
-	ext = context->extensions;
-	while (ext && ext->callback) {
-		ext->callback(context, ext, wsi,
-				LWS_EXT_CALLBACK_DESTROY_ANY_WSI_CLOSING,
-				       NULL, NULL, 0);
-		ext++;
-	}
-#endif
-
-/*	lwsl_info("closing fd=%d\n", wsi->sock); */
-
-#ifdef LWS_OPENSSL_SUPPORT
-	if (wsi->ssl) {
-		n = SSL_get_fd(wsi->ssl);
-		SSL_shutdown(wsi->ssl);
-		compatible_close(n);
-		SSL_free(wsi->ssl);
-	} else {
-#endif
-		if (wsi->sock) {
-			n = shutdown(wsi->sock, SHUT_RDWR);
-			if (n)
-				lwsl_debug("closing: shutdown returned %d\n",
-									errno);
-
-			n = compatible_close(wsi->sock);
-			if (n)
-				lwsl_debug("closing: close returned %d\n",
-									errno);
-		}
-#ifdef LWS_OPENSSL_SUPPORT
-	}
-#endif
-	if (wsi->protocol && wsi->protocol->per_session_data_size &&
-					wsi->user_space) /* user code may own */
-		free(wsi->user_space);
-
-	free(wsi);
-}
-
-/**
- * libwebsockets_get_peer_addresses() - Get client address information
- * @context:	Libwebsockets context
- * @wsi:	Local struct libwebsocket associated with
- * @fd:		Connection socket descriptor
- * @name:	Buffer to take client address name
- * @name_len:	Length of client address name buffer
- * @rip:	Buffer to take client address IP qotted quad
- * @rip_len:	Length of client address IP buffer
- *
- *	This function fills in @name and @rip with the name and IP of
- *	the client connected with socket descriptor @fd.  Names may be
- *	truncated if there is not enough room.  If either cannot be
- *	determined, they will be returned as valid zero-length strings.
- */
-
-void
-libwebsockets_get_peer_addresses(struct libwebsocket_context *context,
-	struct libwebsocket *wsi, int fd, char *name, int name_len,
-					char *rip, int rip_len)
-{
-	unsigned int len;
-	struct sockaddr_in sin;
-	struct hostent *host;
-	struct hostent *host1;
-	char ip[128];
-	unsigned char *p;
-	int n;
-	int ret = -1;
-#ifdef AF_LOCAL
-	struct sockaddr_un *un;
-#endif
-
-	rip[0] = '\0';
-	name[0] = '\0';
-
-	lws_latency_pre(context, wsi);
-
-	len = sizeof(sin);
-	if (getpeername(fd, (struct sockaddr *) &sin, &len) < 0) {
-		perror("getpeername");
-		goto bail;
-	}
-
-	host = gethostbyaddr((char *) &sin.sin_addr, sizeof(sin.sin_addr),
-								       AF_INET);
-	if (host == NULL) {
-		perror("gethostbyaddr");
-		goto bail;
-	}
-
-	strncpy(name, host->h_name, name_len);
-	name[name_len - 1] = '\0';
-
-	host1 = gethostbyname(host->h_name);
-	if (host1 == NULL)
-		goto bail;
-	p = (unsigned char *)host1;
-	n = 0;
-	while (p != NULL) {
-		p = (unsigned char *)host1->h_addr_list[n++];
-		if (p == NULL)
-			continue;
-		if ((host1->h_addrtype != AF_INET)
-#ifdef AF_LOCAL
-			&& (host1->h_addrtype != AF_LOCAL)
-#endif
-			)
-			continue;
-
-		if (host1->h_addrtype == AF_INET)
-			sprintf(ip, "%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
-#ifdef AF_LOCAL
-		else {
-			un = (struct sockaddr_un *)p;
-			strncpy(ip, un->sun_path, sizeof(ip) - 1);
-			ip[sizeof(ip) - 1] = '\0';
-		}
-#endif
-		p = NULL;
-		strncpy(rip, ip, rip_len);
-		rip[rip_len - 1] = '\0';
-	}
-
-	ret = 0;
-bail:
-	lws_latency(context, wsi, "libwebsockets_get_peer_addresses", ret, 1);
-}
-
-int libwebsockets_get_random(struct libwebsocket_context *context,
-							     void *buf, int len)
-{
-	int n;
-	char *p = (char *)buf;
-
-#ifdef WIN32
-	for (n = 0; n < len; n++)
-		p[n] = (unsigned char)rand();
-#else
-	n = read(context->fd_random, p, len);
-#endif
-
-	return n;
-}
-
-int lws_set_socket_options(struct libwebsocket_context *context, int fd)
-{
-	int optval = 1;
-	socklen_t optlen = sizeof(optval);
-#ifdef WIN32
-	unsigned long optl = 0;
-#endif
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-	struct protoent *tcp_proto;
-#endif
-
-	if (context->ka_time) {
-		/* enable keepalive on this socket */
-		optval = 1;
-		if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-
-		/*
-		 * didn't find a way to set these per-socket, need to
-		 * tune kernel systemwide values
-		 */
-#elif WIN32
-		{
-			DWORD dwBytesRet;
-			struct tcp_keepalive alive;
-			alive.onoff = TRUE;
-			alive.keepalivetime = context->ka_time;
-			alive.keepaliveinterval = context->ka_interval;
-
-			if (WSAIoctl(fd, SIO_KEEPALIVE_VALS, &alive, sizeof(alive), 
-									NULL, 0, &dwBytesRet, NULL, NULL))
-				return 1;
-		}
-#else
-		/* set the keepalive conditions we want on it too */
-		optval = context->ka_time;
-		if (setsockopt(fd, IPPROTO_IP, TCP_KEEPIDLE,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-
-		optval = context->ka_probes;
-		if (setsockopt(fd, IPPROTO_IP, TCP_KEEPINTVL,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-
-		optval = context->ka_interval;
-		if (setsockopt(fd, IPPROTO_IP, TCP_KEEPCNT,
-					     (const void *)&optval, optlen) < 0)
-			return 1;
-#endif
-	}
-
-	/* Disable Nagle */
-	optval = 1;
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-	setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen);
-#else
-	tcp_proto = getprotobyname("TCP");
-	setsockopt(fd, tcp_proto->p_proto, TCP_NODELAY, &optval, optlen);
-#endif
-
-	/* We are nonblocking... */
-#ifdef WIN32
-	ioctlsocket(fd, FIONBIO, &optl);
-#else
-	fcntl(fd, F_SETFL, O_NONBLOCK);
-#endif
-
-	return 0;
-}
-
-int lws_send_pipe_choked(struct libwebsocket *wsi)
-{
-	struct pollfd fds;
-
-	fds.fd = wsi->sock;
-	fds.events = POLLOUT;
-	fds.revents = 0;
-
-	if (poll(&fds, 1, 0) != 1)
-		return 1;
-
-	if ((fds.revents & POLLOUT) == 0)
-		return 1;
-
-	/* okay to send another packet without blocking */
-
-	return 0;
-}
-
-int
-lws_handle_POLLOUT_event(struct libwebsocket_context *context,
-				struct libwebsocket *wsi, struct pollfd *pollfd)
-{
-	int n;
-
-#ifndef LWS_NO_EXTENSIONS
-	struct lws_tokens eff_buf;
-	int ret;
-	int m;
-	int handled = 0;
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		m = wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			LWS_EXT_CALLBACK_IS_WRITEABLE,
-				       wsi->active_extensions_user[n], NULL, 0);
-		if (m > handled)
-			handled = m;
-	}
-
-	if (handled == 1)
-		goto notify_action;
-
-	if (!wsi->extension_data_pending || handled == 2)
-		goto user_service;
-
-	/*
-	 * 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 */
-
-		for (n = 0; n < wsi->count_active_extensions; n++) {
-			m = wsi->active_extensions[n]->callback(
-				wsi->protocol->owning_server,
-				wsi->active_extensions[n], wsi,
-					LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
-				   wsi->active_extensions_user[n], &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) {
-			if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
-							     eff_buf.token_len))
-				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;
-	}
-
-	wsi->extension_data_pending = 0;
-
-user_service:
-#endif
-	/* one shot */
-
-	if (pollfd) {
-		pollfd->events &= ~POLLOUT;
-
-		/* external POLL support via protocol 0 */
-		context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_CLEAR_MODE_POLL_FD,
-			(void *)(long)wsi->sock, NULL, POLLOUT);
-	}
-#ifndef LWS_NO_EXTENSIONS
-notify_action:
-#endif
-
-	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);
-}
-
-
-
-void
-libwebsocket_service_timeout_check(struct libwebsocket_context *context,
-				     struct libwebsocket *wsi, unsigned int sec)
-{
-#ifndef LWS_NO_EXTENSIONS
-	int n;
-
-	/*
-	 * if extensions want in on it (eg, we are a mux parent)
-	 * give them a chance to service child timeouts
-	 */
-
-	for (n = 0; n < wsi->count_active_extensions; n++)
-		wsi->active_extensions[n]->callback(
-				    context, wsi->active_extensions[n],
-				    wsi, LWS_EXT_CALLBACK_1HZ,
-				    wsi->active_extensions_user[n], NULL, sec);
-
-#endif
-	if (!wsi->pending_timeout)
-		return;
-
-	/*
-	 * 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);
-	}
-}
-
-/**
- * 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.
- */
-
-int
-libwebsocket_service_fd(struct libwebsocket_context *context,
-							  struct pollfd *pollfd)
-{
-	struct libwebsocket *wsi;
-	int n;
-	int m;
-	int listen_socket_fds_index = 0;
-	struct timeval tv;
-
-#ifndef LWS_NO_EXTENSIONS
-	int more = 1;
-#endif
-	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.
-	 */
-
-	gettimeofday(&tv, NULL);
-
-	if (context->last_timeout_check_s != tv.tv_sec) {
-		context->last_timeout_check_s = tv.tv_sec;
-
-		#ifndef WIN32
-		/* if our parent went down, don't linger around */
-		if (context->started_with_parent &&
-				      kill(context->started_with_parent, 0) < 0)
-			kill(getpid(), SIGTERM);
-		#endif
-
-		/* global timeout check once per second */
-
-		for (n = 0; n < context->fds_count; n++) {
-			struct libwebsocket *new_wsi =
-					context->lws_lookup[context->fds[n].fd];
-			if (!new_wsi)
-				continue;
-			libwebsocket_service_timeout_check(context,
-				new_wsi, tv.tv_sec);
-		}
-	}
-
-	/* just here for timeout management? */
-
-	if (pollfd == NULL)
-		return 0;
-
-	/* no, here to service a socket descriptor */
-
-	/*
-	 * 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 = poll(&context->fds[listen_socket_fds_index],
-									  1, 0);
-				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;
-				}
-			}
-		}
-
-	}
-
-	/* okay, what we came here to do... */
-
-	wsi = context->lws_lookup[pollfd->fd];
-	if (wsi == NULL) {
-		if (pollfd->fd > 11)
-			lwsl_err("unexpected NULL wsi fd=%d fds_count=%d\n",
-						pollfd->fd, context->fds_count);
-		return 0;
-	}
-
-	switch (wsi->mode) {
-
-#ifndef LWS_NO_SERVER
-	case LWS_CONNMODE_HTTP_SERVING:
-	case LWS_CONNMODE_SERVER_LISTENER:
-	case LWS_CONNMODE_SSL_ACK_PENDING:
-		return lws_server_socket_service(context, wsi, pollfd);
-#endif
-
-	case LWS_CONNMODE_WS_SERVING:
-	case LWS_CONNMODE_WS_CLIENT:
-
-		/* handle session socket closed */
-
-		if (pollfd->revents & (POLLERR | POLLHUP)) {
-
-			lwsl_debug("Session Socket %p (fd=%d) dead\n",
-				(void *)wsi, pollfd->fd);
-
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-
-		/* the guy requested a callback when it was OK to write */
-
-		if ((pollfd->revents & POLLOUT) &&
-					    wsi->state == WSI_STATE_ESTABLISHED)
-			if (lws_handle_POLLOUT_event(context, wsi,
-								  pollfd) < 0) {
-				lwsl_info("libwebsocket_service_fd: closing\n");
-				libwebsocket_close_and_free_session(
-					 context, wsi, LWS_CLOSE_STATUS_NORMAL);
-				return 0;
-			}
-
-
-		/* any incoming data ready? */
-
-		if (!(pollfd->revents & 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("Socket read returned %d\n",
-							    eff_buf.token_len);
-			if (errno != EINTR && errno != EAGAIN)
-				libwebsocket_close_and_free_session(context,
-					       wsi, LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-		if (!eff_buf.token_len) {
-			lwsl_info("closing connection due to 0 length read\n");
-			libwebsocket_close_and_free_session(context, wsi,
-						    LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-
-		/*
-		 * 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;
-#ifndef LWS_NO_EXTENSIONS
-		more = 1;
-		while (more) {
-
-			more = 0;
-
-			for (n = 0; n < wsi->count_active_extensions; n++) {
-				m = wsi->active_extensions[n]->callback(context,
-					wsi->active_extensions[n], wsi,
-					LWS_EXT_CALLBACK_PACKET_RX_PREPARSE,
-					wsi->active_extensions_user[n],
-								   &eff_buf, 0);
-				if (m < 0) {
-					lwsl_ext(
-					    "Extension reports fatal error\n");
-					libwebsocket_close_and_free_session(
-						context, wsi,
-						    LWS_CLOSE_STATUS_NOSTATUS);
-					return 0;
-				}
-				if (m)
-					more = 1;
-			}
-#endif
-			/* 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 */
-					return 0;
-			}
-#ifndef LWS_NO_EXTENSIONS
-			eff_buf.token = NULL;
-			eff_buf.token_len = 0;
-		}
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-		if (wsi->ssl && SSL_pending(wsi->ssl))
-			goto read_pending;
-#endif
-		break;
-
-	default:
-#ifdef LWS_NO_CLIENT
-		break;
-#else
-		return  lws_client_socket_service(context, wsi, pollfd);
-#endif
-	}
-
-	return 0;
-}
-
-
-/**
- * libwebsocket_context_destroy() - Destroy the websocket context
- * @context:	Websocket context
- *
- *	This function closes any active connections and then frees the
- *	context.  After calling this, any further use of the context is
- *	undefined.
- */
-void
-libwebsocket_context_destroy(struct libwebsocket_context *context)
-{
-#ifndef LWS_NO_EXTENSIONS
-	int n;
-	int m;
-	struct libwebsocket_extension *ext;
-	struct libwebsocket_protocols *protocol = context->protocols;
-
-#ifdef LWS_LATENCY
-	if (context->worst_latency_info[0])
-		lwsl_notice("Worst latency: %s\n", context->worst_latency_info);
-#endif
-
-	for (n = 0; n < context->fds_count; n++) {
-		struct libwebsocket *wsi =
-					context->lws_lookup[context->fds[n].fd];
-		libwebsocket_close_and_free_session(context,
-			wsi, LWS_CLOSE_STATUS_NOSTATUS /* no protocol close */);
-		n--;
-	}
-
-	/*
-	 * give all extensions a chance to clean up any per-context
-	 * allocations they might have made
-	 */
-
-	ext = context->extensions;
-	m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT;
-	if (context->listen_port)
-		m = LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT;
-	while (ext && ext->callback) {
-		ext->callback(context, ext, NULL,
-			(enum libwebsocket_extension_callback_reasons)m,
-								 NULL, NULL, 0);
-		ext++;
-	}
-
-	/*
-	 * inform all the protocols that they are done and will have no more
-	 * callbacks
-	 */
-
-	while (protocol->callback) {
-		protocol->callback(context, NULL, LWS_CALLBACK_PROTOCOL_DESTROY,
-				NULL, NULL, 0);
-		protocol++;
-	}
-
-#endif
-
-#ifdef WIN32
-#else
-	close(context->fd_random);
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-	if (context->ssl_ctx)
-		SSL_CTX_free(context->ssl_ctx);
-	if (context->ssl_client_ctx)
-		SSL_CTX_free(context->ssl_client_ctx);
-
-	ERR_remove_state(0);
-	ERR_free_strings();
-	EVP_cleanup();
-	CRYPTO_cleanup_all_ex_data();
-#endif
-
-	if (context->fds)
-		free(context->fds);
-	if (context->lws_lookup)
-		free(context->lws_lookup);
-
-	free(context);
-
-#ifdef WIN32
-	WSACleanup();
-#endif
-}
-
-/**
- * libwebsocket_context_user() - get the user data associated with the context
- * @context: Websocket context
- *
- *	This returns the optional user allocation that can be attached to
- *	the context the sockets live in at context_create time.  It's a way
- *	to let all sockets serviced in the same context share data without
- *	using globals statics in the user code.
- */
-LWS_EXTERN void *
-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.
- */
-
-int
-libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
-{
-	int n;
-
-	/* stay dead once we are dead */
-
-	if (context == NULL)
-		return 1;
-
-	/* wait for something to need service */
-
-	n = poll(context->fds, context->fds_count, timeout_ms);
-	if (n == 0) /* poll timeout */
-		return 0;
-
-	if (n < 0)
-		return -1;
-
-	/* any socket with events to service? */
-
-	for (n = 0; n < context->fds_count; n++)
-		if (context->fds[n].revents)
-			if (libwebsocket_service_fd(context,
-							&context->fds[n]) < 0)
-				return -1;
-	return 0;
-}
-
-#ifndef LWS_NO_EXTENSIONS
-int
-lws_any_extension_handled(struct libwebsocket_context *context,
-			  struct libwebsocket *wsi,
-			  enum libwebsocket_extension_callback_reasons r,
-						       void *v, size_t len)
-{
-	int n;
-	int handled = 0;
-
-	/* maybe an extension will take care of it for us */
-
-	for (n = 0; n < wsi->count_active_extensions && !handled; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		handled |= wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			r, wsi->active_extensions_user[n], v, len);
-	}
-
-	return handled;
-}
-
-
-void *
-lws_get_extension_user_matching_ext(struct libwebsocket *wsi,
-					   struct libwebsocket_extension *ext)
-{
-	int n = 0;
-
-	if (wsi == NULL)
-		return NULL;
-
-	while (n < wsi->count_active_extensions) {
-		if (wsi->active_extensions[n] != ext) {
-			n++;
-			continue;
-		}
-		return wsi->active_extensions_user[n];
-	}
-
-	return NULL;
-}
-#endif
-
-/**
- * libwebsocket_callback_on_writable() - Request a callback when this socket
- *					 becomes able to be written to without
- *					 blocking
- *
- * @context:	libwebsockets context
- * @wsi:	Websocket connection instance to get callback for
- */
-
-int
-libwebsocket_callback_on_writable(struct libwebsocket_context *context,
-						      struct libwebsocket *wsi)
-{
-#ifndef LWS_NO_EXTENSIONS
-	int n;
-	int handled = 0;
-
-	/* maybe an extension will take care of it for us */
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		handled |= wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			LWS_EXT_CALLBACK_REQUEST_ON_WRITEABLE,
-				       wsi->active_extensions_user[n], NULL, 0);
-	}
-
-	if (handled)
-		return 1;
-#endif
-	if (wsi->position_in_fds_table < 0) {
-		lwsl_err("libwebsocket_callback_on_writable: failed to find socket %d\n",
-								     wsi->sock);
-		return -1;
-	}
-
-	context->fds[wsi->position_in_fds_table].events |= POLLOUT;
-
-	/* external POLL support via protocol 0 */
-	context->protocols[0].callback(context, wsi,
-		LWS_CALLBACK_SET_MODE_POLL_FD,
-		(void *)(long)wsi->sock, NULL, POLLOUT);
-
-	return 1;
-}
-
-/**
- * libwebsocket_callback_on_writable_all_protocol() - Request a callback for
- *			all connections using the given protocol when it
- *			becomes possible to write to each socket without
- *			blocking in turn.
- *
- * @protocol:	Protocol whose connections will get callbacks
- */
-
-int
-libwebsocket_callback_on_writable_all_protocol(
-				  const struct libwebsocket_protocols *protocol)
-{
-	struct libwebsocket_context *context = protocol->owning_server;
-	int n;
-	struct libwebsocket *wsi;
-
-	for (n = 0; n < context->fds_count; n++) {
-		wsi = context->lws_lookup[context->fds[n].fd];
-		if (!wsi)
-			continue;
-		if (wsi->protocol == protocol)
-			libwebsocket_callback_on_writable(context, wsi);
-	}
-
-	return 0;
-}
-
-/**
- * libwebsocket_set_timeout() - marks the wsi as subject to a timeout
- *
- * You will not need this unless you are doing something special
- *
- * @wsi:	Websocket connection instance
- * @reason:	timeout reason
- * @secs:	how many seconds
- */
-
-void
-libwebsocket_set_timeout(struct libwebsocket *wsi,
-					  enum pending_timeout reason, int secs)
-{
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-
-	wsi->pending_timeout_limit = tv.tv_sec + secs;
-	wsi->pending_timeout = reason;
-}
-
-
-/**
- * libwebsocket_get_socket_fd() - returns the socket file descriptor
- *
- * You will not need this unless you are doing something special
- *
- * @wsi:	Websocket connection instance
- */
-
-int
-libwebsocket_get_socket_fd(struct libwebsocket *wsi)
-{
-	return wsi->sock;
-}
-
-#ifdef LWS_LATENCY
-void
-lws_latency(struct libwebsocket_context *context, struct libwebsocket *wsi,
-				     const char *action, int ret, int completed)
-{
-	struct timeval tv;
-	unsigned long u;
-	char buf[256];
-
-	gettimeofday(&tv, NULL);
-
-	u = (tv.tv_sec * 1000000) + tv.tv_usec;
-
-	if (action) {
-		if (completed) {
-			if (wsi->action_start == wsi->latency_start)
-				sprintf(buf,
-			"Completion first try lat %luus: %p: ret %d: %s\n",
-					u - wsi->latency_start,
-					(void *)wsi, ret, action);
-			else
-				sprintf(buf,
-			"Completion %luus: lat %luus: %p: ret %d: %s\n",
-					u - wsi->action_start,
-					u - wsi->latency_start,
-					(void *)wsi, ret, action);
-			wsi->action_start = 0;
-		} else
-			sprintf(buf, "lat %luus: %p: ret %d: %s\n",
-					u - wsi->latency_start,
-						      (void *)wsi, ret, action);
-		if (u - wsi->latency_start > context->worst_latency) {
-			context->worst_latency = u - wsi->latency_start;
-			strcpy(context->worst_latency_info, buf);
-		}
-		lwsl_latency("%s", buf);
-	} else {
-		wsi->latency_start = u;
-		if (!wsi->action_start)
-			wsi->action_start = u;
-	}
-}
-#endif
-
-#ifdef LWS_NO_SERVER
-int
-_libwebsocket_rx_flow_control(struct libwebsocket *wsi)
-{
-	return 0;
-}
-#else
-int
-_libwebsocket_rx_flow_control(struct libwebsocket *wsi)
-{
-	struct libwebsocket_context *context = wsi->protocol->owning_server;
-	int n;
-
-	if (!(wsi->u.ws.rxflow_change_to & 2))
-		return 0;
-
-	wsi->u.ws.rxflow_change_to &= ~2;
-
-	lwsl_info("rxflow: wsi %p change_to %d\n",
-					wsi, wsi->u.ws.rxflow_change_to);
-
-	/* if we're letting it come again, did we interrupt anything? */
-	if ((wsi->u.ws.rxflow_change_to & 1) && wsi->u.ws.rxflow_buffer) {
-		n = libwebsocket_interpret_incoming_packet(wsi, NULL, 0);
-		if (n < 0) {
-			lwsl_info("libwebsocket_rx_flow_control: close req\n");
-			return -1;
-		}
-		if (n)
-			/* oh he stuck again, do nothing */
-			return 0;
-	}
-
-	if (wsi->u.ws.rxflow_change_to & 1)
-		context->fds[wsi->position_in_fds_table].events |= POLLIN;
-	else
-		context->fds[wsi->position_in_fds_table].events &= ~POLLIN;
-
-	if (wsi->u.ws.rxflow_change_to & 1)
-		/* external POLL support via protocol 0 */
-		context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_SET_MODE_POLL_FD,
-			(void *)(long)wsi->sock, NULL, POLLIN);
-	else
-		/* external POLL support via protocol 0 */
-		context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_CLEAR_MODE_POLL_FD,
-			(void *)(long)wsi->sock, NULL, POLLIN);
-
-	return 1;
-}
-#endif
-
-/**
- * libwebsocket_rx_flow_control() - Enable and disable socket servicing for
- *				receieved packets.
- *
- * If the output side of a server process becomes choked, this allows flow
- * control for the input side.
- *
- * @wsi:	Websocket connection instance to get callback for
- * @enable:	0 = disable read servicing for this connection, 1 = enable
- */
-
-int
-libwebsocket_rx_flow_control(struct libwebsocket *wsi, int enable)
-{
-	wsi->u.ws.rxflow_change_to = 2 | !!enable;
-
-	return 0;
-}
-
-
-/**
- * libwebsocket_canonical_hostname() - returns this host's hostname
- *
- * This is typically used by client code to fill in the host parameter
- * when making a client connection.  You can only call it after the context
- * has been created.
- *
- * @context:	Websocket context
- */
-
-
-extern const char *
-libwebsocket_canonical_hostname(struct libwebsocket_context *context)
-{
-	return (const char *)context->canonical_hostname;
-}
-
-
-static void sigpipe_handler(int x)
-{
-}
-
-#ifdef LWS_OPENSSL_SUPPORT
-static int
-OpenSSL_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
-{
-
-	SSL *ssl;
-	int n;
-	struct libwebsocket_context *context;
-
-	ssl = X509_STORE_CTX_get_ex_data(x509_ctx,
-		SSL_get_ex_data_X509_STORE_CTX_idx());
-
-	/*
-	 * !!! nasty openssl requires the index to come as a library-scope
-	 * static
-	 */
-	context = SSL_get_ex_data(ssl, openssl_websocket_private_data_index);
-
-	n = context->protocols[0].callback(NULL, NULL,
-		LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION,
-						   x509_ctx, ssl, preverify_ok);
-
-	/* convert return code from 0 = OK to 1 = OK */
-
-	if (!n)
-		n = 1;
-	else
-		n = 0;
-
-	return n;
-}
-#endif
-
-int user_callback_handle_rxflow(callback_function callback_function,
-		struct libwebsocket_context *context,
-			struct libwebsocket *wsi,
-			 enum libwebsocket_callback_reasons reason, void *user,
-							  void *in, size_t len)
-{
-	int n;
-
-	n = callback_function(context, wsi, reason, user, in, len);
-	if (!n)
-		n = _libwebsocket_rx_flow_control(wsi);
-
-	return n;
-}
-
-
-/**
- * libwebsocket_create_context() - Create the websocket handler
- * @info:	pointer to struct with parameters
- *
- *	This function creates the listening socket (if serving) and takes care
- *	of all initialization in one step.
- *
- *	After initialization, it returns a struct libwebsocket_context * that
- *	represents this server.  After calling, user code needs to take care
- *	of calling libwebsocket_service() with the context pointer to get the
- *	server's sockets serviced.  This can be done in the same process context
- *	or a forked process, or another thread,
- *
- *	The protocol callback functions are called for a handful of events
- *	including http requests coming in, websocket connections becoming
- *	established, and data arriving; it's also called periodically to allow
- *	async transmission.
- *
- *	HTTP requests are sent always to the FIRST protocol in @protocol, since
- *	at that time websocket protocol has not been negotiated.  Other
- *	protocols after the first one never see any HTTP callack activity.
- *
- *	The server created is a simple http server by default; part of the
- *	websocket standard is upgrading this http connection to a websocket one.
- *
- *	This allows the same server to provide files like scripts and favicon /
- *	images or whatever over http and dynamic data over websockets all in
- *	one place; they're all handled in the user callback.
- */
-
-struct libwebsocket_context *
-libwebsocket_create_context(struct lws_context_creation_info *info)
-{
-	struct libwebsocket_context *context = NULL;
-	char *p;
-#ifndef LWS_NO_SERVER
-	int n;
-	int opt = 1;
-	struct libwebsocket *wsi;
-	struct sockaddr_in serv_addr;
-#endif
-#ifndef LWS_NO_EXTENSIONS
-	int m;
-	struct libwebsocket_extension *ext;
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-	SSL_METHOD *method;
-#endif
-
-#ifndef LWS_NO_DAEMONIZE
-	int pid_daemon = get_daemonize_pid();
-#endif
-
-	lwsl_notice("Initial logging level %d\n", log_level);
-	lwsl_notice("Library version: %s\n", library_version);
-	lwsl_info(" LWS_MAX_HEADER_NAME_LENGTH: %u\n",
-						LWS_MAX_HEADER_NAME_LENGTH);
-	lwsl_info(" LWS_MAX_HEADER_LEN: %u\n", LWS_MAX_HEADER_LEN);
-	lwsl_info(" LWS_MAX_PROTOCOLS: %u\n", LWS_MAX_PROTOCOLS);
-#ifndef LWS_NO_EXTENSIONS
-	lwsl_info(" LWS_MAX_EXTENSIONS_ACTIVE: %u\n",
-						LWS_MAX_EXTENSIONS_ACTIVE);
-#else
-	lwsl_notice(" Configured without extension support\n");
-#endif
-	lwsl_info(" SPEC_LATEST_SUPPORTED: %u\n", SPEC_LATEST_SUPPORTED);
-	lwsl_info(" AWAITING_TIMEOUT: %u\n", AWAITING_TIMEOUT);
-	lwsl_info(" CIPHERS_LIST_STRING: '%s'\n", CIPHERS_LIST_STRING);
-	lwsl_info(" SYSTEM_RANDOM_FILEPATH: '%s'\n", SYSTEM_RANDOM_FILEPATH);
-	lwsl_info(" LWS_MAX_ZLIB_CONN_BUFFER: %u\n", LWS_MAX_ZLIB_CONN_BUFFER);
-
-#ifdef _WIN32
-	{
-		WORD wVersionRequested;
-		WSADATA wsaData;
-		int err;
-		HMODULE wsdll;
-
-		/* Use the MAKEWORD(lowbyte, highbyte) macro from Windef.h */
-		wVersionRequested = MAKEWORD(2, 2);
-
-		err = WSAStartup(wVersionRequested, &wsaData);
-		if (err != 0) {
-			/* Tell the user that we could not find a usable */
-			/* Winsock DLL.                                  */
-			lwsl_err("WSAStartup failed with error: %d\n", err);
-			return NULL;
-		}
-
-		/* default to a poll() made out of select() */
-		poll = emulated_poll;
-
-		/* if windows socket lib available, use his WSAPoll */
-		wsdll = GetModuleHandle(_T("Ws2_32.dll"));
-		if (wsdll)
-			poll = (PFNWSAPOLL)GetProcAddress(wsdll, "WSAPoll");
-
-		/* Finally fall back to emulated poll if all else fails */
-		if (!poll)
-			poll = emulated_poll;
-	}
-#endif
-
-	context = (struct libwebsocket_context *)
-				malloc(sizeof(struct libwebsocket_context));
-	if (!context) {
-		lwsl_err("No memory for websocket context\n");
-		return NULL;
-	}
-	memset(context, 0, sizeof(*context));
-#ifndef LWS_NO_DAEMONIZE
-	context->started_with_parent = pid_daemon;
-	lwsl_notice(" Started with daemon pid %d\n", pid_daemon);
-#endif
-
-	context->listen_service_extraseen = 0;
-	context->protocols = info->protocols;
-	context->listen_port = info->port;
-	context->http_proxy_port = 0;
-	context->http_proxy_address[0] = '\0';
-	context->options = info->options;
-	/* to reduce this allocation, */
-	context->max_fds = getdtablesize();
-	lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",
-		sizeof(struct libwebsocket_context),
-		sizeof(struct pollfd) + sizeof(struct libwebsocket *),
-		context->max_fds,
-		sizeof(struct libwebsocket_context) +
-		((sizeof(struct pollfd) + sizeof(struct libwebsocket *)) *
-							     context->max_fds));
-
-	context->fds = (struct pollfd *)malloc(sizeof(struct pollfd) *
-							      context->max_fds);
-	if (context->fds == NULL) {
-		lwsl_err("Unable to allocate fds array for %d connections\n",
-							      context->max_fds);
-		free(context);
-		return NULL;
-	}
-	context->lws_lookup = (struct libwebsocket **)
-		      malloc(sizeof(struct libwebsocket *) * context->max_fds);
-	if (context->lws_lookup == NULL) {
-		lwsl_err(
-		  "Unable to allocate lws_lookup array for %d connections\n",
-							      context->max_fds);
-		free(context->fds);
-		free(context);
-		return NULL;
-	}
-
-	context->fds_count = 0;
-#ifndef LWS_NO_EXTENSIONS
-	context->extensions = info->extensions;
-#endif
-	context->last_timeout_check_s = 0;
-	context->user_space = info->user;
-
-#ifdef WIN32
-	context->fd_random = 0;
-#else
-	context->fd_random = open(SYSTEM_RANDOM_FILEPATH, O_RDONLY);
-	if (context->fd_random < 0) {
-		lwsl_err("Unable to open random device %s %d\n",
-				    SYSTEM_RANDOM_FILEPATH, context->fd_random);
-		goto bail;
-	}
-#endif
-
-#ifdef LWS_OPENSSL_SUPPORT
-	context->use_ssl = 0;
-	context->ssl_ctx = NULL;
-	context->ssl_client_ctx = NULL;
-	openssl_websocket_private_data_index = 0;
-#endif
-
-	strcpy(context->canonical_hostname, "unknown");
-
-#ifndef LWS_NO_SERVER
-	if (!(info->options & LWS_SERVER_OPTION_SKIP_SERVER_CANONICAL_NAME)) {
-		/* find canonical hostname */
-		gethostname((char *)context->canonical_hostname,
-				       sizeof(context->canonical_hostname) - 1);
-
-		lwsl_notice(" canonical_hostname = %s\n",
-					context->canonical_hostname);
-	}
-#endif
-
-	/* split the proxy ads:port if given */
-
-	p = getenv("http_proxy");
-	if (p) {
-		strncpy(context->http_proxy_address, p,
-				      sizeof(context->http_proxy_address) - 1);
-		context->http_proxy_address[
-				sizeof(context->http_proxy_address) - 1] = '\0';
-
-		p = strchr(context->http_proxy_address, ':');
-		if (p == NULL) {
-			lwsl_err("http_proxy needs to be ads:port\n");
-			goto bail;
-		}
-		*p = '\0';
-		context->http_proxy_port = atoi(p + 1);
-
-		lwsl_notice(" Proxy %s:%u\n",
-				context->http_proxy_address,
-						      context->http_proxy_port);
-	}
-
-#ifndef LWS_NO_SERVER
-	if (info->port) {
-
-#ifdef LWS_OPENSSL_SUPPORT
-		context->use_ssl = info->ssl_cert_filepath != NULL &&
-					 info->ssl_private_key_filepath != NULL;
-#ifdef USE_CYASSL
-		lwsl_notice(" Compiled with CYASSL support\n");
-#else
-		lwsl_notice(" Compiled with OpenSSL support\n");
-#endif
-		if (context->use_ssl)
-			lwsl_notice(" Using SSL mode\n");
-		else
-			lwsl_notice(" Using non-SSL mode\n");
-
-#else
-		if (info->ssl_cert_filepath != NULL &&
-				       info->ssl_private_key_filepath != NULL) {
-			lwsl_notice(" Not compiled for OpenSSl support!\n");
-			goto bail;
-		}
-		lwsl_notice(" Compiled without SSL support\n");
-#endif
-
-		lwsl_notice(
-			" per-conn mem: %u + %u headers + protocol rx buf\n",
-				sizeof(struct libwebsocket),
-					      sizeof(struct allocated_headers));
-	}
-#endif
-
-	/* ignore SIGPIPE */
-#ifdef WIN32
-#else
-	signal(SIGPIPE, sigpipe_handler);
-#endif
-
-
-#ifdef LWS_OPENSSL_SUPPORT
-
-	/* basic openssl init */
-
-	SSL_library_init();
-
-	OpenSSL_add_all_algorithms();
-	SSL_load_error_strings();
-
-	openssl_websocket_private_data_index =
-		SSL_get_ex_new_index(0, "libwebsockets", NULL, NULL, NULL);
-
-	/*
-	 * Firefox insists on SSLv23 not SSLv3
-	 * Konq disables SSLv2 by default now, SSLv23 works
-	 */
-
-	method = (SSL_METHOD *)SSLv23_server_method();
-	if (!method) {
-		lwsl_err("problem creating ssl method: %s\n",
-			ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-		goto bail;
-	}
-	context->ssl_ctx = SSL_CTX_new(method);	/* create context */
-	if (!context->ssl_ctx) {
-		lwsl_err("problem creating ssl context: %s\n",
-			ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-		goto bail;
-	}
-
-#ifdef SSL_OP_NO_COMPRESSION
-	SSL_CTX_set_options(context->ssl_ctx, SSL_OP_NO_COMPRESSION);
-#endif
-	SSL_CTX_set_options(context->ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
-	SSL_CTX_set_cipher_list(context->ssl_ctx, CIPHERS_LIST_STRING);
-
-#ifndef LWS_NO_CLIENT
-
-	/* client context */
-
-	if (info->port == CONTEXT_PORT_NO_LISTEN) {
-		method = (SSL_METHOD *)SSLv23_client_method();
-		if (!method) {
-			lwsl_err("problem creating ssl method: %s\n",
-				ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-		/* create context */
-		context->ssl_client_ctx = SSL_CTX_new(method);
-		if (!context->ssl_client_ctx) {
-			lwsl_err("problem creating ssl context: %s\n",
-				ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-
-#ifdef SSL_OP_NO_COMPRESSION
-		SSL_CTX_set_options(context->ssl_client_ctx,
-							 SSL_OP_NO_COMPRESSION);
-#endif
-		SSL_CTX_set_options(context->ssl_client_ctx,
-					       SSL_OP_CIPHER_SERVER_PREFERENCE);
-		SSL_CTX_set_cipher_list(context->ssl_client_ctx,
-							   CIPHERS_LIST_STRING);
-
-		/* openssl init for cert verification (for client sockets) */
-		if (!info->ssl_ca_filepath) {
-			if (!SSL_CTX_load_verify_locations(
-				context->ssl_client_ctx, NULL,
-						     LWS_OPENSSL_CLIENT_CERTS))
-				lwsl_err(
-				    "Unable to load SSL Client certs from %s "
-				    "(set by --with-client-cert-dir= "
-				    "in configure) --  client ssl isn't "
-				    "going to work", LWS_OPENSSL_CLIENT_CERTS);
-		} else
-			if (!SSL_CTX_load_verify_locations(
-				context->ssl_client_ctx, info->ssl_ca_filepath,
-								  NULL))
-				lwsl_err(
-					"Unable to load SSL Client certs "
-					"file from %s -- client ssl isn't "
-					"going to work", info->ssl_ca_filepath);
-
-		/*
-		 * callback allowing user code to load extra verification certs
-		 * helping the client to verify server identity
-		 */
-
-		context->protocols[0].callback(context, NULL,
-			LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS,
-			context->ssl_client_ctx, NULL, 0);
-	}
-#endif
-
-	/* as a server, are we requiring clients to identify themselves? */
-
-	if (info->options &
-			LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT) {
-
-		/* absolutely require the client cert */
-
-		SSL_CTX_set_verify(context->ssl_ctx,
-		       SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-						       OpenSSL_verify_callback);
-
-		/*
-		 * give user code a chance to load certs into the server
-		 * allowing it to verify incoming client certs
-		 */
-
-		context->protocols[0].callback(context, NULL,
-			LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS,
-						     context->ssl_ctx, NULL, 0);
-	}
-
-	if (context->use_ssl) {
-
-		/* openssl init for server sockets */
-
-		/* set the local certificate from CertFile */
-		n = SSL_CTX_use_certificate_chain_file(context->ssl_ctx,
-					info->ssl_cert_filepath);
-		if (n != 1) {
-			lwsl_err("problem getting cert '%s': %s\n",
-				info->ssl_cert_filepath,
-				ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-		/* set the private key from KeyFile */
-		if (SSL_CTX_use_PrivateKey_file(context->ssl_ctx,
-			     info->ssl_private_key_filepath,
-						       SSL_FILETYPE_PEM) != 1) {
-			lwsl_err("ssl problem getting key '%s': %s\n",
-				info->ssl_private_key_filepath,
-					ERR_error_string(ERR_get_error(),
-					      (char *)context->service_buffer));
-			goto bail;
-		}
-		/* verify private key */
-		if (!SSL_CTX_check_private_key(context->ssl_ctx)) {
-			lwsl_err("Private SSL key doesn't match cert\n");
-			goto bail;
-		}
-
-		/* SSL is happy and has a cert it's content with */
-	}
-#endif
-
-	/* selftest */
-
-	if (lws_b64_selftest())
-		goto bail;
-
-#ifndef LWS_NO_SERVER
-	/* set up our external listening socket we serve on */
-
-	if (info->port) {
-		int sockfd;
-
-		sockfd = socket(AF_INET, SOCK_STREAM, 0);
-		if (sockfd < 0) {
-			lwsl_err("ERROR opening socket\n");
-			goto bail;
-		}
-
-#ifndef WIN32
-		/*
-		 * allow us to restart even if old sockets in TIME_WAIT
-		 * (REUSEADDR on Unix means, "don't hang on to this
-		 * address after the listener is closed."  On Windows, though,
-		 * it means "don't keep other processes from binding to
-		 * this address while we're using it)
-		 */
-		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
-					      (const void *)&opt, sizeof(opt));
-#endif
-
-		/* Disable Nagle */
-		opt = 1;
-		setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
-					      (const void *)&opt, sizeof(opt));
-
-		#ifdef WIN32
-		opt = 0;
-		ioctlsocket(sockfd, FIONBIO, (unsigned long *)&opt);
-		#else
-		fcntl(sockfd, F_SETFL, O_NONBLOCK);
-		#endif
-
-		bzero((char *) &serv_addr, sizeof(serv_addr));
-		serv_addr.sin_family = AF_INET;
-		if (info->iface == NULL)
-			serv_addr.sin_addr.s_addr = INADDR_ANY;
-		else
-			interface_to_sa(info->iface, &serv_addr,
-						sizeof(serv_addr));
-		serv_addr.sin_port = htons(info->port);
-
-		n = bind(sockfd, (struct sockaddr *) &serv_addr,
-							     sizeof(serv_addr));
-		if (n < 0) {
-			lwsl_err("ERROR on binding to port %d (%d %d)\n",
-							info->port, n, errno);
-			close(sockfd);
-			goto bail;
-		}
-
-		wsi = (struct libwebsocket *)malloc(
-					sizeof(struct libwebsocket));
-		if (wsi == NULL) {
-			lwsl_err("Out of mem\n");
-			close(sockfd);
-			goto bail;
-		}
-		memset(wsi, 0, sizeof(struct libwebsocket));
-		wsi->sock = sockfd;
-#ifndef LWS_NO_EXTENSIONS
-		wsi->count_active_extensions = 0;
-#endif
-		wsi->mode = LWS_CONNMODE_SERVER_LISTENER;
-
-		insert_wsi_socket_into_fds(context, wsi);
-
-		context->listen_service_modulo = LWS_LISTEN_SERVICE_MODULO;
-		context->listen_service_count = 0;
-		context->listen_service_fd = sockfd;
-
-		listen(sockfd, LWS_SOMAXCONN);
-		lwsl_notice(" Listening on port %d\n", info->port);
-	}
-#endif
-
-	/*
-	 * drop any root privs for this process
-	 * to listen on port < 1023 we would have needed root, but now we are
-	 * listening, we don't want the power for anything else
-	 */
-#ifdef WIN32
-#else
-	if (info->gid != -1)
-		if (setgid(info->gid))
-			lwsl_warn("setgid: %s\n", strerror(errno));
-	if (info->uid != -1)
-		if (setuid(info->uid))
-			lwsl_warn("setuid: %s\n", strerror(errno));
-#endif
-
-	/* initialize supported protocols */
-
-	for (context->count_protocols = 0;
-		info->protocols[context->count_protocols].callback;
-						   context->count_protocols++) {
-
-		lwsl_parser("  Protocol: %s\n",
-				info->protocols[context->count_protocols].name);
-
-		info->protocols[context->count_protocols].owning_server =
-									context;
-		info->protocols[context->count_protocols].protocol_index =
-						       context->count_protocols;
-
-		/*
-		 * inform all the protocols that they are doing their one-time
-		 * initialization if they want to
-		 */
-		info->protocols[context->count_protocols].callback(context,
-			       NULL, LWS_CALLBACK_PROTOCOL_INIT, NULL, NULL, 0);
-	}
-
-#ifndef LWS_NO_EXTENSIONS
-	/*
-	 * give all extensions a chance to create any per-context
-	 * allocations they need
-	 */
-
-	m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT;
-	if (info->port)
-		m = LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT;
-
-	if (info->extensions) {
-		ext = info->extensions;
-		while (ext->callback) {
-			lwsl_ext("  Extension: %s\n", ext->name);
-			ext->callback(context, ext, NULL,
-			(enum libwebsocket_extension_callback_reasons)m,
-								NULL, NULL, 0);
-			ext++;
-		}
-	}
-#endif
-	return context;
-
-bail:
-	libwebsocket_context_destroy(context);
-	return NULL;
-}
-
-/**
- * libwebsockets_get_protocol() - Returns a protocol pointer from a websocket
- *				  connection.
- * @wsi:	pointer to struct websocket you want to know the protocol of
- *
- *
- *	Some apis can act on all live connections of a given protocol,
- *	this is how you can get a pointer to the active protocol if needed.
- */
-
-const struct libwebsocket_protocols *
-libwebsockets_get_protocol(struct libwebsocket *wsi)
-{
-	return wsi->protocol;
-}
-
-int
-libwebsocket_is_final_fragment(struct libwebsocket *wsi)
-{
-	return wsi->u.ws.final;
-}
-
-unsigned char
-libwebsocket_get_reserved_bits(struct libwebsocket *wsi)
-{
-	return wsi->u.ws.rsv;
-}
-
-void *
-libwebsocket_ensure_user_space(struct libwebsocket *wsi)
-{
-	/* allocate the per-connection user memory (if any) */
-
-	if (wsi->protocol->per_session_data_size && !wsi->user_space) {
-		wsi->user_space = malloc(
-				  wsi->protocol->per_session_data_size);
-		if (wsi->user_space  == NULL) {
-			lwsl_err("Out of memory for conn user space\n");
-			return NULL;
-		}
-		memset(wsi->user_space, 0,
-					 wsi->protocol->per_session_data_size);
-	}
-	return wsi->user_space;
-}
-
-static void lwsl_emit_stderr(int level, const char *line)
-{
-	char buf[300];
-	struct timeval tv;
-	int n;
-
-	gettimeofday(&tv, NULL);
-
-	buf[0] = '\0';
-	for (n = 0; n < LLL_COUNT; n++)
-		if (level == (1 << n)) {
-			sprintf(buf, "[%ld:%04d] %s: ", tv.tv_sec,
-				(int)(tv.tv_usec / 100), log_level_names[n]);
-			break;
-		}
-
-	fprintf(stderr, "%s%s", buf, line);
-}
-
-#ifdef WIN32
-void lwsl_emit_syslog(int level, const char *line)
-{
-	lwsl_emit_stderr(level, line);
-}
-#else
-void lwsl_emit_syslog(int level, const char *line)
-{
-	int syslog_level = LOG_DEBUG;
-
-	switch (level) {
-	case LLL_ERR:
-		syslog_level = LOG_ERR;
-		break;
-	case LLL_WARN:
-		syslog_level = LOG_WARNING;
-		break;
-	case LLL_NOTICE:
-		syslog_level = LOG_NOTICE;
-		break;
-	case LLL_INFO:
-		syslog_level = LOG_INFO;
-		break;
-	}
-	syslog(syslog_level, "%s", line);
-}
-#endif
-
-void _lws_log(int filter, const char *format, ...)
-{
-	char buf[256];
-	va_list ap;
-
-	if (!(log_level & filter))
-		return;
-
-	va_start(ap, format);
-	vsnprintf(buf, sizeof(buf), format, ap);
-	buf[sizeof(buf) - 1] = '\0';
-	va_end(ap);
-
-	lwsl_emit(filter, buf);
-}
-
-/**
- * lws_set_log_level() - Set the logging bitfield
- * @level:	OR together the LLL_ debug contexts you want output from
- * @log_emit_function:	NULL to leave it as it is, or a user-supplied
- *			function to perform log string emission instead of
- *			the default stderr one.
- *
- *	log level defaults to "err" and "warn" contexts enabled only and
- *	emission on stderr.
- */
-
-void lws_set_log_level(int level, void (*log_emit_function)(int level,
-							      const char *line))
-{
-	log_level = level;
-	if (log_emit_function)
-		lwsl_emit = log_emit_function;
-}
 
=== removed directory '.pc/01-visibility.patch'
=== removed directory '.pc/01-visibility.patch/lib'
=== removed file '.pc/01-visibility.patch/lib/Makefile.am'
--- .pc/01-visibility.patch/lib/Makefile.am	2013-03-28 19:10:28 +0000
+++ .pc/01-visibility.patch/lib/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-@applyhash@
-
-lib_LTLIBRARIES=libwebsockets.la
-include_HEADERS=libwebsockets.h
-dist_libwebsockets_la_SOURCES=libwebsockets.c \
-				parsers.c \
-				handshake.c \
-				libwebsockets.h \
-				base64-decode.c \
-				output.c \
-				private-libwebsockets.h
-
-if NO_EXTENSIONS
-else
-dist_libwebsockets_la_SOURCES+= extension.c \
-				extension-deflate-stream.c extension-deflate-stream.h \
-				extension-deflate-frame.c extension-deflate-frame.h
-endif
-
-if NO_DAEMONIZE
-else
-dist_libwebsockets_la_SOURCES+= daemonize.c
-endif
-
-if NO_CLIENT
-else
-dist_libwebsockets_la_SOURCES+= client.c \
-				client-parser.c \
-				client-handshake.c
-endif
-
-if NO_SERVER
-else
-dist_libwebsockets_la_SOURCES+= server.c \
-				server-handshake.c
-endif
-
-if USE_BUILTIN_GETIFADDRS
-dist_libwebsockets_la_SOURCES += getifaddrs.c
-endif
-
-if LIBCRYPTO
-else
-dist_libwebsockets_la_SOURCES += sha-1.c
-endif
-
-libwebsockets_la_CFLAGS=-Wall -std=gnu99 -pedantic
-libwebsockets_la_LDFLAGS=
-
-# uncomment below and use cat ./lib/.libs/*.su | sort -k2g | tac
-# to get a worst-first list of static stack usage if you have gcc 4.6+
-#libwebsockets_la_CFLAGS+= -fstack-usage
-
-if USE_CYASSL
-libwebsockets_la_LDFLAGS+= -lcyassl
-endif
-
-if DISABLE_DEBUG
-libwebsockets_la_CFLAGS+= -O4
-else
-libwebsockets_la_CFLAGS+= -O0 -g
-endif
-
-if MINGW
-libwebsockets_la_CFLAGS+= -w -I../win32port/win32helpers -I ../win32port/zlib/
-libwebsockets_la_LDFLAGS+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc
-else
-libwebsockets_la_CFLAGS+= -rdynamic -fPIC -Werror
-# notice http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html has rules for how to bump this
-libwebsockets_la_LDFLAGS+=  -version-info 3:0:0
-endif
-
-libwebsockets_la_CFLAGS+= -c \
-	-DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
-if NO_EXTENSIONS
-else
-libwebsockets_la_LDFLAGS+= -lz
-endif
-
-all-local:
-	 ../scripts/kernel-doc -html \
-                *.c \
-                libwebsockets.h \
-			> ../libwebsockets-api-doc.html
-	 ../scripts/kernel-doc -text \
-                *.c \
-                libwebsockets.h \
-			> ../libwebsockets-api-doc.txt
-
 
=== removed file '.pc/01-visibility.patch/lib/base64-decode.c'
--- .pc/01-visibility.patch/lib/base64-decode.c	2013-03-28 19:10:28 +0000
+++ .pc/01-visibility.patch/lib/base64-decode.c	1970-01-01 00:00:00 +0000
@@ -1,189 +0,0 @@
-/*
- * This code originally came from here
- *
- * http://base64.sourceforge.net/b64.c
- *
- * with the following license:
- *
- * LICENCE:        Copyright (c) 2001 Bob Trower, Trantor Standard Systems Inc.
- *
- *                Permission is hereby granted, free of charge, to any person
- *                obtaining a copy of this software and associated
- *                documentation files (the "Software"), to deal in the
- *                Software without restriction, including without limitation
- *                the rights to use, copy, modify, merge, publish, distribute,
- *                sublicense, and/or sell copies of the Software, and to
- *                permit persons to whom the Software is furnished to do so,
- *                subject to the following conditions:
- *
- *                The above copyright notice and this permission notice shall
- *                be included in all copies or substantial portions of the
- *                Software.
- *
- *                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- *                KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- *                WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- *                PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- *                OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- *                OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- *                OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- *                SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * VERSION HISTORY:
- *               Bob Trower 08/04/01 -- Create Version 0.00.00B
- *
- * I cleaned it up quite a bit to match the (linux kernel) style of the rest
- * of libwebsockets; this version is under LGPL2 like the rest of libwebsockets
- * since he explictly allows sublicensing, but I give the URL above so you can
- * get the original with Bob's super-liberal terms directly if you prefer.
- */
-
-
-#include <stdio.h>
-#include <string.h>
-#include "private-libwebsockets.h"
-
-static const char encode[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-			     "abcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char decode[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW"
-			     "$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
-
-int
-lws_b64_encode_string(const char *in, int in_len, char *out, int out_size)
-{
-	unsigned char triple[3];
-	int i;
-	int len;
-	int line = 0;
-	int done = 0;
-
-	while (in_len) {
-		len = 0;
-		for (i = 0; i < 3; i++) {
-			if (in_len) {
-				triple[i] = *in++;
-				len++;
-				in_len--;
-			} else
-				triple[i] = 0;
-		}
-		if (!len)
-			continue;
-
-		if (done + 4 >= out_size)
-			return -1;
-
-		*out++ = encode[triple[0] >> 2];
-		*out++ = encode[((triple[0] & 0x03) << 4) |
-					     ((triple[1] & 0xf0) >> 4)];
-		*out++ = (len > 1 ? encode[((triple[1] & 0x0f) << 2) |
-					     ((triple[2] & 0xc0) >> 6)] : '=');
-		*out++ = (len > 2 ? encode[triple[2] & 0x3f] : '=');
-
-		done += 4;
-		line += 4;
-	}
-
-	if (done + 1 >= out_size)
-		return -1;
-
-	*out++ = '\0';
-
-	return done;
-}
-
-/*
- * returns length of decoded string in out, or -1 if out was too small
- * according to out_size
- */
-
-int
-lws_b64_decode_string(const char *in, char *out, int out_size)
-{
-	int len;
-	int i;
-	int done = 0;
-	unsigned char v;
-	unsigned char quad[4];
-
-	while (*in) {
-
-		len = 0;
-		for (i = 0; i < 4 && *in; i++) {
-
-			v = 0;
-			while (*in && !v) {
-
-				v = *in++;
-				v = (v < 43 || v > 122) ? 0 : decode[v - 43];
-				if (v)
-					v = (v == '$') ? 0 : v - 61;
-				if (*in) {
-					len++;
-					if (v)
-						quad[i] = v - 1;
-				} else
-					quad[i] = 0;
-			}
-		}
-		if (!len)
-			continue;
-
-		if (out_size < (done + len - 1))
-			/* out buffer is too small */
-			return -1;
-
-		if (len >= 2)
-			*out++ = quad[0] << 2 | quad[1] >> 4;
-		if (len >= 3)
-			*out++ = quad[1] << 4 | quad[2] >> 2;
-		if (len >= 4)
-			*out++ = ((quad[2] << 6) & 0xc0) | quad[3];
-
-		done += len - 1;
-	}
-
-	if (done + 1 >= out_size)
-		return -1;
-
-	*out++ = '\0';
-
-	return done;
-}
-
-int
-lws_b64_selftest(void)
-{
-	char buf[64];
-	int n;
-	int test;
-	static const char * const plaintext[] = {
-		"sanity check base 64"
-	};
-	static const char * const coded[] = {
-		"c2FuaXR5IGNoZWNrIGJhc2UgNjQ="
-	};
-
-	for (test = 0; test < sizeof plaintext / sizeof(plaintext[0]); test++) {
-
-		buf[sizeof(buf) - 1] = '\0';
-		n = lws_b64_encode_string(plaintext[test],
-				      strlen(plaintext[test]), buf, sizeof buf);
-		if (n != strlen(coded[test]) || strcmp(buf, coded[test])) {
-			lwsl_err("Failed lws_b64 encode selftest "
-					   "%d result '%s' %d\n", test, buf, n);
-			return -1;
-		}
-
-		buf[sizeof(buf) - 1] = '\0';
-		n = lws_b64_decode_string(coded[test], buf, sizeof buf);
-		if (n != strlen(plaintext[test]) ||
-						 strcmp(buf, plaintext[test])) {
-			lwsl_err("Failed lws_b64 decode selftest "
-					   "%d result '%s' %d\n", test, buf, n);
-			return -1;
-		}
-	}
-
-	return 0;
-}
 
=== removed file '.pc/01-visibility.patch/lib/client-handshake.c'
--- .pc/01-visibility.patch/lib/client-handshake.c	2013-03-28 19:10:28 +0000
+++ .pc/01-visibility.patch/lib/client-handshake.c	1970-01-01 00:00:00 +0000
@@ -1,329 +0,0 @@
-#include "private-libwebsockets.h"
-
-struct libwebsocket *__libwebsocket_client_connect_2(
-	struct libwebsocket_context *context,
-	struct libwebsocket *wsi
-) {
-	struct pollfd pfd;
-	struct hostent *server_hostent;
-	struct sockaddr_in server_addr;
-	int n;
-	int plen = 0;
-	const char *ads;
-
-	lwsl_client("__libwebsocket_client_connect_2\n");
-
-	/*
-	 * proxy?
-	 */
-
-	if (context->http_proxy_port) {
-		plen = sprintf((char *)context->service_buffer,
-			"CONNECT %s:%u HTTP/1.0\x0d\x0a"
-			"User-agent: libwebsockets\x0d\x0a"
-/*Proxy-authorization: basic aGVsbG86d29ybGQ= */
-			"\x0d\x0a",
-			lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS),
-			wsi->u.hdr.c_port);
-
-		/* OK from now on we talk via the proxy, so connect to that */
-
-		/*
-		 * (will overwrite existing pointer,
-		 * leaving old string/frag there but unreferenced)
-		 */
-		if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS,
-						   context->http_proxy_address))
-			goto oom4;
-		wsi->u.hdr.c_port = context->http_proxy_port;
-	}
-
-	/*
-	 * prepare the actual connection (to the proxy, if any)
-	 */
-
-	ads = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS);
-
-	lwsl_client("__libwebsocket_client_connect_2: address %s\n", ads);
-
-	server_hostent = gethostbyname(ads);
-	if (server_hostent == NULL) {
-		lwsl_err("Unable to get host name from %s\n", ads);
-		goto oom4;
-	}
-
-	wsi->sock = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (wsi->sock < 0) {
-		lwsl_warn("Unable to open socket\n");
-		goto oom4;
-	}
-
-	server_addr.sin_family = AF_INET;
-	server_addr.sin_port = htons(wsi->u.hdr.c_port);
-	server_addr.sin_addr = *((struct in_addr *)server_hostent->h_addr);
-	bzero(&server_addr.sin_zero, 8);
-
-	if (connect(wsi->sock, (struct sockaddr *)&server_addr,
-					     sizeof(struct sockaddr)) == -1)  {
-		lwsl_debug("Connect failed\n");
-		compatible_close(wsi->sock);
-		goto oom4;
-	}
-
-	lwsl_client("connected\n");
-
-	if (lws_set_socket_options(context, wsi->sock)) {
-		lwsl_err("Failed to set wsi socket options\n");
-		close(wsi->sock);
-		goto oom4;
-	}
-
-	insert_wsi_socket_into_fds(context, wsi);
-
-	/* we are connected to server, or proxy */
-
-	if (context->http_proxy_port) {
-
-		n = send(wsi->sock, context->service_buffer, plen, 0);
-		if (n < 0) {
-			compatible_close(wsi->sock);
-			lwsl_debug("ERROR writing to proxy socket\n");
-			goto oom4;
-		}
-
-		libwebsocket_set_timeout(wsi,
-			PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE,
-							      AWAITING_TIMEOUT);
-
-		wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY;
-
-		return wsi;
-	}
-
-	/*
-	 * provoke service to issue the handshake directly
-	 * we need to do it this way because in the proxy case, this is the
-	 * next state and executed only if and when we get a good proxy
-	 * response inside the state machine... but notice in SSL case this
-	 * may not have sent anything yet with 0 return, and won't until some
-	 * many retries from main loop.  To stop that becoming endless,
-	 * cover with a timeout.
-	 */
-
-	libwebsocket_set_timeout(wsi,
-		PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE, AWAITING_TIMEOUT);
-
-	wsi->mode = LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE;
-	pfd.fd = wsi->sock;
-	pfd.revents = POLLIN;
-
-	n = libwebsocket_service_fd(context, &pfd);
-
-	if (n < 0)
-		goto oom4;
-
-	if (n) /* returns 1 on failure after closing wsi */
-		return NULL;
-
-	return wsi;
-
-oom4:
-	free(wsi->u.hdr.ah);
-	free(wsi);
-
-	return NULL;
-}
-
-/**
- * libwebsocket_client_connect() - Connect to another websocket server
- * @context:	Websocket context
- * @address:	Remote server address, eg, "myserver.com"
- * @port:	Port to connect to on the remote server, eg, 80
- * @ssl_connection:	0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
- *			signed certs
- * @path:	Websocket path on server
- * @host:	Hostname on server