use new uwsgi_buffer structure for zeromq headers

AMQP Emperor: Auto-delete transient queues

.hgtags

@@ -26,3 +26,29 @@ e91bc724325e14c13b8f548c0b6a315c48a1c32a 0.9.8-rc2
 0f1f3924ee5309a9990d9af1ffc68846e3dfb31b 0.9.8-rc4
 42efe1f329005618c8b44f901979ebcecd5216fb 0.9.8
 fd8477b6348faf16588106055ca59df1c488f76a 0.9.8.1
+7169ef1d68d3dab4737bcc3f9e082839e5a06cc1 0.9.8.2
+f4d3c4dcd7a63e21fcc9d8d567374c69935178bd 0.9.8.3
+6945ee03c7ea95eb19217ef1e1fb17d9ae26adbc 0.9.9-beta1
+fb168b0b86169219aa9b8e40f0caa6297cf34dbc 0.9.9-rc1
+6aa667612019fcff8e68af9469f73aff6fa378a8 0.9.9-rc2
+376ffd8f190623e5e2521fe9fa64bf03c31e71be 0.9.9
+7048ae11cfc8453c6bb599af3c0dfacd7ebae43c 1.0-rc1
+7a4e021ea7ba2953e474326612c3bb82d6817f0e 1.0-rc2
+4e4e781ef89ac33e71a7e92741d54549240ed156 1.0-rc3
+24f7e260ea345c2cd73e2fd8191dddbd1b039062 1.0-rc4
+043ba93dd69cf6924e98db3cb9a8759cce997367 1.0-rc5
+a2b8f25fd17ed7424d1470a287d0b3144d2a12c8 1.0-rc6
+a3ca2e8e27c5c12c44ba0cacb4de4cb51377f184 1.0-rc7
+365e2514cc19f0366365318f12a1d63113b02924 1.0-rc8
+5da6fe43a8c29056bc9442c684615e11a3699795 1.0-rc9
+af490b8c30f83bc5fb6f3837a760981474647755 1.0-rc10
+3c70927335856883283fe4db448e092cecc0ccdb 1.0
+8fe7bb792399cb6e6a24e20551f4149409660363 1.0.1
+1d1702789710ec1c20613d2490b14f70756e67ec 1.1-rc1
+901f0cb5de36ea907b26d64ac9ce54605ec531d2 1.1-rc2
+ede5c664978bb40e476e8d4a5789562928f28507 1.1-rc3
+ef99144291f06822d026e981d5d856cbec14d867 1.1-rc4
+e1568fd16b7b586cc72deb4dfccbbe64ae0b84df 1.1
+24c8fe5a26e557db41cf1cee45b8964d5885e484 1.2-rc1
+29de0fb320bc0a1ce84972f9f249360e315d3c10 1.2-rc2
+c3cdecbf2bac591336baddd14f9ac22e18d6e200 1.2

CONTRIBUTORS

@@ -12,3 +12,9 @@ Marco Beri, Link I.T. S.p.a.
 Leonid Borisenko
 Cal Leeming, Simplicity Media Ltd
 Luigi Scarso
+Corey Farwell
+Charles Duffy
+Lukas Lalinsky
+Steven Fernandez
+Łukasz Mierzwa
+Roy Marples

ChangeLog

@@ -1,5 +1,139 @@
+*** current ***
+
+ * 1.3
+
+- python tracebacker
+- user-governed harakiri
+- simplified external plugin development
+- Linux namespace mountpoint improvements
+- secured subscription system
+- merged routers codebase (fastrouter, http, rawrouter)
+- https support in the http router
+- config report at the end of uWSGI build process
+- support for keepalive in the http router
+- improved subscription system (multicast and unix socket)
+- custom options
+- graceful reloads on shared sockets
+- configurable log-master buffer size
+- extreme-optimizations for the stats subsystem
+
+
+*** april 2012 ***
+
+ * 1.2 [20120430]
+
+- PyPy support 
+- Improved gevent support with threads
+- Python auto-reload subsystem
+- added --spooler-max-tasks
+- pthread robust mutexes support in Linux and Solaris
+- posix semaphores support in FreeBSD9
+- thread-safe ctime() reporting
+- interval support in cron subsystem
+- improved syslog support
+- better management of disconnected clients
+- static files serving improvements
+- another set of multithreading optimizations
+- minor fixes in the Rack plugin
+- Upstart socket-activation support
+
+
+*** march 2012 ***
+
+ * 1.1 [20120317]
+
+- new options parser subsystem
+- improved php support
+- multiple spooler with multiprocessing
+- segmentation fault and floating point exceptions manager
+- never-swap option
+- zergpool plugin
+- perl/psgi multiple interpreters support
+- deadlock detector
+- pluggable cheaper algos
+- new internal routing susbsystem
+- preliminary support for config logic
+- log rotation infrastructure
+- support for paste loggers
+- threading improvements
+- plugins can now mapped to specific modifiers
+- <app> tag is deprecated (use mount option)
+- report startup time for apps
+- reintroduced expat support
+- reintroduced remote spooler plugin
+- various fastrouter optimizations
+- added ruby rvm support
+
+
+*** december 2011 ***
+
+ * 1.0 [20111230]
+
+- adaptive process spawning (--cheaper option)
+- new control options --stop, --reload, --suspend, --resume, --pause
+- stats framework
+- new subscription system
+- support for mime types in static file serving
+- posix capablities support
+- uWSGI mules and farms
+- support for multiple --touch-reload options
+- new logging subsystem
+- new custom locking subsystem
+- process name handling 
+- better (and faster) HTTP parser
+- perl and python threading improvements
+- new plugins: rrdtool, carbon, cgi, php
+- various improvements in the Rack/ruby plugin
+- Linux KSM support
+- refactored ping and nagios plugins
+- support for signals in lazy mode
+- optimized static-file serving
+- support for linux unshare()
+
+*** august 2011 ***
+
+ * 0.9.9 [20110829]
+
+- various spooler improvements
+- upload progress optimizations and fixes
+- new emperor mode: Tyrant
+- allows multiple --ini options
+- better binary path detection
+- gevent loop engine support
+- resolve domain names in socket logging
+- snmp fixes and reintroduction of the snmp-api
+- fixed grunt mode
+- you can specify build profile via env var UWSGI_PROFILE
+- reintroduction of string-based multiapp
+- new option --emperor-throttle
+- improved queue and sharedarea subsystems
+- uWSGI can now be built as a shared library
+- new api attribute: uwsgi.magic_table
+- improved apache2 module
+- new option --pyshell
+- allow threads in gateways
+- fastrouter improvements
+- the application list is now shared and exported to the api
+- allows setting the thread stack size
+- UWSGI_APPID for better multiapp hosting
+- better reloading in lazy mode
+- native pump support
+- various rack fixes
+- support for attaching binary data in the executable
+- new option --set
+- extreme-optimized http protocol parser
+- WSGI handler optimizations
+
 *** july 2011 ***
 
+ * 0.9.8.3 [20110723]
+
+- implemented uwsgi.SymZipImporter to load embedded zip files
+- OSX Lion is officially supported
+- fixed xinetd support (example file added in contrib)
+- suppot for systemd socket activation
+- added --freebind option (Linux only)
+
  * 0.9.8.2 [20110719]
 
 - fixed an ini and yaml parsing bug spotted by Raffaele Colace

Makefile.Py24

@@ -1,2 +0,0 @@
-all:
-	python2.4 uwsgiconfig.py --build

Makefile.Py25

@@ -1,2 +0,0 @@
-all:
-	python2.5 uwsgiconfig.py --build

Makefile.Py26

@@ -1,2 +0,0 @@
-all:
-	python2.6 uwsgiconfig.py --build

Makefile.Py27

@@ -1,2 +0,0 @@
-all:
-	python2.7 uwsgiconfig.py --build

Makefile.Py30

@@ -1,2 +0,0 @@
-all:
-	python3.0 uwsgiconfig.py --build

Makefile.Py31

@@ -1,2 +0,0 @@
-all:
-	python3.1 uwsgiconfig.py --build

Makefile.Py32

@@ -1,2 +0,0 @@
-all:
-	python3.2 uwsgiconfig.py --build

Makefile.PyLua

@@ -1,2 +0,0 @@
-all:
-	python uwsgiconfig.py --build pylua

apache2/mod_Ruwsgi.c

@@ -160,20 +160,35 @@ static int uwsgi_map_location(request_rec *r)
 	return DECLINED;
 }
 
-static void log_err(const char *file, int line, request_rec *r,
+
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+static void log_err(const char *file, int line, int ami, request_rec *r,
 		apr_status_t status, const char *msg)
 {
+	ap_log_rerror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, status, r, "uwsgi: %s", msg);
+#else
+static void log_err(const char *file, int line, request_rec *r,
+                apr_status_t status, const char *msg)
+{
+
 	ap_log_rerror(file, line, APLOG_ERR, status, r, "uwsgi: %s", msg);
+#endif
 }
 
-static void log_debug(const char *file, int line, request_rec *r, const
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+static void log_debug(const char *file, int line, int ami, request_rec *r, const
 		char *msg)
 {
 	/*
 	   ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
 	   ap_log_rerror(file, line, APLOG_WARNING, APR_SUCCESS, r, "uwsgi: %s", msg);
 	   */
+	ap_log_rerror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, APR_SUCCESS, r, "uwsgi: %s", msg);
+#else
+static void log_debug(const char *file, int line, request_rec *r, const
+		char *msg) {
 	ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, "uwsgi: %s", msg);
+#endif
 }
 
 /* buffered socket implementation (buckets are overkill) */
@@ -412,7 +427,11 @@ send_headers(request_rec *r, struct sockbuff *s)
 	apr_table_t *t;
 	apr_status_t rv = 0;
 	apr_port_t  port = 0;
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	GET_PORT(port, r->useragent_addr);
+#else
 	GET_PORT(port, r->connection->remote_addr);
+#endif
 	uwsgi_cfg *cfg = our_dconfig(r);
 
 	log_debug(APLOG_MARK,r, "sending headers");
@@ -430,7 +449,11 @@ send_headers(request_rec *r, struct sockbuff *s)
 
 	add_header(t, "REQUEST_METHOD", (char *) r->method);
 	add_header(t, "QUERY_STRING", r->args ? r->args : "");
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	add_header(t, "SERVER_SOFTWARE", ap_get_server_description());
+#else
 	add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
+#endif
 	add_header(t, "SERVER_ADMIN", r->server->server_admin);
 	add_header(t, "SERVER_NAME", (char *) ap_get_server_name(r));
 	add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)));
@@ -438,7 +461,11 @@ send_headers(request_rec *r, struct sockbuff *s)
 	add_header(t, "SERVER_PROTOCOL", r->protocol);
 
 	add_header(t, "REQUEST_URI", original_uri(r));
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	add_header(t, "REMOTE_ADDR", r->useragent_ip);
+#else
 	add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
+#endif
 	add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
 	add_header(t, "REMOTE_USER", r->user);
 	add_header(t, "DOCUMENT_ROOT", (char *) ap_document_root(r));

apache2/mod_proxy_uwsgi.c

@@ -0,0 +1,397 @@
+#define APR_WANT_MEMFUNC
+#define APR_WANT_STRFUNC
+#include "apr_strings.h"
+#include "apr_hooks.h"
+#include "apr_optional_hooks.h"
+#include "apr_buckets.h"
+
+#include "httpd.h"
+#include "http_config.h"
+#include "http_log.h"
+#include "http_protocol.h"
+#include "http_request.h"
+#include "util_script.h"
+
+#include "mod_proxy.h"
+
+
+#define UWSGI_SCHEME "uwsgi"
+#define UWSGI_DEFAULT_PORT 3031
+
+module AP_MODULE_DECLARE_DATA proxy_uwsgi_module;
+
+
+static int uwsgi_canon(request_rec *r, char *url)
+{
+    char *host, sport[sizeof(":65535")];
+    const char *err, *path;
+    apr_port_t port = UWSGI_DEFAULT_PORT;
+
+    if (strncasecmp(url, UWSGI_SCHEME "://", sizeof(UWSGI_SCHEME) + 2)) {
+        return DECLINED;
+    }
+    url += sizeof(UWSGI_SCHEME); /* Keep slashes */
+
+    err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);
+    if (err) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "error parsing URL %s: %s", url, err);
+        return HTTP_BAD_REQUEST;
+    }
+
+    apr_snprintf(sport, sizeof(sport), ":%u", port);
+
+    if (ap_strchr(host, ':')) { /* if literal IPv6 address */
+        host = apr_pstrcat(r->pool, "[", host, "]", NULL);
+    }
+
+    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
+                             r->proxyreq);
+    if (!path) {
+        return HTTP_BAD_REQUEST;
+    }
+
+    r->filename = apr_pstrcat(r->pool, "proxy:" UWSGI_SCHEME "://", host, sport, "/",
+                              path, NULL);
+
+    return OK;
+}
+
+
+static int uwsgi_send(proxy_conn_rec *conn, const char *buf, apr_size_t length,
+                   request_rec *r)
+{
+    apr_status_t rv;
+    apr_size_t written;
+
+    while (length > 0) {
+        written = length;
+        if ((rv = apr_socket_send(conn->sock, buf, &written)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "sending data to %s:%u failed",
+                          conn->hostname, conn->port);
+            return HTTP_SERVICE_UNAVAILABLE;
+        }
+
+        /* count for stats */
+        conn->worker->s->transferred += written;
+        buf += written;
+        length -= written;
+    }
+
+    return OK;
+}
+
+
+/*
+ * Send uwsgi header block
+ */
+static int uwsgi_send_headers(request_rec *r, proxy_conn_rec *conn)
+{
+    char *buf, *ptr;
+
+    const apr_array_header_t *env_table;
+    const apr_table_entry_t *env;
+
+    int j;
+
+    apr_size_t headerlen = 4;
+    uint16_t pktsize, keylen, vallen;
+
+    ap_add_common_vars(r);
+    ap_add_cgi_vars(r);
+
+    const char *script_name = apr_table_get(r->subprocess_env, "SCRIPT_NAME");
+    const char *path_info = apr_table_get(r->subprocess_env, "PATH_INFO");
+    if (script_name && path_info) {
+        apr_table_set(r->subprocess_env, "SCRIPT_NAME", apr_pstrndup(r->pool, script_name, strlen(script_name)-strlen(path_info)));
+    }
+
+    env_table = apr_table_elts(r->subprocess_env);
+    env = (apr_table_entry_t *)env_table->elts;
+
+    for (j = 0; j < env_table->nelts; ++j) {
+        headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val) ;
+    }
+
+    ptr = buf = apr_palloc(r->pool, headerlen);
+
+    ptr+=4;
+
+    for (j = 0; j < env_table->nelts; ++j) {
+	keylen = strlen(env[j].key);
+	*ptr++= (uint8_t) (keylen & 0xff);
+	*ptr++= (uint8_t) ((keylen >> 8)  & 0xff);
+	memcpy(ptr, env[j].key, keylen) ; ptr+=keylen;
+
+	vallen = strlen(env[j].val);
+	*ptr++= (uint8_t) (vallen & 0xff);
+	*ptr++= (uint8_t) ((vallen >> 8)  & 0xff);
+	memcpy(ptr, env[j].val, vallen) ; ptr+=vallen;
+    }
+
+    pktsize = headerlen-4;
+
+    buf[0] = 0;
+    buf[1] = (uint8_t) (pktsize & 0xff);
+    buf[2] = (uint8_t) ((pktsize >> 8) & 0xff);
+    buf[0] = 0;
+
+    return uwsgi_send(conn, buf, headerlen, r);
+}
+
+
+static int uwsgi_send_body(request_rec *r, proxy_conn_rec *conn)
+{
+    if (ap_should_client_block(r)) {
+        char *buf = apr_palloc(r->pool, AP_IOBUFSIZE);
+        int status;
+        apr_size_t readlen;
+
+        readlen = ap_get_client_block(r, buf, AP_IOBUFSIZE);
+        while (readlen > 0) {
+            status = uwsgi_send(conn, buf, readlen, r);
+            if (status != OK) {
+                return HTTP_SERVICE_UNAVAILABLE;
+            }
+            readlen = ap_get_client_block(r, buf, AP_IOBUFSIZE);
+        }
+        if (readlen == -1) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                          "receiving request body failed");
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
+    }
+
+    return OK;
+}
+
+static
+apr_status_t ap_proxygetline(apr_bucket_brigade *bb, char *s, int n, request_rec *r,
+                             int fold, int *writen)
+{
+    char *tmp_s = s;
+    apr_status_t rv;
+    apr_size_t len;
+
+    rv = ap_rgetline(&tmp_s, n, &len, r, fold, bb);
+    apr_brigade_cleanup(bb);
+
+    if (rv == APR_SUCCESS) {
+        *writen = (int) len;
+    } else if (rv == APR_ENOSPC) {
+        *writen = n;
+    } else {
+        *writen = -1;
+    }
+
+    return rv;
+}
+
+static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_conf *conf)
+{
+
+	char buffer[HUGE_STRING_LEN];
+	const char *buf;
+	char *value, *end;
+	int len;
+	apr_status_t rc;
+	conn_rec *c = r->connection;
+	apr_off_t readbytes;
+	apr_status_t rv;
+	apr_bucket *e;
+	apr_read_type_e mode = APR_NONBLOCK_READ;
+
+	request_rec *rp = ap_proxy_make_fake_req(backend->connection, r);
+	rp->proxyreq = PROXYREQ_RESPONSE;
+
+	apr_bucket_brigade *bb = apr_brigade_create(r->pool, c->bucket_alloc);
+
+
+	rc = ap_proxygetline(bb, buffer, sizeof(buffer), rp, 0, &len);
+	if (len == 0) {
+		rc = ap_proxygetline(bb, buffer, sizeof(buffer), rp, 0, &len);
+	}
+
+	if (len <= 0) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	backend->worker->s->read += len;
+
+	if (!apr_date_checkmask(buffer, "HTTP/#.# ###*")) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+        int major, minor;
+
+        major = buffer[5] - '0';
+        minor = buffer[7] - '0';
+
+        /* If not an HTTP/1 message or
+        * if the status line was > 8192 bytes
+         */
+        if ((major != 1) || (len >= sizeof(buffer)-1)) {
+        	return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                apr_pstrcat(r->pool, "Corrupt status line returned by remote "
+                            "server: ", buffer, NULL));
+        }
+
+        char keepchar = buffer[12];
+        buffer[12] = '\0';
+        r->status = atoi(&buffer[9]);
+
+        if (keepchar != '\0') {
+                buffer[12] = keepchar;
+        } else {
+                /* 2616 requires the space in Status-Line; the origin
+                 * server may have sent one but ap_rgetline_core will
+                 * have stripped it. */
+                buffer[12] = ' ';
+                buffer[13] = '\0';
+            }
+        r->status_line = apr_pstrdup(r->pool, &buffer[9]);
+
+		// start parsing headers;
+		while ((len = ap_getline(buffer, sizeof(buffer), rp, 1)) > 0) {
+			value = strchr(buffer, ':');
+			// invalid header skip
+			if (!value) continue;
+			*value = '\0';
+        		++value;
+        		while (apr_isspace(*value)) ++value; 
+        		for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end) *end = '\0';
+			apr_table_add(r->headers_out, buffer, value);
+		}
+
+
+	if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
+                ap_set_content_type(r, apr_pstrdup(r->pool, buf));
+            }
+	
+	for(;;) {
+		rv = ap_get_brigade(rp->input_filters, bb,
+                                        AP_MODE_READBYTES, mode,
+                                        conf->io_buffer_size);
+		if (APR_STATUS_IS_EAGAIN(rv)
+                        || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb))) {
+			e = apr_bucket_flush_create(c->bucket_alloc);
+			APR_BRIGADE_INSERT_TAIL(bb, e);
+			if (ap_pass_brigade(r->output_filters, bb) || c->aborted) {
+				break;
+			}
+			apr_brigade_cleanup(bb);
+			mode = APR_BLOCK_READ;
+			continue;
+		}
+		else if (rv == APR_EOF) {
+			break;
+		}
+		else if (rv != APR_SUCCESS) {
+			ap_proxy_backend_broke(r, bb);
+			ap_pass_brigade(r->output_filters, bb);
+		}
+
+		mode = APR_NONBLOCK_READ;
+		apr_brigade_length(bb, 0, &readbytes);
+		backend->worker->s->read += readbytes;
+		ap_pass_brigade(r->output_filters, bb);
+		apr_brigade_cleanup(bb);
+	}
+	e = apr_bucket_eos_create(c->bucket_alloc);
+	APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(r->output_filters, bb);
+
+	apr_brigade_cleanup(bb);
+
+    return OK;
+}
+
+static int uwsgi_handler(request_rec *r, proxy_worker *worker,
+                        proxy_server_conf *conf, char *url,
+                        const char *proxyname, apr_port_t proxyport)
+{
+    int status;
+    proxy_conn_rec *backend = NULL;
+    apr_pool_t *p = r->pool;
+    apr_uri_t *uri = apr_palloc(r->pool, sizeof(*uri));
+    char server_portstr[32];
+
+    if (strncasecmp(url, UWSGI_SCHEME "://", sizeof(UWSGI_SCHEME) + 2)) {
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                      "declining URL %s", url);
+        return DECLINED;
+    }
+
+    // ADD PATH_INFO
+    apr_table_add(r->subprocess_env, "PATH_INFO", url+strlen(worker->name));
+
+
+    /* Create space for state information */
+    status = ap_proxy_acquire_connection(UWSGI_SCHEME, &backend, worker,
+                                         r->server);
+    if (status != OK) {
+        goto cleanup;
+    }
+    backend->is_ssl = 0;
+
+    /* Step One: Determine Who To Connect To */
+    status = ap_proxy_determine_connection(p, r, conf, worker, backend,
+                                           uri, &url, proxyname, proxyport,
+                                           server_portstr, sizeof(server_portstr));
+    if (status != OK) {
+        goto cleanup;
+    }
+
+
+    /* Step Two: Make the Connection */
+    if (ap_proxy_connect_backend(UWSGI_SCHEME, backend, worker, r->server)) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "failed to make connection to backend: %s:%u",
+                      backend->hostname, backend->port);
+        status = HTTP_SERVICE_UNAVAILABLE;
+        goto cleanup;
+    }
+
+    /* Step Three: Create conn_rec */
+    if (!backend->connection) {
+	if ((status = ap_proxy_connection_create(UWSGI_SCHEME, backend,
+						r->connection, r->server)) != OK)
+		goto cleanup;
+    }
+
+    /* Step Four: Process the Request */
+    if (   ((status = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK)
+        || ((status = uwsgi_send_headers(r, backend)) != OK)
+        || ((status = uwsgi_send_body(r, backend)) != OK)
+        || ((status = uwsgi_response(r, backend, conf)) != OK)) {
+        goto cleanup;
+    }
+
+cleanup:
+    if (backend) {
+        backend->close = 1; /* always close the socket */
+        ap_proxy_release_connection(UWSGI_SCHEME, backend, r->server);
+    }
+    return status;
+}
+
+
+static void register_hooks(apr_pool_t *p)
+{
+    proxy_hook_scheme_handler(uwsgi_handler, NULL, NULL, APR_HOOK_FIRST);
+    proxy_hook_canon_handler(uwsgi_canon, NULL, NULL, APR_HOOK_FIRST);
+}
+
+
+module AP_MODULE_DECLARE_DATA proxy_uwsgi_module = {
+    STANDARD20_MODULE_STUFF,
+    NULL,		/* create per-directory config structure */
+    NULL,		/* merge per-directory config structures */
+    NULL,		/* create per-server config structure */
+    NULL,		/* merge per-server config structures */
+    NULL,		/* command table */
+    register_hooks	/* register hooks */
+};

apache2/mod_uwsgi.c

@@ -2,7 +2,7 @@
         
 *** uWSGI/mod_uwsgi ***
 
-Copyright 2009-2010 Unbit S.a.s. <info@unbit.it>
+Copyright 2009-2012 Unbit S.a.s. <info@unbit.it>
      
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -37,11 +37,18 @@ LoadModule uwsgi_module <path_of_apache_modules>/mod_uwsgi.so
 
 */
 
+#include <unistd.h>
+#include <ctype.h>
 #include "apr_strings.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include "httpd.h"
 #include "http_core.h"
+#include "http_protocol.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "util_script.h"
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -51,7 +58,6 @@ LoadModule uwsgi_module <path_of_apache_modules>/mod_uwsgi.so
 #include <fcntl.h>
 
 
-#define MAX_VARS 64
 #define DEFAULT_SOCK "/tmp/uwsgi.sock"
 
 typedef struct {
@@ -73,6 +79,8 @@ typedef struct {
 	char script_name[256];
 	char scheme[9];
 	int cgi_mode ;
+	int max_vars;
+	int empty_remote_user;
 } uwsgi_cfg;
 
 module AP_MODULE_DECLARE_DATA uwsgi_module;
@@ -83,8 +91,18 @@ static uint16_t uwsgi_swap16(uint16_t x) {
 }
 #endif
 
-static int uwsgi_add_var(struct iovec *vec, int i, char *key, char *value, uint16_t *pkt_size) {
+static int uwsgi_add_var(struct iovec *vec, int i, request_rec *r, char *key, char *value, uint16_t *pkt_size) {
 
+	uwsgi_cfg *c = ap_get_module_config(r->per_dir_config, &uwsgi_module);
+
+#if APR_IS_BIGENDIAN
+	if (i+6 > c->max_vars) {
+#else
+	if (i+4 > c->max_vars) {
+#endif
+		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: max number of uwsgi variables reached. consider increasing it with uWSGImaxVars directive");
+		return i;
+	}
 
 #if APR_IS_BIGENDIAN
 	char *ptr;
@@ -150,6 +168,9 @@ static void *uwsgi_server_config(apr_pool_t *p, server_rec *s) {
 	c->modifier1 = 0 ;
 	c->modifier2 = 0 ;
 	c->cgi_mode = 0 ;
+	c->max_vars = 128;
+	c->script_name[0] = 0;
+	c->empty_remote_user = 1;
 
 	return c;
 }
@@ -164,6 +185,14 @@ static void *uwsgi_dir_config(apr_pool_t *p, char *dir) {
 	c->modifier1 = 0 ;
 	c->modifier2 = 0 ;
 	c->cgi_mode = 0 ;
+	c->max_vars = 128;
+	c->empty_remote_user = 1;
+	c->script_name[0] = 0;
+	if (dir) {
+		if (strcmp(dir, "/")) {
+			strncpy(c->script_name, dir, 255);
+		}
+	}
 
 	return c;
 }
@@ -243,11 +272,8 @@ static int uwsgi_handler(request_rec *r) {
 
 	uwsgi_cfg *c = ap_get_module_config(r->per_dir_config, &uwsgi_module);
 
-#if APR_IS_BIGENDIAN
-	struct iovec uwsgi_vars[(MAX_VARS*6)+1] ;
-#else
-	struct iovec uwsgi_vars[(MAX_VARS*4)+1] ;
-#endif
+	struct iovec *uwsgi_vars;
+
 	int vecptr = 1 ;
 	char pkt_header[4];
 	uint16_t pkt_size = 0;
@@ -315,68 +341,62 @@ static int uwsgi_handler(request_rec *r) {
 	}
 
 
+#if APR_IS_BIGENDIAN
+        uwsgi_vars = malloc(sizeof(struct iovec) * (c->max_vars*6)+1);
+#else
+        uwsgi_vars = malloc(sizeof(struct iovec) * (c->max_vars*4)+1);
+#endif
 		
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REQUEST_METHOD", (char *) r->method, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "QUERY_STRING", r->args ? r->args : "", &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_NAME", (char *) ap_get_server_name(r), &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)), &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_PROTOCOL", r->protocol, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REQUEST_URI", r->unparsed_uri, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REMOTE_ADDR", r->connection->remote_ip, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REMOTE_USER", r->user ? r->user : "", &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REQUEST_METHOD", (char *) r->method, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "QUERY_STRING", r->args ? r->args : "", &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_NAME", (char *) ap_get_server_name(r), &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)), &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_PROTOCOL", r->protocol, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REQUEST_URI", r->unparsed_uri, &pkt_size) ;
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_ADDR", r->useragent_ip, &pkt_size) ;
+#else
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_ADDR", r->connection->remote_ip, &pkt_size) ;
+#endif
+
+	// 
 	if (r->user) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "AUTH_TYPE", (char *) ap_auth_type(r), &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_USER", r->user, &pkt_size) ;
 	}
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "DOCUMENT_ROOT", (char *) ap_document_root(r), &pkt_size) ;
+	else if (c->empty_remote_user) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_USER", "", &pkt_size) ;
+	}
+
+	if (ap_auth_type(r) != NULL) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "AUTH_TYPE", (char *) ap_auth_type(r), &pkt_size) ;
+	}
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "DOCUMENT_ROOT", (char *) ap_document_root(r), &pkt_size) ;
 
 	if (c->scheme[0] != 0) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "UWSGI_SCHEME", c->scheme, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "UWSGI_SCHEME", c->scheme, &pkt_size) ;
 	}
 
-	if (c->script_name[0] == '/') {
-		if (c->script_name[1] == 0) {
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", "", &pkt_size) ;
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri, &pkt_size) ;
-		}
-		else {
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", c->script_name, &pkt_size) ;
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri+strlen(c->script_name), &pkt_size) ;
-		}
+	// SCRIPT_NAME = "/" is like SCRIPT_NAME = ""
+	if (c->script_name[0] != 0 && !(c->script_name[0] == '/' && c->script_name[1] == 0)) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SCRIPT_NAME", c->script_name, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "PATH_INFO", r->uri+strlen(c->script_name), &pkt_size) ;
 	}
 	else {
-		if (r->path_info) {
-			if (strlen(r->path_info) <= 0) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", "", &pkt_size) ;
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri, &pkt_size) ;
-			}
-			else {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", apr_pstrndup(r->pool, r->uri, (strlen(r->uri) - strlen(r->path_info) )) , &pkt_size) ;
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->path_info, &pkt_size) ;
-			}
-		}
-		else {
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", "", &pkt_size) ;
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri, &pkt_size) ;
-		}
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SCRIPT_NAME", "", &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "PATH_INFO", r->uri, &pkt_size) ;
 	}
 
 
 	headers = apr_table_elts(r->headers_in);
 	h = (apr_table_entry_t *) headers->elts;
 
-	// check for max vars (a bit ugly)
-	cnt = headers->nelts ;
-	if (cnt + 11 > MAX_VARS) {
-		cnt = MAX_VARS -11;
-	}
-
-	for(i=0;i< cnt;i++) {
+	for(i=0;i< headers->nelts;i++) {
 		if (h[i].key){
 			if (!strcasecmp(h[i].key, "Content-Type")) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "CONTENT_TYPE", h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "CONTENT_TYPE", h[i].val, &pkt_size) ;
 			}
 			else if (!strcasecmp(h[i].key, "Content-Length")) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "CONTENT_LENGTH", h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "CONTENT_LENGTH", h[i].val, &pkt_size) ;
 			}
 			else {
 				penv = apr_pstrcat(r->pool, "HTTP_", h[i].key, NULL);
@@ -388,7 +408,7 @@ static int uwsgi_handler(request_rec *r) {
 						*cp = toupper(*cp);
 					}
 				}
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, penv, h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, penv, h[i].val, &pkt_size) ;
 			}
 		}
 	}
@@ -397,7 +417,7 @@ static int uwsgi_handler(request_rec *r) {
 	headers = apr_table_elts(r->subprocess_env);
 	h = (apr_table_entry_t*) headers->elts;
 	for (i = 0; i < headers->nelts; ++i) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, h[i].key, h[i].val, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, h[i].key, h[i].val, &pkt_size) ;
 	}	
 	
 
@@ -418,11 +438,13 @@ static int uwsgi_handler(request_rec *r) {
 	if (cnt < 0) {
 		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: writev() %s", strerror(errno));
 		close(uwsgi_poll.fd);
+		free(uwsgi_vars);
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 	else if (cnt != pkt_size+4) {
 		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: writev() returned wrong size");
 		close(uwsgi_poll.fd);
+		free(uwsgi_vars);
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 
@@ -434,6 +456,7 @@ static int uwsgi_handler(request_rec *r) {
 			if (cnt < 0) {
 				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: read() client block failed !");
 				close(uwsgi_poll.fd);
+				free(uwsgi_vars);
 				return HTTP_INTERNAL_SERVER_ERROR;
 			}
 		}
@@ -458,6 +481,7 @@ static int uwsgi_handler(request_rec *r) {
 		if (cnt == 0) {
 			ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() timeout");
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 		else if (cnt > 0) {
@@ -467,6 +491,7 @@ static int uwsgi_handler(request_rec *r) {
 					if (errno != ECONNRESET) {
 						ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() %s", strerror(errno));
 						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
 						return HTTP_INTERNAL_SERVER_ERROR;
 					}
 					else {
@@ -489,9 +514,25 @@ static int uwsgi_handler(request_rec *r) {
 					if (r->connection->aborted) { 
 						close(uwsgi_poll.fd);
 						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
 						return HTTP_INTERNAL_SERVER_ERROR;
 					}
-					apr_brigade_write(bb, NULL, NULL, buf, cnt);
+					if (!c->cgi_mode) {
+						b = apr_bucket_transient_create(buf, cnt, r->connection->bucket_alloc);
+						APR_BRIGADE_INSERT_TAIL(bb, b);
+						b = apr_bucket_flush_create(r->connection->bucket_alloc);
+						APR_BRIGADE_INSERT_TAIL(bb, b);
+						if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
+							close(uwsgi_poll.fd);
+							apr_brigade_destroy(bb);
+							free(uwsgi_vars);
+							return HTTP_INTERNAL_SERVER_ERROR;
+						}
+						apr_brigade_cleanup(bb);
+					}
+					else {
+						apr_brigade_write(bb, NULL, NULL, buf, cnt);
+					}
 				}
 				else {
 					// EOF
@@ -508,6 +549,7 @@ static int uwsgi_handler(request_rec *r) {
 			ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: poll() %s", strerror(errno));
 			close(uwsgi_poll.fd);
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 	}
@@ -521,6 +563,7 @@ static int uwsgi_handler(request_rec *r) {
 
 	if (!c->cgi_mode) {
 		if (uwsgi_http_status_read == 0) {
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 	}
@@ -528,11 +571,13 @@ static int uwsgi_handler(request_rec *r) {
 
 		if (hret = ap_scan_script_header_err_brigade(r, bb, NULL)) {
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return hret;
 		}
 	}
 
 
+	free(uwsgi_vars);
 	return ap_pass_brigade(r->output_filters, bb) ;
 }
 
@@ -564,6 +609,22 @@ static const char * cmd_uwsgi_force_wsgi_scheme(cmd_parms *cmd, void *cfg, const
 
 }
 
+static const char *cmd_uwsgi_max_vars(cmd_parms *cmd, void *cfg, const char *value) {
+	uwsgi_cfg *c ;
+        int val ;
+
+        if (cfg) {
+                c = cfg ;
+        }
+        else {
+                c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
+        }
+
+        c->max_vars = atoi(value);
+
+        return NULL;
+}
+
 static const char * cmd_uwsgi_modifier1(cmd_parms *cmd, void *cfg, const char *value) {
 
         uwsgi_cfg *c ;
@@ -598,7 +659,7 @@ static const char * cmd_uwsgi_force_cgi_mode(cmd_parms *cmd, void *cfg, const ch
                 c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
         }
 
-	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value)) {
+	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value) || !strcmp("true", value)) {
 		c->cgi_mode = 1 ;
 	}
 
@@ -699,6 +760,28 @@ static const char * cmd_uwsgi_socket(cmd_parms *cmd, void *cfg, const char *path
 	return NULL ;
 }
 
+static const char * cmd_uwsgi_empty_remote_user(cmd_parms *cmd, void *cfg, const char *value) {
+
+	uwsgi_cfg *c ;
+
+	if (cfg) {
+		c = cfg ;
+	}
+	else {
+		c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
+	}
+
+	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value) || !strcmp("true", value)) {
+		c->empty_remote_user = 1;
+	}
+	else {
+		c->empty_remote_user = 0;
+	}
+
+	return NULL ;
+
+}
+
 static const command_rec uwsgi_cmds[] = {
 	AP_INIT_TAKE12("uWSGIsocket", cmd_uwsgi_socket, NULL, RSRC_CONF|ACCESS_CONF, "Absolute path and optional timeout in seconds of uwsgi server socket"),	
 	AP_INIT_TAKE1("uWSGIsocket2", cmd_uwsgi_socket2, NULL, RSRC_CONF|ACCESS_CONF, "Absolute path of failover uwsgi server socket"),	
@@ -707,6 +790,8 @@ static const command_rec uwsgi_cmds[] = {
 	AP_INIT_TAKE1("uWSGIforceScriptName", cmd_uwsgi_force_script_name, NULL, ACCESS_CONF, "Fix for PATH_INFO/SCRIPT_NAME when the location has filesystem correspondence"),	
 	AP_INIT_TAKE1("uWSGIforceCGImode", cmd_uwsgi_force_cgi_mode, NULL, ACCESS_CONF, "Force uWSGI CGI mode for perfect integration with apache filter"),	
 	AP_INIT_TAKE1("uWSGIforceWSGIscheme", cmd_uwsgi_force_wsgi_scheme, NULL, ACCESS_CONF, "Force the WSGI scheme var (set by default to \"http\")"),	
+	AP_INIT_TAKE1("uWSGIemptyRemoteUser", cmd_uwsgi_empty_remote_user, NULL, ACCESS_CONF, "Always include REMOTE_USER in the environment, even with an empty value (default true)"),
+	AP_INIT_TAKE1("uWSGImaxVars", cmd_uwsgi_max_vars, NULL, ACCESS_CONF, "Set the maximum allowed number of uwsgi variables (default 128)"),	
 	{NULL}
 };
 

attach.py

@@ -0,0 +1,13 @@
+import struct
+import sys
+import os
+
+filename = sys.argv[1]
+
+size = os.path.getsize(filename)
+
+f = open(filename, 'r')
+print(f.read())
+f.close()
+
+print(struct.pack("<Q", size))

bootstrap.py

@@ -1,4 +1,5 @@
 import sys
 import uwsgi
 
+print("i am the bootstrap for uwsgi.SymbolsImporter")
 sys.meta_path.insert(0, uwsgi.SymbolsImporter())

bootstrap2.py

@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("pygments_zip"))

bootstrap3.py

@@ -0,0 +1,5 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("django_zip:djenv/lib/python2.6/site-packages"))
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("djapp_zip"))

bootstrap4.py

@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.ZipImporter("data://0"))

bootstrap5.py

@@ -0,0 +1,3 @@
+import uwsgi
+
+print uwsgi.extract("data://0")

buildconf/base.ini

@@ -0,0 +1,45 @@
+[uwsgi]
+xml = auto
+ini = true
+yaml = true
+json = auto
+sqlite3 = auto
+zeromq = auto
+snmp = true
+spooler = true
+embedded = true
+ssl = auto
+udp = true
+multicast = true
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+ldap = auto
+pcre = auto
+routing = auto
+ipv6 = false
+debug = false
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, router_rewrite, router_http
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

buildconf/cgi.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = cgi
+inherit = base

buildconf/core.ini

@@ -1,3 +1,4 @@
 [uwsgi]
-inherit = default
+main_plugin =
+inherit = base
 embedded_plugins = null

buildconf/default.ini

@@ -1,43 +1,3 @@
 [uwsgi]
-xml = true
-ini = true
-yaml = true
-json = auto
-sqlite3 = auto
-zeromq = auto
-snmp = true
-sctp = false
-spooler = true
-embedded = true
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = auto
-pcre = auto
-debug = false
-unbit = false
-xml_implementation = libxml2
-yaml_implementation = auto
-malloc_implementation = libc
-plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = .
-embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-embed_files =
-
-embed_config =
-
-[python]
-paste = true
-web3 = true
+main_plugin = python
+inherit = base

buildconf/django.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+main_plugin = python
+inherit = base
+embed_files = bootstrap3.py,django.zip,djapp.zip

buildconf/embedded.ini

@@ -1,4 +1,5 @@
 [uwsgi]
-inherit = default
+main_plugin = python
+inherit = base
 
 embed_files = embedme.py,uwsgidecorators.py

buildconf/erlang.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = +,erlang
+main_plugin = erlang
+inherit = base

buildconf/gevent.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = python,gevent
+inherit = base

buildconf/lib.ini

@@ -0,0 +1,5 @@
+[uwsgi]
+inherit = base
+bin_name = libuwsgi.so
+embedded_plugins = null
+as_shared_library = true

buildconf/lua.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = lua
+main_plugin = lua
+inherit = base

buildconf/luap.ini

@@ -1,3 +1,4 @@
 [uwsgi]
-inherit = default
+main_plugin = 
+inherit = base
 plugins = lua

buildconf/modular.ini

@@ -1,5 +1,5 @@
 [uwsgi]
-inherit = default
+inherit = base
 plugins = python, ping, rack, psgi, cache, http, fastrouter
 plugin_dir = plugins
 embedded_plugins = null

buildconf/package.ini

@@ -1,4 +1,4 @@
 [uwsgi]
-inherit = default
+inherit = base
 plugin_dir = /usr/lib/uwsgi
-embedded_plugins = null
+embedded_plugins =

buildconf/php.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = php
+inherit = base

buildconf/psgi.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = psgi
+main_plugin = psgi
+inherit = base

buildconf/pyerl.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = +,erlang,pyerl
+main_plugin = python,erlang,pyerl
+inherit = base 

buildconf/pylua.ini

@@ -1,7 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = +,lua
-
-[python]
-paste = true
-web3 = true
+main_plugin = python,lua
+inherit = base

buildconf/pypy.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = pypy
+inherit = base

buildconf/pyrb.ini

@@ -2,7 +2,6 @@
 xml = true
 ini = true
 snmp = true
-sctp = false
 erlang = false
 spooler = true
 embedded = true

buildconf/pyuwsgi.ini

@@ -0,0 +1,5 @@
+[uwsgi]
+main_plugin = pyuwsgi
+inherit = base
+bin_name = pyuwsgi.so
+as_shared_library = true

buildconf/rack.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = rack, ping, nagios, rpc
+main_plugin = rack
+inherit = base

buildconf/rackp.ini

@@ -3,7 +3,6 @@ xml = true
 ini = true
 yaml = true
 snmp = true
-sctp = false
 erlang = false
 spooler = false
 embedded = false

buildconf/unbit.ini

@@ -2,11 +2,10 @@
 xml = true
 ini = true
 yaml = true
-json = true
-sqlite3 = true
+json = false
+sqlite3 = false
 zeromq = false
 snmp = false
-sctp = false
 spooler = true
 embedded = true
 udp = true
@@ -15,12 +14,12 @@ threading = true
 sendfile = true
 minterpreters = true
 async = true
-evdis = false
 ldap = true
-pcre = false
+pcre = true
+routing = true
 debug = false
 unbit = true
-xml_implementation = libxml2
+xml_implementation = expat
 yaml_implementation = auto
 malloc_implementation = libc
 plugins =

buildconf/upcode.ini

@@ -0,0 +1,44 @@
+[uwsgi]
+xml = false
+ini = true
+yaml = false
+json = false
+sqlite3 = false
+zeromq = false
+snmp = false
+spooler = true
+embedded = true
+udp = true
+multicast = false
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+evdis = false
+ldap = false
+pcre = true
+routing = true
+debug = false
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
+extras = 
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins =
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

config17.ru

@@ -0,0 +1,25 @@
+require 'stringio'
+
+hello = proc do |signum|
+  puts "Hello i am signal #{signum}"
+end
+
+file_changed = proc do |signum| 
+  puts "/tmp has been modified"
+end
+
+UWSGI.register_signal(17, '', hello)
+UWSGI.register_signal(30, '', file_changed)
+
+UWSGI.add_rb_timer(17 , 2)
+UWSGI.add_timer(17 , 1)
+UWSGI.add_file_monitor(30 , '/tmp')
+
+puts UWSGI.signal_registered(1)
+puts UWSGI.signal_registered(17)
+
+run lambda { |env| 
+        puts env.inspect
+	UWSGI.signal(17)
+	[200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World!\n")] 
+}

config30.ru

@@ -0,0 +1,68 @@
+require 'stringio'
+require 'uwsgidsl'
+
+
+
+signal 17,'mule5' do |signum|
+end
+
+puts UWSGI::VERSION
+puts UWSGI::NUMPROC
+puts UWSGI::HOSTNAME
+
+puts UWSGI::OPT.inspect
+
+timer 2 do |signum|
+  puts "ciao sono un dsl ruby: #{signum} #{UWSGI::OPT.inspect}"
+end
+
+timer 1,'mule1' do |signum|
+  puts "1 second elapsed (signum #{signum})"
+end
+
+filemon '/tmp' do |signum|
+  puts "/tmp has been modified"
+end
+
+cron 5,-1,-1,-1,-1 do |signum|
+  puts "cron ready #{signum}"
+end
+
+cron 58,-1,-1,-1,-1 do |signum|
+  puts "cron ready #{signum}"
+end
+
+postfork do
+  puts "fork() called"
+end
+
+rpc 'pippo' do
+  "i am an rpc function"
+end
+
+rpc 'pluto' do |x,y|
+  "i am another rpc function #{x} #{y}"
+end
+
+begin
+  foo_func
+rescue
+end
+
+puts UWSGI.cache_exists('nilkey')
+puts UWSGI.cache_exists?('nilkey')
+
+UWSGI.cache_set!('foobar_key?a=1', UWSGI::OPT.inspect)
+begin
+puts UWSGI.cache_get(nil)
+rescue
+end
+puts UWSGI.cache_get('foobar_key?a=1')
+
+
+run lambda { |env| 
+  puts env.inspect
+  UWSGI.setprocname("i am the uWSGI rack plugin")
+  UWSGI.signal(17)
+  [200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World! #{UWSGI.mem.inspect}\n")] 
+}

contrib/binder.pl

@@ -0,0 +1,12 @@
+use POSIX;
+use IO::Socket::INET;
+use IO::Socket::INET6;
+
+my $s = IO::Socket::INET->new(LocalAddr => '127.0.0.1', LocalPort => 1717, Proto => 'tcp', Reuse => 1);
+my $s2 = IO::Socket::INET->new(LocalAddr => '127.0.0.1', LocalPort => 3022, Proto => 'tcp', Reuse => 1);
+my $s3 = IO::Socket::INET6->new(LocalAddr => '::', LocalPort => 3017, Proto => 'tcp', Reuse => 1);
+
+dup2($s->fileno, 17);
+dup2($s2->fileno, 22);
+dup2($s3->fileno, 30);
+exec './uwsgi','-M', '--socket','fd://17', '--http-socket','fd://22', '--socket','fd://30';

contrib/centos_init_script

@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# uwsgi - Use uwsgi to run python and wsgi web apps.
+#
+# chkconfig: - 85 15
+# description: Use uwsgi to run python and wsgi web apps.
+# processname: uwsgi
+
+# author: Roman Vasilyev
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+PATH=/opt/uwsgi:/sbin:/bin:/usr/sbin:/usr/bin
+prog=/usr/sbin/uwsgi
+
+OWNER=nginx
+
+NAME=uwsgi
+DESC=uwsgi
+
+#DAEMON_OPTS="-s 127.0.0.1:9001 -M 4 -t 30 -A 4 -p 4 -d /var/log/uwsgi.log --pidfile /var/run/$NAME.pid --pythonpath $PYTHONPATH --module $MODULE"
+DAEMON_OPTS="-s 127.0.0.1:9001 -M 4 -t 30 -A 4 -p 16 -b 32768 -d /var/log/$NAME.log --pidfile /var/run/$NAME.pid --uid $OWNER"
+
+[ -f /etc/sysconfig/uwsgi ] && . /etc/sysconfig/uwsgi
+
+lockfile=/var/lock/subsys/uwsgi
+
+start () {
+  echo -n "Starting $DESC: "
+  daemon $prog $DAEMON_OPTS
+  retval=$?
+  echo
+  [ $retval -eq 0 ] && touch $lockfile
+  return $retval
+}
+
+stop () {
+  echo -n "Stopping $DESC: "
+  killproc $prog
+  retval=$?
+  echo
+  [ $retval -eq 0 ] && rm -f $lockfile
+  return $retval
+}
+
+reload () {
+  echo "Reloading $NAME" 
+  killproc $prog -HUP
+  RETVAL=$?
+  echo
+}
+
+force-reload () {
+  echo "Reloading $NAME" 
+  killproc $prog -TERM
+  RETVAL=$?
+  echo
+}
+
+restart () {
+    stop
+    start
+}
+
+rh_status () {
+  status $prog
+}
+
+rh_status_q() {
+  rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+  start)
+    rh_status_q && exit 0
+    $1
+    ;;
+  stop)
+    rh_status_q || exit 0
+    $1
+    ;;
+  restart|force-reload)
+    $1
+    ;;
+  reload)
+    rh_status_q || exit 7
+    $1
+    ;;
+  status)
+    rh_status
+    ;;
+  *)  
+    echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2
+    exit 2
+    ;;
+  esac
+  exit 0
+

contrib/cgi_python.c

@@ -0,0 +1,53 @@
+#include <Python.h>
+
+void uwsgi_cgi_load_python() {
+
+	Py_Initialize();
+}
+
+void uwsgi_cgi_run_python(char *filename) {
+
+	char **e, *p;
+        PyObject *k, *env_value;
+
+	FILE *fp = fopen(filename, "r");
+
+	PySys_SetArgv(1, &filename);
+
+	PyObject *os_module = PyImport_ImportModule("os");
+        if (os_module) {
+       		PyObject *os_module_dict = PyModule_GetDict(os_module);
+        	PyObject *py_environ = PyDict_GetItemString(os_module_dict, "environ");
+                if (py_environ) {
+                	for (e = environ; *e != NULL; e++) {
+                        	p = strchr(*e, '=');
+                                if (p == NULL) continue;
+
+                                k = PyString_FromStringAndSize(*e, (int)(p-*e));
+                                if (k == NULL) {
+                                	PyErr_Print();
+                                        continue;
+                                }
+
+                                env_value = PyString_FromString(p+1);
+                                if (env_value == NULL) {
+                                	PyErr_Print();
+                                        Py_DECREF(k);
+                                        continue;
+                                }
+
+                                if (PyObject_SetItem(py_environ, k, env_value)) {
+                                	PyErr_Print();
+                                }
+
+                                Py_DECREF(k);
+                                Py_DECREF(env_value);
+
+                        }
+
+                }
+        }
+
+
+	PyRun_AnyFileEx(fp, filename, 1);
+}

contrib/emperormon.ru

@@ -0,0 +1,114 @@
+require 'sinatra'
+require 'socket'
+require 'json'
+
+module EmperorStats
+  def self.uwsgi_get_stats(server)
+    parts = server.split(':')
+    if parts.length > 1
+      s = TCPSocket.open(parts[0], parts[1])
+    else
+      s = UNIXSocket.open(server)
+    end
+    return JSON.parse(s.read())
+  end
+end
+
+template = <<eof
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title><%=@title%></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="unbit">
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+    </style>
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+  </head>
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#"><%=@title%></a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+      <hr/>
+      <h1>Emperor: <%=@stats['emperor']%></h1>
+      <hr/>
+
+      <div class="row">
+              <div class="span8">
+                  <table class="table table-striped table-bordered">
+                    <thead>
+                      <tr>
+                        <th>name</th><th>pid</th><th>first run</th>
+                        <th>last respawn</th>
+                        <th>last heartbeat</th>
+                        <th>loyal</th>
+                        <th>respawns</th>
+			<% if @stats['emperor_tyrant'] == 1 %>
+                        <th>uid</th>
+                        <th>gid</th>
+			<% end %>
+                     </tr>
+                    </thead>
+          <% for vassal in @stats['vassals'] %>
+			<tr>
+				<td><%=vassal['id']%></td>
+				<td><%=vassal['pid']%></td>
+				<td><%=Time.at(vassal['first_run']).strftime("%d %b %Y %H:%M:%S")%></td>
+				<td><%=Time.at(vassal['last_run']).strftime("%d %b %Y %H:%M:%S")%></td>
+				<td><% if vassal['last_heartbeat'] > 0 %><%=Time.at(vassal['last_heartbeat']).strftime("%d %b %Y %H:%M:%S")%><% end %></td>
+				<td><% if vassal['loyal'] > 0 %><%=Time.at(vassal['last_loyal']).strftime("%d %b %Y %H:%M:%S")%><% end %></td>
+				<td><%=vassal['respawns']%></td>
+				<% if @stats['emperor_tyrant'] == 1 %>
+					<td><%=vassal['uid']%></td>
+					<td><%=vassal['gid']%></td>
+				<% end %>
+			</tr>
+          <% end %>
+                  </table>
+              </div>
+
+
+		<div class="span4">
+			<h3>blacklist</h3>
+			<table class="table table-striped table-bordered">
+				<thead>
+					<tr><th>name</th><th>throttle</th></tr>
+					<% for bli in @stats['blacklist'] %>
+						<tr>
+							<td><%=bli['id']%></td>
+							<td><%=bli['throttle_level']%></td>
+						</tr>
+					<% end %>
+				</thead>
+			</table>
+		</div>
+      </div>
+
+
+
+    <script src="http://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
+    <script src="http://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+  </body>
+</html>
+eof
+
+get '/' do
+  @stats = EmperorStats::uwsgi_get_stats(ENV['EMPEROR']) 
+  @title = 'uWSGI Emperor monitor'
+  erb template
+end
+
+run Sinatra::Application

contrib/loadapp.pl

@@ -0,0 +1,15 @@
+use IO::Socket::INET;
+
+my $s = IO::Socket::INET->new(PeerAddr => '127.0.0.1', PeerPort => $ARGV[0]);
+
+my $mountpoint = $ARGV[1];
+my $app = $ARGV[2];
+
+my $uwsgi_appid = pack('v', length('UWSGI_APPID')).'UWSGI_APPID'.pack('v', length($mountpoint)).$mountpoint;
+my $uwsgi_script = pack('v', length('UWSGI_SCRIPT')).'UWSGI_SCRIPT'.pack('v', length($app)).$app;
+
+$s->send(pack('CvC', 5, length($uwsgi_appid.$uwsgi_script),0).$uwsgi_appid.$uwsgi_script);
+
+while((my $cnt = $s->recv(my $buf, 4096))> 0) {
+	print $buf;
+}

contrib/securesubscribe.pl

@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+
+use Crypt::OpenSSL::RSA;
+use IO::Socket::INET;
+
+open PK,$ARGV[3];
+my @lines = <PK>;
+close PK;
+
+$rsa_priv = Crypt::OpenSSL::RSA->new_private_key(join('',@lines));
+
+my %items = {};
+
+$items{'key'} = $ARGV[1];
+$items{'address'} = $ARGV[2];
+
+my $uwsgi_pkt = '';
+
+foreach(keys %items) {
+	$uwsgi_pkt .= pack('v', length($_)).$_.pack('v', length($items{$_})).$items{$_};	
+}
+
+my $unix_check = time();
+
+$uwsgi_pkt .= pack('v', 4).'unix'.pack('v', length($unix_check)).$unix_check;
+
+my $signature = $rsa_priv->sign($uwsgi_pkt);
+
+$uwsgi_pkt .= pack('v', 4).'sign'.pack('v', length($signature)).$signature;
+
+
+my $udp = new IO::Socket::INET(PeerAddr => $ARGV[0], Proto => 'udp');
+
+$udp->send(pack('CvC', 224, length($uwsgi_pkt), 0).$uwsgi_pkt);
+
+print ''.(length($uwsgi_pkt)+4).' bytes sent to '.$ARGV[0]."\n";

contrib/spoolqueue/producer.py

@@ -0,0 +1,11 @@
+from tasksconsumer import enqueue
+
+def application(env, sr):
+
+    sr('200 OK', [('Content-Type','text/html')])
+
+    enqueue(queue='fast', pippo='pluto')
+
+    return "Task enqueued"
+
+

contrib/spoolqueue/tasks.py

@@ -0,0 +1,9 @@
+from tasksconsumer import *
+
+@queueconsumer('fast', 4)
+def fast_queue(arguments):
+    print "fast", arguments
+
+@queueconsumer('slow')
+def slow_queue(arguments):
+    print "foobar", arguments

contrib/spoolqueue/tasksconsumer.py

@@ -0,0 +1,44 @@
+from uwsgidecorators import *
+import Queue
+from threading import Thread
+
+queues = {}
+
+class queueconsumer(object):
+
+    def __init__(self, name, num=1, **kwargs):
+        self.name = name
+	self.num = num
+        self.queue = Queue.Queue()
+	self.threads = []
+	self.func = None
+	queues[self.name] = self
+
+
+    @staticmethod
+    def consumer(self):
+        while True:
+	    req = self.queue.get()
+            print req
+	    self.func(req)
+	    self.queue.task_done()
+
+    def __call__(self, f):
+        self.func = f
+	for i in range(self.num):
+	    t = Thread(target=self.consumer,args=(self,))	
+	    self.threads.append(t)
+	    t.daemon = True
+	    t.start()
+
+@spool
+def spooler_enqueuer(arguments):
+    if 'queue' in arguments:
+        queue = arguments['queue']
+        queues[queue].queue.put(arguments)
+    else:
+        raise Exception("You have to specify a queue name")
+
+
+def enqueue(*args, **kwargs):
+    return spooler_enqueuer.spool(*args, **kwargs)

contrib/subscribe.pl

@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+
+use IO::Socket::INET;
+
+my %items = {};
+
+$items{'key'} = $ARGV[1];
+$items{'address'} = $ARGV[2];
+
+my $uwsgi_pkt = '';
+
+foreach(keys %items) {
+	$uwsgi_pkt .= pack('v', length($_)).$_.pack('v', length($items{$_})).$items{$_};	
+}
+
+my $udp = new IO::Socket::INET(PeerAddr => $ARGV[0], Proto => 'udp');
+
+$udp->send(pack('CvC', 224, length($uwsgi_pkt), 0).$uwsgi_pkt);
+
+print ''.(length($uwsgi_pkt)+4).' bytes sent to '.$ARGV[0]."\n";

contrib/upstart/uwsgi.conf

@@ -12,4 +12,6 @@ env LOGTO=/tmp/uwsgi.log
 env BINPATH=/home/foo/uwsgi/uwsgi
 
 # --no-orphans avoid workers without master
-exec $BINPATH --no-orphans --socket :3033 --uid 1001 --gid 1001 --limit-as 256 -m simple_app --logto $LOGTO -M -p 4
+# --die-on-term could be a good idea
+exec $BINPATH --no-orphans --socket :3033 --uid 1001 --gid 1001 --limit-as 256 -w simple_app --logto $LOGTO -M -p 4
+

contrib/upython

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+COMMAND=./uwsgi
+CONFIG_FILE=
+
+
+FIRST=0
+
+for ARG in $@;do
+  if [ $FIRST -eq 0 ];then
+    FIRST=1
+  else
+    ARGS="$ARGS $ARG"
+  fi
+done
+
+export UWSGI_INHERIT=CONFIG_FILE
+export UWSGI_PYRUN=$1
+export UWSGI_PYARGV=$ARGS
+
+exec $COMMAND

contrib/urack.rb

@@ -1,5 +1,9 @@
 require 'rubygems'
 require 'socket'
+begin
+        require 'bundler/setup'
+rescue LoadError
+end
 require 'rack'
 require 'rack/content_length'
 require 'rack/rewindable_input'

contrib/uwsgi-cache-monitor.py

@@ -0,0 +1,123 @@
+import mmap
+import os
+import struct
+import array
+import time
+import sys
+from optparse import OptionParser
+
+class Cache:
+
+    def __init__(self, filename, cache_slots, block_size=65536, sample_sleep=1):
+
+        self.block_size = block_size
+        self.cache_slots = cache_slots
+
+        self.key_size = 2048
+        self.item_size = 2 + 2 + 4 + 8 + 8 + 8 + 8 + 8 + self.key_size
+        self.block_size_start = self.item_size * self.cache_slots
+
+        fd = os.open(filename, os.O_RDONLY)
+        self.cache_store = mmap.mmap(fd, 0, mmap.MAP_SHARED, mmap.PROT_READ)
+
+        self.sample_sleep = sample_sleep
+        self.samples = 0
+        self.history = []
+        self.cache_full = 0
+        self.cache_empty = 0
+        self.cache_items = 0
+        self.block_sizes = 0
+
+    def store_read_item_block(self, position):
+        pos = self.cache_store.tell()
+        # uwsgi cache stores cache entries first and then the blocks
+        self.cache_store.seek(self.block_size_start + (position * self.block_size))
+        buf = self.cache_store.read(self.block_size)
+        self.cache_store.seek(pos)
+        return buf
+
+    def store_read_item(self, position):
+        buf = self.cache_store.read(self.item_size)
+        fields = struct.unpack_from('@HHIQQQQQ2048c', buf)
+        key = array.array('c', fields[8:self.key_size+8]).tostring().rstrip('\x00')
+
+        if [x for x in key if x!= '\x00']:
+            buf = self.store_read_item_block(position)
+            value = array.array('c', buf).tostring().rstrip('\x00')
+        else:
+            value = ''
+        return (position, key, value, len(value))
+
+    def read(self):
+        data = [self.store_read_item(i) for i in range(self.cache_slots)]
+        self.cache_store.seek(0)
+        self.update_stats(data)
+        if self.sample_sleep:
+            time.sleep(self.sample_sleep)
+        return data
+ 
+    def update_stats(self, data):
+        # data is a list of (position, key, value, len(value)) tuples
+        items = len([1 for x in data if x[3] > 0])
+        self.cache_items += items
+        full, empty = items == self.cache_slots, items == 0
+        if full:
+            self.cache_full += 1
+        if empty:
+            self.cache_empty += 1
+        self.samples += 1
+        block_sizes = sum([x[3] for x in data])
+        self.block_sizes += block_sizes
+        self.history.append({'full': full, 'empty': empty, 'data': data, \
+            'items': items, 'block_sizes': block_sizes})
+
+    def dump(self):
+        return {
+            'samples': self.samples,
+            'history': self.history,
+            'cache_slots': self.cache_slots,
+            'sample_sleep': self.sample_sleep, 
+            'cache_empty': self.cache_empty,
+            'cache_full': self.cache_full,
+            'cache_items': self.cache_items,
+            'block_sizes': self.block_sizes,
+         }
+
+    def show_dump(self):
+        d = self.dump()
+        print
+        print "Recorded %d samples (%d second(s) sleep between samples)" % \
+            (d['samples'], d['sample_sleep'])
+        print "Cache empty %d times, full %d times, %.2f items on average" % \
+            (d['cache_empty'], d['cache_full'], d['cache_items'] / d['samples'])
+        print "Block size average size: %d bytes" % \
+            (d['block_sizes'] / d['cache_items'] * 8)
+        print "Data in cache average: %d bytes" % \
+            (d['block_sizes'] / d['samples'] * 8)
+
+def main(options):
+    cache = Cache(options.cache_store, options.cache_slots, options.block_size,
+        options.sleep_time)
+    print "Recording..."
+    while True:
+        try:
+            data = cache.read()
+        except KeyboardInterrupt:
+            cache.show_dump()
+            sys.exit(0)
+
+if __name__ == '__main__':
+    parser = OptionParser()
+    parser.add_option("-s", "--cache-slots", dest="cache_slots", type="int",
+        help="Slots available in the cache, uwsgi cache option")
+    parser.add_option("-c", "--cache-store", dest="cache_store", default="uwsgi.cache",
+        help="The filename of the cache store, uwsgi cache-store option. Default: uwsgi.cache")
+    parser.add_option("-b", "--block-size", dest="block_size", default=65536, type="int",
+        help="The size of the cache block, uwsgi cache-blocksize option. Default: 65536")
+    parser.add_option("-t", "--sleep-time", dest="sleep_time", default=1, type="int",
+        help="The time to sleep between each sample. Default: 1")
+
+    (options, args) = parser.parse_args()
+    if not options.cache_slots:
+        parser.error('Option -s / --cache-slots is mandatory')
+    main(options)

contrib/uwsgisubscribers.ru

@@ -0,0 +1,96 @@
+require 'sinatra'
+require 'socket'
+require 'json'
+
+module USubscribers
+  def self.uwsgi_get_stats(server)
+    parts = server.split(':')
+      if parts.length > 1
+        s = TCPSocket.open(parts[0], parts[1])
+      else
+        s = UNIXSocket.open(server)
+      end
+      return JSON.parse(s.read())
+  end
+end
+
+template = <<eof
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title><%=@title%></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="unbit">
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+    </style>
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+  </head>
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#"><%=@title%></a>
+        </div>
+      </div>
+    </div>
+
+    <% for server in @servers.keys %>
+    <div class="container">
+      <hr/>
+      <h1>SubscriptionServer: <%=server%></h1>
+      <hr/>
+
+      <div class="row">
+          <% for pool in @servers[server] %>
+              <div class="span6">
+                  <h3><%=pool['key']%> (<%=pool['hits']%> hits)</h3>
+                  <table class="table table-striped table-bordered">
+                    <thead>
+                      <tr>
+                        <th>node</th><th>load</th><th>requests</th>
+                        <th>last check</th>
+                        <th>fail count</th>
+                     </tr>
+                    </thead>
+                    <% for node in pool['nodes'] %>
+                      <tr>
+                        <td><%=node['name']%></td><td><%=node['load']%></td><td><%=node['requests']%></td>
+                        <td><%=Time.at(node['last_check']).strftime("%d-%m-%Y %H:%M:%S")%></td>
+                        <td><%=node['failcnt']%></td>
+                      </tr>
+                    <% end %>
+                  </table>
+              </div>
+          <% end %>
+      </div>
+
+    </div> 
+
+    <% end %>
+
+    <script src="http://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
+    <script src="http://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+  </body>
+</html>
+eof
+
+get '/' do
+  @servers = {}
+  for server in ENV['U_SERVERS'].split(',')
+    stats = USubscribers::uwsgi_get_stats(server) 
+    if stats
+      @servers[server] = stats['subscriptions']
+    end
+  end
+  @title = 'uWSGI subscriptions viewer'
+  erb template
+end
+
+run Sinatra::Application

contrib/xinetd_uwsgi

@@ -0,0 +1,14 @@
+service uwsgi
+{
+        disable         = no
+        id              = uwsgi-000
+        type            = UNLISTED
+        socket_type     = stream
+        server          = /root/uwsgi/uwsgi
+        server_args     = --chdir /root/uwsgi/ --module welcome --logto /tmp/uwsgi.log
+        port            = 3031
+        bind            = 127.0.0.1
+        user            = root
+        wait            = yes
+}
+

core/async.c

@@ -2,6 +2,29 @@
 
 extern struct uwsgi_server uwsgi;
 
+void uwsgi_async_init() {
+	int i;
+
+	uwsgi.async_queue = event_queue_init();
+
+        if (uwsgi.async_queue < 0) {
+        	exit(1);
+        }
+
+                uwsgi_add_sockets_to_queue(uwsgi.async_queue, -1);
+
+                uwsgi.rb_async_timeouts = uwsgi_init_rb_timer();
+
+                uwsgi.async_queue_unused = uwsgi_malloc(sizeof(struct wsgi_request *) * uwsgi.async);
+
+                for (i = 0; i < uwsgi.async; i++) {
+                        uwsgi.async_queue_unused[i] = &uwsgi.workers[uwsgi.mywid].cores[i].req;
+                }
+
+                uwsgi.async_queue_unused_ptr = uwsgi.async - 1;
+
+}
+
 struct wsgi_request *find_wsgi_req_proto_by_fd(int fd) {
 	return uwsgi.async_proto_fd_table[fd];
 }
@@ -76,7 +99,7 @@ struct wsgi_request *find_first_available_wsgi_req() {
 void async_expire_timeouts() {
 
 	struct wsgi_request *wsgi_req;
-	time_t current_time = time(NULL);
+	time_t current_time = uwsgi_now();
 	struct uwsgi_async_fd *uaf = NULL, *current_uaf;
 
 	struct uwsgi_rb_timer *urbt;
@@ -150,7 +173,7 @@ void async_add_fd_read(struct wsgi_request *wsgi_req, int fd, int timeout) {
 void async_add_timeout(struct wsgi_request *wsgi_req, int timeout) {
 
 	if (timeout > 0 && wsgi_req->async_timeout == NULL) {
-        	wsgi_req->async_timeout = uwsgi_add_rb_timer(uwsgi.rb_async_timeouts, time(NULL)+timeout, wsgi_req);
+        	wsgi_req->async_timeout = uwsgi_add_rb_timer(uwsgi.rb_async_timeouts, uwsgi_now()+timeout, wsgi_req);
         }
 
 }
@@ -212,6 +235,11 @@ void *async_loop(void *arg1) {
 	uwsgi.async_runqueue = NULL;
 	uwsgi.async_runqueue_cnt = 0;
 
+	if (uwsgi.signal_socket > -1) {
+		event_queue_add_fd_read(uwsgi.async_queue, uwsgi.signal_socket);
+		event_queue_add_fd_read(uwsgi.async_queue, uwsgi.my_signal_socket);
+	}
+
 	// set a default request manager
         if (!uwsgi.schedule_to_req) uwsgi.schedule_to_req = async_schedule_to_req;
 
@@ -226,7 +254,7 @@ void *async_loop(void *arg1) {
                         	timeout = 0;
 			}
                 	if (min_timeout) {
-                        	timeout = min_timeout->key - time(NULL);
+                        	timeout = min_timeout->key - uwsgi_now();
                         	if (timeout <= 0) {
                                 	async_expire_timeouts();
                                 	timeout = 0;
@@ -249,6 +277,12 @@ void *async_loop(void *arg1) {
 			// manage events
 			interesting_fd = event_queue_interesting_fd(events, i);
 
+			if (uwsgi.signal_socket > -1 && (interesting_fd == uwsgi.signal_socket || interesting_fd == uwsgi.my_signal_socket)) {
+                		uwsgi_receive_signal(interesting_fd, "worker", uwsgi.mywid);
+				continue;
+        		}
+
+
 			is_a_new_connection = 0;
 
 			// new request coming in ?
@@ -262,12 +296,12 @@ void *async_loop(void *arg1) {
 
 					uwsgi.wsgi_req = find_first_available_wsgi_req();
 					if (uwsgi.wsgi_req == NULL) {
-						now = time(NULL);
+						now = uwsgi_now();
 						if (now > last_now) {
 							uwsgi_log("async queue is full !!!\n");
 							last_now = now;
 						}
-						break;;
+						break;
 					}
 
 					wsgi_req_setup(uwsgi.wsgi_req, uwsgi.wsgi_req->async_id, uwsgi_sock );
@@ -285,15 +319,15 @@ void *async_loop(void *arg1) {
 
 // on linux we do not need to reset the socket to blocking state
 #ifndef __linux__
-					if (uwsgi.numproc > 1) {
-	                                	/* re-set blocking socket */
-	                                	if (fcntl(uwsgi.wsgi_req->poll.fd, F_SETFL, uwsgi_sock->arg) < 0) {
-	                                        	uwsgi_error("fcntl()");
-							uwsgi.async_queue_unused_ptr++;
-							uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
-	                                		break;
-						}
-					}
+					 /* re-set blocking socket */
+    					int arg = uwsgi_sock->arg;
+   					arg &= (~O_NONBLOCK);
+    	                                if (fcntl(uwsgi.wsgi_req->poll.fd, F_SETFL, arg) < 0) {
+   	                                       	uwsgi_error("fcntl()");
+    						uwsgi.async_queue_unused_ptr++;
+    						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+   	                                	break;
+      					}
 #endif
 
 					if (wsgi_req_async_recv(uwsgi.wsgi_req)) {
@@ -332,8 +366,9 @@ void *async_loop(void *arg1) {
 						runqueue_push(uwsgi.wsgi_req);
 						continue;
 					}
-					else if (proto_parser_status == -1) {
-						uwsgi_log("error parsing request\n");
+					else if (proto_parser_status < 0) {
+						if (proto_parser_status == -1)
+							uwsgi_log("error parsing request\n");
 						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
 						close(interesting_fd);
 						continue;

core/buffer.c

@@ -0,0 +1,68 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_buffer *uwsgi_buffer_new(size_t len) {
+	struct uwsgi_buffer *ub = uwsgi_calloc(sizeof(struct uwsgi_buffer));
+
+	if (len) {
+		ub->buf = uwsgi_malloc(len);
+		ub->len = len;
+	}
+	return ub;
+	
+}
+
+int uwsgi_buffer_append(struct uwsgi_buffer *ub, char *buf, size_t len) {
+
+	size_t remains = ub->len - ub->pos;
+
+	if (len > remains) {
+		char *new_buf = realloc(ub->buf, ub->len + UMAX(len, (size_t) uwsgi.page_size));
+		if (!new_buf) {
+			uwsgi_error("realloc()");
+			return -1;
+		}
+	}
+
+	memcpy(ub->buf + ub->pos, buf, len);
+	ub->pos += len;
+	return 0;
+}
+
+void uwsgi_buffer_destroy(struct uwsgi_buffer *ub) {
+	if (ub->buf) free(ub->buf);
+	free(ub);
+}
+
+int uwsgi_buffer_send(struct uwsgi_buffer *ub, int fd) {
+	size_t remains = ub->pos;
+	char *ptr = ub->buf;
+
+	while(remains > 0) {
+		int ret = uwsgi_waitfd_write(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+		if (ret > 0) {
+			ssize_t len = write(fd, ptr, remains);
+			if (len > 0) {
+				ptr += len;
+				remains -= len;
+			}	
+			else if (len == 0) {
+				return -1;
+			}
+			else {
+				uwsgi_error("write()");
+				return -1;
+			}
+		}
+		else if (ret == 0) {
+			uwsgi_log("timeout while sending buffer !!!\n");
+			return -1;
+		}
+		else {
+			return -1;
+		}
+	}
+
+	return 0;
+}

core/cache.c

@@ -6,12 +6,7 @@ void uwsgi_init_cache() {
 	int i;
 
 	if (!uwsgi.cache_blocksize)
-                        uwsgi.cache_blocksize = UMAX16;
-
-                if (uwsgi.cache_blocksize % uwsgi.page_size != 0) {
-                        uwsgi_log("invalid cache blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) uwsgi.cache_blocksize, uwsgi.page_size);
-                        exit(1);
-                }
+        	uwsgi.cache_blocksize = UMAX16;
 
                 uwsgi.cache_hashtable = (uint64_t *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
                 if (!uwsgi.cache_hashtable) {
@@ -88,155 +83,10 @@ void uwsgi_init_cache() {
 
                 uwsgi.cache = ((void *) uwsgi.cache_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items);
 
-                uwsgi.cache_lock = uwsgi_mmap_shared_rwlock();
-                uwsgi_rwlock_init(uwsgi.cache_lock);
+                uwsgi.cache_lock = uwsgi_rwlock_init("cache");
 
-                uwsgi_log("*** Cache subsystem initialized: %dMB preallocated ***\n", ((sizeof(uint64_t) * UMAX16) + (sizeof(uint64_t) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items)) / (1024 * 1024));
-}
-
-struct uwsgi_subscriber_name *uwsgi_get_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
-
-	uint64_t ovl;
-	struct uwsgi_subscriber *usub;
-	struct uwsgi_subscriber_name *ret = NULL;
-	
-	usub = (struct uwsgi_subscriber *) uwsgi_dict_get(udict, key, keylen, &ovl);
-
-	if (usub == NULL || !ovl) return NULL;
-
-	if (!usub->nodes) return NULL;
-
-	if (usub && ovl) {
-		ret = &usub->names[usub->current];
-		// dead node
-		if (ret->len == 0) {
-			if (usub->current == usub->nodes-1) {
-				usub->nodes--;
-			}
-			// retry with another node (if available)
-			if (usub->nodes > 0) {
-				usub->current++;
-				if (usub->current >= usub->nodes) usub->current = 0;
-				return uwsgi_get_subscriber(udict, key, keylen);
-			}
-		}
-
-		if (usub->nodes > 1) {
-			usub->current++;
-			if (usub->current >= usub->nodes) usub->current = 0;
-		}
-
-	}
-
-	return ret;
-}
-
-void uwsgi_add_subscriber(struct uwsgi_dict *udict, struct uwsgi_subscribe_req *usr) {
-
-	char *ptr;
-	uint64_t vallen = 0;
-	struct uwsgi_subscriber *usub, nusub;
-	int found = 0;
-	int i;
-	
-	ptr = uwsgi_dict_get(udict, usr->key, usr->keylen, &vallen);
-	if (ptr && vallen) {
-		usub = (struct uwsgi_subscriber *) ptr;
-		for(i=0;i<(int)usub->nodes;i++) {
-			if (!uwsgi_strncmp(usub->names[i].name, usub->names[i].len, usr->address, usr->address_len)) {
-				found = 1;
-				break;
-			}
-		}
-		if (!found) {
-			found = usub->nodes;
-			// check for unallocated slot
-			for(i=0;i<(int)usub->nodes;i++) {
-				if (usub->names[i].len == 0) {
-					found = i;
-					break;
-				}
-			}
-			usub->names[found].len = usr->address_len;
-			usub->names[found].modifier1 = usr->modifier1;
-			usub->names[found].modifier2 = usr->modifier2;
-			memcpy(usub->names[found].name, usr->address, usr->address_len);
-			if (found == (int) usub->nodes) {
-				usub->nodes++;
-			}
-		}
-		return;
-	}
-	else {
-		nusub.nodes = 1;
-		nusub.current = 0;
-		memcpy(nusub.names[0].name, usr->address, usr->address_len);
-		nusub.names[0].modifier1 = usr->modifier1;
-		nusub.names[0].modifier2 = usr->modifier2;
-		uwsgi_dict_set(udict, usr->key, usr->keylen, (char *) &nusub, sizeof(struct uwsgi_subscriber));
-	}
-
-}
-
-struct uwsgi_dict *uwsgi_dict_create(uint64_t items, uint64_t blocksize) {
-
-	int i;
-
-	struct uwsgi_dict *udict = (struct uwsgi_dict *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-	if (!udict) {
-        	uwsgi_error("mmap()");
-                exit(1);
-	}
-
-	if (!blocksize) blocksize = 4096;
-
-        if (blocksize % uwsgi.page_size != 0) {
-        	uwsgi_log("invalid shared dictionary blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) udict->blocksize, uwsgi.page_size);
-        	exit(1);
-	}
-
-	udict->blocksize = blocksize;
-	udict->max_items = items;
-
-        udict->hashtable = (uint64_t *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->hashtable) {
-        	uwsgi_error("mmap()");
-                exit(1);
-	}
-
-        memset(udict->hashtable, 0, sizeof(uint64_t) * UMAX16);
-
-        udict->unused_stack = (uint64_t *) mmap(NULL, sizeof(uint64_t) * udict->max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->unused_stack) {
-        	uwsgi_error("mmap()");
-                exit(1);
-	}
-
-        memset(udict->unused_stack, 0, sizeof(uint64_t) * udict->max_items);
-
-        udict->items = (struct uwsgi_dict_item *) mmap(NULL, sizeof(struct uwsgi_dict_item) * udict->max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->items) {
-        	uwsgi_error("mmap()");
-                exit(1);
-        }
-
-        udict->data = mmap(NULL, udict->blocksize * udict->max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->data) {
-        	uwsgi_error("mmap()");
-                exit(1);
-        }
-
-        for(i=0;i< (int) udict->max_items;i++) {
-        	memset(&udict->items[i], 0, sizeof(struct uwsgi_dict_item));
-        }
-
-        udict->first_available_item = 1;
-        udict->unused_stack_ptr = 0;
-
-        udict->lock = uwsgi_mmap_shared_lock();
-        uwsgi_lock_init(udict->lock);
-
-	return udict;
+                uwsgi_log("*** Cache subsystem initialized: %dMB (key: %llu bytes, keys: %llu bytes, data: %llu bytes) preallocated ***\n", ((uwsgi.cache_blocksize * uwsgi.cache_max_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items)) / (1024 * 1024),
+				 (unsigned long long) sizeof(struct uwsgi_cache_item), (unsigned long long) sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, (unsigned long long) uwsgi.cache_blocksize * uwsgi.cache_max_items);
 }
 
 uint32_t djb33x_hash(char *key, int keylen) {
@@ -252,89 +102,6 @@ uint32_t djb33x_hash(char *key, int keylen) {
 }
 
 
-inline uint64_t uwsgi_dict_get_index(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
-
-        uint32_t hash = djb33x_hash(key, keylen);
-
-        int hash_key = hash % 0xffff;
-
-        uint64_t slot = udict->hashtable[hash_key];
-
-        struct uwsgi_dict_item *udi;
-
-        udi = &udict->items[slot];
-
-        // first round
-        if (udi->djbhash != hash) goto cycle;
-        if (udi->keysize != keylen) goto cycle;
-        if (memcmp(udi->key, key, keylen)) goto cycle;
-
-        return slot;
-
-cycle:
-        while(udi->next) {
-                slot = udi->next;
-                udi = &udict->items[slot];
-                if (udi->djbhash != hash) continue;
-                if (udi->keysize != keylen) continue;
-                if (!memcmp(udi->key, key, keylen)) return slot;
-        }
-
-        return 0;
-}
-
-char *uwsgi_dict_get(struct uwsgi_dict *udict, char *key, uint16_t keylen, uint64_t *valsize) {
-
-        uint64_t index = uwsgi_dict_get_index(udict, key, keylen);
-
-        if (index) {
-                *valsize = udict->items[index].valsize;
-                udict->items[index].hits++;
-                return udict->data+(index*udict->blocksize);
-        }
-
-        return NULL;
-}
-
-int uwsgi_dict_del(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
-
-        uint64_t index = 0;
-        struct uwsgi_dict_item *udi;
-        int ret = -1;
-
-        index = uwsgi_dict_get_index(udict, key, keylen);
-        if (index) {
-                udi = &udict->items[index] ;
-                udi->keysize = 0;
-                udi->valsize = 0;
-                udict->unused_stack_ptr++;
-                udict->unused_stack[udict->unused_stack_ptr] = index;
-                // try to return to initial condition...
-                if (index == udict->first_available_item-1) {
-                        udict->first_available_item--;
-                }
-                ret = 0;
-                // relink collisioned entry
-                if (udi->prev) {
-                        udict->items[udi->prev].next = udi->next;
-                }
-                if (udi->next) {
-                        udict->items[udi->next].prev = udi->prev;
-                }
-                if (!udi->prev && !udi->next) {
-                        // reset hashtable entry
-                        udict->hashtable[udi->djbhash % 0xffff] = 0;
-                }
-                udi->djbhash = 0;
-                udi->prev = 0;
-                udi->next = 0;
-        }
-
-        return ret;
-}
-
-
-
 inline uint64_t uwsgi_cache_get_index(char *key, uint16_t keylen) {
 
 	uint32_t hash = djb33x_hash(key, keylen);
@@ -344,13 +111,14 @@ inline uint64_t uwsgi_cache_get_index(char *key, uint16_t keylen) {
 	uint64_t slot = uwsgi.cache_hashtable[hash_key];
 
 	struct uwsgi_cache_item *uci;
+	uint64_t rounds = 0;
 
 	//uwsgi_log("found slot %d for key %d\n", slot, hash_key);
 
 	uci = &uwsgi.cache_items[slot];
 
 	// first round
-	if (uci->djbhash != hash) goto cycle;
+	if (uci->djbhash != hash) return 0;
 	if (uci->keysize != keylen) goto cycle;
 	if (memcmp(uci->key, key, keylen)) goto cycle;
 
@@ -360,7 +128,20 @@ cycle:
 	while(uci->next) {
 		slot = uci->next;
 		uci = &uwsgi.cache_items[slot];
-		if (uci->djbhash != hash) continue;
+		rounds++;
+		if (rounds > uwsgi.cache_max_items) {
+			uwsgi_log("ALARM !!! cache-loop (and potential deadlock) detected slot = %llu prev = %llu next = %llu\n", uci->next, slot, uci->prev, uci->next);	
+			// terrible case: the whole uWSGI stack can deadlock, leaving only the master alive
+			// if the master is avalable, trigger a brutal reload
+			if (uwsgi.master_process) {
+				kill(uwsgi.workers[0].pid, SIGTERM);
+			}
+			// otherwise kill the current worker (could be pretty useless...)
+			else {
+				exit(1);
+			}
+		}
+		if (uci->djbhash != hash) return 0;
 		if (uci->keysize != keylen) continue;
 		if (!memcmp(uci->key, key, keylen)) return slot;
 	}
@@ -387,13 +168,14 @@ char *uwsgi_cache_get(char *key, uint16_t keylen, uint64_t *valsize) {
 	return NULL;
 }
 
-int uwsgi_cache_del(char *key, uint16_t keylen) {
+int uwsgi_cache_del(char *key, uint16_t keylen, uint64_t index) {
 
-	uint64_t index = 0;
 	struct uwsgi_cache_item *uci;
 	int ret = -1;
 
-	index = uwsgi_cache_get_index(key, keylen);
+	if (!index)
+		index = uwsgi_cache_get_index(key, keylen);
+
 	if (index) {
 		uci = &uwsgi.cache_items[index] ;
 		uci->keysize = 0;
@@ -410,9 +192,15 @@ int uwsgi_cache_del(char *key, uint16_t keylen) {
 		if (uci->prev) {
 			uwsgi.cache_items[uci->prev].next = uci->next;	
 		}
+		else {
+			// set next as the new entry point (could be 0)
+			uwsgi.cache_hashtable[uci->djbhash % 0xffff] = uci->next;
+		}
+
 		if (uci->next) {
 			uwsgi.cache_items[uci->next].prev = uci->prev;	
 		}
+
 		if (!uci->prev && !uci->next) {
 			// reset hashtable entry
 			//uwsgi_log("!!! resetted hashtable entry !!!\n");
@@ -421,6 +209,7 @@ int uwsgi_cache_del(char *key, uint16_t keylen) {
 		uci->djbhash = 0;
 		uci->prev = 0;
 		uci->next = 0;
+		uci->expires = 0;
 	}
 
 	return ret;
@@ -480,7 +269,7 @@ int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint64_t vallen, uint
 			}
 		}
 		uci = &uwsgi.cache_items[index] ;
-		if (expires) expires += time(NULL);
+		if (expires) expires += uwsgi_now();
 		uci->expires = expires;
 		uci->djbhash = djb33x_hash(key, keylen);
 		uci->hits = 0;
@@ -495,6 +284,9 @@ int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint64_t vallen, uint
 		ret = 0;
 		// now put the value in the 16bit hashtable
 		slot = uci->djbhash % 0xffff;
+		// reset values
+		uci->prev = 0;
+		uci->next = 0;
 
 		if (uwsgi.cache_hashtable[slot] == 0) {
 			uwsgi.cache_hashtable[slot] = index;
@@ -512,77 +304,22 @@ int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint64_t vallen, uint
 			uci->prev = last_index;
 		}
 	}
+	else if (flags & UWSGI_CACHE_FLAG_UPDATE) {
+		uci = &uwsgi.cache_items[index] ;
+		if (expires) {
+			expires += uwsgi_now();
+			uci->expires = expires;
+		}
+		memcpy(uwsgi.cache+(index*uwsgi.cache_blocksize), val, vallen);
+		uci->valsize = vallen;
+		ret = 0;
+	}
 
 end:
 	return ret;
 	
 }
 
-int uwsgi_dict_set(struct uwsgi_dict *udict, char *key, uint16_t keylen, char *val, uint64_t vallen) {
-
-        uint64_t index = 0, last_index = 0 ;
-
-        struct uwsgi_dict_item *udi, *udii;
-
-        int ret = -1;
-        int slot;
-
-        if (!keylen || !vallen) return -1;
-
-        if (keylen > UWSGI_CACHE_MAX_KEY_SIZE) return -1;
-
-        if (udict->first_available_item >= udict->max_items && !udict->unused_stack_ptr) {
-                uwsgi_log("*** DANGER dictionary %p is FULL !!! ***\n", udict);
-                goto end;
-        }
-
-        index = uwsgi_dict_get_index(udict, key, keylen);
-        if (!index) {
-                if (udict->unused_stack_ptr) {
-                        index = udict->unused_stack[udict->unused_stack_ptr];
-                        udict->unused_stack_ptr--;
-                }
-                else {
-                        index = udict->first_available_item;
-                        if (udict->first_available_item < udict->max_items) {
-                                udict->first_available_item++;
-                        }
-                }
-                udi = &udict->items[index] ;
-                udi->djbhash = djb33x_hash(key, keylen);
-                udi->hits = 0;
-                memcpy(udi->key, key, keylen);
-                memcpy(udict->data+(index*udict->blocksize), val, vallen);
-
-                // set this as late as possibile (to reduce races risk)
-
-                udi->valsize = vallen;
-                udi->keysize = keylen;
-                ret = 0;
-                // now put the value in the 16bit hashtable
-                slot = udi->djbhash % 0xffff;
-
-                if (udict->hashtable[slot] == 0) {
-                        udict->hashtable[slot] = index;
-                }
-                else {
-                        // append to first available next
-                        last_index = udict->hashtable[slot];
-                        udii = &udict->items[ last_index ];
-                        while(udii->next) {
-                                last_index = udii->next;
-                                udii = &udict->items[ last_index ];
-                        }
-                        udii->next = index;
-                        udi->prev = last_index;
-                }
-        }
-
-end:
-        return ret;
-
-}
-
 /* THIS PART IS HEAVILY OPTIMIZED: PERFORMANCE NOT ELEGANCE !!! */
 
 void *cache_thread_loop(void *fd_ptr) {
@@ -674,6 +411,7 @@ clear:
 		close(ctl_poll.fd);
 	}
 
+	return NULL;
 }
 
 int uwsgi_cache_server(char *socket, int threads) {

core/clock.c

@@ -0,0 +1,46 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+// in the future we will need to use the best clock source for each os/system
+time_t uwsgi_now() {
+        return uwsgi.clock->seconds();
+}
+
+uint64_t uwsgi_micros() {
+        return uwsgi.clock->microseconds();
+}
+
+
+void uwsgi_register_clock(struct uwsgi_clock *clock) {
+	struct uwsgi_clock *clocks = uwsgi.clocks;
+
+	clock->next = NULL;
+
+	if (!clocks) {
+		uwsgi.clocks = clock;
+		return;
+	}
+
+	while(clocks) {
+		if (!clocks->next) {
+			clocks->next = clock;
+			return;
+		}
+		clocks = clocks->next;
+	}
+}
+
+void uwsgi_set_clock(char *name) {
+	struct uwsgi_clock *clocks = uwsgi.clocks;
+	while(clocks) {
+		if (!strcmp(name, clocks->name)) {
+			uwsgi.clock = clocks;
+			return;
+		}
+		clocks = clocks->next;
+	}
+
+	uwsgi_log("unable to set \"%s\" clock\n", name);
+	exit(1);
+}

core/cluster.c

@@ -0,0 +1,464 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+
+#ifdef UWSGI_UDP
+
+static void cluster_manage_opt(char *key, uint16_t keylen, char *value, uint16_t vallen, void *foobar) {
+
+	add_exported_option( uwsgi_concat2n(key, keylen, "", 0), uwsgi_concat2n(value, vallen, "", 0), 0);
+
+}
+
+void cluster_setup() {
+
+	int rlen;
+// get cluster configuration
+        if (uwsgi.cluster != NULL) {
+                // get multicast socket
+
+                uwsgi.cluster_fd = uwsgi_cluster_join(uwsgi.cluster);
+
+                uwsgi_log("JOINED CLUSTER: %s\n", uwsgi.cluster);
+
+                // ask for cluster options only if bot pre-existent options are set
+                if (uwsgi.exported_opts_cnt == 1 && !uwsgi.cluster_nodes) {
+                        // now wait max 60 seconds and resend multicast request every 10 seconds
+                        for (;;) {
+                                uwsgi_log("asking \"%s\" uWSGI cluster for configuration data:\n", uwsgi.cluster);
+                                if (uwsgi_send_empty_pkt(uwsgi.cluster_fd, uwsgi.cluster, 99, 0) < 0) {
+                                        uwsgi_log("unable to send multicast message to %s\n", uwsgi.cluster);
+                                        continue;
+                                }
+                              waitfd:
+                                rlen = uwsgi_waitfd(uwsgi.cluster_fd, 10);
+                                if (rlen < 0) {
+                                        break;
+                                }
+                                else if (rlen > 0) {
+                                        // receive the packet
+                                        char clusterbuf[4096];
+                                        if (!uwsgi_hooked_parse_dict_dgram(uwsgi.cluster_fd, clusterbuf, 4096, 99, 1, cluster_manage_opt, NULL)) {
+                                                uwsgi_configure();
+                                                goto options_parsed;
+                                        }
+                                        else {
+                                                goto waitfd;
+                                        }
+                                }
+                        }
+                }
+              options_parsed:
+
+                if (!uwsgi.cluster_nodes)
+                        uwsgi_cluster_add_me();
+        }
+}
+
+
+
+
+void uwsgi_cluster_add_node(struct uwsgi_cluster_node *nucn, int type) {
+
+        int i;
+        struct uwsgi_cluster_node *ucn;
+        char *tcp_port;
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("adding node\n");
+#endif
+
+        tcp_port = strchr(nucn->name, ':');
+#ifndef UWSGI_ZEROMQ
+        if (tcp_port == NULL) {
+#else
+        char *zmq_dash = strchr(nucn->name, '-');
+        if (tcp_port == NULL && zmq_dash == NULL) {
+#endif
+
+                fprintf(stdout, "invalid cluster node name %s\n", nucn->name);
+                return;
+        }
+
+        // first check for already present node
+        for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+                ucn = &uwsgi.shared->nodes[i];
+                if (ucn->name[0] != 0) {
+                        if (!strcmp(ucn->name, nucn->name)) {
+                                ucn->status = UWSGI_NODE_OK;
+                                ucn->last_seen = uwsgi_now();
+                                // update requests
+                                ucn->requests = nucn->requests;
+                                return;
+                        }
+                }
+        }
+
+        for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+                ucn = &uwsgi.shared->nodes[i];
+
+                if (ucn->name[0] == 0) {
+                        memcpy(ucn->name, nucn->name, strlen(nucn->name) + 1);
+                        memcpy(ucn->nodename, nucn->nodename, strlen(nucn->nodename) + 1);
+                        ucn->workers = nucn->workers;
+                        ucn->ucn_addr.sin_family = AF_INET;
+                        if (tcp_port) {
+                                ucn->ucn_addr.sin_port = htons(atoi(tcp_port + 1));
+                                tcp_port[0] = 0;
+                        }
+                        if (nucn->name[0] == 0) {
+                                ucn->ucn_addr.sin_addr.s_addr = INADDR_ANY;
+                        }
+                        else {
+#ifdef UWSGI_DEBUG
+                                uwsgi_log("%s\n", nucn->name);
+#endif
+                                ucn->ucn_addr.sin_addr.s_addr = inet_addr(nucn->name);
+                        }
+
+                        ucn->type = type;
+                        // here memory can be freed, as it is allocated by uwsgi_concat2n
+                        if (type != CLUSTER_NODE_DYNAMIC && tcp_port) {
+                                tcp_port[0] = ':';
+                        }
+                        ucn->last_seen = uwsgi_now();
+                        ucn->requests = nucn->requests;
+                        uwsgi_log("[uWSGI cluster] added node %s\n", ucn->name);
+                        return;
+                }
+        }
+
+        uwsgi_log("unable to add node %s\n", nucn->name);
+}
+
+
+
+int uwsgi_cluster_add_me() {
+
+        const char *key1 = "hostname";
+        const char *key2 = "address";
+        const char *key3 = "workers";
+        const char *key4 = "requests";
+
+        char *ptrbuf;
+        uint16_t ustrlen;
+        char numproc[6];
+
+#ifdef UWSGI_ZEROMQ
+        char uuid_zmq_str[37];
+        uuid_t uuid_zmq;
+        if (!uwsgi.sockets && !uwsgi.zeromq) {
+#else
+        if (!uwsgi.sockets) {
+#endif
+                uwsgi_log("you need to specify at least a socket to start a uWSGI cluster\n");
+                exit(1);
+        }
+
+        snprintf(numproc, 6, "%d", uwsgi.numproc);
+
+        size_t len;
+
+        if (uwsgi.sockets) {
+                len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key2) + 2 + strlen(uwsgi.sockets->name) + 2 + strlen(key3) + 2 + strlen(numproc) + 2 + strlen(key4) + 2 + 1;
+        }
+#ifdef UWSGI_ZEROMQ
+        else if (uwsgi.zeromq) {
+                uuid_generate(uuid_zmq);
+                uuid_unparse(uuid_zmq, uuid_zmq_str);
+                len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key2) + 2 + strlen(uuid_zmq_str) + 2 + strlen(key3) + 2 + strlen(numproc) + 2 + strlen(key4) + 2 + 1;
+        }
+#endif
+        else {
+                len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key3) + 2 + strlen(numproc) + 2 + strlen(key4) + 2 + 1;
+        }
+        char *buf = uwsgi_malloc(len);
+
+        ptrbuf = buf;
+
+        ustrlen = strlen(key1);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, key1, strlen(key1));
+        ptrbuf += strlen(key1);
+
+        ustrlen = strlen(uwsgi.hostname);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, uwsgi.hostname, strlen(uwsgi.hostname));
+        ptrbuf += strlen(uwsgi.hostname);
+
+
+        if (uwsgi.sockets && uwsgi.sockets->name) {
+                ustrlen = strlen(key2);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, key2, strlen(key2));
+                ptrbuf += strlen(key2);
+
+                ustrlen = strlen(uwsgi.sockets->name);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, uwsgi.sockets->name, strlen(uwsgi.sockets->name));
+                ptrbuf += strlen(uwsgi.sockets->name);
+        }
+#ifdef UWSGI_ZEROMQ
+        else if (uwsgi.zeromq) {
+                ustrlen = strlen(key2);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, key2, strlen(key2));
+                ptrbuf += strlen(key2);
+
+                ustrlen = strlen(uuid_zmq_str);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, uuid_zmq_str, strlen(uuid_zmq_str));
+                ptrbuf += strlen(uuid_zmq_str);
+        }
+#endif
+
+
+	ustrlen = strlen(key3);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, key3, strlen(key3));
+        ptrbuf += strlen(key3);
+
+        ustrlen = strlen(numproc);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, numproc, strlen(numproc));
+        ptrbuf += strlen(numproc);
+
+        ustrlen = strlen(key4);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, key4, strlen(key4));
+        ptrbuf += strlen(key4);
+
+        ustrlen = 1;
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, "0", 1);
+        ptrbuf += 1;
+
+
+        uwsgi_string_sendto(uwsgi.cluster_fd, 95, 0, (struct sockaddr *) &uwsgi.mc_cluster_addr, sizeof(uwsgi.mc_cluster_addr), buf, len);
+
+        free(buf);
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("add_me() successfull\n");
+#endif
+
+        return 0;
+}
+
+
+int uwsgi_cluster_join(char *name) {
+
+        int fd;
+        char *cp;
+        int broadcast = 0;
+
+
+
+        if (name[0] == ':') {
+                fd = bind_to_udp(name, 0, 1);
+                broadcast = 1;
+        }
+        else {
+                fd = bind_to_udp(name, 1, 0);
+        }
+
+        if (fd >= 0) {
+                cp = strchr(name, ':');
+                cp[0] = 0;
+                uwsgi.mc_cluster_addr.sin_family = AF_INET;
+                if (broadcast) {
+                        uwsgi.mc_cluster_addr.sin_addr.s_addr = INADDR_BROADCAST;
+                }
+                else {
+                        uwsgi.mc_cluster_addr.sin_addr.s_addr = inet_addr(name);
+                }
+                uwsgi.mc_cluster_addr.sin_port = htons(atoi(cp + 1));
+                cp[0] = ':';
+
+
+                // announce my presence to all the nodes
+                uwsgi_string_sendto(fd, 73, 0, (struct sockaddr *) &uwsgi.mc_cluster_addr, sizeof(uwsgi.mc_cluster_addr), uwsgi.hostname, strlen(uwsgi.hostname));
+        }
+        else {
+                exit(1);
+        }
+
+
+        return fd;
+
+}
+
+
+char *uwsgi_cluster_best_node() {
+
+        int i;
+        int best_node = -1;
+        struct uwsgi_cluster_node *ucn;
+
+        for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+                ucn = &uwsgi.shared->nodes[i];
+                if (ucn->name[0] != 0 && ucn->status == UWSGI_NODE_OK) {
+                        if (best_node == -1) {
+                                best_node = i;
+                        }
+                        else {
+                                if (ucn->last_choosen < uwsgi.shared->nodes[best_node].last_choosen) {
+                                        best_node = i;
+                                }
+                        }
+                }
+        }
+
+        if (best_node == -1) {
+                return NULL;
+        }
+
+        uwsgi.shared->nodes[best_node].last_choosen = uwsgi_now();
+        return uwsgi.shared->nodes[best_node].name;
+}
+
+
+void manage_cluster_announce(char *key, uint16_t keylen, char *val, uint16_t vallen, void *data) {
+
+        char *tmpstr;
+        struct uwsgi_cluster_node *ucn = (struct uwsgi_cluster_node *) data;
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("%.*s = %.*s\n", keylen, key, vallen, val);
+#endif
+
+        if (!uwsgi_strncmp("hostname", 8, key, keylen)) {
+                strncpy(ucn->nodename, val, UMIN(vallen, 255));
+        }
+
+        if (!uwsgi_strncmp("address", 7, key, keylen)) {
+                strncpy(ucn->name, val, UMIN(vallen, 100));
+        }
+
+        if (!uwsgi_strncmp("workers", 7, key, keylen)) {
+                tmpstr = uwsgi_concat2n(val, vallen, "", 0);
+                ucn->workers = atoi(tmpstr);
+                free(tmpstr);
+        }
+
+        if (!uwsgi_strncmp("requests", 8, key, keylen)) {
+                tmpstr = uwsgi_concat2n(val, vallen, "", 0);
+                ucn->requests = strtoul(tmpstr, NULL, 0);
+                free(tmpstr);
+        }
+}
+
+void manage_cluster_message(char *cluster_opt_buf, int cluster_opt_size) {
+
+		struct uwsgi_cluster_node nucn;
+
+		switch (uwsgi.workers[0].cores[0].req.uh.modifier1) {
+                                        case 95:
+                                                memset(&nucn, 0, sizeof(struct uwsgi_cluster_node));
+
+#ifdef __BIG_ENDIAN__
+                                                uwsgi.workers[0].cores[0].req.uh.pktsize = uwsgi_swap16(uwsgi.wsgi_requests[0]->uh.pktsize);
+#endif
+                                                uwsgi_hooked_parse(uwsgi.workers[0].cores[0].req.buffer, uwsgi.workers[0].cores[0].req.uh.pktsize, manage_cluster_announce, &nucn);
+                                                if (nucn.name[0] != 0) {
+                                                        uwsgi_cluster_add_node(&nucn, CLUSTER_NODE_DYNAMIC);
+                                                }
+                                                break;
+                                        case 96:
+#ifdef __BIG_ENDIAN__
+                                                uwsgi.workers[0].cores[0].req.uh.pktsize = uwsgi_swap16(uwsgi.wsgi_requests[0]->uh.pktsize);
+#endif
+                                                uwsgi_log_verbose("%.*s\n", uwsgi.workers[0].cores[0].req.uh.pktsize, uwsgi.workers[0].cores[0].req.buffer);
+                                                break;
+                                        case 98:
+                                                if (kill(getpid(), SIGHUP)) {
+                                                        uwsgi_error("kill()");
+                                                }
+                                                break;
+                                        case 99:
+                                                if (uwsgi.cluster_nodes)
+                                                        break;
+                                                if (uwsgi.workers[0].cores[0].req.uh.modifier2 == 0) {
+                                                        uwsgi_log("requested configuration data, sending %d bytes\n", cluster_opt_size);
+                                                        sendto(uwsgi.cluster_fd, cluster_opt_buf, cluster_opt_size, 0, (struct sockaddr *) &uwsgi.mc_cluster_addr, sizeof(uwsgi.mc_cluster_addr));
+                                                }
+                                                break;
+                                        case 73:
+#ifdef __BIG_ENDIAN__
+                                                uwsgi.workers[0].cores[0].req.uh.pktsize = uwsgi_swap16(uwsgi.workers[0].cores[0].req.uh.pktsize);
+#endif
+                                                uwsgi_log_verbose("[uWSGI cluster %s] new node available: %.*s\n", uwsgi.cluster, uwsgi.workers[0].cores[0].req.uh.pktsize, uwsgi.workers[0].cores[0].req.buffer);
+                                                break;
+                                        }
+}
+
+#endif
+
+
+char *uwsgi_setup_clusterbuf(size_t *size) {
+
+	size_t cluster_opt_size = 4;
+	int i;
+
+	for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
+                        //uwsgi_log("%s\n", uwsgi.exported_opts[i]->key);
+                        cluster_opt_size += 2 + strlen(uwsgi.exported_opts[i]->key);
+                        if (uwsgi.exported_opts[i]->value) {
+                                cluster_opt_size += 2 + strlen(uwsgi.exported_opts[i]->value);
+                        }
+                        else {
+                                cluster_opt_size += 2 + 1;
+                        }
+                }
+
+                //uwsgi_log("cluster opts size: %d\n", cluster_opt_size);
+                char *cluster_opt_buf = uwsgi_malloc(cluster_opt_size);
+
+                struct uwsgi_header *uh = (struct uwsgi_header *) cluster_opt_buf;
+
+                uh->modifier1 = 99;
+                uh->pktsize = cluster_opt_size - 4;
+                uh->modifier2 = 1;
+
+#ifdef __BIG_ENDIAN__
+                uh->pktsize = uwsgi_swap16(uh->pktsize);
+#endif
+
+                char *cptrbuf = cluster_opt_buf + 4;
+
+                for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
+                        //uwsgi_log("%s\n", uwsgi.exported_opts[i]->key);
+                        uint16_t ustrlen = strlen(uwsgi.exported_opts[i]->key);
+                        *cptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                        *cptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                        memcpy(cptrbuf, uwsgi.exported_opts[i]->key, ustrlen);
+                        cptrbuf += ustrlen;
+
+                        if (uwsgi.exported_opts[i]->value) {
+                                ustrlen = strlen(uwsgi.exported_opts[i]->value);
+                                *cptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                                *cptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                                memcpy(cptrbuf, uwsgi.exported_opts[i]->value, ustrlen);
+                        }
+                        else {
+                                ustrlen = 1;
+                                *cptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                                *cptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                                *cptrbuf = '1';
+                        }
+                        cptrbuf += ustrlen;
+                }
+
+		return cluster_opt_buf;
+}

core/event.c

@@ -42,6 +42,18 @@ int event_queue_fd_write_to_read(int eq, int fd) {
 
 }
 
+int event_queue_fd_read_to_write(int eq, int fd) {
+
+        if (port_associate(eq, PORT_SOURCE_FD, fd, POLLOUT, NULL)) {
+                uwsgi_error("port_associate");
+                return -1;
+        }
+
+        return fd;
+
+}
+
+
 
 int event_queue_interesting_fd_has_error(void *events, int id) {
 	port_event_t *pe = (port_event_t *) events;
@@ -81,7 +93,7 @@ void *event_queue_alloc(int nevents) {
 int event_queue_interesting_fd(void *events, int id) {
 	port_event_t *pe = (port_event_t *) events;
 	if (pe[id].portev_source == PORT_SOURCE_FILE || pe[id].portev_source == PORT_SOURCE_TIMER) {
-                return (int) pe[id].portev_user;
+                return (long) pe[id].portev_user;
         }
 
 	return (int) pe[id].portev_object;
@@ -149,7 +161,7 @@ int event_queue_wait(int eq, int timeout, int *interesting_fd) {
 
 
 	if (pe.portev_source == PORT_SOURCE_FILE || pe.portev_source == PORT_SOURCE_TIMER) {
-        	*interesting_fd = (int) pe.portev_user;
+        	*interesting_fd = (long) pe.portev_user;
 	}
 	else {
 		*interesting_fd = (int) pe.portev_object;
@@ -172,6 +184,7 @@ int event_queue_init() {
 
         int epfd;
 
+
         epfd = epoll_create(256);
 
         if (epfd < 0) {
@@ -215,6 +228,23 @@ int event_queue_fd_write_to_read(int eq, int fd) {
         return fd;
 }
 
+int event_queue_fd_read_to_write(int eq, int fd) {
+
+        struct epoll_event ee;
+
+        memset(&ee, 0, sizeof(struct epoll_event));
+        ee.events = EPOLLOUT;
+        ee.data.fd = fd;
+
+        if (epoll_ctl(eq, EPOLL_CTL_MOD, fd, &ee)) {
+                uwsgi_error("epoll_ctl()");
+                return -1;
+        }
+
+        return fd;
+}
+
+
 int event_queue_del_fd(int eq, int fd, int event) {
 
         struct epoll_event ee;
@@ -327,11 +357,13 @@ int event_queue_fd_write_to_read(int eq, int fd) {
 
 	struct kevent kev;
 
+#ifndef __FreeBSD__
         EV_SET(&kev, fd, EVFILT_WRITE, EV_DISABLE, 0, 0, 0);
         if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
                 uwsgi_error("kevent()");
                 return -1;
         }
+#endif
 
         EV_SET(&kev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
         if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
@@ -342,6 +374,28 @@ int event_queue_fd_write_to_read(int eq, int fd) {
 	return fd;
 }
 
+int event_queue_fd_read_to_write(int eq, int fd) {
+
+        struct kevent kev;
+
+#ifndef __FreeBSD__
+        EV_SET(&kev, fd, EVFILT_READ, EV_DISABLE, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+#endif
+
+        EV_SET(&kev, fd, EVFILT_WRITE, EV_ADD, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+
+        return fd;
+}
+
+
 int event_queue_del_fd(int eq, int fd, int event) {
 
 	struct kevent kev;
@@ -401,7 +455,8 @@ int event_queue_wait_multi(int eq, int timeout, void *events, int nevents) {
         }
 
         if (ret < 0) {
-                uwsgi_error("kevent()");
+		if (errno != EINTR)
+                	uwsgi_error("kevent()");
         }
 
         return ret;
@@ -417,7 +472,8 @@ int event_queue_interesting_fd(void *events, int id) {
 int event_queue_interesting_fd_has_error(void *events, int id) {
 	struct kevent *ev = (struct kevent *) events;
 
-        if (  ( (ev[id].flags == EV_ERROR) || (ev[id].flags == EV_EOF) || (ev[id].flags == (EV_EOF|EV_ERROR))) ) {
+	// DO NOT CHECK FOR EOF !!!
+        if ( ev[id].flags & EV_ERROR ) {
                 return 1;
         }
         return 0;
@@ -441,7 +497,8 @@ int event_queue_wait(int eq, int timeout, int *interesting_fd) {
         }
 
         if (ret < 0) {
-                uwsgi_error("kevent()");
+		if (errno != EINTR)
+                	uwsgi_error("kevent()");
         }
 
 	if (ret > 0) {
@@ -476,7 +533,7 @@ int event_queue_add_file_monitor(int eq, char *filename, int *id) {
 	fo.fo_ctime = st.st_ctim;
 	
 	fmon_id++;
-	if (port_associate(eq, PORT_SOURCE_FILE, (uintptr_t) &fo, FILE_MODIFIED|FILE_ATTRIB, (void *) fmon_id)) {
+	if (port_associate(eq, PORT_SOURCE_FILE, (uintptr_t) &fo, FILE_MODIFIED|FILE_ATTRIB, (void *) (long) fmon_id)) {
 		uwsgi_error("port_associate()");
 		return -1;
 	}
@@ -506,7 +563,7 @@ struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
         			fo.fo_atime = st.st_atim;
         			fo.fo_mtime = st.st_mtim;
         			fo.fo_ctime = st.st_ctim;
-				if (port_associate(eq, PORT_SOURCE_FILE, (uintptr_t) &fo, FILE_MODIFIED|FILE_ATTRIB, (void *)id)) {
+				if (port_associate(eq, PORT_SOURCE_FILE, (uintptr_t) &fo, FILE_MODIFIED|FILE_ATTRIB, (void *)(long)id)) {
                 			uwsgi_error("port_associate()");
                 			return NULL;
         			}
@@ -565,6 +622,16 @@ struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
 #endif
 
 #ifdef UWSGI_EVENT_FILEMONITOR_USE_INOTIFY
+
+
+#ifdef OBSOLETE_LINUX_KERNEL
+int event_queue_add_file_monitor(int eq, char *filename, int *id) {
+	return -1;
+}
+struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
+	return NULL;
+}
+#else
 #include <sys/inotify.h>
 
 int event_queue_add_file_monitor(int eq, char *filename, int *id) {
@@ -657,6 +724,8 @@ struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
 	return NULL;
 	
 }
+
+#endif
 #endif
 
 #ifdef UWSGI_EVENT_TIMER_USE_TIMERFD
@@ -687,13 +756,23 @@ enum
 
 
 static int timerfd_create (clockid_t __clock_id, int __flags) {
+#ifdef __amd64__
+	return syscall(283, __clock_id, __flags);
+#elif defined(__i386__)
 	return syscall(322, __clock_id, __flags);
+#else
+	return -1;
+#endif
 }
 
 static int timerfd_settime (int __ufd, int __flags,
                             __const struct itimerspec *__utmr,
                             struct itimerspec *__otmr) {
+#ifdef __amd64__
+	return syscall(286, __ufd, __flags, __utmr, __otmr);
+#elif defined(__i386__)
 	return syscall(325, __ufd, __flags, __utmr, __otmr);
+#endif
 }
 #endif
 
@@ -765,7 +844,7 @@ int event_queue_add_timer(int eq, int *id, int sec) {
 	timer_id++;
 
 	pnotif.portnfy_port = eq;
-	pnotif.portnfy_user = (void *) timer_id;
+	pnotif.portnfy_user = (void *) (long) timer_id;
 
 	sigev.sigev_notify = SIGEV_PORT;
 	sigev.sigev_value.sival_ptr = &pnotif;

core/gateway.c

@@ -0,0 +1,159 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_gateway *register_gateway(char *name, void (*loop)(int, void *), void *data) {
+
+        struct uwsgi_gateway *ug;
+        int num=1,i;
+
+        if (ushared->gateways_cnt >= MAX_GATEWAYS) {
+                uwsgi_log("you can register max %d gateways\n", MAX_GATEWAYS);
+                return NULL;
+        }
+
+        for(i=0;i<ushared->gateways_cnt;i++) {
+                if (!strcmp(name, ushared->gateways[i].name)) {
+                        num++;
+                }
+        }
+
+	char *fullname = uwsgi_concat3(name, " ", uwsgi_num2str(num));
+
+        ug = &ushared->gateways[ushared->gateways_cnt];
+        ug->pid = 0;
+        ug->name = name;
+        ug->loop = loop;
+        ug->num = num;
+	ug->fullname = fullname;
+	ug->data = data;
+
+	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, ug->internal_subscription_pipe)) {
+		uwsgi_error("socketpair()");
+	}
+
+	if (!uwsgi.master_process)
+		gateway_respawn(ushared->gateways_cnt);
+
+        ushared->gateways_cnt++;
+
+
+        return ug;
+}
+
+void gateway_respawn(int id) {
+
+	pid_t gw_pid;
+	struct uwsgi_gateway *ug = &ushared->gateways[id];
+
+	if (uwsgi.master_process)
+		uwsgi.shared->gateways_harakiri[id] = 0;
+	
+	gw_pid = uwsgi_fork(ug->fullname);
+	if (gw_pid < 0) {
+                uwsgi_error("fork()");
+		return;
+	}
+
+	if (gw_pid == 0) {
+		uwsgi_fixup_fds(0, 0, ug);
+		if (uwsgi.master_as_root) uwsgi_as_root();
+#ifdef __linux__
+                if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0,0,0)) {
+                        uwsgi_error("prctl()");
+                }
+#endif
+		uwsgi.mypid = getpid();
+		signal(SIGALRM, SIG_IGN);
+        	signal(SIGHUP, SIG_IGN);
+        	signal(SIGINT, end_me);
+        	signal(SIGTERM, end_me);
+        	signal(SIGUSR1, SIG_IGN);
+        	signal(SIGUSR2, SIG_IGN);
+        	signal(SIGPIPE, SIG_IGN);
+
+		ug->loop(id, ug->data);
+		// never here !!! (i hope)
+		exit(1);	
+	}
+
+	ug->pid = gw_pid;
+	ug->respawns++;
+	if (ug->respawns == 1) {
+		uwsgi_log( "spawned %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	}
+	else {
+		uwsgi_log( "respawned %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	}
+	
+}
+
+struct uwsgi_gateway_socket *uwsgi_new_gateway_socket(char *name, char *owner) {
+
+        struct uwsgi_gateway_socket *uwsgi_sock = uwsgi.gateway_sockets, *old_uwsgi_sock;
+
+        if (!uwsgi_sock) {
+                uwsgi.gateway_sockets = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                uwsgi_sock = uwsgi.gateway_sockets;
+        }
+        else {
+                while(uwsgi_sock) {
+                        old_uwsgi_sock = uwsgi_sock;
+                        uwsgi_sock = uwsgi_sock->next;
+                }
+
+                uwsgi_sock = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                old_uwsgi_sock->next = uwsgi_sock;
+        }
+
+        memset(uwsgi_sock, 0, sizeof(struct uwsgi_gateway_socket));
+	uwsgi_sock->fd = -1;
+	uwsgi_sock->shared = 0;
+        uwsgi_sock->name = name;
+	uwsgi_sock->name_len = strlen(name);
+	uwsgi_sock->owner = owner;
+
+        return uwsgi_sock;
+}
+
+struct uwsgi_gateway_socket *uwsgi_new_gateway_socket_from_fd(int fd, char *owner) {
+
+        struct uwsgi_gateway_socket *uwsgi_sock = uwsgi.gateway_sockets, *old_uwsgi_sock;
+
+        if (!uwsgi_sock) {
+                uwsgi.gateway_sockets = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                uwsgi_sock = uwsgi.gateway_sockets;
+        }
+        else {
+                while(uwsgi_sock) {
+                        old_uwsgi_sock = uwsgi_sock;
+                        uwsgi_sock = uwsgi_sock->next;
+                }
+
+                uwsgi_sock = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                old_uwsgi_sock->next = uwsgi_sock;
+        }
+
+        memset(uwsgi_sock, 0, sizeof(struct uwsgi_gateway_socket));
+	uwsgi_sock->fd = fd;
+        uwsgi_sock->name = uwsgi_getsockname(fd);
+	uwsgi_sock->name_len = strlen(uwsgi_sock->name);
+        uwsgi_sock->owner = owner;
+
+        return uwsgi_sock;
+}
+
+
+void uwsgi_gateway_go_cheap(char *gw_id, int queue, int *i_am_cheap) {
+
+        uwsgi_log("[%s pid %d] no more nodes available. Going cheap...\n", gw_id, (int) uwsgi.mypid);
+        struct uwsgi_gateway_socket *ugs = uwsgi.gateway_sockets;
+        while (ugs) {
+                if (!strcmp(ugs->owner, gw_id) && !ugs->subscription) {
+                        event_queue_del_fd(queue, ugs->fd, event_queue_read());
+                }
+                ugs = ugs->next;
+        }
+        *i_am_cheap = 1;
+}
+

core/ini.c

@@ -14,7 +14,7 @@ void ini_rstrip(char *line) {
 	off_t i;
 
 	for(i = strlen(line)-1;i>=0; i--) {
-		if (line[i] == ' ' || line[i] == '\t') {
+		if (line[i] == ' ' || line[i] == '\t' || line[i] == '\r') {
 			line[i] = 0;
 			continue;
 		}
@@ -28,7 +28,7 @@ char *ini_lstrip(char *line) {
 	char *ptr = line;
 
 	for(i=0;i< (int) strlen(line);i++) {
-		if (line[i] == ' ' || line[i] == '\t') {
+		if (line[i] == ' ' || line[i] == '\t' || line[i] == '\r') {
 			ptr++;
 			continue;
 		}
@@ -92,7 +92,7 @@ void uwsgi_ini_config(char *file, char *magic_table[]) {
 	char *section_asked = "uwsgi";
 	char *colon;
 
-	if (!uwsgi_startswith(file, "http://", 7)) {
+	if (uwsgi_check_scheme(file)) {
                 colon = uwsgi_get_last_char(file, '/');
                 colon = uwsgi_get_last_char(colon, ':');
         }

core/init.c

@@ -0,0 +1,235 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_init_default() {
+
+	uwsgi.cpus = 1;
+
+	uwsgi.backtrace_depth = 64;
+        uwsgi.max_apps = 64;
+
+        uwsgi.master_queue = -1;
+
+        uwsgi.signal_socket = -1;
+        uwsgi.my_signal_socket = -1;
+        uwsgi.cache_server_fd = -1;
+        uwsgi.stats_fd = -1;
+
+        uwsgi.original_log_fd = -1;
+
+        uwsgi.emperor_fd_config = -1;
+        // default emperor scan frequency
+        uwsgi.emperor_freq = 3;
+        uwsgi.emperor_throttle = 1000;
+        uwsgi.emperor_heartbeat = 30;
+        // max 3 minutes throttling
+        uwsgi.emperor_max_throttle = 1000 * 180;
+        uwsgi.emperor_pid = -1;
+
+        uwsgi.subscribe_freq = 10;
+        uwsgi.subscription_tolerance = 17;
+
+        uwsgi.cluster_fd = -1;
+        uwsgi.cores = 1;
+        uwsgi.threads = 1;
+
+        uwsgi.default_app = -1;
+
+        uwsgi.buffer_size = 4096;
+        uwsgi.numproc = 1;
+
+        uwsgi.forkbomb_delay = 2;
+
+        uwsgi.async = 1;
+        uwsgi.listen_queue = 100;
+
+        uwsgi.cheaper_overload = 3;
+
+        uwsgi.log_master_bufsize = 8192;
+
+        uwsgi.max_vars = MAX_VARS;
+        uwsgi.vec_size = 4 + 1 + (4 * MAX_VARS);
+
+        uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] = 4;
+        uwsgi.shared->options[UWSGI_OPTION_LOGGING] = 1;
+
+#ifdef UWSGI_SPOOLER
+        uwsgi.shared->spooler_frequency = 30;
+
+        uwsgi.shared->spooler_signal_pipe[0] = -1;
+        uwsgi.shared->spooler_signal_pipe[1] = -1;
+#endif
+        uwsgi.shared->mule_signal_pipe[0] = -1;
+        uwsgi.shared->mule_signal_pipe[1] = -1;
+
+        uwsgi.shared->mule_queue_pipe[0] = -1;
+        uwsgi.shared->mule_queue_pipe[1] = -1;
+
+        uwsgi.shared->worker_log_pipe[0] = -1;
+        uwsgi.shared->worker_log_pipe[1] = -1;
+
+#ifdef UWSGI_SSL
+        // 1 day of tolerance
+        uwsgi.subscriptions_sign_check_tolerance = 3600 * 24;
+#endif
+
+}
+
+void uwsgi_setup_reload() {
+
+        char env_reload_buf[11];
+
+	char *env_reloads = getenv("UWSGI_RELOADS");
+        if (env_reloads) {
+                //convert env value to int
+                uwsgi.reloads = atoi(env_reloads);
+                uwsgi.reloads++;
+                //convert reloads to string
+                int rlen = snprintf(env_reload_buf, 10, "%u", uwsgi.reloads);
+                if (rlen > 0) {
+                        env_reload_buf[rlen] = 0;
+                        if (setenv("UWSGI_RELOADS", env_reload_buf, 1)) {
+                                uwsgi_error("setenv()");
+                        }
+                }
+                uwsgi.is_a_reload = 1;
+        }
+        else {
+                if (setenv("UWSGI_RELOADS", "0", 1)) {
+                        uwsgi_error("setenv()");
+                }
+        }
+
+}
+
+void uwsgi_autoload_plugins_by_name(char *argv_zero) {
+
+	char *plugins_requested = NULL;
+
+	char *original_proc_name = getenv("UWSGI_ORIGINAL_PROC_NAME");
+        if (!original_proc_name) {
+                // here we use argv[0];
+                original_proc_name = argv_zero;
+                setenv("UWSGI_ORIGINAL_PROC_NAME", original_proc_name, 1);
+        }
+        char *p = strrchr(original_proc_name, '/');
+        if (p == NULL)
+                p = original_proc_name;
+        p = strstr(p, "uwsgi_");
+        if (p != NULL) {
+                plugins_requested = strtok(uwsgi_str(p + 6), "_");
+                while (plugins_requested) {
+                        uwsgi_log("[uwsgi] implicit plugin requested %s\n", plugins_requested);
+                        uwsgi_load_plugin(-1, plugins_requested, NULL);
+                        plugins_requested = strtok(NULL, "_");
+                }
+        }
+
+        plugins_requested = getenv("UWSGI_PLUGINS");
+        if (plugins_requested) {
+                plugins_requested = uwsgi_concat2(plugins_requested, "");
+                char *p = strtok(plugins_requested, ",");
+                while (p != NULL) {
+                        uwsgi_load_plugin(-1, p, NULL);
+                        p = strtok(NULL, ",");
+                }
+        }
+
+}
+
+void uwsgi_commandline_config() {
+	int i;
+
+	uwsgi.option_index = -1;
+
+        char *optname;
+        while ((i = getopt_long(uwsgi.argc, uwsgi.argv, uwsgi.short_options, uwsgi.long_options, &uwsgi.option_index)) != -1) {
+
+                if (i == '?') {
+                        uwsgi_log("getopt_long() error\n");
+                        exit(1);
+                }
+
+                if (uwsgi.option_index > -1) {
+                        optname = (char *) uwsgi.long_options[uwsgi.option_index].name;
+                }
+                else {
+                        optname = uwsgi_get_optname_by_index(i);
+                }
+                if (!optname) {
+                        uwsgi_log("unable to parse command line options\n");
+                        exit(1);
+                }
+                uwsgi.option_index = -1;
+                add_exported_option(optname, optarg, 0);
+        }
+
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("optind:%d argc:%d\n", optind, uwsgi.argc);
+#endif
+
+        if (optind < uwsgi.argc) {
+                for (i = optind; i < uwsgi.argc; i++) {
+                        char *lazy = uwsgi.argv[i];
+                        if (lazy[0] != '[') {
+                                uwsgi_opt_load(NULL, lazy, NULL);
+                                // manage magic mountpoint
+                                int magic = 0;
+                                int j;
+                                for (j = 0; j < uwsgi.gp_cnt; j++) {
+                                        if (uwsgi.gp[j]->magic) {
+                                                if (uwsgi.gp[j]->magic(NULL, lazy)) {
+                                                        magic = 1;
+                                                        break;
+                                                }
+                                        }
+                                }
+                                if (!magic) {
+                                        for (j = 0; j < 256; j++) {
+                                                if (uwsgi.p[j]->magic) {
+                                                        if (uwsgi.p[j]->magic(NULL, lazy)) {
+                                                                magic = 1;
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+
+}
+
+void uwsgi_setup_workers() {
+	int i,j;
+	// allocate shared memory for workers + master
+        uwsgi.workers = (struct uwsgi_worker *) uwsgi_calloc_shared(sizeof(struct uwsgi_worker) * (uwsgi.numproc + 1 + uwsgi.grunt));
+
+        for (i = 0; i <= uwsgi.numproc; i++) {
+                // allocate memory for apps
+                uwsgi.workers[i].apps = (struct uwsgi_app *) uwsgi_calloc_shared(sizeof(struct uwsgi_app) * uwsgi.max_apps);
+
+                // allocate memory for cores
+                uwsgi.workers[i].cores = (struct uwsgi_core *) uwsgi_calloc_shared(sizeof(struct uwsgi_core) * uwsgi.cores);
+
+                for (j = 0; j < uwsgi.cores; j++) {
+                        // allocate shared memory for thread states (required for some language, like python)
+                        uwsgi.workers[i].cores[j].ts = uwsgi_calloc_shared(sizeof(void *) * uwsgi.max_apps);
+                        // raw per-request buffer
+                        uwsgi.workers[i].cores[j].buffer = uwsgi_malloc_shared(uwsgi.buffer_size);
+                        // iovec for uwsgi vars
+                        uwsgi.workers[i].cores[j].hvec = uwsgi_malloc_shared(sizeof(struct iovec) * uwsgi.vec_size);
+                        if (uwsgi.post_buffering > 0)
+                                uwsgi.workers[i].cores[j].post_buf = uwsgi_malloc_shared(uwsgi.post_buffering_bufsize);
+                }
+                // master does not need to following steps...
+                if (i == 0) continue;
+                uwsgi.workers[i].signal_pipe[0] = -1;
+                uwsgi.workers[i].signal_pipe[1] = -1;
+                snprintf(uwsgi.workers[i].name, 0xff, "uWSGI worker %d", i);
+                snprintf(uwsgi.workers[i].snapshot_name, 0xff, "uWSGI snapshot %d", i);
+        }
+
+}

core/json.c

@@ -30,7 +30,7 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
 	char *colon;
 	int i;
 
-	if (!uwsgi_startswith(file, "http://", 7)) {
+	if (uwsgi_check_scheme(file)) {
                 colon = uwsgi_get_last_char(file, '/');
                 colon = uwsgi_get_last_char(colon, ':');
         }
@@ -49,7 +49,11 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
 
 	json_data = uwsgi_open_and_read(file, &len, 1, magic_table);
 
+#ifdef JANSSON_MAJOR_VERSION 
 	root = json_loads(json_data, 0, &error);
+#else
+	root = json_loads(json_data, &error);
+#endif
 
 	if (!root) {
 		uwsgi_log("error parsing JSON data: line %d %s\n", error.line, error.text);
@@ -73,10 +77,10 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
 			add_exported_option((char *)key, (char *) json_string_value(config_value), 0);
 		}
 		else if (json_is_true(config_value)) {
-			add_exported_option((char *)key, (char *) "1", 0);
+			add_exported_option((char *)key, strdup("1"), 0);
 		}
 		else if (json_is_false(config_value) || json_is_null(config_value)) {
-			add_exported_option((char *)key, (char *) "0", 0);
+			add_exported_option((char *)key, strdup("0"), 0);
 		}
 		else if (json_is_integer(config_value)) {
 			add_exported_option((char *)key, uwsgi_num2str(json_integer_value(config_value)), 0);
@@ -88,10 +92,10 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
                         		add_exported_option((char *)key, (char *) json_string_value(config_array_item), 0);
                 		}
                 		else if (json_is_true(config_array_item)) {
-                        		add_exported_option((char *)key, (char *) "1", 0);
+                        		add_exported_option((char *)key, strdup("1"), 0);
                 		}
                 		else if (json_is_false(config_array_item) || json_is_null(config_array_item)) {
-                        		add_exported_option((char *)key, (char *) "0", 0);
+                        		add_exported_option((char *)key, strdup("0"), 0);
                 		}
                 		else if (json_is_integer(config_array_item)) {
                         		add_exported_option((char *)key, uwsgi_num2str(json_integer_value(config_array_item)), 0);

core/ldap.c

@@ -108,56 +108,37 @@ struct uwsgi_ldap_entry *search_ldap_cache(struct uwsgi_ldap_entry *root, char *
 
 struct uwsgi_ldap_entry *get_ldap_names(int *count) {
 
-	struct option *aopt, *lopt;
+	struct uwsgi_option *op = uwsgi.options;
 	struct uwsgi_ldap_entry *ule, *entry;
 	char ldap_name[1024];
-	static int counter = 30000000;
 
 	*count = 0;
-	lopt = uwsgi.long_options;
 
-	ule = uwsgi_malloc(sizeof(struct uwsgi_ldap_entry)*count_options(lopt));
+	ule = uwsgi_malloc(sizeof(struct uwsgi_ldap_entry)*uwsgi_count_options(op));
 
-	while( (aopt = lopt) ) {
-                if (!aopt->name)
-                        break;
+	while( op && op->name ) {
 
-		uwsgi_name_to_ldap((char *)aopt->name, ldap_name);
+		uwsgi_name_to_ldap((char *)op->name, ldap_name);
 
 		entry = search_ldap_cache(ule, ldap_name, *count);
 
 		if (entry) goto next;
 
-		if (aopt->flag) {
-			entry = &ule[*count] ;
-			entry->num = counter;
-			strcpy(entry->names, ldap_name);
-			counter++;
-			*count = *count+1;
-		}
-		else {
-			entry = get_ldap_by_num(ule, aopt->val, *count);
-			if (entry) {
-				strcat(entry->names, ldap_name);
-			}
-			else {
-				entry = &ule[*count] ;
-				entry->num = aopt->val;
-				strcpy(entry->names, ldap_name);
-				*count = *count+1;
-			}
-		}
+		entry = &ule[*count] ;
+		entry->num = *count;
+		strcpy(entry->names, ldap_name);
+		*count = *count+1;
 
-		entry->has_arg = aopt->has_arg;
+		entry->has_arg = op->type;
 		
 next:
-		lopt++;
+		op++;
 	}
 
 	return ule;
 }
 
-void uwsgi_ldap_schema_dump_ldif() {
+void uwsgi_opt_ldap_dump_ldif(char *opt, char *foo, void *bar) {
 
 	int i;
 	int items;
@@ -210,7 +191,7 @@ void uwsgi_ldap_schema_dump_ldif() {
 	exit(0);
 }
 
-void uwsgi_ldap_schema_dump() {
+void uwsgi_opt_ldap_dump(char *opt, char *foo, void *bar) {
 
 	int i;
 	int items;
@@ -258,7 +239,7 @@ void uwsgi_ldap_schema_dump() {
 	exit(0);
 }
 
-void uwsgi_ldap_config() {
+void uwsgi_ldap_config(char *url) {
 
 	LDAP *ldp;
 	LDAPMessage *results, *entry;
@@ -267,7 +248,6 @@ void uwsgi_ldap_config() {
 	char *attr;
 	char *uwsgi_attr;
 
-	char *url = "ldap:///";
 	char *url_slash;
 
 	int desired_version = LDAP_VERSION3;
@@ -275,10 +255,6 @@ void uwsgi_ldap_config() {
 
 	LDAPURLDesc *ldap_url;
 
-	if (uwsgi.ldap) {
-		url = uwsgi.ldap;
-	}
-
 	if (!ldap_is_ldap_url(url)) {
 		uwsgi_log("invalid LDAP url.\n");
 		exit(1);

core/lock.c

@@ -0,0 +1,631 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+static struct uwsgi_lock_item *uwsgi_register_lock(char *id, int rw) {
+
+	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
+	if (!uli) {
+		uwsgi.registered_locks = uwsgi_malloc_shared(sizeof(struct uwsgi_lock_item));
+		uwsgi.registered_locks->id = id;
+		uwsgi.registered_locks->pid = 0;
+		if (rw) {
+			uwsgi.registered_locks->lock_ptr = uwsgi_malloc_shared(uwsgi.rwlock_size);
+		}
+		else {
+			uwsgi.registered_locks->lock_ptr = uwsgi_malloc_shared(uwsgi.lock_size);
+		}
+		uwsgi.registered_locks->rw = rw;
+		uwsgi.registered_locks->next = NULL;
+		return uwsgi.registered_locks;
+	}
+
+	while(uli) {
+		if (!uli->next) {
+			uli->next = uwsgi_malloc_shared(sizeof(struct uwsgi_lock_item));
+			if (rw) {
+				uli->next->lock_ptr = uwsgi_malloc_shared(uwsgi.rwlock_size);
+			}
+			else {
+				uli->next->lock_ptr = uwsgi_malloc_shared(uwsgi.lock_size);
+			}
+			uli->next->id = id;
+			uli->next->pid = 0;
+			uli->next->rw = rw;
+			uli->next->next = NULL;
+			return uli->next;
+		}
+		uli = uli->next;
+	}
+
+	uwsgi_log("*** DANGER: unable to allocate lock %s ***\n", id);
+	exit(1);
+
+}
+
+#ifdef UWSGI_LOCK_USE_MUTEX
+
+#ifdef EOWNERDEAD
+#define UWSGI_LOCK_ENGINE_NAME "pthread robust mutexes"
+int uwsgi_pthread_robust_mutexes_enabled = 1;
+#else
+#define UWSGI_LOCK_ENGINE_NAME "pthread mutexes"
+#endif
+
+#define UWSGI_LOCK_SIZE	sizeof(pthread_mutex_t)
+
+#ifdef OBSOLETE_LINUX_KERNEL
+#define UWSGI_RWLOCK_SIZE	sizeof(pthread_mutex_t)
+#else
+#define UWSGI_RWLOCK_SIZE	sizeof(pthread_rwlock_t)
+#endif
+
+// REMEMBER lock must contains space for both pthread_mutex_t and pthread_mutexattr_t !!! 
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+
+	pthread_mutexattr_t attr;
+	
+        struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+
+#ifdef EOWNERDEAD
+retry:
+#endif
+	if (pthread_mutexattr_init(&attr)) {
+        	uwsgi_log("unable to allocate mutexattr structure\n");
+                exit(1);
+	}
+
+        if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
+        	uwsgi_log("unable to share mutex\n");
+                exit(1);
+        }
+
+#ifdef EOWNERDEAD
+	if (uwsgi_pthread_robust_mutexes_enabled) {
+        	if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP)) {
+        		uwsgi_log("unable to make the mutex 'robust'\n");
+                	exit(1);
+        	}
+	}
+#endif
+
+        if (pthread_mutex_init((pthread_mutex_t *) uli->lock_ptr, &attr)) {
+#ifdef EOWNERDEAD
+		if (uwsgi_pthread_robust_mutexes_enabled) {
+			uwsgi_log("!!! it looks like your kernel does not support pthread robust mutexes !!!\n");
+			uwsgi_log("!!! falling back to standard pthread mutexes !!!\n");
+			uwsgi_pthread_robust_mutexes_enabled = 0;
+			pthread_mutexattr_destroy(&attr);
+			goto retry;
+		}
+#endif
+        	uwsgi_log("unable to initialize mutex\n");
+                exit(1);
+        }
+
+	pthread_mutexattr_destroy(&attr);
+
+#ifdef EOWNERDEAD
+	if (!uwsgi_pthread_robust_mutexes_enabled) {
+		uli->can_deadlock = 1;
+	}
+#else
+	uli->can_deadlock = 1;
+#endif
+
+	return uli;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+
+	if (pthread_mutex_trylock((pthread_mutex_t *) uli->lock_ptr) == 0 ) {
+		pthread_mutex_unlock((pthread_mutex_t *) uli->lock_ptr);	
+		return 0;
+	}
+	return uli->pid;
+}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	return uwsgi_lock_fast_check(uli);
+#else
+
+	if (pthread_rwlock_trywrlock((pthread_rwlock_t *) uli->lock_ptr) == 0 ) {
+		pthread_rwlock_unlock((pthread_rwlock_t *) uli->lock_ptr);	
+		return 0;
+	}
+        return uli->pid;
+#endif
+}
+
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+
+#ifdef EOWNERDEAD
+	if (pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr) == EOWNERDEAD) {
+		uwsgi_log("[deadlock-detector] a process holding a robust mutex died. recovering...\n");
+		pthread_mutex_consistent_np((pthread_mutex_t *) uli->lock_ptr);
+	}
+#else
+	pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr);
+#endif
+        uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+
+	pthread_mutex_unlock((pthread_mutex_t *) uli->lock_ptr);
+	uli->pid = 0;
+
+}
+
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	uwsgi_lock_fast(uli);
+#else
+	pthread_rwlock_rdlock((pthread_rwlock_t *) uli->lock_ptr);
+        uli->pid = uwsgi.mypid;
+#endif
+}
+
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	uwsgi_lock_fast(uli);
+#else
+	pthread_rwlock_wrlock((pthread_rwlock_t *) uli->lock_ptr);
+        uli->pid = uwsgi.mypid;
+#endif
+}
+
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	uwsgi_unlock_fast(uli);
+#else
+	pthread_rwlock_unlock((pthread_rwlock_t *) uli->lock_ptr);
+        uli->pid = 0;
+#endif
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) {
+
+#ifdef OBSOLETE_LINUX_KERNEL
+	return uwsgi_lock_fast_init(id);
+#else
+
+	pthread_rwlockattr_t attr;
+
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 1);
+
+        if (pthread_rwlockattr_init(&attr)) {
+                uwsgi_log("unable to allocate rwlock structure\n");
+                exit(1);
+        }
+
+        if (pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
+                uwsgi_log("unable to share rwlock\n");
+                exit(1);
+        }
+
+        if (pthread_rwlock_init((pthread_rwlock_t *) uli->lock_ptr, &attr)) {
+                uwsgi_log("unable to initialize rwlock\n");
+                exit(1);
+        }
+
+	pthread_rwlockattr_destroy(&attr);
+
+	uli->can_deadlock = 1;
+
+	return uli;
+#endif
+
+
+
+}
+
+
+
+#elif defined(UWSGI_LOCK_USE_UMTX)
+
+/* Warning: FreeBSD is still not ready for process-shared UMTX */
+
+#include <machine/atomic.h>
+#include <sys/umtx.h>
+
+#define UWSGI_LOCK_SIZE		sizeof(struct umtx)
+#define UWSGI_RWLOCK_SIZE	sizeof(struct umtx)
+#define UWSGI_LOCK_ENGINE_NAME	"FreeBSD umtx"
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) { return uwsgi_lock_fast_init(id) ;}
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) { uwsgi_unlock_fast(uli); }
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+	umtx_init((struct umtx*) uli->lock_ptr);
+	return uli;
+}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+	umtx_lock((struct umtx*) uli->lock_ptr, (u_long) getpid() );
+	uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+	umtx_unlock((struct umtx*) uli->lock_ptr, (u_long) getpid() );
+	uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (umtx_trylock((struct umtx*) uli->lock_ptr, (u_long) getpid() )) {
+		umtx_unlock((struct umtx*) uli->lock_ptr, (u_long) getpid() );
+		return 0;
+	}
+	return uli->pid;
+}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_fast_check(uli); }
+
+#elif defined(UWSGI_LOCK_USE_POSIX_SEM)
+
+#define UWSGI_LOCK_SIZE         sizeof(sem_t)
+#define UWSGI_RWLOCK_SIZE       sizeof(sem_t)
+#define UWSGI_LOCK_ENGINE_NAME  "POSIX semaphores"
+
+#include <semaphore.h>
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+        struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+        sem_init((sem_t*) uli->lock_ptr, 1, 1);
+	uli->can_deadlock = 1;
+        return uli;
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) { return uwsgi_lock_fast_init(id) ;}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+        sem_wait((sem_t *) uli->lock_ptr);
+        uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+        sem_post((sem_t*) uli->lock_ptr);
+        uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (sem_trywait((sem_t *) uli->lock_ptr) == 0) {
+		sem_post((sem_t*) uli->lock_ptr);
+                return 0;
+        }
+        return uli->pid;
+}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_fast_check(uli); }
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) { uwsgi_unlock_fast(uli); }
+
+
+#elif defined(UWSGI_LOCK_USE_OSX_SPINLOCK)
+
+#define UWSGI_LOCK_ENGINE_NAME "OSX spinlocks"
+#define UWSGI_LOCK_SIZE		sizeof(OSSpinLock)
+#define UWSGI_RWLOCK_SIZE	sizeof(OSSpinLock)
+
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+	memset(uli->lock_ptr, 0, UWSGI_LOCK_SIZE);
+	uli->can_deadlock = 1;
+	return uli;
+}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+
+	OSSpinLockLock((OSSpinLock *) uli->lock_ptr);
+	uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+
+	OSSpinLockUnlock((OSSpinLock *) uli->lock_ptr);
+	uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (OSSpinLockTry((OSSpinLock *) uli->lock_ptr)) {
+		OSSpinLockUnlock((OSSpinLock *) uli->lock_ptr);
+		return 0;
+	}
+	return uli->pid;
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) { 
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 1);
+	memset(uli->lock_ptr, 0, UWSGI_LOCK_SIZE);
+	uli->can_deadlock = 1;
+	return uli;
+}
+
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_fast_check(uli); }
+
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) { uwsgi_unlock_fast(uli); }
+
+#else
+
+#define uwsgi_lock_fast_init uwsgi_lock_ipcsem_init
+#define uwsgi_lock_fast_check uwsgi_lock_ipcsem_check
+#define uwsgi_lock_fast uwsgi_lock_ipcsem
+#define uwsgi_unlock_fast uwsgi_unlock_ipcsem
+
+#define uwsgi_rwlock_fast_init uwsgi_rwlock_ipcsem_init
+#define uwsgi_rwlock_fast_check uwsgi_rwlock_ipcsem_check
+
+#define uwsgi_rlock_fast uwsgi_rlock_ipcsem
+#define uwsgi_wlock_fast uwsgi_wlock_ipcsem
+#define uwsgi_rwunlock_fast uwsgi_rwunlock_ipcsem
+
+#define UWSGI_LOCK_SIZE sizeof(int)
+#define UWSGI_RWLOCK_SIZE sizeof(int)
+
+#define UWSGI_LOCK_ENGINE_NAME "ipcsem"
+
+#define UWSGI_IPCSEM_ATEXIT	1
+
+#endif
+
+struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
+
+	// used by ftok
+	static int counter = 1;
+	union semun {
+ 		int val;
+		struct semid_ds *buf;
+		ushort *array;
+	} semu ;
+	int semid;
+	key_t myKey;
+
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+
+	if (uwsgi.ftok) {
+		myKey = ftok(uwsgi.ftok, counter);
+		if (myKey < 0) {
+			uwsgi_error("ftok()");
+			exit(1);
+		}
+		counter++;
+		semid = semget(myKey, 1, IPC_CREAT|0666);
+	}
+	else {
+		semid = semget(IPC_PRIVATE, 1, IPC_CREAT|IPC_EXCL| 0666);
+	}
+
+	if (semid < 0) {
+		uwsgi_error("semget()");
+		exit(1);
+	}
+	// do this now, to allows triggering of atexit hook in case of problems
+	memcpy(uli->lock_ptr, &semid, sizeof(int));
+
+	semu.val = 1;
+	if (semctl(semid, 0, SETVAL, semu)) {
+		uwsgi_error("semctl()");
+		exit(1);
+	}
+	
+	return uli;
+}
+
+void uwsgi_lock_ipcsem(struct uwsgi_lock_item *uli) {
+
+	int semid;
+	struct sembuf sb;
+	sb.sem_num = 0;
+	sb.sem_op = -1;
+	sb.sem_flg = SEM_UNDO;
+
+	memcpy(&semid, uli->lock_ptr, sizeof(int));
+
+	if (semop(semid, &sb, 1)) {
+		uwsgi_error("semop()");
+	} 
+}
+
+void uwsgi_unlock_ipcsem(struct uwsgi_lock_item *uli) {
+
+	int semid;
+	struct sembuf sb;
+	sb.sem_num = 0;
+	sb.sem_op = 1;
+	sb.sem_flg = SEM_UNDO;
+
+	memcpy(&semid, uli->lock_ptr, sizeof(int));
+
+	if (semop(semid, &sb, 1)) {
+		uwsgi_error("semop()");
+	} 
+
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_ipcsem_init(char *id) { return uwsgi_lock_ipcsem_init(id);}
+void uwsgi_rlock_ipcsem(struct uwsgi_lock_item *uli) { uwsgi_lock_ipcsem(uli);}
+void uwsgi_wlock_ipcsem(struct uwsgi_lock_item *uli) { uwsgi_lock_ipcsem(uli);}
+void uwsgi_rwunlock_ipcsem(struct uwsgi_lock_item *uli) { uwsgi_unlock_ipcsem(uli); }
+
+// ipc cannot deadlock
+pid_t uwsgi_lock_ipcsem_check(struct uwsgi_lock_item *uli) {
+	return 0;
+}
+
+void uwsgi_ipcsem_clear(void) {
+
+	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
+
+	if (!uwsgi.workers) goto clear;
+
+	if (uwsgi.mywid == 0) goto clear;
+
+	if (uwsgi.master_process && getpid() == uwsgi.workers[0].pid) goto clear;
+
+	if (!uwsgi.master_process && uwsgi.mywid == 1) goto clear;
+
+	return;
+
+clear:
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("removing sysvipc semaphores...\n");
+#endif
+        while(uli) {
+		int semid = 0;
+		memcpy(&semid, uli->lock_ptr, sizeof(int));
+		if (semctl(semid, 0, IPC_RMID)) {
+			uwsgi_error("semctl()");
+		}
+		uli = uli->next;
+	}
+}
+
+
+pid_t uwsgi_rwlock_ipcsem_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_ipcsem_check(uli); }
+
+
+void uwsgi_setup_locking() {
+
+	// use the fastest available locking
+	if (uwsgi.lock_engine) {
+		if (!strcmp(uwsgi.lock_engine, "ipcsem")) {
+			uwsgi_log_initial("lock engine: ipcsem\n");
+			atexit(uwsgi_ipcsem_clear);
+			uwsgi.lock_ops.lock_init = uwsgi_lock_ipcsem_init;
+			uwsgi.lock_ops.lock_check = uwsgi_lock_ipcsem_check;
+			uwsgi.lock_ops.lock = uwsgi_lock_ipcsem;
+			uwsgi.lock_ops.unlock = uwsgi_unlock_ipcsem;
+			uwsgi.lock_ops.rwlock_init = uwsgi_rwlock_ipcsem_init;
+			uwsgi.lock_ops.rwlock_check = uwsgi_rwlock_ipcsem_check;
+			uwsgi.lock_ops.rlock = uwsgi_rlock_ipcsem;
+			uwsgi.lock_ops.wlock = uwsgi_wlock_ipcsem;
+			uwsgi.lock_ops.rwunlock = uwsgi_rwunlock_ipcsem;
+			uwsgi.lock_size = 8;
+			uwsgi.rwlock_size = 8;
+			return;
+		}
+	}
+
+	uwsgi_log_initial("lock engine: %s\n", UWSGI_LOCK_ENGINE_NAME);
+#ifdef UWSGI_IPCSEM_ATEXIT
+	atexit(uwsgi_ipcsem_clear);
+#endif
+	uwsgi.lock_ops.lock_init = uwsgi_lock_fast_init;
+	uwsgi.lock_ops.lock_check = uwsgi_lock_fast_check;
+	uwsgi.lock_ops.lock = uwsgi_lock_fast;
+	uwsgi.lock_ops.unlock = uwsgi_unlock_fast;
+	uwsgi.lock_ops.rwlock_init = uwsgi_rwlock_fast_init;
+	uwsgi.lock_ops.rwlock_check = uwsgi_rwlock_fast_check;
+	uwsgi.lock_ops.rlock = uwsgi_rlock_fast;
+	uwsgi.lock_ops.wlock = uwsgi_wlock_fast;
+	uwsgi.lock_ops.rwunlock = uwsgi_rwunlock_fast;
+	uwsgi.lock_size = UWSGI_LOCK_SIZE;
+	uwsgi.rwlock_size = UWSGI_RWLOCK_SIZE;
+
+	// application generic lock
+	int i;
+        uwsgi.user_lock = uwsgi_malloc(sizeof(void *) * (uwsgi.locks + 1));
+        for (i = 0; i < uwsgi.locks + 1; i++) {
+                uwsgi.user_lock[i] = uwsgi_lock_init(uwsgi_concat2("user ", uwsgi_num2str(i)));
+        }
+
+	// event queue lock (mitigate same event on multiple queues)
+        if (uwsgi.threads > 1) {
+                pthread_mutex_init(&uwsgi.thunder_mutex, NULL);
+        }
+
+        if (uwsgi.master_process) {
+                // signal table lock
+                uwsgi.signal_table_lock = uwsgi_lock_init("signal");
+
+                // fmon table lock
+                uwsgi.fmon_table_lock = uwsgi_lock_init("filemon");
+
+                // timer table lock
+                uwsgi.timer_table_lock = uwsgi_lock_init("timer");
+
+                // probe table lock
+                uwsgi.probe_table_lock = uwsgi_lock_init("probe");
+
+                // rb_timer table lock
+                uwsgi.rb_timer_table_lock = uwsgi_lock_init("rbtimer");
+
+                // cron table lock
+                uwsgi.cron_table_lock = uwsgi_lock_init("cron");
+        }
+
+        uwsgi.rpc_table_lock = uwsgi_lock_init("rpc");
+
+}
+
+
+int uwsgi_fcntl_lock(int fd) {
+	struct flock fl;
+	fl.l_type = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_pid = 0;
+
+	int ret = fcntl(fd, F_SETLKW, &fl);
+	if (ret < 0)
+		uwsgi_error("fcntl()");
+
+	return ret;
+}
+
+int uwsgi_fcntl_is_locked(int fd) {
+
+	struct flock fl;
+        fl.l_type = F_WRLCK;
+        fl.l_whence = SEEK_SET;
+        fl.l_start = 0;
+        fl.l_len = 0;
+        fl.l_pid = 0;
+
+        if (fcntl(fd, F_SETLK, &fl)) {
+		return 1;
+	}
+
+	return 0;
+	
+}
+
+void uwsgi_deadlock_check(pid_t diedpid) {
+	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
+                while (uli) {
+                        if (!uli->can_deadlock)
+                                goto nextlock;
+                        pid_t locked_pid = 0;
+                        if (uli->rw) {
+                                locked_pid = uwsgi_rwlock_check(uli);
+                        }
+                        else {
+                                locked_pid = uwsgi_lock_check(uli);
+                        }
+                        if (locked_pid == diedpid) {
+                                uwsgi_log("[deadlock-detector] pid %d was holding lock %s (%p)\n", (int) diedpid, uli->id, uli->lock_ptr);
+                                if (uli->rw) {
+                                        uwsgi_rwunlock(uli);
+                                }
+                                else {
+                                        uwsgi_unlock(uli);
+                                }
+                        }
+nextlock:
+                        uli = uli->next;
+                }
+
+}

core/loop.c

@@ -0,0 +1,122 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct wsgi_request *threaded_current_wsgi_req() {
+	return pthread_getspecific(uwsgi.tur_key);
+}
+struct wsgi_request *simple_current_wsgi_req() {
+	return uwsgi.wsgi_req;
+}
+
+
+void uwsgi_register_loop(char *name, void *loop) {
+
+	if (uwsgi.loops_cnt >= MAX_LOOPS) {
+		uwsgi_log("you can define %d loops at max\n", MAX_LOOPS);
+		exit(1);
+	}
+
+	uwsgi.loops[uwsgi.loops_cnt].name = name;
+	uwsgi.loops[uwsgi.loops_cnt].loop = loop;
+	uwsgi.loops_cnt++;
+}
+
+void *uwsgi_get_loop(char *name) {
+
+	int i;
+
+	for (i = 0; i < uwsgi.loops_cnt; i++) {
+		if (!strcmp(name, uwsgi.loops[i].name)) {
+			return uwsgi.loops[i].loop;
+		}
+	}
+
+	return NULL;
+}
+
+void *simple_loop(void *arg1) {
+
+	long core_id = (long) arg1;
+
+	struct wsgi_request *wsgi_req = &uwsgi.workers[uwsgi.mywid].cores[core_id].req;
+
+#ifdef UWSGI_THREADING
+	int i;
+	sigset_t smask;
+
+	if (uwsgi.threads > 1) {
+
+		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &i);
+		pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &i);
+		pthread_setspecific(uwsgi.tur_key, (void *) wsgi_req);
+
+		if (core_id > 0) {
+			// block all signals on new threads
+			sigfillset(&smask);
+#ifdef UWSGI_DEBUG
+			sigdelset(&smask, SIGSEGV);
+#endif
+			pthread_sigmask(SIG_BLOCK, &smask, NULL);
+
+			// run per-thread socket hook
+			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+			while(uwsgi_sock) {
+				if (uwsgi_sock->proto_thread_fixup) {
+					uwsgi_sock->proto_thread_fixup(uwsgi_sock, core_id);
+				}
+				uwsgi_sock = uwsgi_sock->next;
+			}
+
+			for (i = 0; i < 256; i++) {
+				if (uwsgi.p[i]->init_thread) {
+					uwsgi.p[i]->init_thread(core_id);
+				}
+			}
+		}
+	}
+#endif
+
+	// initialize the main event queue to monitor sockets
+	int main_queue = event_queue_init();
+
+	uwsgi_add_sockets_to_queue(main_queue, core_id);
+
+	if (uwsgi.signal_socket > -1) {
+		event_queue_add_fd_read(main_queue, uwsgi.signal_socket);
+		event_queue_add_fd_read(main_queue, uwsgi.my_signal_socket);
+	}
+
+
+	// ok we are ready, let's start managing requests and signals
+	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
+
+		wsgi_req_setup(wsgi_req, core_id, NULL);
+
+		if (wsgi_req_accept(main_queue, wsgi_req)) {
+			continue;
+		}
+
+		if (wsgi_req_recv(wsgi_req)) {
+			uwsgi_destroy_request(wsgi_req);
+			continue;
+		}
+
+		uwsgi_close_request(wsgi_req);
+	}
+
+	// end of the loop
+	if (uwsgi.workers[uwsgi.mywid].destroy && uwsgi.workers[0].pid > 0) {
+#ifdef __APPLE__
+		kill(uwsgi.workers[0].pid, SIGTERM);
+#else
+		if (uwsgi.propagate_touch) {
+			kill(uwsgi.workers[0].pid, SIGHUP);
+		}
+		else {
+			gracefully_kill(0);
+		}
+#endif
+	}
+	return NULL;
+}

core/mule.c

@@ -0,0 +1,448 @@
+/*
+
+uWSGI mules are very simple workers only managing signals or running custom code in background.
+
+By default they born in signal-only mode, but if you patch them (passing the script/code to run) they will became fully customized daemons.
+
+*/
+
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_mule_handler(void);
+
+void mule_send_msg(int fd, char *message, size_t len) {
+
+	socklen_t so_bufsize_len = sizeof(int);
+	int so_bufsize = 0;
+
+	if (write(fd, message, len) != (ssize_t) len) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                        if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &so_bufsize, &so_bufsize_len)) {
+                                uwsgi_error("getsockopt()");
+                        }
+                        uwsgi_log("*** MULE MSG QUEUE IS FULL: buffer size %d bytes (you can tune it with --signal-bufsize) ***\n", so_bufsize);
+                }
+                else {
+                        uwsgi_error("mule_send_msg()");
+                }
+	}
+}
+
+void uwsgi_mule(int id) {
+
+	int i;
+
+	pid_t pid = uwsgi_fork(uwsgi.mules[id-1].name);
+	if (pid == 0) {
+#ifdef __linux__
+                if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0,0,0)) {
+                        uwsgi_error("prctl()");
+                }
+#endif
+		uwsgi.muleid = id;
+		// avoid race conditions
+		uwsgi.mules[id-1].id = id;
+		uwsgi.mules[id-1].pid = getpid();
+
+		uwsgi_fixup_fds(0, id, NULL);
+
+		uwsgi.my_signal_socket = uwsgi.mules[id-1].signal_pipe[1];
+		uwsgi.signal_socket = uwsgi.shared->mule_signal_pipe[1];
+
+		uwsgi_close_all_sockets();
+
+		for (i = 0; i < 256; i++) {
+                	if (uwsgi.p[i]->master_fixup) {
+                		uwsgi.p[i]->master_fixup(1);
+                	}
+                }
+
+		for (i = 0; i < 256; i++) {
+                        if (uwsgi.p[i]->post_fork) {
+                                uwsgi.p[i]->post_fork();
+                        }
+                }
+
+
+		if (uwsgi.mules[id-1].patch) {
+			for (i = 0; i < 256; i++) {
+                        	if (uwsgi.p[i]->mule) {
+                                	if (uwsgi.p[i]->mule(uwsgi.mules[id-1].patch) == 1) {
+						// never here
+						break;
+					}
+				}
+                        }
+		}
+
+		uwsgi_mule_handler();
+	}
+	else if (pid > 0) {
+		uwsgi.mules[id-1].id = id;
+		uwsgi.mules[id-1].pid = pid;
+		uwsgi_log("spawned uWSGI mule %d (pid: %d)\n", id, (int) pid);
+	}
+}
+
+int uwsgi_farm_has_mule(struct uwsgi_farm *farm, int muleid) {
+
+	struct uwsgi_mule_farm *umf = farm->mules;
+
+	while(umf) {
+		if (umf->mule->id == muleid) {
+			return 1;
+		}
+		umf = umf->next;
+	}
+
+	return 0;
+}
+
+int farm_has_signaled(int fd) {
+
+	int i;
+	for(i=0;i<uwsgi.farms_cnt;i++) {
+		struct uwsgi_mule_farm *umf = uwsgi.farms[i].mules;
+		while(umf) {
+			if (umf->mule->id == uwsgi.muleid && uwsgi.farms[i].signal_pipe[1] == fd) {
+				return 1;
+			}
+			umf = umf->next;
+		}
+	}
+	
+	return 0;
+}
+
+int farm_has_msg(int fd) {
+
+        int i;
+        for(i=0;i<uwsgi.farms_cnt;i++) {
+                struct uwsgi_mule_farm *umf = uwsgi.farms[i].mules;
+                while(umf) {
+                        if (umf->mule->id == uwsgi.muleid && uwsgi.farms[i].queue_pipe[1] == fd) {
+                                return 1;
+                        }
+                        umf = umf->next;
+                }
+        }
+
+        return 0;
+}
+
+
+void uwsgi_mule_add_farm_to_queue(int queue) {
+
+	int i;
+	for(i=0;i<uwsgi.farms_cnt;i++) {
+		if (uwsgi_farm_has_mule(&uwsgi.farms[i], uwsgi.muleid)) {
+			event_queue_add_fd_read(queue, uwsgi.farms[i].signal_pipe[1]);	
+			event_queue_add_fd_read(queue, uwsgi.farms[i].queue_pipe[1]);	
+		}
+	}
+}
+
+void uwsgi_mule_handler() {
+	
+	ssize_t len;
+	uint8_t uwsgi_signal;
+	int rlen;
+	int interesting_fd;
+	
+	// this must be configurable
+	char message[65536];
+
+	int mule_queue = event_queue_init();
+
+	event_queue_add_fd_read(mule_queue, uwsgi.signal_socket);
+	event_queue_add_fd_read(mule_queue, uwsgi.my_signal_socket);
+	event_queue_add_fd_read(mule_queue, uwsgi.mules[uwsgi.muleid-1].queue_pipe[1]);
+	event_queue_add_fd_read(mule_queue, uwsgi.shared->mule_queue_pipe[1]);
+
+	uwsgi_mule_add_farm_to_queue(mule_queue);
+
+	for(;;) {
+		rlen = event_queue_wait(mule_queue, -1, &interesting_fd);
+		if (rlen <= 0) {
+			continue;
+		}
+
+		if (interesting_fd == uwsgi.signal_socket || interesting_fd == uwsgi.my_signal_socket || farm_has_signaled(interesting_fd)) {
+			len = read(interesting_fd, &uwsgi_signal, 1);
+			if (len <= 0) {
+                		uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
+                        	end_me(0);
+                	}
+#ifdef UWSGI_DEBUG
+			uwsgi_log_verbose("master sent signal %d to mule %d\n", uwsgi_signal, uwsgi.muleid);
+#endif
+			if (uwsgi_signal_handler(uwsgi_signal)) {
+                		uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.muleid);
+                	}
+		}
+		else if (interesting_fd == uwsgi.mules[uwsgi.muleid-1].queue_pipe[1] || interesting_fd == uwsgi.shared->mule_queue_pipe[1] || farm_has_msg(interesting_fd)) {
+			len = read(interesting_fd, message, 65536);
+			if (len < 0) {
+				uwsgi_error("read()");
+			}	
+			else {
+				int i,found = 0;
+				for(i=0;i<256;i++) {
+                                	if (uwsgi.p[i]->mule_msg) {
+                                        	if (uwsgi.p[i]->mule_msg(message, len)) {
+							found = 1;
+							break;
+						}
+					}
+                                }
+				if (!found)
+					uwsgi_log("*** mule %d received a %d bytes message ***\n", uwsgi.muleid, len);
+			}
+		}
+	}
+
+}
+
+struct uwsgi_mule *get_mule_by_id(int id) {
+
+	int i;
+
+	for(i=0;i<uwsgi.mules_cnt;i++) {
+		if (uwsgi.mules[i].id == id) {
+			return &uwsgi.mules[i];
+		}
+	}
+
+	return NULL;
+}
+
+struct uwsgi_farm *get_farm_by_name(char *name) {
+
+        int i;
+
+        for(i=0;i<uwsgi.farms_cnt;i++) {
+                if (!strcmp(uwsgi.farms[i].name, name)) {
+                        return &uwsgi.farms[i];
+                }
+        }
+
+        return NULL;
+}
+
+
+struct uwsgi_mule_farm *uwsgi_mule_farm_new(struct uwsgi_mule_farm **umf, struct uwsgi_mule *um) {
+
+        struct uwsgi_mule_farm *uwsgi_mf = *umf, *old_umf;
+
+        if (!uwsgi_mf) {
+                *umf = uwsgi_malloc(sizeof(struct uwsgi_mule_farm));
+                uwsgi_mf = *umf;
+        }
+        else {
+                while(uwsgi_mf) {
+                        old_umf = uwsgi_mf;
+			uwsgi_mf = uwsgi_mf->next;
+                }
+
+                uwsgi_mf = uwsgi_malloc(sizeof(struct uwsgi_mule_farm));
+                old_umf->next = uwsgi_mf;
+        }
+
+        uwsgi_mf->mule = um;
+        uwsgi_mf->next = NULL;
+
+        return uwsgi_mf;
+}
+
+ssize_t uwsgi_mule_get_msg(int manage_signals, int manage_farms, char *message, size_t buffer_size, int timeout) {
+
+        ssize_t len = 0;
+        struct pollfd *mulepoll;
+        int count = 4;
+        int farms_count = 0;
+        uint8_t uwsgi_signal;
+        int i;
+
+	if (uwsgi.muleid == 0) return -1;
+
+        if (manage_signals) count = 2;
+
+        if (!manage_farms) goto next;
+
+        for(i=0;i<uwsgi.farms_cnt;i++) {
+                if (uwsgi_farm_has_mule(&uwsgi.farms[i], uwsgi.muleid)) farms_count++;
+        }
+next:
+
+        if (timeout > -1) timeout = timeout*1000;
+
+        mulepoll = uwsgi_malloc(sizeof(struct pollfd) * (count+farms_count));
+
+        mulepoll[0].fd = uwsgi.mules[uwsgi.muleid-1].queue_pipe[1];
+        mulepoll[0].events = POLLIN;
+        mulepoll[1].fd = uwsgi.shared->mule_queue_pipe[1];
+        mulepoll[1].events = POLLIN;
+        if (count > 2) {
+                mulepoll[2].fd = uwsgi.signal_socket;
+                mulepoll[2].events = POLLIN;
+                mulepoll[3].fd = uwsgi.my_signal_socket;
+                mulepoll[3].events = POLLIN;
+        }
+
+	if (farms_count > 0) {
+		int tmp_cnt = 0;
+        	for(i=0;i<uwsgi.farms_cnt;i++) {
+			if (uwsgi_farm_has_mule(&uwsgi.farms[i], uwsgi.muleid)) {
+                		mulepoll[count+tmp_cnt].fd = uwsgi.farms[i].queue_pipe[1];
+                		mulepoll[count+tmp_cnt].events = POLLIN;
+				tmp_cnt++;
+			}
+        	}
+	}
+
+        int ret = poll(mulepoll, count+farms_count, timeout);
+        if (ret <= 0) {
+                uwsgi_error("poll");
+        }
+        else {
+                if (mulepoll[0].revents & POLLIN) {
+                        len = read(uwsgi.mules[uwsgi.muleid-1].queue_pipe[1], message, buffer_size);
+                }
+                else if (mulepoll[1].revents & POLLIN) {
+                        len = read(uwsgi.shared->mule_queue_pipe[1], message, buffer_size);
+                }
+                else {
+                        if (count > 2) {
+                                int interesting_fd = -1;
+                                if (mulepoll[2].revents & POLLIN) {
+                                        interesting_fd = mulepoll[2].fd;
+                                }
+                                else if (mulepoll[3].revents & POLLIN) {
+                                        interesting_fd = mulepoll[3].fd;
+                                }
+
+                                if (interesting_fd > -1) {
+                                        len = read(interesting_fd, &uwsgi_signal, 1);
+                                        if (len <= 0) {
+                                                uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
+                                                end_me(0);
+                                        }
+#ifdef UWSGI_DEBUG
+                                        uwsgi_log_verbose("master sent signal %d to mule %d\n", uwsgi_signal, uwsgi.muleid);
+#endif
+                                        if (uwsgi_signal_handler(uwsgi_signal)) {
+                                                uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.mywid);
+                                        }
+					// set the error condition
+					len = -1;
+                                        goto clear;
+                                }
+                        }
+
+			// read messages in the farm
+                        for(i=0;i<farms_count;i++) {
+                                if (mulepoll[count+i].revents & POLLIN) {
+                                        len = read(mulepoll[count+i].fd, message, buffer_size);
+                                        break;
+                                }
+                        }
+                }
+        }
+
+        if (len < 0) {
+                uwsgi_error("read()");
+                goto clear;
+        }
+
+clear:
+        free(mulepoll);
+        return len;
+}
+
+
+void uwsgi_opt_add_mule(char *opt, char *value, void *foobar) {
+
+	uwsgi.mules_cnt++;
+        uwsgi_string_new_list(&uwsgi.mules_patches, value);
+}
+
+void uwsgi_opt_add_mules(char *opt, char *value, void *foobar) {
+	int i;
+
+	for(i=0;i<atoi(value);i++) {
+                        uwsgi.mules_cnt++;
+                        uwsgi_string_new_list(&uwsgi.mules_patches, NULL);
+                }
+}
+
+void uwsgi_opt_add_farm(char *opt, char *value, void *foobar) {
+	uwsgi.farms_cnt++;
+                uwsgi_string_new_list(&uwsgi.farms_list, value);
+
+}
+
+void uwsgi_setup_mules_and_farms() {
+	int i;
+	if (uwsgi.mules_cnt > 0) {
+                uwsgi.mules = (struct uwsgi_mule *) uwsgi_calloc_shared(sizeof(struct uwsgi_mule) * uwsgi.mules_cnt);
+
+                create_signal_pipe(uwsgi.shared->mule_signal_pipe);
+                create_signal_pipe(uwsgi.shared->mule_queue_pipe);
+
+                for (i = 0; i < uwsgi.mules_cnt; i++) {
+                        // create the socket pipe
+                        create_signal_pipe(uwsgi.mules[i].signal_pipe);
+                        create_signal_pipe(uwsgi.mules[i].queue_pipe);
+
+                        uwsgi.mules[i].id = i + 1;
+
+                        snprintf(uwsgi.mules[i].name, 0xff, "uWSGI mule %d", i + 1);
+                }
+        }
+
+        if (uwsgi.farms_cnt > 0) {
+                uwsgi.farms = (struct uwsgi_farm *) uwsgi_calloc_shared(sizeof(struct uwsgi_farm) * uwsgi.farms_cnt);
+
+                struct uwsgi_string_list *farm_name = uwsgi.farms_list;
+                for (i = 0; i < uwsgi.farms_cnt; i++) {
+
+                        char *farm_value = uwsgi_str(farm_name->value);
+
+                        char *mules_list = strchr(farm_value, ':');
+                        if (!mules_list) {
+                                uwsgi_log("invalid farm value (%s) must be in the form name:mule[,muleN].\n", farm_value);
+                                exit(1);
+                        }
+
+                        mules_list[0] = 0;
+                        mules_list++;
+
+                        strncpy(uwsgi.farms[i].name, farm_value, 0xff);
+
+                        // create the socket pipe
+                        create_signal_pipe(uwsgi.farms[i].signal_pipe);
+                        create_signal_pipe(uwsgi.farms[i].queue_pipe);
+
+                        char *p = strtok(mules_list, ",");
+                        while (p != NULL) {
+                                struct uwsgi_mule *um = get_mule_by_id(atoi(p));
+                                if (!um) {
+                                        uwsgi_log("invalid mule id: %s\n", p);
+                                        exit(1);
+                                }
+
+                                uwsgi_mule_farm_new(&uwsgi.farms[i].mules, um);
+
+                                p = strtok(NULL, ",");
+                        }
+                        uwsgi_log("created farm %d name: %s mules:%s\n", i + 1, uwsgi.farms[i].name, strchr(farm_name->value, ':') + 1);
+
+                        farm_name = farm_name->next;
+
+                }
+
+        }
+
+}

core/plugins.c

@@ -0,0 +1,277 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+static int plugin_already_loaded(const char *plugin) {
+	int i;
+
+	for (i = 0; i < 256; i++) {
+		if (uwsgi.p[i]->name) {
+			if (!strcmp(plugin, uwsgi.p[i]->name)) {
+#ifdef UWSGI_DEBUG
+				uwsgi_log("%s plugin already available\n", plugin);
+#endif
+				return 1;
+			}	
+		}
+		if (uwsgi.p[i]->alias) {
+			if (!strcmp(plugin, uwsgi.p[i]->alias)) {
+#ifdef UWSGI_DEBUG
+				uwsgi_log("%s plugin already available\n", plugin);
+#endif
+				return 1;
+			}	
+		}
+	}
+
+	for(i=0;i<uwsgi.gp_cnt;i++) {
+
+		if (uwsgi.gp[i]->name) {
+                        if (!strcmp(plugin, uwsgi.gp[i]->name)) {
+#ifdef UWSGI_DEBUG
+                                uwsgi_log("%s plugin already available\n", plugin);
+#endif
+                                return 1;
+                        }       
+                }
+                if (uwsgi.gp[i]->alias) {
+                        if (!strcmp(plugin, uwsgi.gp[i]->alias)) {
+#ifdef UWSGI_DEBUG
+                                uwsgi_log("%s plugin already available\n", plugin);
+#endif
+                                return 1;
+                        }
+                }
+        }
+
+	return 0;
+}
+
+void *uwsgi_load_plugin(int modifier, char *plugin, char *has_option) {
+
+	void *plugin_handle = NULL;
+	char *plugin_abs_path = NULL;
+	char *plugin_filename = NULL;
+
+	int need_free = 0;
+	char *plugin_name = plugin;
+	char *plugin_symbol_name_start = plugin;
+
+
+	struct uwsgi_plugin *up;
+	char linkpath_buf[1024], linkpath[1024];
+	int linkpath_size;
+
+	char *colon = strchr(plugin_name, ':');
+	if (colon) {
+		colon[0] = 0;
+		modifier = atoi(plugin_name);
+		plugin_name = colon+1;
+		colon[0] = ':';
+	}
+
+	if (!uwsgi_endswith(plugin_name, "_plugin.so")) {
+		plugin_name = uwsgi_concat2(plugin_name, "_plugin.so");
+		need_free = 1;
+	}
+
+	plugin_symbol_name_start = plugin_name;
+
+	// step 1: check for absolute plugin (stop if it fails)
+	if (strchr(plugin_name, '/')) {
+		plugin_handle = dlopen(plugin_name, RTLD_NOW | RTLD_GLOBAL);
+		if (!plugin_handle) {
+			if (!has_option)
+				uwsgi_log( "%s\n", dlerror());
+			goto end;
+		}
+		plugin_symbol_name_start = uwsgi_get_last_char(plugin_name, '/');
+		plugin_symbol_name_start++;
+		plugin_abs_path = plugin_name;
+		goto success;
+	}
+
+	// step dir, check for user-supplied plugins directory
+	struct uwsgi_string_list *pdir = uwsgi.plugins_dir;
+	while(pdir) {
+		plugin_filename = uwsgi_concat3(pdir->value, "/", plugin_name);
+		plugin_handle = dlopen(plugin_filename, RTLD_NOW | RTLD_GLOBAL);
+		if (plugin_handle) {
+			plugin_abs_path = plugin_filename;
+			//free(plugin_filename);
+			goto success;
+		}
+		free(plugin_filename);
+		plugin_filename = NULL;
+		pdir = pdir->next;
+	}
+
+	// last step: search in compile-time plugin_dir
+	if (!plugin_handle) {
+		plugin_filename = uwsgi_concat3(UWSGI_PLUGIN_DIR, "/", plugin_name);
+		plugin_handle = dlopen(plugin_filename, RTLD_NOW | RTLD_GLOBAL);
+		plugin_abs_path = plugin_filename;
+		//free(plugin_filename);
+	}
+
+success:
+        if (!plugin_handle) {
+		if (!has_option)
+                	uwsgi_log( "%s\n", dlerror());
+        }
+        else {
+		char *plugin_entry_symbol = uwsgi_concat2n(plugin_symbol_name_start, strlen(plugin_symbol_name_start)-3, "", 0);
+                up = dlsym(plugin_handle, plugin_entry_symbol);
+		if (!up) {
+			// is it a link ?
+			memset(linkpath_buf, 0, 1024);
+			memset(linkpath, 0, 1024);
+			if ((linkpath_size = readlink(plugin_abs_path, linkpath_buf, 1023)) > 0) {
+				do {
+					linkpath_buf[linkpath_size] = '\0';
+					strncpy(linkpath, linkpath_buf, linkpath_size+1);
+				} while ((linkpath_size = readlink(linkpath, linkpath_buf, 1023)) > 0);
+#ifdef UWSGI_DEBUG
+				uwsgi_log("%s\n", linkpath);
+#endif
+				free(plugin_entry_symbol);
+				up = dlsym(plugin_handle, plugin_entry_symbol);
+				char *slash = uwsgi_get_last_char(linkpath, '/');
+				if (!slash) {
+					slash = linkpath;
+				}
+				else {
+					slash++;
+				}
+				plugin_entry_symbol = uwsgi_concat2n(slash, strlen(slash)-3, "",0);
+				up = dlsym(plugin_handle, plugin_entry_symbol);
+			}
+		}
+                if (up) {
+			if (!up->name) {
+				uwsgi_log("the loaded plugin (%s) has no .name attribute\n", plugin_name);
+				if (dlclose(plugin_handle)) {
+                                	uwsgi_error("dlclose()");
+                                }
+				if (need_free)
+					free(plugin_name);
+				if (plugin_filename)
+					free(plugin_filename);
+				free(plugin_entry_symbol);
+				return NULL;
+			}
+			if (plugin_already_loaded(up->name)) {
+				if (dlclose(plugin_handle)) {
+                                	uwsgi_error("dlclose()");
+                                }
+				if (need_free)
+					free(plugin_name);
+				if (plugin_filename)
+					free(plugin_filename);
+				free(plugin_entry_symbol);
+				return NULL;
+			}
+			if (has_option) {
+				struct uwsgi_option *op = up->options;
+				int found = 0;
+				while (op && op->name) {
+					if (!strcmp(has_option, op->name)) {
+						found = 1;
+						break;
+					}	
+                			op++;
+				}
+				if (!found) {
+					if (dlclose(plugin_handle)) {
+						uwsgi_error("dlclose()");
+					}
+					if (need_free)
+						free(plugin_name);
+					if (plugin_filename)
+						free(plugin_filename);
+					free(plugin_entry_symbol);
+					return NULL;
+				}
+				
+			}
+			if (modifier != -1) {
+				fill_plugin_table(modifier, up);			
+				up->modifier1 = modifier;
+			}
+			else {
+				fill_plugin_table(up->modifier1, up);			
+			}
+			if (need_free)
+				free(plugin_name);
+			if (plugin_filename)
+				free(plugin_filename);
+			free(plugin_entry_symbol);
+
+			if (up->on_load)
+				up->on_load();
+			return plugin_handle;
+                }
+		if (!has_option)
+                	uwsgi_log( "%s\n", dlerror());
+        }
+
+end:
+	if (need_free)
+		free(plugin_name);
+	if (plugin_filename)
+		free(plugin_filename);
+
+	return NULL;
+}
+
+int uwsgi_try_autoload(char *option) {
+	DIR *d;
+	struct dirent *dp;
+	// step dir, check for user-supplied plugins directory
+        struct uwsgi_string_list *pdir = uwsgi.plugins_dir;
+        while(pdir) {
+		d = opendir(pdir->value);
+		if (d) {
+			while ((dp = readdir(d)) != NULL) {
+				if (uwsgi_endswith(dp->d_name, "_plugin.so")) {
+					char *filename = uwsgi_concat3(pdir->value, "/", dp->d_name);
+					if (uwsgi_load_plugin(-1, filename, option)) {	
+						uwsgi_log("option \"%s\" found in plugin %s\n", option, filename);
+						free(filename);
+						closedir(d);
+						// add new options
+						build_options();
+						return 1;
+					}
+					free(filename);
+				}
+			}
+			closedir(d);
+		}
+                pdir = pdir->next;
+        }
+
+        // last step: search in compile-time plugin_dir
+	d = opendir(UWSGI_PLUGIN_DIR);
+	if (!d) return 0;
+
+	while((dp = readdir(d)) != NULL) {
+		if (uwsgi_endswith(dp->d_name, "_plugin.so")) {
+				char *filename = uwsgi_concat3(UWSGI_PLUGIN_DIR, "/", dp->d_name);
+				if (uwsgi_load_plugin(-1, filename, option)) {
+					uwsgi_log("option \"%s\" found in plugin %s\n", option, filename);
+					free(filename);
+					closedir(d);
+					// add new options
+					build_options();
+					return 1;
+				}
+				free(filename);
+		}
+        }
+
+	closedir(d);
+
+	return 0;
+
+}

core/queue.c

@@ -6,17 +6,15 @@ void uwsgi_init_queue() {
 	if (!uwsgi.queue_blocksize)
                         uwsgi.queue_blocksize = 8192;
 
-                if (uwsgi.queue_blocksize % uwsgi.page_size != 0) {
-                        uwsgi_log("invalid queue blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) uwsgi.queue_blocksize, uwsgi.page_size);
+                if ((uwsgi.queue_blocksize * uwsgi.queue_size) % uwsgi.page_size != 0) {
+                        uwsgi_log("invalid queue size/blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) uwsgi.queue_blocksize, uwsgi.page_size);
                         exit(1);
                 }
 
 
-                uwsgi.shared->queue_pos = 0;
-                uwsgi.shared->queue_pull_pos = 0;
 
                 if (uwsgi.queue_store) {
-                        uwsgi.queue_filesize = uwsgi.queue_blocksize * uwsgi.queue_size;
+                        uwsgi.queue_filesize = uwsgi.queue_blocksize * uwsgi.queue_size + 16;
                         int queue_fd;
                         struct stat qst;
 
@@ -45,18 +43,27 @@ void uwsgi_init_queue() {
                                 exit(1);
                         }
                         uwsgi.queue = mmap(NULL, uwsgi.queue_filesize, PROT_READ | PROT_WRITE, MAP_SHARED, queue_fd, 0);
-                        uwsgi_queue_fix();
+
+			// fix header
+			uwsgi.queue_header = uwsgi.queue;
+			uwsgi.queue+=16;
                 }
                 else {
-                        uwsgi.queue = mmap(NULL, uwsgi.queue_blocksize * uwsgi.queue_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+                        uwsgi.queue = mmap(NULL, (uwsgi.queue_blocksize * uwsgi.queue_size)+16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+			// fix header
+			uwsgi.queue_header = uwsgi.queue;
+			uwsgi.queue+=16;
+                	uwsgi.queue_header->pos = 0;
+                	uwsgi.queue_header->pull_pos = 0;
                 }
                 if (!uwsgi.queue) {
                         uwsgi_error("mmap()");
                         exit(1);
                 }
 
-                uwsgi.queue_lock = uwsgi_mmap_shared_rwlock();
-                uwsgi_rwlock_init(uwsgi.queue_lock);
+
+
+                uwsgi.queue_lock = uwsgi_rwlock_init("queue");
 
                 uwsgi_log("*** Queue subsystem initialized: %dMB preallocated ***\n", (uwsgi.queue_blocksize * uwsgi.queue_size) / (1024 * 1024));
 }
@@ -78,33 +85,20 @@ char *uwsgi_queue_get(uint64_t index, uint64_t *size) {
 	
 }
 
-void uwsgi_queue_fix() {
-
-        uint64_t i;
-	char *value;
-	uint64_t size;
-
-        for(i=0;i< uwsgi.queue_size;i++) {
-                // valid record ?
-		value = uwsgi_queue_get(i, &size);
-		if (value && size) {
-			uwsgi.shared->queue_pos++;
-		}
-		else {
-			return;
-		}
-        }
-}
-
 
 char *uwsgi_queue_pop(uint64_t *size) {
 
         struct uwsgi_queue_item *uqi;
         char *ptr = (char *) uwsgi.queue;
 
-	if (uwsgi.shared->queue_pos > 0) uwsgi.shared->queue_pos--;
+	if (uwsgi.queue_header->pos == 0) {
+		uwsgi.queue_header->pos = uwsgi.queue_size-1;
+	}
+	else {
+		uwsgi.queue_header->pos--;
+	}
 
-        ptr = ptr + (uwsgi.queue_blocksize*uwsgi.shared->queue_pos);
+        ptr = ptr + (uwsgi.queue_blocksize*uwsgi.queue_header->pos);
         uqi = (struct uwsgi_queue_item *) ptr;
 
         if (!uqi->size) return NULL;
@@ -122,16 +116,16 @@ char *uwsgi_queue_pull(uint64_t *size) {
 	struct uwsgi_queue_item *uqi;
 	char *ptr = (char *) uwsgi.queue;	
 
-	ptr = ptr + (uwsgi.queue_blocksize*uwsgi.shared->queue_pull_pos);
+	ptr = ptr + (uwsgi.queue_blocksize*uwsgi.queue_header->pull_pos);
 	uqi = (struct uwsgi_queue_item *) ptr;
 
 	if (!uqi->size) return NULL;
 
 	*size = uqi->size;
 
-	uwsgi.shared->queue_pull_pos++;
+	uwsgi.queue_header->pull_pos++;
 
-	if (uwsgi.shared->queue_pull_pos >= uwsgi.queue_size) uwsgi.shared->queue_pull_pos = 0;
+	if (uwsgi.queue_header->pull_pos >= uwsgi.queue_size) uwsgi.queue_header->pull_pos = 0;
 
 	// remove item
 	uqi->size = 0;
@@ -150,18 +144,43 @@ int uwsgi_queue_push(char *message, uint64_t size) {
 
 	if (!size) return 0;
 
-	ptr = ptr + (uwsgi.queue_blocksize*uwsgi.shared->queue_pos);
+	ptr = ptr + (uwsgi.queue_blocksize*uwsgi.queue_header->pos);
 	uqi = (struct uwsgi_queue_item *) ptr;
 
 	ptr += sizeof(struct uwsgi_queue_item);
 
 	uqi->size = size;
-	uqi->ts = time(NULL);
+	uqi->ts = uwsgi_now();
 	memcpy(ptr, message, size);
 
-	uwsgi.shared->queue_pos++;
+	uwsgi.queue_header->pos++;
 	
-	if (uwsgi.shared->queue_pos >= uwsgi.queue_size) uwsgi.shared->queue_pos = 0;
+	if (uwsgi.queue_header->pos >= uwsgi.queue_size) uwsgi.queue_header->pos = 0;
 
 	return 1;
 }
+
+int uwsgi_queue_set(uint64_t pos, char *message, uint64_t size) {
+
+        struct uwsgi_queue_item *uqi;
+        char *ptr = (char *) uwsgi.queue;
+
+        if (size > uwsgi.queue_blocksize + sizeof(struct uwsgi_queue_item))
+                return 0;
+
+        if (!size) return 0;
+
+	if (pos >= uwsgi.queue_size) return 0;
+
+        ptr = ptr + (uwsgi.queue_blocksize*pos);
+        uqi = (struct uwsgi_queue_item *) ptr;
+
+        ptr += sizeof(struct uwsgi_queue_item);
+
+        uqi->size = size;
+        uqi->ts = uwsgi_now();
+        memcpy(ptr, message, size);
+
+        return 1;
+}
+

core/regexp.c

@@ -0,0 +1,87 @@
+#ifdef UWSGI_PCRE
+#include "uwsgi.h"
+
+int uwsgi_regexp_build(char *re, pcre **pattern, pcre_extra **pattern_extra) {
+
+	const char *errstr;
+	int erroff;
+
+	*pattern = pcre_compile( (const char *)re, 0, &errstr, &erroff, NULL);
+        if (!*pattern) {
+		uwsgi_log("pcre error: %s at offset %d\n", errstr, erroff);
+		return -1;
+	}
+
+	*pattern_extra = (pcre_extra *) pcre_study((const pcre*)*pattern, 0, &errstr);
+        if (*pattern_extra == NULL && errstr != NULL) {
+		pcre_free(*pattern);
+		uwsgi_log("pcre (study) error: %s\n", errstr);
+		return -1;
+	}
+
+	return 0;
+	
+}
+
+int uwsgi_regexp_match(pcre *pattern, pcre_extra *pattern_extra, char *subject, int length) {
+
+	return pcre_exec((const pcre*)pattern, (const pcre_extra *)pattern_extra, subject, length, 0, 0, NULL, 0 );
+}
+
+int uwsgi_regexp_match_ovec(pcre *pattern, pcre_extra *pattern_extra, char *subject, int length, int *ovec, int n ) {
+
+	if (n > 0) {
+		return pcre_exec((const pcre*)pattern, (const pcre_extra *)pattern_extra, subject, length, 0, 0, ovec, (n+1)*3 );
+	}
+	return pcre_exec((const pcre*)pattern, (const pcre_extra *)pattern_extra, subject, length, 0, 0, NULL, 0 );
+}
+
+int uwsgi_regexp_ovector(pcre *pattern, pcre_extra *pattern_extra) {
+
+	int n;
+
+	if (pcre_fullinfo((const pcre*)pattern, (const pcre_extra *)pattern_extra, PCRE_INFO_CAPTURECOUNT, &n))
+		return 0;
+
+	return n;
+}
+
+char *uwsgi_regexp_apply_ovec(char *src, int src_n, char *dst, int dst_n, int *ovector, int n) {
+
+	int i;
+	int dollar = 0;
+
+	char *res = uwsgi_malloc( dst_n + (src_n * n) + 1);
+	char *ptr = res;
+
+	for(i=0;i<dst_n;i++) {
+		if (dollar) {
+			if (isdigit((int)dst[i])) {
+				int pos = (dst[i] - 48);
+				if (pos <= n) {
+					pos = pos * 2;
+					memcpy(ptr, src + ovector[pos], ovector[pos+1]-ovector[pos]);
+					ptr+=ovector[pos+1]-ovector[pos];
+				}
+			}
+			else {
+				*ptr++= dst[i];
+			}
+			dollar = 0;
+		}	
+		else {
+			if (dst[i] == '$') {
+				dollar = 1;
+			}
+			else {
+				*ptr++= dst[i];
+			}
+		}
+	}
+
+	*ptr++= 0;
+
+	return res;
+}
+
+#endif

core/routing.c

@@ -0,0 +1,168 @@
+#ifdef UWSGI_ROUTING
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+int uwsgi_apply_routes(struct wsgi_request *wsgi_req) {
+
+	struct uwsgi_route *routes = uwsgi.routes;
+
+	if (!routes) return UWSGI_ROUTE_CONTINUE;
+
+	if (uwsgi_parse_vars(wsgi_req)) {
+                return UWSGI_ROUTE_BREAK;
+        }
+
+	while(routes) {
+		char **subject = (char **) (((char *)(wsgi_req))+routes->subject);
+		uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+routes->subject_len);
+#ifdef UWSGI_DEBUG
+		uwsgi_log("route subject = %.*s\n", *subject_len, *subject);
+#endif
+		int n = uwsgi_regexp_match_ovec(routes->pattern, routes->pattern_extra, *subject, *subject_len, routes->ovector, routes->ovn);
+		if (n>= 0) {
+			int ret = routes->func(wsgi_req, routes);
+			if (ret != UWSGI_ROUTE_NEXT) {
+				return ret;
+			}
+		}
+		routes = routes->next;
+	}
+
+	return UWSGI_ROUTE_CONTINUE;
+}
+
+int uwsgi_apply_routes_fast(struct wsgi_request *wsgi_req, char *uri, int len) {
+
+        struct uwsgi_route *routes = uwsgi.routes;
+
+        if (!routes) return UWSGI_ROUTE_CONTINUE;
+
+        while(routes) {
+                int n = uwsgi_regexp_match_ovec(routes->pattern, routes->pattern_extra, uri, len, routes->ovector, routes->ovn);
+                if (n>= 0) {
+			int ret = routes->func(wsgi_req, routes);
+			if (ret != UWSGI_ROUTE_NEXT) {
+				return ret;
+			}
+                }
+
+                routes = routes->next;
+        }
+
+        return UWSGI_ROUTE_CONTINUE;
+}
+
+
+void uwsgi_opt_add_route(char *opt, char *value, void *foobar) {
+
+	char *route = uwsgi_str(value);
+
+	char *space = strchr(route, ' ');
+	if (!space) {
+		uwsgi_log("invalid route syntax\n");
+		exit(1);
+	}
+
+	*space = 0;
+
+	struct uwsgi_route *ur = uwsgi.routes;
+	if (!ur) {
+		uwsgi.routes = uwsgi_calloc(sizeof(struct uwsgi_route));
+		ur = uwsgi.routes;
+	}
+	else {
+		while(ur) {
+			if (!ur->next) {
+				ur->next = uwsgi_calloc(sizeof(struct uwsgi_route));	
+				ur = ur->next;
+				break;
+			}
+			ur = ur->next;
+		}
+	}
+
+	if (!strcmp(foobar, "http_host")) {
+		ur->subject = offsetof(struct wsgi_request, host);
+		ur->subject_len = offsetof(struct wsgi_request, host_len);
+	}
+	else if (!strcmp(foobar, "request_uri")) {
+		ur->subject = offsetof(struct wsgi_request, uri);
+		ur->subject_len = offsetof(struct wsgi_request, uri_len);
+	}
+	else if (!strcmp(foobar, "query_string")) {
+		ur->subject = offsetof(struct wsgi_request, query_string);
+		ur->subject_len = offsetof(struct wsgi_request, query_string_len);
+	}
+	else {
+		ur->subject = offsetof(struct wsgi_request, path_info);
+		ur->subject_len = offsetof(struct wsgi_request, path_info_len);
+	}
+
+	if (uwsgi_regexp_build(route, &ur->pattern, &ur->pattern_extra)) {
+		exit(1);
+	}
+
+	ur->ovn = uwsgi_regexp_ovector(ur->pattern, ur->pattern_extra);
+	if (ur->ovn > 0) {
+		ur->ovector = uwsgi_calloc(sizeof(int) * (3 * (ur->ovn + 1)) );
+	}
+
+	char *command = space+1;
+
+	char *colon = strchr(command, ':');
+	if (!colon) {
+		uwsgi_log("invalid route syntax\n");
+		exit(1);
+	}
+
+	*colon = 0;
+
+	struct uwsgi_router *r = uwsgi.routers;
+	while(r) {
+		if (!strcmp(r->name, command)) {
+			if (r->func(ur, colon+1) == 0) {
+				// apply is_last
+				struct uwsgi_route *last_ur = ur;
+				ur = uwsgi.routes;
+				while(ur) {
+					if (ur->func == last_ur->func) {
+						ur->is_last = 0;
+					}
+					ur = ur->next;	
+				}
+				last_ur->is_last = 1;
+				return;
+			}
+		}
+		r = r->next;
+	}
+
+	uwsgi_log("unable to register route \"%s\"\n", value);
+	exit(1);
+}
+
+struct uwsgi_router *uwsgi_register_router(char *name, int (*func)(struct uwsgi_route *, char *)) {
+
+	struct uwsgi_router *ur = uwsgi.routers;
+	if (!ur) {
+		uwsgi.routers = uwsgi_calloc(sizeof(struct uwsgi_router));
+		uwsgi.routers->name = name;
+		uwsgi.routers->func = func;
+		return uwsgi.routers;
+	}
+
+	while(ur) {
+		if (!ur->next) {
+			ur->next = uwsgi_calloc(sizeof(struct uwsgi_router));
+			ur->next->name = name;
+			ur->next->func = func;
+			return ur->next;
+		}
+		ur = ur->next;
+	}
+
+	return NULL;
+
+}
+#endif

core/rpc.c

@@ -0,0 +1,142 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+int uwsgi_register_rpc(char *name, uint8_t modifier1, uint8_t args, void *func) {
+
+	struct uwsgi_rpc *urpc;
+	int ret = -1;
+
+	if (uwsgi.mywid != 0) {
+		uwsgi_log("you can register RPC functions only in the master\n");
+		return -1;
+	}
+
+	uwsgi_lock(uwsgi.rpc_table_lock);
+
+	if (uwsgi.shared->rpc_count < MAX_RPC) {
+		urpc = &uwsgi.shared->rpc_table[uwsgi.shared->rpc_count];
+	
+		memcpy(urpc->name, name, strlen(name));
+		urpc->modifier1 = modifier1;
+		urpc->args = args;
+		urpc->func = func;
+
+		uwsgi.shared->rpc_count++;
+
+		ret = 0;
+		uwsgi_log("registered RPC function %s\n", name);
+	}
+
+	uwsgi_unlock(uwsgi.rpc_table_lock);
+
+	return ret;
+}
+
+uint16_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], char *output) {
+
+	struct uwsgi_rpc *urpc = NULL;
+	int i;
+	uint16_t ret = 0;
+
+	for(i=0;i<uwsgi.shared->rpc_count;i++) {
+		if (uwsgi.shared->rpc_table[i].name[0] != 0) {
+			if (!strcmp(uwsgi.shared->rpc_table[i].name, name)) {
+				urpc = &uwsgi.shared->rpc_table[i];
+				break;
+			}
+		}
+	}
+
+	if (urpc) {
+		if (uwsgi.p[urpc->modifier1]->rpc) {
+			ret = uwsgi.p[urpc->modifier1]->rpc(urpc->func, argc, argv, argvs, output);
+		}
+	}
+
+	return ret;
+}
+
+
+char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t argvs[], uint16_t *len) {
+
+	uint8_t i;
+	uint16_t ulen;
+	struct uwsgi_header uh;
+	char *buffer = NULL;
+	
+	*len = 0;
+
+        if (node == NULL || !strcmp(node, "")) {
+		// allocate the whole buffer
+		buffer = uwsgi_malloc(65536);
+        	*len = uwsgi_rpc(func, argc, argv, argvs, buffer);
+		return buffer;
+        }
+
+
+	// connect to node
+        int fd = uwsgi_connect(node, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
+
+        if (fd < 0) return NULL;
+
+        // prepare a uwsgi array
+	uint16_t buffer_size = 2 + strlen(func);
+
+        for (i = 0; i < argc; i++) {
+        	buffer_size += 2 + argvs[i];
+        }
+
+	// allocate the whole buffer
+	buffer = uwsgi_malloc(65536);
+
+        uh.modifier1 = 173;
+        uh.pktsize = buffer_size;
+        uh.modifier2 = 0;
+
+	// add func to the array
+        char *bufptr = buffer;
+        ulen = strlen(func);
+        *bufptr++ = (uint8_t) (ulen & 0xff);
+        *bufptr++ = (uint8_t) ((ulen >> 8) & 0xff);
+        memcpy(bufptr, func, ulen);
+        bufptr += ulen;
+
+        for (i = 0; i < argc; i++) {
+        	ulen = argvs[i];
+        	*bufptr++ = (uint8_t) (ulen & 0xff);
+        	*bufptr++ = (uint8_t) ((ulen >> 8) & 0xff);
+        	memcpy(bufptr, argv[i], ulen);
+        	bufptr += ulen;
+        }
+
+        if (write(fd, &uh, 4) != 4) {
+        	uwsgi_error("write()");
+                close(fd);
+		free(buffer);
+                return NULL;
+        }
+
+        if (write(fd, buffer, buffer_size) != buffer_size) {
+        	uwsgi_error("write()");
+                close(fd);
+		free(buffer);
+                return NULL;
+        }
+
+	if (uwsgi_read_response(fd, &uh, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &buffer) < 0) {
+		close(fd);
+		free(buffer);
+		return NULL;
+	}
+
+	close(fd);
+	
+	*len = uh.pktsize;
+	if (*len == 0) {
+		free(buffer);
+		return NULL;
+	}
+	return buffer;
+
+}

core/sendfile.c

@@ -56,9 +56,11 @@ ssize_t uwsgi_do_sendfile(int sockfd, int filefd, size_t filesize, size_t chunk,
 		sf_ret = sendfile(filefd, sockfd, 0, 0, NULL, &sf_len, 0);
 	}
 
-	if (sf_ret) {
-		uwsgi_error("sendfile()");
-		return 0;
+	if (sf_ret < 0) {
+		if (errno != EAGAIN) {
+			uwsgi_error("sendfile()");
+			return 0;
+		}
 	}
 
 	return sf_len;
@@ -87,23 +89,34 @@ ssize_t uwsgi_do_sendfile(int sockfd, int filefd, size_t filesize, size_t chunk,
 
 #elif defined(__linux__) || defined(__sun__)
 	int sf_ret;
+	size_t written = 0;
 
 	if (async > 1) {
 		sf_ret = sendfile(sockfd, filefd, pos, chunk);
-	}
-	else {
-		sf_ret = sendfile(sockfd, filefd, pos, filesize);
+		if (sf_ret < 0) {
+			uwsgi_error("sendfile()");
+			return 0;
+		}
+		return sf_ret;
 	}
 
-	if (sf_ret < 0) {
-		uwsgi_error("sendfile()");
-		return 0;
+	while(written < filesize) {
+		sf_ret = sendfile(sockfd, filefd, pos, filesize-written);
+		if (sf_ret < 0) {
+			uwsgi_error("sendfile()");
+			return 0;
+		}
+		else if (sf_ret == 0) {
+			return 0;
+		}
+		written+= sf_ret;
 	}
+	return written;
 
-	return sf_ret;
 #else
 	static size_t nosf_buf_size = 0;
 	static char *nosf_buf;
+	char *nosf_buf2;
 
 	ssize_t jlen = 0;
 	ssize_t rlen = 0;
@@ -113,7 +126,16 @@ ssize_t uwsgi_do_sendfile(int sockfd, int filefd, size_t filesize, size_t chunk,
 		nosf_buf = malloc(chunk);
 	}
 	else if (chunk != nosf_buf_size) {
-		nosf_buf = realloc(nosf_buf, chunk);
+		nosf_buf2 = realloc(nosf_buf, chunk);
+		if (!nosf_buf2) {
+			free(nosf_buf);
+		}
+		nosf_buf = nosf_buf2;
+	}
+
+	if (!nosf_buf) {
+		uwsgi_error("sendfile malloc()/realloc()");
+		return 0;
 	}
 
 	nosf_buf_size = chunk;

core/setup_utils.c

@@ -0,0 +1,197 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+
+void uwsgi_setup_systemd() {
+	struct uwsgi_socket *uwsgi_sock = NULL;
+	int i;
+
+	char *listen_pid = getenv("LISTEN_PID");
+	if (listen_pid) {
+		if (atoi(listen_pid) == (int) getpid()) {
+			char *listen_fds = getenv("LISTEN_FDS");
+			if (listen_fds) {
+				int systemd_fds = atoi(listen_fds);
+				if (systemd_fds > 0) {
+					uwsgi_log("- SystemD socket activation detected -\n");
+					for (i = 3; i < 3 + systemd_fds; i++) {
+						uwsgi_sock = uwsgi_new_socket(NULL);
+						uwsgi_add_socket_from_fd(uwsgi_sock, i);
+					}
+					uwsgi.skip_zero = 1;
+				}
+				unsetenv("LISTEN_PID");
+				unsetenv("LISTEN_FDS");
+			}
+		}
+	}
+
+}
+
+void uwsgi_setup_upstart() {
+
+	struct uwsgi_socket *uwsgi_sock = NULL;
+
+	char *upstart_events = getenv("UPSTART_EVENTS");
+	if (upstart_events && !strcmp(upstart_events, "socket")) {
+		char *upstart_fds = getenv("UPSTART_FDS");
+		if (upstart_fds) {
+			uwsgi_log("- Upstart socket bridge detected (job: %s) -\n", getenv("UPSTART_JOB"));
+			uwsgi_sock = uwsgi_new_socket(NULL);
+			uwsgi_add_socket_from_fd(uwsgi_sock, atoi(upstart_fds));
+			uwsgi.skip_zero = 1;
+		}
+		unsetenv("UPSTART_EVENTS");
+		unsetenv("UPSTART_FDS");
+	}
+
+}
+
+
+void uwsgi_setup_zerg() {
+
+	struct uwsgi_socket *uwsgi_sock = NULL;
+	int i;
+
+	struct uwsgi_string_list *zn = uwsgi.zerg_node;
+	while (zn) {
+		if (uwsgi_zerg_attach(zn->value)) {
+			if (!uwsgi.zerg_fallback) {
+				exit(1);
+			}
+		}
+		zn = zn->next;
+	}
+
+
+
+	if (uwsgi.zerg) {
+#ifdef UWSGI_DEBUG
+		uwsgi_log("attaching zerg sockets...\n");
+#endif
+		int zerg_fd;
+		i = 0;
+		for (;;) {
+			zerg_fd = uwsgi.zerg[i];
+			if (zerg_fd == -1) {
+				break;
+			}
+			uwsgi_sock = uwsgi_new_socket(NULL);
+			uwsgi_add_socket_from_fd(uwsgi_sock, zerg_fd);
+			i++;
+		}
+
+		uwsgi_log("zerg sockets attached\n");
+	}
+}
+
+void uwsgi_setup_inherited_sockets() {
+
+	int j;
+	union uwsgi_sockaddr usa;
+	union uwsgi_sockaddr_ptr gsa;
+
+	struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+	while (uwsgi_sock) {
+		//a bit overengineering
+		if (uwsgi_sock->name[0] != 0 && !uwsgi_sock->bound) {
+			for (j = 3; j < (int) uwsgi.max_fd; j++) {
+				uwsgi_add_socket_from_fd(uwsgi_sock, j);
+			}
+		}
+		uwsgi_sock = uwsgi_sock->next;
+	}
+
+	//now close all the unbound fd
+	for (j = 3; j < (int) uwsgi.max_fd; j++) {
+		int useless = 1;
+#ifdef UWSGI_MULTICAST
+		if (j == uwsgi.cluster_fd)
+			continue;
+#endif
+		if (uwsgi.has_emperor) {
+			if (j == uwsgi.emperor_fd)
+				continue;
+		}
+
+		if (uwsgi.shared->worker_log_pipe[0] > -1) {
+			if (j == uwsgi.shared->worker_log_pipe[0])
+				continue;
+		}
+
+		if (uwsgi.shared->worker_log_pipe[1] > -1) {
+			if (j == uwsgi.shared->worker_log_pipe[1])
+				continue;
+		}
+
+		if (uwsgi.original_log_fd > -1) {
+			if (j == uwsgi.original_log_fd)
+				continue;
+		}
+
+		if (uwsgi.cache_server && uwsgi.cache_server_fd != -1) {
+			if (j == uwsgi.cache_server_fd)
+				continue;
+		}
+
+		struct uwsgi_gateway_socket *ugs = uwsgi.gateway_sockets;
+		int found = 0;
+		while (ugs) {
+			if (ugs->fd == j) {
+				found = 1;
+				break;
+			}
+			ugs = ugs->next;
+		}
+		if (found)
+			continue;
+
+
+		int y;
+		found = 0;
+		for (y = 0; y < ushared->gateways_cnt; y++) {
+			if (ushared->gateways[y].internal_subscription_pipe[0] == j) {
+				found = 1;
+				break;
+			}
+			if (ushared->gateways[y].internal_subscription_pipe[1] == j) {
+				found = 1;
+				break;
+			}
+		}
+
+		if (found)
+			continue;
+
+
+		socklen_t socket_type_len = sizeof(struct sockaddr_un);
+		gsa.sa = (struct sockaddr *) &usa;
+		if (!getsockname(j, gsa.sa, &socket_type_len)) {
+			uwsgi_sock = uwsgi.sockets;
+			while (uwsgi_sock) {
+				if (uwsgi_sock->fd == j && uwsgi_sock->bound) {
+					useless = 0;
+					break;
+				}
+				uwsgi_sock = uwsgi_sock->next;
+			}
+
+			if (useless) {
+				uwsgi_sock = uwsgi.shared_sockets;
+				while (uwsgi_sock) {
+					if (uwsgi_sock->fd == j && uwsgi_sock->bound) {
+						useless = 0;
+						break;
+					}
+					uwsgi_sock = uwsgi_sock->next;
+				}
+			}
+		}
+
+		if (useless) {
+			close(j);
+		}
+	}
+
+}

core/signal.c

@@ -0,0 +1,591 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+int uwsgi_signal_handler(uint8_t sig) {
+
+	struct uwsgi_signal_entry *use = NULL; 
+
+	use = &uwsgi.shared->signal_table[sig];
+
+	if (!uwsgi.p[use->modifier1]->signal_handler) {
+		return -1;
+	}	
+
+	// check for COW
+	if (uwsgi.master_process) {
+		if (use->wid != 0 && use->wid != uwsgi.mywid) {
+			uwsgi_log("[uwsgi-signal] you have registered this signal in worker %d memory area, only that process will be able to run it\n", use->wid);
+			return -1;
+		}
+	}
+	// in lazy mode (without a master), only the same worker will be able to run handlers
+	else if (uwsgi.lazy) {
+		if (use->wid != uwsgi.mywid) {
+			uwsgi_log("[uwsgi-signal] you have registered this signal in worker %d memory area, only that process will be able to run it\n", use->wid);
+			return -1;
+		}
+	}
+	else {
+		// when master is not active, worker1 is the COW-leader
+		if (use->wid != 1 && use->wid != uwsgi.mywid) {
+			uwsgi_log("[uwsgi-signal] you have registered this signal in worker %d memory area, only that process will be able to run it\n", use->wid);
+			return -1;
+		}
+	}
+
+        // set harakiri here (if required and if i am a worker)
+	
+	if (uwsgi.mywid > 0) {
+                uwsgi.workers[uwsgi.mywid].sig = 1;
+                uwsgi.workers[uwsgi.mywid].signum = sig;
+		uwsgi.workers[uwsgi.mywid].signals++;
+		if(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+                	set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
+		}
+        }
+	else if (uwsgi.muleid > 0) {
+                uwsgi.mules[uwsgi.muleid-1].sig = 1;
+                uwsgi.mules[uwsgi.muleid-1].signum = sig;
+		uwsgi.mules[uwsgi.muleid-1].signals++;
+		if(uwsgi.shared->options[UWSGI_OPTION_MULE_HARAKIRI] > 0) {
+                	set_mule_harakiri(uwsgi.shared->options[UWSGI_OPTION_MULE_HARAKIRI]);
+		}
+	}
+#ifdef UWSGI_SPOOLER
+        else if (uwsgi.i_am_a_spooler && (getpid() == uwsgi.i_am_a_spooler->pid)) {
+		if(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+                        set_spooler_harakiri(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI]);
+                }
+        }
+#endif
+
+	int ret = uwsgi.p[use->modifier1]->signal_handler(sig, use->handler);
+
+	if (uwsgi.mywid > 0) {
+                uwsgi.workers[uwsgi.mywid].sig = 0;
+		if(uwsgi.workers[uwsgi.mywid].harakiri > 0) {
+                	set_harakiri(0);
+		}
+        }
+	else if (uwsgi.muleid > 0) {
+                uwsgi.mules[uwsgi.muleid-1].sig = 0;
+		if(uwsgi.mules[uwsgi.muleid-1].harakiri > 0) {
+                	set_mule_harakiri(0);
+		}
+        }
+#ifdef UWSGI_SPOOLER
+	else if (uwsgi.i_am_a_spooler && (getpid() == uwsgi.i_am_a_spooler->pid)) {
+		if(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+                        set_spooler_harakiri(0);
+                }
+        }
+#endif
+
+	return ret;
+}
+
+int uwsgi_signal_registered(uint8_t sig) {
+
+	if (uwsgi.shared->signal_table[sig].handler != NULL)
+		return 1;
+
+	return 0;
+}
+
+int uwsgi_register_signal(uint8_t sig, char *receiver, void *handler, uint8_t modifier1) {
+
+	struct uwsgi_signal_entry *use = NULL;
+
+	if (strlen(receiver) > 63) return -1;
+
+	uwsgi_lock(uwsgi.signal_table_lock);
+
+	use = &uwsgi.shared->signal_table[sig];
+
+	if (use->handler) {
+		uwsgi_log("[uwsgi-signal] you cannot re-register a signal !!!\n");
+		uwsgi_unlock(uwsgi.signal_table_lock);
+		return -1;
+	}
+
+	strncpy(use->receiver, receiver, strlen(receiver)+1);
+	use->handler = handler;
+	use->modifier1 = modifier1;
+	use->wid = uwsgi.mywid;
+
+	if (use->receiver[0] == 0) {
+		uwsgi_log("[uwsgi-signal] signum %d registered (wid: %d modifier1: %d target: default, any worker)\n", sig, uwsgi.mywid, modifier1);
+	}
+	else {
+		uwsgi_log("[uwsgi-signal] signum %d registered (wid: %d modifier1: %d target: %s)\n", sig, uwsgi.mywid, modifier1, receiver);
+	}
+
+	uwsgi_unlock(uwsgi.signal_table_lock);
+
+	return 0;
+}
+
+
+int uwsgi_add_file_monitor(uint8_t sig, char *filename) {
+
+	if (strlen(filename) > (0xff-1)) {
+		uwsgi_log("uwsgi_add_file_monitor: invalid filename length\n");
+		return -1;
+	}
+
+	uwsgi_lock(uwsgi.fmon_table_lock);
+
+	if (ushared->files_monitored_cnt < 64) {
+
+		// fill the fmon table, the master will use it to add items to the event queue
+		memcpy(ushared->files_monitored[ushared->files_monitored_cnt].filename, filename, strlen(filename));
+                ushared->files_monitored[ushared->files_monitored_cnt].registered = 0;
+		ushared->files_monitored[ushared->files_monitored_cnt].sig = sig;
+	
+		ushared->files_monitored_cnt++;
+	}
+	else {
+		uwsgi_log("you can register max 64 file monitors !!!\n");
+		uwsgi_unlock(uwsgi.fmon_table_lock);
+		return -1;
+	}
+
+	uwsgi_unlock(uwsgi.fmon_table_lock);
+
+	return 0;
+
+}
+
+struct uwsgi_probe *uwsgi_probe_register(struct uwsgi_probe **up, char *name, int (*func)(int, struct uwsgi_signal_probe *)) {
+
+        struct uwsgi_probe *uwsgi_up = *up, *old_up;
+
+        if (!uwsgi_up) {
+                *up = uwsgi_malloc(sizeof(struct uwsgi_probe));
+                uwsgi_up = *up;
+        }
+        else {
+                while(uwsgi_up) {
+                        old_up = uwsgi_up;
+                        uwsgi_up = uwsgi_up->next;
+                }
+
+                uwsgi_up = uwsgi_malloc(sizeof(struct uwsgi_probe));
+                old_up->next = uwsgi_up;
+        }
+
+        uwsgi_up->name = name;
+        uwsgi_up->func = func;
+        uwsgi_up->next = NULL;
+
+	uwsgi_log("registered new probe \"%s\" at %p\n", name, uwsgi_up);
+
+        return uwsgi_up;
+}
+
+
+int uwsgi_add_probe(uint8_t sig, char *kind, char *args, int timeout, int freq) {
+
+	uwsgi_lock(uwsgi.probe_table_lock);
+
+        if (ushared->probes_cnt < MAX_PROBES) {
+
+		struct uwsgi_probe *up = uwsgi.probes;
+		while(up) {
+			if (!strcmp(up->name, kind)) {
+				break;
+			}
+			up = up->next;
+		}
+
+		if (!up) {
+			uwsgi_log("unable to find probe \"%s\" !!!\n", kind);
+                	uwsgi_unlock(uwsgi.probe_table_lock);
+                	return -1;
+		}
+
+                // fill the probe table
+                ushared->probes[ushared->probes_cnt].func = up->func;
+		strncpy(ushared->probes[ushared->probes_cnt].args, args, 1024-1);
+                ushared->probes[ushared->probes_cnt].registered = 0;
+                ushared->probes[ushared->probes_cnt].sig = sig;
+		ushared->probes[ushared->probes_cnt].fd = -1;
+		ushared->probes[ushared->probes_cnt].state = 0;
+		ushared->probes[ushared->probes_cnt].last_event = 0;
+		ushared->probes[ushared->probes_cnt].data = NULL;
+		ushared->probes[ushared->probes_cnt].cycles = 0;
+		ushared->probes[ushared->probes_cnt].bad = 0;
+
+		if (!timeout) {
+			timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
+		}
+		ushared->probes[ushared->probes_cnt].timeout = timeout;
+		if (!freq) {
+			freq = 1;
+		}
+		ushared->probes[ushared->probes_cnt].freq = freq;
+                ushared->probes_cnt++;
+        }
+        else {
+                uwsgi_log("you can register max %d probes !!!\n", MAX_PROBES);
+                uwsgi_unlock(uwsgi.probe_table_lock);
+                return -1;
+        }
+
+        uwsgi_unlock(uwsgi.probe_table_lock);
+
+	return 0;
+}
+
+int uwsgi_add_timer(uint8_t sig, int secs) {
+
+	uwsgi_lock(uwsgi.timer_table_lock);
+
+	if (ushared->timers_cnt < 64) {
+
+		// fill the timer table, the master will use it to add items to the event queue
+		ushared->timers[ushared->timers_cnt].value = secs;
+		ushared->timers[ushared->timers_cnt].registered = 0;
+		ushared->timers[ushared->timers_cnt].sig = sig;
+		ushared->timers_cnt++;
+	}
+	else {
+		uwsgi_log("you can register max 64 timers !!!\n");
+		uwsgi_unlock(uwsgi.timer_table_lock);
+		return -1;
+	}
+
+	uwsgi_unlock(uwsgi.timer_table_lock);
+
+	return 0;
+
+}
+
+void uwsgi_opt_add_cron(char *opt, char *value, void *foobar) {
+
+	int i;
+
+	struct uwsgi_cron *old_uc, *uc = uwsgi.crons;
+                if (!uc) {
+                        uc = uwsgi_malloc(sizeof(struct uwsgi_cron));
+                        uwsgi.crons = uc;
+                }
+                else {
+                        old_uc = uc;
+                        while(uc->next) {
+                                uc = uc->next;
+                                old_uc = uc;
+                        }
+
+                        old_uc->next = uwsgi_malloc(sizeof(struct uwsgi_cron));
+                        uc = old_uc->next;
+                }
+
+                memset(uc, 0, sizeof(struct uwsgi_cron));
+
+                if (sscanf(value, "%d %d %d %d %d %n", &uc->minute, &uc->hour, &uc->day, &uc->month, &uc->week, &i) != 5) {
+                        uwsgi_log("invalid cron syntax\n");
+                        exit(1);
+                }
+                uc->command = value+i;
+}
+
+int uwsgi_signal_add_cron(uint8_t sig, int minute, int hour, int day, int month, int week) {
+
+	if (!uwsgi.master_process) return -1;
+
+	uwsgi_lock(uwsgi.cron_table_lock);
+
+        if (ushared->cron_cnt < MAX_CRONS) {
+
+                ushared->cron[ushared->cron_cnt].sig = sig;
+                ushared->cron[ushared->cron_cnt].minute = minute;
+                ushared->cron[ushared->cron_cnt].hour = hour;
+                ushared->cron[ushared->cron_cnt].day = day;
+                ushared->cron[ushared->cron_cnt].month = month;
+                ushared->cron[ushared->cron_cnt].week = week;
+                ushared->cron_cnt++;
+        }
+        else {
+                uwsgi_log("you can register max %d cron !!!\n", MAX_CRONS);
+                uwsgi_unlock(uwsgi.cron_table_lock);
+                return -1;
+        }
+
+        uwsgi_unlock(uwsgi.cron_table_lock);
+
+        return 0;
+}
+
+int uwsgi_signal_add_rb_timer(uint8_t sig, int secs, int iterations) {
+
+	if (!uwsgi.master_process) return -1;
+
+        uwsgi_lock(uwsgi.rb_timer_table_lock);
+
+        if (ushared->rb_timers_cnt < 64) {
+
+                // fill the timer table, the master will use it to add items to the event queue
+                ushared->rb_timers[ushared->rb_timers_cnt].value = secs;
+                ushared->rb_timers[ushared->rb_timers_cnt].registered = 0;
+                ushared->rb_timers[ushared->rb_timers_cnt].iterations = iterations;
+                ushared->rb_timers[ushared->rb_timers_cnt].iterations_done = 0;
+                ushared->rb_timers[ushared->rb_timers_cnt].sig = sig;
+                ushared->rb_timers_cnt++;
+        }
+        else {
+                uwsgi_log("you can register max 64 rb_timers !!!\n");
+                uwsgi_unlock(uwsgi.rb_timer_table_lock);
+                return -1;
+        }
+
+        uwsgi_unlock(uwsgi.rb_timer_table_lock);
+
+        return 0;
+
+}
+
+void create_signal_pipe(int *sigpipe) {
+
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sigpipe)) {
+        	uwsgi_error("socketpair()\n");
+        	exit(1);
+        }
+        uwsgi_socket_nb(sigpipe[0]);
+        uwsgi_socket_nb(sigpipe[1]);
+
+	if (uwsgi.signal_bufsize) {
+		if (setsockopt(sigpipe[0],  SOL_SOCKET, SO_SNDBUF, &uwsgi.signal_bufsize, sizeof(int))) {
+                        	uwsgi_error("setsockopt()");
+		}
+		if (setsockopt(sigpipe[0],  SOL_SOCKET, SO_RCVBUF, &uwsgi.signal_bufsize, sizeof(int))) {
+                        	uwsgi_error("setsockopt()");
+		}
+
+		if (setsockopt(sigpipe[1],  SOL_SOCKET, SO_SNDBUF, &uwsgi.signal_bufsize, sizeof(int))) {
+                        	uwsgi_error("setsockopt()");
+		}
+		if (setsockopt(sigpipe[1],  SOL_SOCKET, SO_RCVBUF, &uwsgi.signal_bufsize, sizeof(int))) {
+                        	uwsgi_error("setsockopt()");
+		}
+	}
+}
+
+int uwsgi_remote_signal_send(char *addr, uint8_t sig) {
+
+	struct uwsgi_header uh;
+
+	uh.modifier1 = 110;
+	uh.pktsize = 0;
+	uh.modifier2 = sig;
+	
+	int fd = uwsgi_connect(addr, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
+        if (fd < 0) return -1;
+
+	if (write(fd, (char *) &uh, 4) != 4) {
+		uwsgi_error("uwsgi_remote_signal_send()");
+		close(fd);
+		return -1;
+	}
+
+	int ret = uwsgi_read_response(fd, &uh, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], NULL);
+
+	close(fd);
+	return ret;
+
+}
+
+int uwsgi_signal_send(int fd, uint8_t sig) {
+
+	socklen_t so_bufsize_len = sizeof(int);
+	int so_bufsize = 0;
+
+	if (write(fd, &sig, 1) != 1) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                	if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &so_bufsize, &so_bufsize_len)) {
+                        	uwsgi_error("getsockopt()");
+                	}
+                	uwsgi_log("*** SIGNAL QUEUE IS FULL: buffer size %d bytes (you can tune it with --signal-bufsize) ***\n", so_bufsize);
+		}
+		else {
+			uwsgi_error("uwsgi_signal_send()");
+		}
+		return -1;
+        }
+	return 0;
+
+}
+
+void uwsgi_route_signal(uint8_t sig) {
+
+	struct uwsgi_signal_entry *use = &ushared->signal_table[sig];
+	int i;
+
+	// send to first available worker
+	if (use->receiver[0] == 0 || !strcmp(use->receiver, "worker") || !strcmp(use->receiver, "worker0")) {
+		if (uwsgi_signal_send(ushared->worker_signal_pipe[0], sig)) {
+			uwsgi_log("could not deliver signal %d to workers pool\n", sig);
+		}
+	}
+	// send to all workers
+	else if (!strcmp(use->receiver, "workers")) {
+		for(i=1;i<=uwsgi.numproc;i++) {
+			if (uwsgi_signal_send(uwsgi.workers[i].signal_pipe[0], sig)) {
+				uwsgi_log("could not deliver signal %d to worker %d\n", sig, i);
+			}
+		}
+	}
+	// route to specific worker
+	else if (!strncmp(use->receiver, "worker", 6)) {
+		i = atoi(use->receiver+6);
+		if (i > uwsgi.numproc) {
+			uwsgi_log("invalid signal target: %s\n", use->receiver);
+		}
+		if (uwsgi_signal_send(uwsgi.workers[i].signal_pipe[0], sig)) {
+                	uwsgi_log("could not deliver signal %d to worker %d\n", sig, i);
+                }
+	}
+	// route to subscribed
+	else if (!strcmp(use->receiver, "subscribed")) {
+	}
+	// route to spooler
+#ifdef UWSGI_SPOOLER
+	else if (!strcmp(use->receiver, "spooler")) {
+		if (ushared->worker_signal_pipe[0] != -1) {
+			if (uwsgi_signal_send(ushared->spooler_signal_pipe[0], sig)) {
+                        	uwsgi_log("could not deliver signal %d to the spooler\n", sig);
+                	}
+		}
+	}
+#endif
+	else if (!strcmp(use->receiver, "mules")) {
+		for(i=0;i<uwsgi.mules_cnt;i++) {
+			if (uwsgi_signal_send(uwsgi.mules[i].signal_pipe[0], sig)) {
+                                uwsgi_log("could not deliver signal %d to mule %d\n", sig, i+1);
+                        }
+		}
+	}
+	else if (!strncmp(use->receiver, "mule", 4)) {
+		i = atoi(use->receiver+4);
+		if (i > uwsgi.mules_cnt) {
+			uwsgi_log("invalid signal target: %s\n", use->receiver);
+		}
+		else if (i == 0) {
+			if (uwsgi_signal_send(ushared->mule_signal_pipe[0], sig)) {
+                                uwsgi_log("could not deliver signal %d to a mule\n", sig);
+                        }
+		}
+		else {
+			if (uwsgi_signal_send(uwsgi.mules[i-1].signal_pipe[0], sig)) {
+                                uwsgi_log("could not deliver signal %d to mule %d\n", sig, i);
+                        }
+		}
+	}
+	else if (!strncmp(use->receiver, "farm_", 5)) {
+		char *name = use->receiver+5;
+		struct uwsgi_farm *uf = get_farm_by_name(name);
+		if (!uf) {
+			uwsgi_log("unknown farm: %s\n", name);
+			return;
+		}
+		if (uwsgi_signal_send(uf->signal_pipe[0], sig)) {
+                        uwsgi_log("could not deliver signal %d to farm %d (%s)\n", sig, uf->id, uf->name);
+                }
+	}
+	else if (!strncmp(use->receiver, "farm", 4)) {
+		i = atoi(use->receiver+4);
+		if (i > uwsgi.farms_cnt || i <= 0) {
+			uwsgi_log("invalid signal target: %s\n", use->receiver);
+		}
+		else {
+			if (uwsgi_signal_send(uwsgi.farms[i-1].signal_pipe[0], sig)) {
+                                uwsgi_log("could not deliver signal %d to farm %d (%s)\n", sig, i, uwsgi.farms[i-1].name);
+                        }
+		}
+	}
+
+	else {
+		// unregistered signal, sending it to all the workers
+		uwsgi_log("^^^ UNSUPPORTED SIGNAL TARGET: %s ^^^\n", use->receiver);
+	}
+
+}
+
+uint8_t uwsgi_signal_wait(int signum) {
+
+        int wait_for_specific_signal = 0;
+        uint8_t uwsgi_signal = 0;
+        uint8_t received_signal;
+        int ret;
+        struct pollfd pfd[2];
+
+	if (signum > -1) {
+                wait_for_specific_signal = 1;
+        }
+
+        pfd[0].fd = uwsgi.signal_socket;
+        pfd[0].events = POLLIN;
+        pfd[1].fd = uwsgi.my_signal_socket;
+        pfd[1].events = POLLIN;
+cycle:
+        ret = poll(pfd, 2, -1);
+        if (ret > 0) {
+        	if (pfd[0].revents == POLLIN) {
+                          if (read(uwsgi.signal_socket, &received_signal, 1) != 1) {
+                          	uwsgi_error("read()");
+                          }
+                          else {
+                          	(void)uwsgi_signal_handler(received_signal);
+                                if (wait_for_specific_signal) {
+                                	if (received_signal != uwsgi_signal) goto cycle;
+                                }
+                           }
+		}
+                if (pfd[1].revents == POLLIN) {
+                               if (read(uwsgi.my_signal_socket, &received_signal, 1) != 1) {
+                                       uwsgi_error("read()");
+                               }
+                               else {
+                                       (void)uwsgi_signal_handler(received_signal);
+                                       if (wait_for_specific_signal) {
+                                               if (received_signal != uwsgi_signal) goto cycle;
+                                       }
+                               }
+                        }
+
+                }
+
+        return received_signal;
+}
+
+void uwsgi_receive_signal(int fd, char *name, int id) {
+
+	uint8_t uwsgi_signal;
+
+	ssize_t ret = read(fd, &uwsgi_signal, 1);
+
+        if (ret == 0) {
+		goto destroy;
+        }
+        else if (ret < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
+                uwsgi_error("[uwsgi-signal] read()");
+		goto destroy;
+        }
+        else if (ret > 0) {
+#ifdef UWSGI_DEBUG
+                uwsgi_log_verbose("master sent signal %d to %s %d\n", uwsgi_signal, name, id);
+#endif
+                if (uwsgi_signal_handler(uwsgi_signal)) {
+                        uwsgi_log_verbose("error managing signal %d on %s %d\n", uwsgi_signal, name, id);
+                }
+        }
+
+	return;
+
+destroy:
+	// better to kill the whole worker...
+        uwsgi_log_verbose("uWSGI %s %d screams: UAAAAAAH my master disconnected: i will kill myself !!!\n", name, id);
+	end_me(0);
+
+}

core/skel.c

@@ -0,0 +1,10 @@
+/* this is a skeleton to use libuwsgi in external projects */
+
+extern char **environ;
+
+int uwsgi_init(int, char **, char **);
+
+int main(int argc, char **argv, char **environ) {
+
+	uwsgi_init(argc, argv, environ);
+}

core/snmp.c

@@ -351,122 +351,60 @@ static int get_snmp_integer(uint8_t * ptr, uint64_t * val) {
 
 		}
 
-		/*
-		   PyObject *py_snmp_counter32(PyObject * self, PyObject * args) {
-
-		   uint8_t oid_num;
-		   uint32_t oid_val = 0;
-
-		   if (!PyArg_ParseTuple(args, "bI:snmp_set_counter32", &oid_num, &oid_val)) {
-		   return NULL;
-		   }
-
-		   if (oid_num > 100 || oid_num < 1)
-		   goto clear;
-
-		   uwsgi.shared->snmp_value[oid_num - 1].type = SNMP_COUNTER32;
-		   uwsgi.shared->snmp_value[oid_num - 1].val = oid_val;
-
-		   Py_INCREF(Py_True);
-		   return Py_True;
-
-clear:
-
-Py_INCREF(Py_None);
-return Py_None;
-}
-
-PyObject *py_snmp_counter64(PyObject * self, PyObject * args) {
-
-uint8_t oid_num;
-uint64_t oid_val = 0;
-
-if (!PyArg_ParseTuple(args, "bK:snmp_set_counter64", &oid_num, &oid_val)) {
-return NULL;
-}
-
-if (oid_num > 100 || oid_num < 1)
-goto clear;
-
-uwsgi.shared->snmp_value[oid_num - 1].type = SNMP_COUNTER64;
-uwsgi.shared->snmp_value[oid_num - 1].val = oid_val;
-
-Py_INCREF(Py_True);
-return Py_True;
-
-clear:
-
-Py_INCREF(Py_None);
-return Py_None;
-}
-
-PyObject *py_snmp_gauge(PyObject * self, PyObject * args) {
-
-uint8_t oid_num;
-uint32_t oid_val = 0;
-
-if (!PyArg_ParseTuple(args, "bI:snmp_set_gauge", &oid_num, &oid_val)) {
-return NULL;
-}
-
-if (oid_num > 100 || oid_num < 1)
-goto clear;
-
-uwsgi.shared->snmp_value[oid_num - 1].type = SNMP_GAUGE;
-uwsgi.shared->snmp_value[oid_num - 1].val = oid_val;
-
-Py_INCREF(Py_True);
-return Py_True;
-
-clear:
-
-Py_INCREF(Py_None);
-return Py_None;
-}
-
-PyObject *py_snmp_community(PyObject * self, PyObject * args) {
-
-	char *snmp_community;
-
-	if (!PyArg_ParseTuple(args, "s:snmp_set_community", &snmp_community)) {
-		return NULL;
-	}
-
-	if (strlen(snmp_community) > 72) {
-		uwsgi_log( "*** warning the supplied SNMP community string will be truncated to 72 chars ***\n");
-		memcpy(uwsgi.shared->snmp_community, snmp_community, 72);
-	}
-	else {
-		memcpy(uwsgi.shared->snmp_community, snmp_community, strlen(snmp_community) + 1);
-	}
-
-	Py_INCREF(Py_True);
-	return Py_True;
+void uwsgi_opt_snmp(char *opt, char *value, void *foobar) {
+	uwsgi.snmp = 1;
+        if (value) {
+        	uwsgi.snmp_addr = value; 
+                uwsgi.master_process = 1;
+        }
 
 }
 
-static PyMethodDef uwsgi_snmp_methods[] = {
-	{"snmp_set_counter32", py_snmp_counter32, METH_VARARGS, ""},
-	{"snmp_set_counter64", py_snmp_counter64, METH_VARARGS, ""},
-	{"snmp_set_gauge", py_snmp_gauge, METH_VARARGS, ""},
-	{"snmp_set_community", py_snmp_community, METH_VARARGS, ""},
-	{NULL, NULL},
-};
-
-void snmp_init() {
-
-	PyMethodDef *uwsgi_function;
-
-	for (uwsgi_function = uwsgi_snmp_methods; uwsgi_function->ml_name != NULL; uwsgi_function++) {
-		PyObject *func = PyCFunction_New(uwsgi_function, NULL);
-		PyDict_SetItemString(uwsgi.embedded_dict, uwsgi_function->ml_name, func);
-		Py_DECREF(func);
-	}
-
-	uwsgi_log( "SNMP python functions initialized.\n");
+void uwsgi_opt_snmp_community(char *opt, char *value, void *foobar) {
+	uwsgi.snmp = 1;
+        uwsgi.snmp_community = value;
 }
-*/
 
+int uwsgi_setup_snmp(void) {
+	int snmp_fd = -1;
+	int i;
+	if (uwsgi.snmp) {
+                if (uwsgi.snmp_community) {
+                        if (strlen(uwsgi.snmp_community) > 72) {
+                                uwsgi_log("*** warning the supplied SNMP community string will be truncated to 72 chars ***\n");
+                                memcpy(uwsgi.shared->snmp_community, uwsgi.snmp_community, 72);
+                        }
+                        else {
+                                memcpy(uwsgi.shared->snmp_community, uwsgi.snmp_community, strlen(uwsgi.snmp_community) + 1);
+                        }
+                }
+
+                uwsgi.shared->snmp_gvalue[0].type = SNMP_COUNTER64;
+                uwsgi.shared->snmp_gvalue[0].val = &uwsgi.workers[0].requests;
+
+                for (i = 0; i < uwsgi.numproc; i++) {
+                        uwsgi.shared->snmp_gvalue[30 + i].type = SNMP_COUNTER64;
+                        uwsgi.shared->snmp_gvalue[30 + i].val = &uwsgi.workers[i + 1].requests;
+                }
+
+                if (uwsgi.snmp_addr) {
+                        snmp_fd = bind_to_udp(uwsgi.snmp_addr, 0, 0);
+                        if (snmp_fd < 0) {
+                                uwsgi_log("unable to bind to udp socket. SNMP service will be disabled.\n");
+                        }
+                        else {
+                                uwsgi_log("SNMP server enabled on %s\n", uwsgi.snmp_addr);
+                                event_queue_add_fd_read(uwsgi.master_queue, snmp_fd);
+                        }
+                }
+                else {
+                        uwsgi_log("SNMP agent enabled.\n");
+                }
+
+        }
+
+	return snmp_fd;
+}
 #else
 #warning "*** SNMP support is disabled ***"
 #endif

core/spooler.c

@@ -0,0 +1,570 @@
+#ifdef UWSGI_SPOOLER
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+static void spooler_readdir(struct uwsgi_spooler *, char *dir);
+#ifdef __linux__
+static void spooler_scandir(struct uwsgi_spooler *, char *dir);
+#endif
+static void spooler_manage_task(struct uwsgi_spooler *, char *, char *);
+
+// increment it whenever a signal is raised
+static uint64_t wakeup = 0;
+
+// function to allow waking up the spooler if blocked in event_wait
+void spooler_wakeup() { wakeup++; }
+
+void uwsgi_opt_add_spooler(char *opt, char *directory, void *mode) {
+
+	int i;
+	struct uwsgi_spooler *us;
+
+        if (access(directory, R_OK | W_OK | X_OK)) {
+               	uwsgi_error("[spooler directory] access()");
+               	exit(1);
+        }
+
+	if (uwsgi.spooler_numproc > 0) {
+		for(i=0;i<uwsgi.spooler_numproc;i++) {
+			us = uwsgi_new_spooler(directory);
+			if (mode) us->mode = (long) mode;
+		}
+	}
+	else {
+        	us = uwsgi_new_spooler(directory);
+		if (mode) us->mode = (long) mode;
+	}
+
+}
+
+
+struct uwsgi_spooler *uwsgi_new_spooler(char *dir) {
+
+        struct uwsgi_spooler *uspool = uwsgi.spoolers;
+
+        if (!uspool) {
+                uwsgi.spoolers = uwsgi_calloc_shared(sizeof(struct uwsgi_spooler));
+                uspool = uwsgi.spoolers;
+        }
+        else {
+                while(uspool) {
+                        if (uspool->next == NULL) {
+                                uspool->next = uwsgi_calloc_shared(sizeof(struct uwsgi_spooler));
+                                uspool = uspool->next;
+                                break;
+                        }
+                        uspool = uspool->next;
+                }
+        }
+
+        if (!realpath(dir, uspool->dir)) {
+                uwsgi_error("[spooler] realpath()");
+                exit(1);
+        }
+
+        uspool->next = NULL;
+
+        return uspool;
+}
+
+
+struct uwsgi_spooler *uwsgi_get_spooler_by_name(char *name) {
+
+	struct uwsgi_spooler *uspool = uwsgi.spoolers;
+
+	while(uspool) {
+		if (!strcmp(uspool->dir, name)) {
+			return uspool;
+		}
+		uspool = uspool->next;
+	}
+	
+	return NULL;
+}
+
+pid_t spooler_start(struct uwsgi_spooler *uspool) {
+	
+	int i;
+
+	pid_t pid = uwsgi_fork("uWSGI spooler");
+	if (pid < 0) {
+		uwsgi_error("fork()");
+		exit(1);
+	}
+	else if (pid == 0) {
+		// USR1 will be used to wake up the spooler
+		uwsgi_unix_signal(SIGUSR1, spooler_wakeup);
+		uwsgi.mywid = -1;
+		uwsgi.mypid = getpid();
+		uspool->pid = uwsgi.mypid;
+		// avoid race conditions !!!
+		uwsgi.i_am_a_spooler = uspool;
+
+		uwsgi_fixup_fds(0, 0, NULL);
+		uwsgi_close_all_sockets();
+
+		for (i = 0; i < 256; i++) {
+                	if (uwsgi.p[i]->post_fork) {
+                        	uwsgi.p[i]->post_fork();
+                	}
+        	}
+
+		uwsgi.signal_socket = uwsgi.shared->spooler_signal_pipe[1];
+
+		for (i = 0; i < 256; i++) {
+                	if (uwsgi.p[i]->spooler_init) {
+                        	uwsgi.p[i]->spooler_init();
+                	}
+        	}
+
+        	for (i = 0; i < uwsgi.gp_cnt; i++) {
+                	if (uwsgi.gp[i]->spooler_init) {
+                        	uwsgi.gp[i]->spooler_init();
+                	}
+        	}
+
+		spooler(uspool);
+	}
+	else if (pid > 0) {
+		uwsgi_log("spawned the uWSGI spooler on dir %s with pid %d\n", uspool->dir, pid);
+	}
+
+	return pid;
+}
+
+void destroy_spool(char *dir, char *file) {
+
+	if (chdir(dir)) {
+		uwsgi_error("chdir()");
+                uwsgi_log("[spooler] something horrible happened to the spooler. Better to kill it.\n");
+		exit(1);
+	}
+
+	if (unlink(file)) {
+        	uwsgi_error("unlink()");
+                uwsgi_log("[spooler] something horrible happened to the spooler. Better to kill it.\n");
+                exit(1);
+	}
+
+}
+
+
+int spool_request(struct uwsgi_spooler *uspool, char *filename, int rn, int core_id, char *buffer, int size, char *priority, time_t at, char *body, size_t body_len) {
+
+	struct timeval tv;
+	int fd;
+	struct uwsgi_header uh;
+
+	if (!uspool) {
+		uspool = uwsgi.spoolers;
+	}
+
+	// this lock is for threads, the pid value in filename will avoid multiprocess races
+	uwsgi_lock(uspool->lock);
+
+	gettimeofday(&tv, NULL);
+
+	if (priority) {
+		if (snprintf(filename, 1024, "%s/%s", uspool->dir, priority) <= 0) {
+			uwsgi_unlock(uspool->lock);
+			return 0;
+		}
+		// no need to check for errors...
+		(void) mkdir(filename, 0777);
+
+		if (snprintf(filename, 1024, "%s/%s/uwsgi_spoolfile_on_%s_%d_%d_%d_%llu_%llu", uspool->dir, priority, uwsgi.hostname, (int) getpid(), rn, core_id, (unsigned long long) tv.tv_sec, (unsigned long long) tv.tv_usec) <= 0) {
+			uwsgi_unlock(uspool->lock);
+			return 0;
+		}
+	}
+	else {
+		if (snprintf(filename, 1024, "%s/uwsgi_spoolfile_on_%s_%d_%d_%d_%llu_%llu", uspool->dir, uwsgi.hostname, (int) getpid(), rn, core_id, (unsigned long long) tv.tv_sec, (unsigned long long) tv.tv_usec) <= 0) {
+			uwsgi_unlock(uspool->lock);
+			return 0;
+		}
+	}
+
+	fd = open(filename, O_CREAT | O_EXCL | O_WRONLY, S_IRUSR | S_IWUSR);
+	if (fd < 0) {
+		uwsgi_error_open(filename);
+		uwsgi_unlock(uspool->lock);
+		return 0;
+	}
+
+	// now lock the file, it will no be runnable, until the lock is not removed
+	// a race could come if the spooler take the file before fcntl is called
+        // in such case the spooler will detect a zeroed file and will retry later
+	if (uwsgi_fcntl_lock(fd)) {
+		close(fd);
+		uwsgi_unlock(uspool->lock);
+		return 0;
+	}
+
+	uh.modifier1 = 17;
+	uh.modifier2 = 0;
+	uh.pktsize = (uint16_t) size;
+#ifdef __BIG_ENDIAN__
+	uh.pktsize = uwsgi_swap16(uh.pktsize);
+#endif
+
+	if (write(fd, &uh, 4) != 4) {
+		goto clear;
+	}
+
+	if (write(fd, buffer, size) != size) {
+		goto clear;
+	}
+
+	if (body && body_len > 0) {
+		if ((size_t)write(fd, body, body_len) != body_len) {
+			goto clear;	
+		}
+	}
+
+	if (at > 0) {
+		struct timeval tv[2];
+		tv[0].tv_sec = at;
+		tv[0].tv_usec = 0;
+		tv[1].tv_sec = at;
+		tv[1].tv_usec = 0;
+#ifdef __sun__
+		if (futimesat(fd, NULL, tv)) {
+#else
+		if (futimes(fd, tv)) {
+#endif
+			uwsgi_error("futimes()");
+		}
+	}
+
+	// here the file will be unlocked too
+	close(fd);
+
+	if (!uwsgi.spooler_quiet)
+		uwsgi_log("[spooler] written %d bytes to file %s\n", size + body_len + 4, filename);
+	
+	// and here waiting threads can continue
+	uwsgi_unlock(uspool->lock);
+
+/*	wake up the spoolers attached to the specified dir ... (HACKY) 
+	no need to fear races, as USR1 is harmless an all of the uWSGI processes...
+	it could be a problem if a new process takes the old pid, but modern systems should avoid that
+*/
+
+	struct uwsgi_spooler *spoolers = uwsgi.spoolers;
+	while(spoolers) {
+		if (!strcmp(spoolers->dir, uspool->dir)) {
+			if (spoolers->pid > 0 && spoolers->running == 0) {
+				(void) kill(spoolers->pid, SIGUSR1);
+			}
+		}
+		spoolers = spoolers->next;
+	}
+
+	return 1;
+
+
+      clear:
+	uwsgi_unlock(uspool->lock);
+	uwsgi_error("write()");
+	if (unlink(filename)) {
+		uwsgi_error("unlink()");
+	}
+	// unlock the file too
+	close(fd);
+	return 0;
+}
+
+
+
+void spooler(struct uwsgi_spooler *uspool) {
+
+	// prevent process blindly reading stdin to make mess
+	int nullfd;
+
+	// asked by Marco Beri
+#ifdef __HAIKU__
+#ifdef UWSGI_DEBUG
+	uwsgi_log("lowering spooler priority to %d\n", B_LOW_PRIORITY);
+#endif
+	set_thread_priority(find_thread(NULL), B_LOW_PRIORITY);
+#else
+#ifdef UWSGI_DEBUG
+	uwsgi_log("lowering spooler priority to %d\n", PRIO_MAX);
+#endif
+	setpriority(PRIO_PROCESS, getpid(), PRIO_MAX);
+#endif
+
+	nullfd = open("/dev/null", O_RDONLY);
+	if (nullfd < 0) {
+		uwsgi_error_open("/dev/null");
+		exit(1);
+	}
+
+	if (nullfd != 0) {
+		dup2(nullfd, 0);
+		close(nullfd);
+	}
+
+	int spooler_event_queue = event_queue_init();
+	int interesting_fd = -1;
+
+	if (uwsgi.master_process) {
+		event_queue_add_fd_read(spooler_event_queue, uwsgi.shared->spooler_signal_pipe[1]);
+	}
+
+	// reset the tasks counter
+	uspool->tasks = 0;
+
+	for (;;) {
+
+
+		if (chdir(uspool->dir)) {
+			uwsgi_error("chdir()");
+			exit(1);
+		}
+
+		if (uwsgi.spooler_ordered) {
+#ifdef __linux__
+			spooler_scandir(uspool, NULL);
+#else
+			spooler_readdir(uspool, NULL);
+#endif
+		}
+		else {
+			spooler_readdir(uspool, NULL);
+		}
+
+		int timeout = uwsgi.shared->spooler_frequency;
+		if (wakeup > 0) {
+			timeout = 0;
+		}
+
+		if (event_queue_wait(spooler_event_queue, timeout, &interesting_fd) > 0) {
+			if (uwsgi.master_process) {
+				if (interesting_fd == uwsgi.shared->spooler_signal_pipe[1]) {
+					uwsgi_receive_signal(interesting_fd, "spooler", (int) getpid());
+				}
+			}
+		}
+
+		// avoid races
+		uint64_t tmp_wakeup = wakeup;
+		if (tmp_wakeup > 0) {
+			tmp_wakeup--;
+		}
+		wakeup = tmp_wakeup;
+
+		// need to recycle ?
+		if (uwsgi.spooler_max_tasks > 0 && uspool->tasks >= (uint64_t)uwsgi.spooler_max_tasks) {
+			uwsgi_log("[spooler %s pid: %d] maximum number of tasks reached (%d) recycling ...\n", uspool->dir, (int) uwsgi.mypid, uwsgi.spooler_max_tasks);
+			end_me(0);
+		}
+
+	}
+}
+
+#ifdef __linux__
+static void spooler_scandir(struct uwsgi_spooler *uspool, char *dir) {
+
+	struct dirent **tasklist;
+	int n;
+
+	if (!dir) dir = uspool->dir;
+
+	n = scandir(dir, &tasklist, 0, versionsort);
+	if (n < 0) {
+		uwsgi_error("scandir()");
+		return;
+	}
+	
+	while(n--) {
+		spooler_manage_task(uspool, dir, tasklist[n]->d_name);
+		free(tasklist[n]);	
+	}
+
+	free(tasklist);
+}
+#endif
+
+
+static void spooler_readdir(struct uwsgi_spooler *uspool, char *dir) {
+
+	DIR *sdir;
+	struct dirent *dp;
+
+	if (!dir) dir = uspool->dir;
+
+	sdir = opendir(dir);
+	if (sdir) {
+		while ((dp = readdir(sdir)) != NULL) {
+			spooler_manage_task(uspool, dir, dp->d_name);
+		}
+		closedir(sdir);
+	}
+	else {
+		uwsgi_error("opendir()");
+	}
+}
+
+void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
+
+	int i, ret;
+
+	char spool_buf[0xffff];
+	struct uwsgi_header uh;
+	char *body = NULL;
+	size_t body_len = 0;
+
+	int spool_fd;
+
+	if (!dir) dir = uspool->dir;
+
+	if (!strncmp("uwsgi_spoolfile_on_", task, 19) || (uwsgi.spooler_ordered && is_a_number(task))) {
+		struct stat sf_lstat;
+		if (lstat(task, &sf_lstat)) {
+			return;
+		}
+
+		// a spool request for the future
+		if (sf_lstat.st_mtime > uwsgi_now()) {
+			return;
+		}
+
+#ifdef __linux__
+		if (S_ISDIR(sf_lstat.st_mode) && uwsgi.spooler_ordered) {
+			if (chdir(task)) {
+				uwsgi_error("chdir()");
+				return;
+			}
+			char *prio_path = realpath(".", NULL);
+			spooler_scandir(uspool, prio_path);
+			free(prio_path);
+			if (chdir(dir)) {
+				uwsgi_error("chdir()");
+			}
+			return;
+		}
+#endif
+		if (!S_ISREG(sf_lstat.st_mode)) {
+			return;
+		}
+		if (!access(task, R_OK | W_OK)) {
+
+			spool_fd = open(task, O_RDWR);
+
+			if (spool_fd < 0) {
+				if (errno != ENOENT)
+					uwsgi_error_open(task);
+				return;
+			}
+
+			// check if the file is locked by another process
+			if (uwsgi_fcntl_is_locked(spool_fd)) {
+				uwsgi_protected_close(spool_fd);
+				return;
+			}
+
+			// unlink() can destroy the lock !!!
+			if (access(task, R_OK | W_OK)) {
+				uwsgi_protected_close(spool_fd);
+				return;
+			}
+
+			ssize_t rlen = uwsgi_protected_read(spool_fd, &uh, 4);
+
+			if (rlen != 4) {
+				// it could be here for broken file or just opened one
+				if (rlen < 0)
+					uwsgi_error("read()");
+				uwsgi_protected_close(spool_fd);
+				return;
+			}
+
+#ifdef __BIG_ENDIAN__
+			uh.pktsize = uwsgi_swap16(uh.pktsize);
+#endif
+
+			if (uwsgi_protected_read(spool_fd, spool_buf, uh.pktsize) != uh.pktsize) {
+				uwsgi_error("read()");
+				destroy_spool(dir, task);	
+				uwsgi_protected_close(spool_fd);
+				return;
+			}			
+					
+			// body available ?
+			if (sf_lstat.st_size > (uh.pktsize+4)) {
+				body_len = sf_lstat.st_size - (uh.pktsize+4);
+				body = uwsgi_malloc(body_len);
+				if ((size_t)uwsgi_protected_read(spool_fd, body, body_len) != body_len) {
+					uwsgi_error("read()");
+					destroy_spool(dir, task);
+					uwsgi_protected_close(spool_fd);
+					free(body);
+					return;
+				}
+			}
+
+			// now the task is running and should not be waken up
+			uspool->running = 1;
+
+			if (!uwsgi.spooler_quiet)
+				uwsgi_log("[spooler %s pid: %d] managing request %s ...\n", uspool->dir, (int) uwsgi.mypid, task);
+
+
+			// chdir before running the task (if requested)
+			if (uwsgi.spooler_chdir) {
+				if (chdir(uwsgi.spooler_chdir)) {
+					uwsgi_error("chdir()");
+				}
+			}
+
+			int callable_found = 0;
+			for(i=0;i<256;i++) {
+				if (uwsgi.p[i]->spooler) {
+					time_t now = uwsgi_now();
+					if(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+                        			set_spooler_harakiri(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI]);
+                			}
+					ret = uwsgi.p[i]->spooler(task, spool_buf, uh.pktsize, body, body_len);
+					if(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+                        			set_spooler_harakiri(0);
+                			}
+					if (ret == 0) continue;
+					callable_found = 1;
+					// increase task counter
+					uspool->tasks++;
+					if (ret == -2) {
+						if (!uwsgi.spooler_quiet)
+							uwsgi_log("[spooler %s pid: %d] done with task %s after %d seconds\n", uspool->dir, (int) uwsgi.mypid, task, uwsgi_now()-now);
+						destroy_spool(dir, task);	
+					}
+					// re-spool it
+					break;	
+				}
+			}
+
+			if (body)
+				free(body);
+
+			// here we free and unlock the task
+			uwsgi_protected_close(spool_fd);
+			uspool->running = 0;
+
+			if (chdir(dir)) {
+				uwsgi_error("chdir()");		
+                		uwsgi_log("[spooler] something horrible happened to the spooler. Better to kill it.\n");
+				exit(1);
+			}
+
+			if (!callable_found) {
+				uwsgi_log("unable to find the spooler function, have you loaded it into the spooler process ?\n");
+			}
+
+		}
+	}
+}
+
+#else
+#warning "*** Spooler support is disabled ***"
+#endif

core/stats.c

@@ -0,0 +1,266 @@
+#include "uwsgi.h"
+/*
+	utility functions for fast generating json output for the stats subsystem
+*/
+
+struct uwsgi_stats *uwsgi_stats_new(size_t chunk_size) {
+	struct uwsgi_stats *us = uwsgi_malloc(sizeof(struct uwsgi_stats));
+	us->base = uwsgi_malloc(chunk_size);
+	us->base[0] = '{';
+	us->base[1] = '\n';
+	us->pos = 2;
+	us->chunk = chunk_size;
+	us->size = chunk_size;
+	us->tabs = 1;
+	return us;
+}
+
+int uwsgi_stats_symbol(struct uwsgi_stats *us, char sym) {
+	char *ptr = us->base + us->pos;
+	char *watermark = us->base + us->size;
+
+	if (ptr+1 > watermark) {
+		char *new_base = realloc(us->base, us->size + us->chunk);
+		if (!new_base) return -1;
+		us->base = new_base;
+		us->size += us->chunk;
+		ptr = us->base + us->pos;
+	}
+
+	*ptr = sym;
+	us->pos++;
+	return 0;
+}
+
+int uwsgi_stats_symbol_nl(struct uwsgi_stats *us, char sym) {
+	if (uwsgi_stats_symbol(us, sym)) {
+		return -1;
+	}
+	return uwsgi_stats_symbol(us, '\n');
+}
+
+
+int uwsgi_stats_comma(struct uwsgi_stats *us) {
+	return uwsgi_stats_symbol_nl(us, ',');
+}
+
+int uwsgi_stats_apply_tabs(struct uwsgi_stats *us) {
+	size_t i;
+	for(i=0;i<us->tabs;i++) {
+		if (uwsgi_stats_symbol(us, '\t')) return -1;
+	};
+	return 0;
+}
+
+
+int uwsgi_stats_object_open(struct uwsgi_stats *us) {
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+	us->tabs++;
+	return uwsgi_stats_symbol_nl(us, '{');
+}
+
+int uwsgi_stats_object_close(struct uwsgi_stats *us) {
+	if (uwsgi_stats_symbol(us, '\n')) return -1;
+	us->tabs--;
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+	return uwsgi_stats_symbol(us, '}');
+}
+
+int uwsgi_stats_list_open(struct uwsgi_stats *us) {
+	us->tabs++;
+	return uwsgi_stats_symbol_nl(us, '[');
+}
+
+int uwsgi_stats_list_close(struct uwsgi_stats *us) {
+	if (uwsgi_stats_symbol(us, '\n')) return -1;
+	us->tabs--;
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+	return uwsgi_stats_symbol(us, ']');
+}
+
+int uwsgi_stats_keyval(struct uwsgi_stats *us, char *key, char *value) {
+
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+
+	char *ptr = us->base + us->pos;
+	char *watermark = us->base + us->size;
+	size_t available = watermark - ptr ;
+
+	int ret = snprintf(ptr, available, "\"%s\":\"%s\"", key, value);
+	if (ret < 0) return -1;
+	while (ret >= (int) available) {
+		char *new_base = realloc(us->base, us->size + us->chunk);
+		if (!new_base) return -1;
+		us->base = new_base;
+		us->size += us->chunk;
+		ptr = us->base + us->pos;
+		watermark = us->base + us->size;
+		available = watermark - ptr ;
+		ret = snprintf(ptr, available, "\"%s\":\"%s\"", key, value);
+		if (ret < 0) return -1;
+	}
+
+	us->pos += ret;
+	return 0;
+	
+}
+
+int uwsgi_stats_keyval_comma(struct uwsgi_stats *us, char *key, char *value) {
+	int ret = uwsgi_stats_keyval(us, key, value);
+	if (ret) return -1;
+	return uwsgi_stats_comma(us);
+}
+
+int uwsgi_stats_keyvalnum(struct uwsgi_stats *us, char *key, char *value, unsigned long long num) {
+
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+
+        char *ptr = us->base + us->pos;
+        char *watermark = us->base + us->size;
+        size_t available = watermark - ptr ;
+
+        int ret = snprintf(ptr, available, "\"%s\":\"%s%llu\"", key, value, num);
+        if (ret < 0) return -1;
+        while (ret >= (int) available) {
+                char *new_base = realloc(us->base, us->size + us->chunk);
+                if (!new_base) return -1;
+		us->base = new_base;
+                us->size += us->chunk;
+		ptr = us->base + us->pos;
+                watermark = us->base + us->size;
+                available = watermark - ptr ;
+                ret = snprintf(ptr, available, "\"%s\":\"%s%llu\"", key, value, num);
+                if (ret < 0) return -1;
+        }
+
+        us->pos += ret;
+        return 0;
+        
+}
+
+int uwsgi_stats_keyvalnum_comma(struct uwsgi_stats *us, char *key, char *value, unsigned long long num) {
+        int ret = uwsgi_stats_keyvalnum(us, key, value, num);
+        if (ret) return -1;
+        return uwsgi_stats_comma(us);
+}
+
+
+int uwsgi_stats_keyvaln(struct uwsgi_stats *us, char *key, char *value, int vallen) {
+
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+
+        char *ptr = us->base + us->pos;
+        char *watermark = us->base + us->size;
+        size_t available = watermark - ptr ;
+
+        int ret = snprintf(ptr, available, "\"%s\":\"%.*s\"", key, vallen, value);
+        if (ret < 0) return -1;
+        while (ret >= (int) available) {
+                char *new_base = realloc(us->base, us->size + us->chunk);
+                if (!new_base) return -1;
+		us->base = new_base;
+                us->size += us->chunk;
+		ptr = us->base + us->pos;
+                watermark = us->base + us->size;
+                available = watermark - ptr ;
+                ret = snprintf(ptr, available, "\"%s\":\"%.*s\"", key, vallen, value);
+                if (ret < 0) return -1;
+        }
+
+        us->pos += ret;
+        return 0;
+        
+}
+
+int uwsgi_stats_keyvaln_comma(struct uwsgi_stats *us, char *key, char *value, int vallen) {
+        int ret = uwsgi_stats_keyvaln(us, key, value, vallen);
+        if (ret) return -1;
+        return uwsgi_stats_comma(us);
+}
+
+
+int uwsgi_stats_key(struct uwsgi_stats *us, char *key) {
+
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+
+        char *ptr = us->base + us->pos;
+        char *watermark = us->base + us->size;
+        size_t available = watermark - ptr ;
+
+        int ret = snprintf(ptr, available, "\"%s\":", key);
+        if (ret < 0) return -1;
+        while (ret >= (int) available) {
+                char *new_base = realloc(us->base, us->size + us->chunk);
+                if (!new_base) return -1;
+		us->base = new_base;
+                us->size += us->chunk;
+		ptr = us->base + us->pos;
+                watermark = us->base + us->size;
+                available = watermark - ptr ;
+                ret = snprintf(ptr, available, "\"%s\":", key);
+                if (ret < 0) return -1;
+        }
+
+        us->pos += ret;
+        return 0;
+}
+
+int uwsgi_stats_str(struct uwsgi_stats *us, char *str) {
+
+        char *ptr = us->base + us->pos;
+        char *watermark = us->base + us->size;
+        size_t available = watermark - ptr ;
+
+        int ret = snprintf(ptr, available, "\"%s\"", str);
+        if (ret < 0) return -1;
+        while (ret >= (int) available) {
+                char *new_base = realloc(us->base, us->size + us->chunk);
+                if (!new_base) return -1;
+		us->base = new_base;
+                us->size += us->chunk;
+		ptr = us->base + us->pos;
+                watermark = us->base + us->size;
+                available = watermark - ptr ;
+                ret = snprintf(ptr, available, "\"%s\"", str);
+                if (ret < 0) return -1;
+        }
+
+        us->pos += ret;
+        return 0;
+}
+
+
+
+
+int uwsgi_stats_keylong(struct uwsgi_stats *us, char *key, unsigned long long num) {
+
+	if (uwsgi_stats_apply_tabs(us)) return -1;
+
+        char *ptr = us->base + us->pos;
+        char *watermark = us->base + us->size;
+        size_t available = watermark - ptr ;
+
+        int ret = snprintf(ptr, available, "\"%s\":%llu", key, num);
+        if (ret < 0) return -1;
+        while (ret >= (int) available) {
+                char *new_base = realloc(us->base, us->size + us->chunk);
+                if (!new_base) return -1;
+		us->base = new_base;
+                us->size += us->chunk;
+		ptr = us->base + us->pos;
+                watermark = us->base + us->size;
+                available = watermark - ptr ;
+                ret = snprintf(ptr, available, "\"%s\":%llu", key, num);
+                if (ret < 0) return -1;
+        }
+
+        us->pos += ret;
+        return 0;
+}
+
+
+int uwsgi_stats_keylong_comma(struct uwsgi_stats *us, char *key, unsigned long long num) {
+	int ret = uwsgi_stats_keylong(us, key, num);
+	if (ret) return -1;
+	return uwsgi_stats_comma(us);
+}

core/subscription.c

@@ -0,0 +1,723 @@
+#include "uwsgi.h"
+
+/*
+
+	subscription subsystem
+
+	each subscription slot is as an auto-optmizing linked list. Originally it was a uwsgi_dict (now removed from uWSGI) but this
+	would have not be able to support regexp as keys.
+
+	each slot has another circular linked list containing the nodes names
+
+	the structure and system is very similar to uwsgi_dyn_dict already used by the mime type parser
+
+	This system is not mean to run on shared memory. If you have multiple processes for the same app, you have to create
+	a new subscriptions slot list.
+
+	To avoid removal of already using nodes, a reference count system has been implemented
+
+*/
+
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_subscribe_slot *uwsgi_get_subscribe_slot(struct uwsgi_subscribe_slot **slot, char *key, uint16_t keylen, int regexp) {
+
+	if (keylen > 0xff) return NULL;
+	
+	uint32_t hash = djb33x_hash(key, keylen);
+	int hash_key = hash % 0xffff;
+
+	struct uwsgi_subscribe_slot *current_slot = slot[hash_key];
+
+	
+#ifdef UWSGI_DEBUG
+	uwsgi_log("****************************\n");
+	while(current_slot) {
+		uwsgi_log("slot %.*s %d\n", current_slot->keylen, current_slot->key, current_slot->hits);
+		current_slot = current_slot->next;
+	}
+	uwsgi_log("****************************\n");
+	current_slot = slot[hash_key];
+#endif
+
+	while(current_slot) {
+#ifdef UWSGI_PCRE
+		if (regexp) {
+			if (uwsgi_regexp_match(current_slot->pattern, current_slot->pattern_extra, key, keylen) >= 0) {
+				return current_slot;
+			}
+		}
+		else {
+#endif
+			if (!uwsgi_strncmp(key, keylen, current_slot->key, current_slot->keylen)) {
+                		// auto optimization
+                        	if (current_slot->prev) {
+                                        if (current_slot->hits > current_slot->prev->hits) {
+                                                struct uwsgi_subscribe_slot *slot_parent = current_slot->prev->prev, *slot_prev = current_slot->prev;
+                                                if (slot_parent) {
+                                                       slot_parent->next = current_slot;
+                                                }
+						else {
+							slot[hash_key] = current_slot;
+						}
+
+						if (current_slot->next) {
+							current_slot->next->prev = slot_prev;
+						}
+
+                                                slot_prev->prev = current_slot;
+                                                slot_prev->next = current_slot->next;
+
+                                                current_slot->next = slot_prev;
+						current_slot->prev = slot_parent;
+
+                        		}
+                        	}
+				return current_slot;
+			}
+#ifdef UWSGI_PCRE
+		}
+#endif
+		current_slot = current_slot->next;
+		// check for loopy optimization
+		if (current_slot == slot[hash_key]) break;
+	}
+
+        return NULL;
+}
+
+struct uwsgi_subscribe_node *uwsgi_get_subscribe_node(struct uwsgi_subscribe_slot **slot, char *key, uint16_t keylen, int regexp) {
+
+	if (keylen > 0xff) return NULL;
+
+	struct uwsgi_subscribe_slot *current_slot = uwsgi_get_subscribe_slot(slot, key, keylen, regexp);
+
+	if (current_slot) {
+		// slot found, move up in the list increasing hits
+		current_slot->hits++;
+		time_t now = uwsgi_now();
+		struct uwsgi_subscribe_node *node = current_slot->nodes;
+		while(node) {
+			// is the node alive ?
+			if (now - node->last_check > uwsgi.subscription_tolerance) {
+				if (node->death_mark == 0)
+					uwsgi_log("[uwsgi-subscription for pid %d] %.*s => marking %.*s as failed (no announce received in %d seconds)\n", (int) uwsgi.mypid, (int) keylen, key, (int) node->len, node->name, uwsgi.subscription_tolerance);
+				node->failcnt++;
+				node->death_mark = 1;
+			}
+			// is the node must be removed ?
+			if (node->death_mark && node->reference == 0) {
+				// remove the node and move to next
+				struct uwsgi_subscribe_node *dead_node = node;
+				node = node->next;
+				// if the slot has been removed, return NULL;
+				if (uwsgi_remove_subscribe_node(slot, dead_node) == 1) {
+					return NULL;
+				}
+				continue;
+			}
+
+			if (node->death_mark == 0 && node->wrr > 0) {
+				node->wrr--;
+				node->reference++;
+				return node;
+			}
+			node = node->next;
+		}
+
+		// no wrr > 0 node found, reset them
+		node = current_slot->nodes;
+		uint64_t min_weight = 0;
+		while(node) {
+			if (!node->death_mark) {
+				if (min_weight == 0 || node->weight < min_weight) min_weight = node->weight;
+			}
+			node = node->next;
+		}
+
+		// now set wrr
+		node = current_slot->nodes;
+		struct uwsgi_subscribe_node *choosen_node = NULL;
+		while(node) {
+			if (!node->death_mark) {
+				node->wrr = node->weight/min_weight;
+				choosen_node = node;
+			}
+			node = node->next;
+		}
+		if (choosen_node) {
+			choosen_node->wrr--;
+			choosen_node->reference++;
+		}
+		return choosen_node;
+	
+	}
+
+	return NULL;
+}
+
+struct uwsgi_subscribe_node *uwsgi_get_subscribe_node_by_name(struct uwsgi_subscribe_slot **slot, char *key, uint16_t keylen, char *val, uint16_t vallen, int regexp) {
+
+	if (keylen > 0xff) return NULL;
+	struct uwsgi_subscribe_slot *current_slot = uwsgi_get_subscribe_slot(slot, key, keylen, regexp);
+	if (current_slot) {
+		struct uwsgi_subscribe_node *node = current_slot->nodes;
+		while(node) {
+			if (!uwsgi_strncmp(val, vallen, node->name, node->len)) {
+				return node;
+			}			
+			node = node->next;
+		}
+	}
+
+	return NULL;
+}
+
+int uwsgi_remove_subscribe_node(struct uwsgi_subscribe_slot **slot, struct uwsgi_subscribe_node *node) {
+
+	int ret = 0;
+
+	struct uwsgi_subscribe_node *a_node;
+	struct uwsgi_subscribe_slot *node_slot = node->slot;
+	struct uwsgi_subscribe_slot *prev_slot = node_slot->prev;
+	struct uwsgi_subscribe_slot *next_slot = node_slot->next;
+
+	int hash_key = node_slot->hash;
+
+	// over-engineering to avoid race conditions
+	node->len = 0;
+
+	if (node == node_slot->nodes) {
+		node_slot->nodes = node->next;
+	}
+	else {
+		a_node = node_slot->nodes;
+		while(a_node) {
+			if (a_node->next == node) {
+				a_node->next = node->next;
+				break;
+			}
+			a_node = a_node->next;
+		}
+	}
+
+	free(node);
+	// no more nodes, remove the slot too
+	if (node_slot->nodes == NULL) {
+
+		ret = 1;
+
+		// first check if i am the only node
+		if ((!prev_slot && !next_slot) || next_slot == node_slot) {
+#ifdef UWSGI_PCRE
+		if (node_slot->pattern) {
+			pcre_free(node_slot->pattern);
+		}
+		if (node_slot->pattern_extra) {
+			pcre_free(node_slot->pattern_extra);
+		}
+#endif
+#ifdef UWSGI_SSL
+		if (uwsgi.subscriptions_sign_check_dir) {
+			EVP_PKEY_free(node_slot->sign_public_key);
+			EVP_MD_CTX_destroy(node_slot->sign_ctx);		
+		}
+#endif
+			free(node_slot);
+			slot[hash_key] = NULL;
+			goto end;
+		}
+
+		// if i am the main entry point, set the next value
+		if (node_slot == slot[hash_key]) {
+			slot[hash_key] = next_slot;
+		}
+			
+		if (prev_slot) {	
+			prev_slot->next = next_slot;	
+		}
+		if (next_slot) {
+			next_slot->prev = prev_slot;
+		}
+
+#ifdef UWSGI_PCRE
+		if (node_slot->pattern) {
+			pcre_free(node_slot->pattern);
+		}
+		if (node_slot->pattern_extra) {
+			pcre_free(node_slot->pattern_extra);
+		}
+#endif
+#ifdef UWSGI_SSL
+		if (uwsgi.subscriptions_sign_check_dir) {
+			EVP_PKEY_free(node_slot->sign_public_key);
+			EVP_MD_CTX_destroy(node_slot->sign_ctx);		
+		}
+#endif
+		free(node_slot);
+	}
+
+end:
+
+	return ret;
+}
+
+struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slot **slot, struct uwsgi_subscribe_req *usr, int regexp) {
+
+	struct uwsgi_subscribe_slot *current_slot = uwsgi_get_subscribe_slot(slot, usr->key, usr->keylen, 0), *old_slot = NULL, *a_slot;
+	struct uwsgi_subscribe_node *node, *old_node = NULL;
+
+	if (usr->address_len > 0xff || usr->address_len == 0) return NULL;
+
+#ifdef UWSGI_SSL
+	if (uwsgi.subscriptions_sign_check_dir) {
+		if (usr->sign_len == 0 || usr->base_len == 0) return NULL;
+	}
+#endif
+
+        if (current_slot) {
+#ifdef UWSGI_SSL
+		if (uwsgi.subscriptions_sign_check_dir && !uwsgi_subscription_sign_check(current_slot, usr)) {
+			return NULL;
+		}
+#endif
+		node = current_slot->nodes;
+		while(node) {
+                        if (!uwsgi_strncmp(node->name, node->len, usr->address, usr->address_len)) {
+#ifdef UWSGI_SSL
+				// this should avoid sending sniffed packets...
+				if (uwsgi.subscriptions_sign_check_dir && usr->unix_check <= node->unix_check) {
+                			uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n",(int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
+					return NULL;
+				}
+#endif
+				// remove death mark and update cores and load
+				node->death_mark = 0;
+                                node->last_check = uwsgi_now();
+				node->cores = usr->cores;
+				node->load = usr->load;
+				node->weight = usr->weight;
+				if (!node->weight) node->weight = 1;
+                                return node;
+                        }
+			old_node = node;
+			node = node->next;
+                }
+
+#ifdef UWSGI_SSL
+		if (uwsgi.subscriptions_sign_check_dir && usr->unix_check < (uwsgi_now()-(time_t)uwsgi.subscriptions_sign_check_tolerance)) {
+			uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n",(int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
+			return NULL;
+		}
+#endif
+
+		node = uwsgi_malloc(sizeof(struct uwsgi_subscribe_node));
+		node->len = usr->address_len;
+		node->modifier1 = usr->modifier1;
+		node->modifier2 = usr->modifier2;
+		node->requests = 0;
+		node->transferred = 0;
+		node->reference = 0;
+		node->death_mark = 0;
+		node->failcnt = 0;
+		node->cores = usr->cores;
+		node->load = usr->load;
+		node->weight = usr->weight;
+		node->unix_check = usr->unix_check;
+		if (!node->weight) node->weight = 1;
+		node->wrr = 0;
+		node->last_check = uwsgi_now();
+		node->slot = current_slot;
+                memcpy(node->name, usr->address, usr->address_len);
+		if (old_node) {
+			old_node->next = node;
+		}
+		node->next = NULL;
+                uwsgi_log("[uwsgi-subscription for pid %d] %.*s => new node: %.*s\n",(int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address);
+                return node;
+        }
+        else {
+#ifdef UWSGI_SSL
+		FILE *kf = NULL;
+		if (uwsgi.subscriptions_sign_check_dir) {
+			if (usr->unix_check < (uwsgi_now()-(time_t)uwsgi.subscriptions_sign_check_tolerance)) {
+				uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n",(int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
+				return NULL;
+			}
+			char *keyfile = uwsgi_sanitize_cert_filename(uwsgi.subscriptions_sign_check_dir, usr->key, usr->keylen);
+			kf = fopen(keyfile, "r");
+			free(keyfile);
+			if (!kf) return NULL;
+		
+		}
+#endif
+		current_slot = uwsgi_malloc(sizeof(struct uwsgi_subscribe_slot));
+		uint32_t hash = djb33x_hash(usr->key, usr->keylen);
+        	int hash_key = hash % 0xffff;
+		current_slot->hash = hash_key;
+#ifdef UWSGI_SSL
+		if (uwsgi.subscriptions_sign_check_dir) {
+			current_slot->sign_public_key = PEM_read_PUBKEY(kf, NULL, NULL, NULL);
+			fclose(kf);
+			if (!current_slot->sign_public_key) {
+				uwsgi_log("unable to load public key for %.*s\n", usr->keylen, usr->key);
+				free(current_slot);
+				return NULL;
+			}
+			current_slot->sign_ctx = EVP_MD_CTX_create();
+			if (!current_slot->sign_ctx) {
+				uwsgi_log("unable to initialize EVP context for %.*s\n", usr->keylen, usr->key);
+				EVP_PKEY_free(current_slot->sign_public_key);
+				free(current_slot);
+				return NULL;
+			}
+
+			if (!uwsgi_subscription_sign_check(current_slot, usr)) {
+				EVP_PKEY_free(current_slot->sign_public_key);
+				EVP_MD_CTX_destroy(current_slot->sign_ctx);
+				free(current_slot);
+				return NULL;
+			}
+		}
+#endif
+		current_slot->keylen = usr->keylen;
+		memcpy(current_slot->key, usr->key, usr->keylen);
+		current_slot->key[usr->keylen] = 0;
+		current_slot->hits = 0;
+
+#ifdef UWSGI_PCRE
+		current_slot->pattern = NULL;
+		current_slot->pattern_extra = NULL;
+		if (regexp) {
+			if (uwsgi_regexp_build(current_slot->key, &current_slot->pattern, &current_slot->pattern_extra)) {
+				free(current_slot);
+				return NULL;
+			}
+		}
+#endif
+
+		current_slot->nodes = uwsgi_malloc(sizeof(struct uwsgi_subscribe_node));
+		current_slot->nodes->slot = current_slot;
+		current_slot->nodes->len = usr->address_len;
+		current_slot->nodes->reference = 0;
+		current_slot->nodes->requests = 0;
+		current_slot->nodes->transferred = 0;
+		current_slot->nodes->death_mark = 0;
+		current_slot->nodes->failcnt = 0;
+		current_slot->nodes->modifier1 = usr->modifier1;
+		current_slot->nodes->modifier2 = usr->modifier2;
+		current_slot->nodes->cores = usr->cores;
+		current_slot->nodes->load = usr->load;
+		current_slot->nodes->weight = usr->weight;
+		current_slot->nodes->unix_check = usr->unix_check;
+		if (!current_slot->nodes->weight) current_slot->nodes->weight = 1;
+		current_slot->nodes->wrr = 0;
+		memcpy(current_slot->nodes->name, usr->address, usr->address_len);
+		current_slot->nodes->last_check = uwsgi_now();
+
+		current_slot->nodes->next = NULL;
+
+#ifdef UWSGI_PCRE
+		// if key is a regexp, order it by keylen
+		if (regexp) {
+			old_slot = NULL;
+			a_slot = slot[hash_key];
+			while(a_slot) {
+				if (a_slot->keylen > current_slot->keylen) {
+					old_slot = a_slot;
+					break;
+				}	
+				a_slot = a_slot->next;
+			}
+
+			if (old_slot) {
+				current_slot->prev = old_slot->prev;
+				old_slot->prev = current_slot;
+				if (current_slot->prev) {
+					old_slot->prev->next = current_slot;
+				}
+	
+				current_slot->next = old_slot;
+			}
+			else {
+				a_slot = slot[hash_key];
+                        	while(a_slot) {
+                                	old_slot = a_slot;
+                                	a_slot = a_slot->next;
+                        	}
+
+
+                        	if (old_slot) {
+                                	old_slot->next = current_slot;
+                        	}
+
+                        	current_slot->prev = old_slot;
+                        	current_slot->next = NULL;
+			}
+		}
+		else {
+#endif
+			a_slot = slot[hash_key];
+			while(a_slot) {
+				old_slot = a_slot;
+				a_slot = a_slot->next;
+			}
+
+
+			if (old_slot) {
+				old_slot->next = current_slot;
+			}
+
+			current_slot->prev = old_slot;
+			current_slot->next = NULL;
+
+#ifdef UWSGI_PCRE
+		}
+#endif
+
+		if (!slot[hash_key] || current_slot->prev == NULL) {
+			slot[hash_key] = current_slot;
+		}
+
+		uwsgi_log("[uwsgi-subscription for pid %d] new pool: %.*s (hash key: %d)\n",(int) uwsgi.mypid, usr->keylen, usr->key, current_slot->hash);
+		uwsgi_log("[uwsgi-subscription for pid %d] %.*s => new node: %.*s\n",(int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address);
+                return current_slot->nodes;
+        }
+
+}
+
+
+void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, uint8_t modifier1, uint8_t modifier2, uint8_t cmd, char *socket_name, char *sign) {
+
+	char value_cores[sizeof(UMAX64_STR)+1];
+	char value_load[sizeof(UMAX64_STR)+1];
+	char value_weight[sizeof(UMAX64_STR)+1];
+
+
+	int value_cores_size = uwsgi_long2str2n(uwsgi.numproc*uwsgi.cores, value_cores, sizeof(UMAX64_STR));
+	int value_load_size = uwsgi_long2str2n(uwsgi.shared->load, value_load, sizeof(UMAX64_STR));
+
+	int value_weight_size = 0;
+	
+	if (uwsgi.auto_weight) {
+		value_weight_size = uwsgi_long2str2n(uwsgi.numproc*uwsgi.cores, value_weight, sizeof(UMAX64_STR));
+	}
+	else {
+		value_weight_size = uwsgi_long2str2n(uwsgi.weight, value_weight, sizeof(UMAX64_STR));
+	}
+
+	char value_modifier1[4];
+	char value_modifier2[4];
+	int value_modifier1_size = uwsgi_long2str2n(modifier1, value_modifier1, 3);
+	int value_modifier2_size = uwsgi_long2str2n(modifier2, value_modifier2, 3);
+
+	if (socket_name == NULL && !uwsgi.sockets) return;
+
+	if (!socket_name) {
+		socket_name = uwsgi.sockets->name;
+	}
+
+	size_t ssb_size = 4 + (2 + 3) + (2 + keysize) + (2 + 7) + (2 + strlen(socket_name)) + (2+9 + 2+value_modifier1_size) +
+		(2+9 + 2+value_modifier2_size) + (2+5 + 2+value_cores_size) + (2+4 + 2+value_load_size) + (2+6 + 2+value_weight_size);
+
+        char *subscrbuf = uwsgi_malloc(ssb_size);
+	// leave space for uwsgi header
+        char *ssb = subscrbuf+4;
+
+	// key = "domain"
+        uint16_t ustrlen = 3;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "key", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = keysize;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, key, ustrlen);
+        ssb+=ustrlen;
+
+	// address = "first uwsgi socket"
+        ustrlen = 7;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "address", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = strlen(socket_name);
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, socket_name, ustrlen);
+        ssb+=ustrlen;
+
+	// modifier1 = "modifier1"
+        ustrlen = 9;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "modifier1", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = value_modifier1_size;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, value_modifier1, value_modifier1_size);
+        ssb+=ustrlen;
+
+	// modifier2 = "modifier2"
+        ustrlen = 9;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "modifier2", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = value_modifier2_size;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, value_modifier2, value_modifier2_size);
+        ssb+=ustrlen;
+
+	// cores = uwsgi.numproc * uwsgi.cores
+        ustrlen = 5;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "cores", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = value_cores_size;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, value_cores, value_cores_size);
+        ssb+=ustrlen;
+
+	// load
+        ustrlen = 4;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "load", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = value_load_size;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, value_load, value_load_size);
+        ssb+=ustrlen;
+
+	// weight
+        ustrlen = 6;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, "weight", ustrlen);
+        ssb+=ustrlen;
+
+        ustrlen = value_weight_size;
+        *ssb++ = (uint8_t) (ustrlen  & 0xff);
+        *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        memcpy(ssb, value_weight, value_weight_size);
+        ssb+=ustrlen;
+
+#ifdef UWSGI_SSL
+	if (sign) {
+		// add space for "unix" item
+		char unix_dst[sizeof(UMAX64_STR)+1];
+                if (snprintf(unix_dst, sizeof(UMAX64_STR)+1, "%lu", (unsigned long) (uwsgi_now() + (time_t)cmd)) < 1) {
+                	uwsgi_error("unable to generate unix time for subscription !!!\n");
+                        free(subscrbuf);
+                        return;
+                }
+                ssb_size += 2 + 4 + 2 + strlen(unix_dst);
+		char *new_buf = realloc(subscrbuf, ssb_size);
+		if (!new_buf) {
+                        uwsgi_error("realloc()");
+                        free(subscrbuf);
+                	return;
+                }
+
+		// fix ssb (new_buf base could be changed)
+		ssb = (new_buf + (ssb-subscrbuf));
+		subscrbuf = new_buf;
+
+		ustrlen = 4;
+                *ssb++ = (uint8_t) (ustrlen  & 0xff);
+                *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+                memcpy(ssb, "unix", ustrlen);
+                ssb+=ustrlen;
+
+                ustrlen = strlen(unix_dst);
+                *ssb++ = (uint8_t) (ustrlen  & 0xff);
+                *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+                memcpy(ssb, unix_dst, strlen(unix_dst));
+                ssb+=ustrlen;
+		
+		unsigned int signature_len = 0;
+		char *signature = uwsgi_rsa_sign(sign, subscrbuf+4, ssb_size-4, &signature_len);
+		if (signature && signature_len > 0) {
+			// add space for "sign" item
+			ssb_size += 2 + 4 + 2 + signature_len;
+			char *new_buf = realloc(subscrbuf, ssb_size);	
+			if (!new_buf) {
+				uwsgi_error("realloc()");
+				free(signature);
+				free(subscrbuf);
+				return;
+			}
+
+			// fix ssb (new_buf base could be changed)
+			ssb = (new_buf + (ssb-subscrbuf));
+			subscrbuf = new_buf;
+
+			ustrlen = 4;
+        		*ssb++ = (uint8_t) (ustrlen  & 0xff);
+        		*ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        		memcpy(ssb, "sign", ustrlen);
+        		ssb+=ustrlen;
+
+        		ustrlen = signature_len;
+        		*ssb++ = (uint8_t) (ustrlen  & 0xff);
+        		*ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        		memcpy(ssb, signature, signature_len);
+        		ssb+=ustrlen;
+
+			free(signature);
+		}
+	}
+#endif
+	
+
+        send_udp_message(224, cmd, udp_address, subscrbuf, ssb_size-4);
+	free(subscrbuf);
+}
+
+
+#ifdef UWSGI_SSL
+int uwsgi_subscription_sign_check(struct uwsgi_subscribe_slot *slot, struct uwsgi_subscribe_req *usr) {
+
+	if (EVP_VerifyInit_ex(slot->sign_ctx, uwsgi.subscriptions_sign_check_md, NULL) == 0) {
+                ERR_print_errors_fp(stderr);
+		return 0;
+	}
+
+	if (EVP_VerifyUpdate(slot->sign_ctx, usr->base, usr->base_len) == 0) {
+                ERR_print_errors_fp(stderr);
+		return 0;
+	}
+
+	if (EVP_VerifyFinal(slot->sign_ctx, (unsigned char *)usr->sign, usr->sign_len, slot->sign_public_key) != 1) {
+#ifdef UWSGI_DEBUG
+                ERR_print_errors_fp(stderr);
+#endif
+		return 0;
+	}
+
+
+	return 1;
+}
+#endif
+
+int uwsgi_no_subscriptions(struct uwsgi_subscribe_slot **slot) {
+	int i;
+	for(i=0;i<UMAX16;i++) {
+		if (slot[i]) return 0;
+	}
+	return 1;
+}