completed first step of teajs integration, improved environ copy

cache refactoring for better plugin friendliness

.gitignore

@@ -0,0 +1,9 @@
+*.o
+*.py[co]
+*.class
+*.jar
+
+/uwsgi
+/uwsgibuild.*
+
+/t/ring/target

.hgignore

@@ -0,0 +1,4 @@
+syntax: glob
+
+*.o
+*.pyc

.hgtags

@@ -7,3 +7,52 @@ b0db39cfad5ac6d4f00bbb3f9c57cf73206e2afb 0.9.5
 a83e7a482e65befcfbb0e24af8cd5d15190acdd7 0.9.6-rc1
 b8f67c6cd0d62f864db9b2b265b4e260ad7d873c 0.9.6-rc2
 35918dd4b3771158b2b57410613ef029e08bbd60 0.9.6
+5f25d1f97f9dde3e391a668c1c610a52a5db8244 0.9.6.1
+ef31fc61ac48018c464f28ebfdf865b96bf83f18 0.9.6.2
+9e100c1f085034396cec586f0c76ad3f9800d1a5 0.9.7-beta1
+ff4111eb8f55b958ec91c70163e10f3372a9b94d 0.9.7-rc1
+eb8aff2926230bb114fb90f67203440a2c534bf1 0.9.7-rc2
+311eef929ec8fd0a5dc8c16531afb7bb42d36d01 0.9.7-rc3
+4b50c04e414f1d9ab8b0b5910aba83d09ac21abb 0.9.7
+d9b9b540f7dce8cb05d2e61ca8b4d75f2ea25f62 0.9.7.1
+d9b9b540f7dce8cb05d2e61ca8b4d75f2ea25f62 0.9.7.1
+0000000000000000000000000000000000000000 0.9.7.1
+0000000000000000000000000000000000000000 0.9.7.1
+486e7760bcbc2191ddb9b4aee6c98dbd5fc4c754 0.9.7.1
+a5f13497b39269621f8f1e56e14d2cc141452e79 0.9.7.2
+d1e57707f6317f134fea7d12f6588d8690f74f3f 0.9.8-rc1
+e91bc724325e14c13b8f548c0b6a315c48a1c32a 0.9.8-rc2
+4fb424d52f226a0a087fea89709f5eb540e03f25 0.9.8-rc3
+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
+14524da00a8b382dffb1d16a0e70cdf4a946f369 1.3-rc2
+883b946db9038372cb1d76cb1d328a3093140e7b 1.3-rc3
+aeea5a5d2e8b62ad55e23d539e1be02f2b6962af 1.3-rc4
+620e0cb6ccdb0ce27561b4240cb3a0ef4c3527fd 1.3

.travis.yml

@@ -0,0 +1,44 @@
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+script:
+  - echo -e "\n\n>>> Building uWSGI binary"
+  - /usr/bin/python uwsgiconfig.py --build travis
+  - echo -e "\n\n>>> Building python26 plugin"
+  - /usr/bin/python2.6 -V
+  - /usr/bin/python2.6 uwsgiconfig.py --plugin plugins/python base python26
+  - echo -e "\n\n>>> Building python27 plugin"
+  - /usr/bin/python2.7 -V
+  - /usr/bin/python2.7 uwsgiconfig.py --plugin plugins/python base python27
+  - echo -e "\n\n>>> Building python31 plugin"
+  - /usr/bin/python3.1 -V
+  - /usr/bin/python3.1 uwsgiconfig.py --plugin plugins/python base python31
+  - echo -e "\n\n>>> Building python32 plugin"
+  - /usr/bin/python3.2 -V
+  - /usr/bin/python3.2 uwsgiconfig.py --plugin plugins/python base python32
+  - echo -e "\n\n>>> Building python33 plugin"
+  - /usr/bin/python3.3 -V
+  - /usr/bin/python3.3 uwsgiconfig.py --plugin plugins/python base python33
+  - echo -e "\n\n>>> Building rack 1.8.7 plugin"
+  - /usr/bin/ruby1.8 -v
+  - UWSGICONFIG_RUBYPATH=/usr/bin/ruby1.8 /usr/bin/python uwsgiconfig.py --plugin plugins/rack base rack187
+  - echo -e "\n\n>>> Building rack 1.9.1 plugin"
+  - /usr/bin/ruby1.9.1 -v
+  - UWSGICONFIG_RUBYPATH=/usr/bin/ruby1.9.1 /usr/bin/python uwsgiconfig.py --plugin plugins/rack base rack191
+  - echo -e "\n\n>>> Building cgi plugin"
+  - /usr/bin/python uwsgiconfig.py --plugin plugins/cgi base
+  - echo -e "\n\n>>> Building dummy plugin"
+  - /usr/bin/python uwsgiconfig.py --plugin plugins/dummy base
+  - echo -e "\n\n>>> Building done, starting tests"
+  - ./tests/travis.sh
+
+before_install:
+  - sudo add-apt-repository -y ppa:fkrull/deadsnakes
+  - sudo apt-get update -qq
+  - sudo apt-get install -qqyf python2.6-dev python2.7-dev python3.1-dev python3.2-dev python3.3-dev rubygems1.8 ruby1.8-dev ruby1.9.1-dev
+  - sudo apt-get install -qqyf libxml2-dev libpcre3-dev libcap2-dev
+  - sudo apt-get install -qqyf curl
+

CONTRIBUTORS

@@ -0,0 +1,24 @@
+- this is a incomplete list of all the contributors of the project -
+
+Roberto De Ioris, Unbit, <roberto@unbit.it>
+Riccardo Magliocchetti, Unbit, <riccardo@unbit.it>
+Yann Malet, Lincoln Loop
+Simon Litchfield
+Masahiro Honma, <hiratara@cpan.org>
+Łukasz Wróblewski <admin@nri.pl>
+Giacomo Bagnoli, Asidev
+Guido Notari, Link I.T. S.p.a.
+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
+Aarni Koskela
+C Anthony Risinger
+Stephen Pierce
+Mingli Yuan

ChangeLog

@@ -1,171 +0,0 @@
-*** september 2010 ***
-
- * 0.9.6.1 []
-
-- print the request uri during SIGPIPE or HARAKIRI
-- added SIGUSR2 support (it will print the current running request, if available)
-- protocol parsing optimization
-- fixed --logto support
-- new --eval option allows inline definition of WSGI script
-- support for defining WSGI script in xml using CDATA
-- allow --pp as --pythonpath shortcut
-- various spooler optimizations and fixes
-- added -O2 optimization by default
-- added uwsgi.is_a_reload commodity function
-- .ini file support fix
-- SNMP agent fix
-- support for subprocesses generated by master
-- fix a regression in SCRIPT_NAME handling
- 
-*** august 2010 ***
-
- * 0.9.6 [20100829]
-
-- better handling of SCRIPT_NAME
-- vacuum option for deleting unix sockets and pidfiles after usage
-- advanced XML configuration
-- new configuration systems: INI files and LDAP
-- embedded HTTP server for development/testing
-- better signal handling
-- PSGI plugin improved
-- usability fixes and new commodities options for root startup
-- grunt processes (detached workers)
-- preliminary integrated virtualhosting mode
-- new option catch-exceptions can redirect python exceptions to your browser
-- logging improvements (--logto and --logdate options)
-- Full PEP 333 compliant usage of wsgi.file_wrapper
-- re-initialize random seed after every fork() [security fix]
-- fix Spooler's usage of stdin
-- export WSGI environment in uwsgi.env (for doing evil things)
-- logsize tracking (uwsgi.logsize) for future embedded log rotation
-
-*** july 2010 ***
- 
- * 0.9.5.4 [20100706]
-	
-*** june 2010 ***
-
- * 0.9.5.3 [20100628]
-
-- fixed linux x86_64 compilation (sorry)
-
- * 0.9.5.2 [20100626] *
-
-- fixed a request parsing bug
-- applied debian fixes
-- fixed multiple interpreter sys.argv
-- improved --chmod-socket
-- fixed uid 0 SIGHUP
-- updated nginx and apache modules
-- updated PSGI, lua and example plugin
-- fixed --pyargv with python 3.x
-- improved plugin build system
-
-*** may 2010 ***
-
- * 0.9.5.1 [20100519] *
-
-- fixed paste support
-- added a new modifier (22)
-- full support for configuration via environment variables
-- nginx_string option in nginx module
-- fix for harakiri without master
-- backported unladen swallow support for 0.9.6-dev
-- fixed address space limit detection via getrlimit()
-- http body buffering implementation
-- added --prio option (to set priority)
-- added --post-limit to limit the size of uploads
-- added --logto option to allow udp logging without daemonizing
-- applied Gentoo's packagers fixes for build system
-
- * 0.9.5 [20100501] *
-
-- hook based request/modifier management
-- plugin support via dlopen
-- on-the-fly management flag
-- integrated proxy
-- logging via udp
-- improved spooler for cron-like apps
-- async support
-- green thread platform (uGreen) on top of the async mode
-- transparent Erlang integration
-- embedded snmp agent
-- nagios mode
-- improved python 3.x support
-- improved xml configuration
-- new build system
-- address space usage limiting
-- lot of portability fixes
-- lot of optimizations and code refactoring
-
-
-*** april 2010 ***
-
- * Fourth Maintenance release [20100427] *
-
-- backported non-yielding app optimization from 0.9.5
-- backported udp logging from 0.9.5
-- backported uwsgi_error() from 0.9.5 (no more dumb perror())
-- fix a rare (but possible) segmentation fault
-- added --version
-- updated apache2 module
-
-*** march 2010 ***
-
- * Third Maintenance release [20100310] *
-
-- fix sendfile on 64bit
-- include setup.py
-
-*** february 2010 ***
- * Maintenance release *
-
-- better support for NetBSD
-- threading fix for FreeBSD
-- sendfile portability fixes 
-- new makefiles
-- example app for testing static file serving
-- fixes for ROCK_SOLID mode
-
-*** january 2010 ***
-
-- Integrated Spooler
-- better error management
-- long options
-- clustering functions
-- experimental lighttpd module
-- official support for OpenBSD and OpenSolaris
-- FastFuncs
-- new functions for embedded module
-- reliable harakiri
-- better Makefiles
-- python threads support in master process
-- proper timeout handling in apache2 module
-- endianess fixes all over the place
-- paste support
-- Django app for managing and monitoring the uWSGI server
-- options for changin uid/gid and chrooting when run by root
-- lot of bugfixes and optimizations
-
-*** 20091129 Version 0.9.3 ***
-
-- Nginx 0.7.x module
-- configuration via python module
-- support (non-standard) for Python 3.x
-- Twisted client resource adapter
-- graceful restart of worker processes and hot-plug substitution/upgrade of the uWSGI server
-- shared memory area to share data between workers/processes
-- Tomcat handler
-- support for virtualenv
-- tons of bugfixes and optimizations
-
-*** 20090829 Version 0.9.2 ***
-
-- TCP support
-- configurable internal timeout (socket/poll)
-- Cherokee handler
-- code refactoring
-- Makefiles
-- customizable harakiri handler (put an harakiri(environ, start_response) function in your wsgi script)
-- limit requests per worker
-- a lot of bugfix and optimizations

Makefile

@@ -1,2 +1,8 @@
 all:
 	python uwsgiconfig.py --build
+
+clean:
+	python uwsgiconfig.py --clean
+
+check:
+	python uwsgiconfig.py --check

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

README

@@ -1,3 +1,3 @@
 surprise i am empty !
 
-Look in the online documentation on http://projects.unbit.it/uwsgi/
+Look in the online documentation on https://uwsgi-docs.readthedocs.org/en/latest/

apache2/mod_proxy_uwsgi.c

@@ -0,0 +1,464 @@
+/*
+        
+*** mod_proxy_uwsgi ***
+
+Copyright 2009-2013 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
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+To build:
+
+apxs2 -i -c mod_proxy_uwsgi.c
+
+To use:
+
+LoadModule proxy_uwsgi_module /usr/lib/apache2/modules/mod_proxy_uwsgi.so
+ProxyPass / uwsgi://127.0.0.1:3031/
+
+Docs:
+
+http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
+
+*/
+#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);
+
+    // this is not a security problem (in Linux) as uWSGI destroy the env memory area readable in /proc
+    // and generally if you host untrusted apps in your server and allows them to read others uid /proc/<pid>
+    // files you have higher problems...
+    const char *auth = apr_table_get(r->headers_in, "Authorization");
+    if (auth) {
+        apr_table_setn(r->subprocess_env, "HTTP_AUTHORIZATION", auth); 
+    }
+
+    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) {
+        if (strcmp(path_info, "/")) {
+            apr_table_set(r->subprocess_env, "SCRIPT_NAME", apr_pstrndup(r->pool, script_name, strlen(script_name)-strlen(path_info)));
+	}
+        else {
+            if (!strcmp(script_name, "/")) {
+                apr_table_set(r->subprocess_env, "SCRIPT_NAME", "");
+            }
+        }
+    }
+
+    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[3] = 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;
+}
+
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+static request_rec *ap_proxy_make_fake_req(conn_rec *c, request_rec *r)
+{
+    apr_pool_t *pool;
+    request_rec *rp;
+
+    apr_pool_create(&pool, c->pool);
+
+    rp = apr_pcalloc(pool, sizeof(*r));
+
+    rp->pool            = pool;
+    rp->status          = HTTP_OK;
+
+    rp->headers_in      = apr_table_make(pool, 50);
+    rp->subprocess_env  = apr_table_make(pool, 50);
+    rp->headers_out     = apr_table_make(pool, 12);
+    rp->err_headers_out = apr_table_make(pool, 5);
+    rp->notes           = apr_table_make(pool, 5);
+
+    rp->server = r->server;
+    rp->log = r->log;
+    rp->proxyreq = r->proxyreq;
+    rp->request_time = r->request_time;
+    rp->connection      = c;
+    rp->output_filters  = c->output_filters;
+    rp->input_filters   = c->input_filters;
+    rp->proto_output_filters  = c->output_filters;
+    rp->proto_input_filters   = c->input_filters;
+    rp->useragent_ip = c->client_ip;
+    rp->useragent_addr = c->client_addr;
+
+    rp->request_config  = ap_create_request_config(pool);
+    proxy_run_create_req(r, rp);
+
+    return rp;
+}
+#endif
+
+
+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);
+
+	len = ap_getline(buffer, sizeof(buffer), rp, 1);
+
+	if (len <= 0) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	backend->worker->s->read += len;
+
+	if (!apr_date_checkmask(buffer, "HTTP/#.# ###*") || len >= sizeof(buffer)-1) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+        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
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+    size_t w_len = strlen(worker->s->name);
+#else
+    size_t w_len = strlen(worker->name);
+#endif
+    char *u_path_info = r->filename + 6 + w_len;
+    int delta = 0;
+    if (u_path_info[0] != '/') {
+        delta = 1;
+    }
+    int decode_status = ap_unescape_url(url+w_len-delta);
+    if (decode_status) {
+       ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "unable to decode uri: %s",
+                      url+w_len-delta);
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+    apr_table_add(r->subprocess_env, "PATH_INFO", url+w_len-delta);
+
+
+    /* 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

@@ -1,18 +1,18 @@
 /* 
         
-    *** uWSGI/mod_uwsgi ***
+*** uWSGI/mod_uwsgi ***
 
-    Copyright 2009-2010 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
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
+Copyright 2009-2013 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
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
@@ -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;
@@ -264,7 +290,6 @@ static int uwsgi_handler(request_rec *r) {
 	char uwsgi_http_status[13] ;
 	int uwsgi_http_status_read = 0;
 	
-
 	apr_bucket_brigade *bb;
 
 	if (strcmp(r->handler, "uwsgi-handler"))
@@ -287,7 +312,6 @@ static int uwsgi_handler(request_rec *r) {
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 
-
 	if ( (ret = timed_connect(&uwsgi_poll, (struct sockaddr *) &c->s_addr, c->addr_size, c->socket_timeout, r) ) != 0) {
 
 		close(uwsgi_poll.fd);
@@ -317,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->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);
@@ -390,10 +408,17 @@ 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) ;
 			}
 		}
 	}
+
+	/* environment variables */
+	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, r, h[i].key, h[i].val, &pkt_size) ;
+	}	
 	
 
 	uwsgi_vars[0].iov_base = pkt_header;
@@ -413,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;
 	}
 
@@ -429,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;
 			}
 		}
@@ -453,15 +481,22 @@ 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) {
-			if (uwsgi_poll.revents & POLLIN) {
+			if (uwsgi_poll.revents & POLLIN || uwsgi_poll.revents & POLLHUP) {
 				cnt = recv(uwsgi_poll.fd, buf, 4096, 0) ;
 				if (cnt < 0) {
-					ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() %s", strerror(errno));
-					apr_brigade_destroy(bb);
-					return HTTP_INTERNAL_SERVER_ERROR;
+					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 {
+						break;
+					}
 				}
 				else if (cnt > 0) {
 					if (!c->cgi_mode && uwsgi_http_status_read < 12) {
@@ -479,29 +514,42 @@ 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);
-					hret = ap_fflush(r->output_filters, bb) ;
-					if (hret != APR_SUCCESS) {
-						close(uwsgi_poll.fd);
-						apr_brigade_destroy(bb);
-						return hret;
+					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
 					break;
 				}
 			}
 
-			if (uwsgi_poll.revents & POLLHUP || uwsgi_poll.revents & POLLERR || uwsgi_poll.revents & POLLNVAL) {
-				break;
-			}
+			// error
+			if (uwsgi_poll.revents & POLLERR || uwsgi_poll.revents & POLLNVAL) {
+                                break;
+                        }
 		}
 		else {
 			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;
 		}
 	}
@@ -515,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;
 		}
 	}
@@ -522,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) ;
 }
 
@@ -558,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 ;
@@ -592,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 ;
 	}
 
@@ -693,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"),	
@@ -701,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}
 };
 

async.c

@@ -1,459 +0,0 @@
-#ifdef UWSGI_ASYNC
-
-#include "uwsgi.h"
-
-
-#ifdef __linux__
-
-#include <sys/epoll.h>
-
-int async_queue_init(int serverfd) {
-	int epfd ;
-	struct epoll_event ee;
-
-	epfd = epoll_create(256);	
-
-	if (epfd < 0) {
-		uwsgi_error("epoll_create()");
-		return -1 ;
-	}
-
-	memset(&ee, 0, sizeof(struct epoll_event));
-	ee.events = EPOLLIN;
-        ee.data.fd = serverfd;
-
-        if (epoll_ctl(epfd, EPOLL_CTL_ADD, serverfd, &ee)) {
-                uwsgi_error("epoll_ctl()");
-		close(epfd);
-		return -1;
-        }
-
-	return epfd;
-}
-
-int async_wait(int queuefd, void *events, int nevents, int block, int timeout) {
-
-	int ret ;
-
-	if (timeout <= 0) {
-		timeout = block;
-	}
-	else {
-		timeout = timeout*1000;
-	}
-
-	//uwsgi_log("waiting with timeout %d nevents %d\n", timeout, nevents);
-	ret = epoll_wait(queuefd, (struct epoll_event *) events, nevents, timeout);
-	if (ret < 0) {
-		uwsgi_error("epoll_wait()");
-	}
-	return ret ;
-}
-
-int async_add(int queuefd, int fd, int etype) {
-	struct epoll_event ee;
-
-	memset(&ee, 0, sizeof(struct epoll_event));
-	ee.events = etype;
-        ee.data.fd = fd;
-
-        if (epoll_ctl(queuefd, EPOLL_CTL_ADD, fd, &ee)) {
-                uwsgi_error("epoll_ctl()");
-		return -1;
-        }
-
-	return 0;
-}
-
-int async_mod(int queuefd, int fd, int etype) {
-	struct epoll_event ee;
-
-	memset(&ee, 0, sizeof(struct epoll_event));
-	ee.events = etype;
-        ee.data.fd = fd;
-
-        if (epoll_ctl(queuefd, EPOLL_CTL_MOD, fd, &ee)) {
-                uwsgi_error("epoll_ctl()");
-		return -1;
-        }
-
-	return 0;
-}
-
-int async_del(int queuefd, int fd, int etype) {
-	struct epoll_event ee;
-
-	memset(&ee, 0, sizeof(struct epoll_event));
-	ee.events = etype;
-        ee.data.fd = fd;
-
-        if (epoll_ctl(queuefd, EPOLL_CTL_DEL, fd, &ee)) {
-                uwsgi_error("epoll_ctl()");
-		return -1;
-        }
-
-	return 0;
-}
-
-#elif defined(__sun__)
-
-int async_queue_init(int serverfd) {
-        int dpfd ;
-        struct pollfd dpev;
-
-
-        dpfd = open("/dev/poll", O_RDWR);
-
-        if (dpfd < 0) {
-                uwsgi_error("open()");
-                return -1 ;
-        }
-
-
-	dpev.fd = serverfd;
-	dpev.events = POLLIN ;
-	dpev.revents = 0;
-
-        if (write(dpfd, &dpev, sizeof(struct pollfd)) < 0) {
-                uwsgi_error("write()");
-                return -1;
-        }
-
-
-        return dpfd;
-}
-
-int async_wait(int queuefd, void *events, int nevents, int block, int timeout) {
-
-	int ret ;
-	struct dvpoll dv ;
-
-	if (timeout <= 0) {
-		timeout = block;
-	}
-	else {
-		timeout = timeout*1000;
-	}
-
-	dv.dp_fds = (struct pollfd *) events;
-	dv.dp_nfds = nevents;
-	dv.dp_timeout = timeout;
-
-	//uwsgi_log("waiting with timeout %d nevents %d\n", timeout, nevents);
-	ret = ioctl(queuefd, DP_POLL, &dv);
-	if (ret < 0) {
-		uwsgi_error("ioctl()");
-	}
-	return ret ;
-}
-
-int async_add(int queuefd, int fd, int etype) {
-	struct pollfd pl;
-
-	pl.fd = fd ;
-	pl.events = etype ;
-	pl.revents = 0 ;
-
-        if (write(queuefd, &pl, sizeof(struct pollfd)) < 0) {
-                uwsgi_error("write()");
-		return -1;
-        }
-
-	return 0;
-}
-
-int async_mod(int queuefd, int fd, int etype) {
-	// using the same fd will overwrite existing rule
-	return async_add(queuefd, fd, etype);
-}
-
-int async_del(int queuefd, int fd, int etype) {
-	// use POLLREMOVE to remove an fd
-	return async_add(queuefd, fd, POLLREMOVE);
-}
-
-#else
-int async_queue_init(int serverfd) {
-	int kfd ;
-	struct kevent kev;
-
-	kfd = kqueue();	
-
-	if (kfd < 0) {
-		uwsgi_error("kqueue()");
-		return -1 ;
-	}
-
-	EV_SET(&kev, serverfd, EVFILT_READ, EV_ADD, 0, 0, 0);
-        if (kevent(kfd, &kev, 1, NULL, 0, NULL) < 0) {
-                uwsgi_error("kevent()");
-                return -1;
-        }
-
-	return kfd;
-}
-
-int async_wait(int queuefd, void *events, int nevents, int block, int timeout) {
-
-        int ret;
-	struct timespec ts ;
-
-
-	if (timeout <= 0) {
-		if (!block) {
-			memset(&ts, 0, sizeof(struct timespec));
-			ts.tv_sec = timeout ;
-			ret = kevent(queuefd, NULL, 0, events, nevents, &ts);
-		}
-		else {
-			ret = kevent(queuefd, NULL, 0, events, nevents, NULL);
-		}
-	}
-	else {
-		memset(&ts, 0, sizeof(struct timespec));
-		ts.tv_sec = timeout ;
-		ret = kevent(queuefd, NULL, 0, events, nevents, &ts);
-	}
-
-	if (ret < 0) {
-		uwsgi_error("kevent()");
-	}
-	
-	return ret;
-}
-
-int async_add(int queuefd, int fd, int etype) {
-	struct kevent kev;
-
-
-	EV_SET(&kev, fd, etype, EV_ADD, 0, 0, 0);
-        if (kevent(queuefd, &kev, 1, NULL, 0, NULL) < 0) {
-                uwsgi_error("kevent()");
-                return -1;
-        }
-	return 0;
-}
-
-int async_mod(int queuefd, int fd, int etype) {
-	struct kevent kev;
-
-	EV_SET(&kev, fd, ASYNC_OUT, EV_DISABLE, 0, 0, 0);
-        if (kevent(queuefd, &kev, 1, NULL, 0, NULL) < 0) {
-                uwsgi_error("kevent()");
-                return -1;
-        }
-
-	EV_SET(&kev, fd, etype, EV_ADD, 0, 0, 0);
-        if (kevent(queuefd, &kev, 1, NULL, 0, NULL) < 0) {
-                uwsgi_error("kevent()");
-                return -1;
-        }
-	return 0;
-}
-
-int async_del(int queuefd, int fd, int etype) {
-	struct kevent kev;
-
-	EV_SET(&kev, fd, etype, EV_DELETE, 0, 0, 0);
-        if (kevent(queuefd, &kev, 1, NULL, 0, NULL) < 0) {
-                uwsgi_error("kevent()");
-                return -1;
-        }
-
-	return 0;
-}
-
-#endif
-
-inline struct wsgi_request *next_wsgi_req(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
-
-        uint8_t *ptr = (uint8_t *) wsgi_req ;
-
-        ptr += sizeof(struct wsgi_request) ;
-
-        return (struct wsgi_request *) ptr ;
-}
-
-int async_get_timeout(struct uwsgi_server *uwsgi) {
-
-
-        struct wsgi_request* wsgi_req = uwsgi->wsgi_requests ;
-        int i ;
-	time_t curtime, tdelta = 0 ;
-	int ret = 0 ;
-
-	if (!uwsgi->async_running) return 0;
-
-        for(i=0;i<uwsgi->async;i++) {
-                if (wsgi_req->async_status == UWSGI_AGAIN) {
-			if (wsgi_req->async_timeout_expired) {
-				return 0;
-			}
-			if (wsgi_req->async_timeout > 0) {
-				if (tdelta <= 0 || tdelta > wsgi_req->async_timeout) {
-					tdelta = wsgi_req->async_timeout ;
-				}
-			}
-                }
-                wsgi_req = next_wsgi_req(uwsgi, wsgi_req) ;
-        }
-
-	curtime = time(NULL);
-
-	ret = tdelta - curtime ;
-	if (ret > 0) {
-		return ret;
-	}
-	
-	return 0;
-}
-
-void async_expire_timeouts(struct uwsgi_server *uwsgi) {
-
-        struct wsgi_request* wsgi_req = uwsgi->wsgi_requests ;
-        int i ;
-	time_t deadline = time(NULL);
-
-
-        for(i=0;i<uwsgi->async;i++) {
-                if (wsgi_req->async_status == UWSGI_AGAIN && wsgi_req->async_timeout > 0) {
-			if (wsgi_req->async_timeout <= deadline) {
-				wsgi_req->async_timeout = 0 ;
-				wsgi_req->async_timeout_expired = 1 ;
-			}	
-                }
-                wsgi_req = next_wsgi_req(uwsgi, wsgi_req) ;
-        }
-}
-
-struct wsgi_request *find_first_available_wsgi_req(struct uwsgi_server *uwsgi) {
-
-        struct wsgi_request* wsgi_req = uwsgi->wsgi_requests ;
-        int i ;
-
-        for(i=0;i<uwsgi->async;i++) {
-                if (wsgi_req->async_status == UWSGI_OK) {
-                        return wsgi_req ;
-                }
-                wsgi_req = next_wsgi_req(uwsgi, wsgi_req) ;
-        }
-
-        return NULL ;
-}
-
-struct wsgi_request *find_wsgi_req_by_id(struct uwsgi_server *uwsgi, int async_id) {
-
-	uint8_t *ptr = (uint8_t *) uwsgi->wsgi_requests ;
-
-        ptr += sizeof(struct wsgi_request) * async_id ;
-
-        return (struct wsgi_request *) ptr ;
-}
-
-struct wsgi_request *find_wsgi_req_by_fd(struct uwsgi_server *uwsgi, int fd, int etype) {
-
-        struct wsgi_request* wsgi_req = uwsgi->wsgi_requests ;
-        int i ;
-
-	if (etype != -1) {
-        	for(i=0;i<uwsgi->async;i++) {
-                	if (wsgi_req->async_waiting_fd == fd && wsgi_req->async_waiting_fd_type == etype) {
-                        	return wsgi_req ;
-                	}
-                	wsgi_req = next_wsgi_req(uwsgi, wsgi_req) ;
-        	}
-	}
-	else {
-        	for(i=0;i<uwsgi->async;i++) {
-                	if (wsgi_req->async_waiting_fd == fd) {
-                        	return wsgi_req ;
-                	}
-                	wsgi_req = next_wsgi_req(uwsgi, wsgi_req) ;
-        	}
-	}
-
-        return NULL ;
-
-}
-
-void async_set_timeout(struct wsgi_request *wsgi_req, time_t timeout) {
-
-	wsgi_req->async_timeout = time(NULL);
-	wsgi_req->async_timeout += timeout;
-	wsgi_req->async_timeout_expired = 0 ;
-	
-}
-
-void async_write_all(struct uwsgi_server *uwsgi, char *data, size_t len) {
-	
-	struct wsgi_request *wsgi_req = uwsgi->wsgi_requests ;
-	int i;
-	ssize_t rlen ;
-
-	for(i=0;i<uwsgi->async;i++) {
-                if (wsgi_req->async_status == UWSGI_PAUSED) {
-			rlen = write(wsgi_req->poll.fd, data, len);
-			if (rlen < 0) {
-				uwsgi_error("write()");
-			}
-			else {
-				wsgi_req->response_size += rlen ;
-			}
-		}
-	}
-}
-
-void async_unpause_all(struct uwsgi_server *uwsgi) {
-	
-	struct wsgi_request *wsgi_req = uwsgi->wsgi_requests ;
-	int i;
-
-	for(i=0;i<uwsgi->async;i++) {
-                if (wsgi_req->async_status == UWSGI_PAUSED) {
-			wsgi_req->async_status = UWSGI_AGAIN;
-		}
-	}
-}
-
-struct wsgi_request * async_loop(struct uwsgi_server *uwsgi) {
-
-	struct wsgi_request *wsgi_req ;
-	int i ;
-
-	uwsgi->async_running = -1 ;
-        wsgi_req = uwsgi->wsgi_requests ;
-
-
-	for(i=0;i<uwsgi->async;i++) {
-        	if (wsgi_req->async_status == UWSGI_AGAIN) {
-                	if (wsgi_req->async_waiting_fd != -1 && !wsgi_req->async_waiting_fd_monitored) {
-				// add fd to monitoring
-				if (async_add(uwsgi->async_queue, wsgi_req->async_waiting_fd, wsgi_req->async_waiting_fd_type)) {
-					// error adding fd to the async queue, better to close it...
-					close(wsgi_req->async_waiting_fd);
-					wsgi_req->async_status = UWSGI_OK ;
-					return wsgi_req;
-				}
-				wsgi_req->async_waiting_fd_monitored = 1;
-				wsgi_req->async_status = UWSGI_AGAIN;
-			}
-			else if (wsgi_req->async_waiting_fd == -1 && wsgi_req->async_timeout <= 0) {
-                		uwsgi->async_running = 0 ;
-				// st global wsgi_req for python functions
-				uwsgi->wsgi_req = wsgi_req ;
-				wsgi_req->async_status = (*uwsgi->shared->hooks[wsgi_req->uh.modifier1]) (uwsgi, wsgi_req);
-
-				wsgi_req->async_switches++;
-
-				if (wsgi_req->async_status < UWSGI_AGAIN) {
-					return wsgi_req;
-				}
-			}
-		}
-		wsgi_req = next_wsgi_req(uwsgi, wsgi_req) ;
-	}
-
-	return NULL;
-
-}
-#endif

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))

bin/uwsgi

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+cmd = File.expand_path "#{File.dirname(__FILE__)}/../ext/uwsgi/uwsgi.ruby"
+
+exec(cmd, *ARGV)

buildconf/base.ini

@@ -0,0 +1,32 @@
+[uwsgi]
+xml = auto
+yaml = true
+json = auto
+zeromq = auto
+ssl = auto
+pcre = auto
+routing = auto
+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, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter, router_static, sslrouter
+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

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

buildconf/coverity.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+# pypy,jvm,ring,jwsgi
+main_plugin = erlang,psgi,rack,lua,python,gevent,php,cgi,mono,pyerl,go
+inherit = base

buildconf/default.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = python,gevent
+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

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

buildconf/erlang.ini

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

buildconf/gevent.ini

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

buildconf/go.ini

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

buildconf/gridfs.ini

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

buildconf/jwsgi.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = jvm,jwsgi
+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

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

buildconf/luap.ini

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

buildconf/modular.ini

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

buildconf/mono.ini

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

buildconf/package.ini

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

buildconf/php.ini

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

buildconf/ppa.ini

@@ -0,0 +1,32 @@
+[uwsgi]
+xml = true
+yaml = true
+json = true
+zeromq = true
+ssl = true
+pcre = true
+routing = true
+debug = false
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = libyaml
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = /usr/lib/libuwsgi.so
+append_version = ubuntu
+plugin_dir = /usr/lib/uwsgi
+embedded_plugins =
+as_shared_library = true
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

buildconf/psgi.ini

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

buildconf/pyerl.ini

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

buildconf/pylua.ini

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

buildconf/pypy.ini

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

buildconf/pyring.ini

@@ -0,0 +1,6 @@
+[uwsgi]
+main_plugin = python,gevent
+inherit = base
+plugins = jvm,ring
+plugin_dir = .
+

buildconf/pyuwsgi.ini

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

buildconf/rack.ini

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

buildconf/ring.ini

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

buildconf/travis.ini

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

buildconf/unbit.ini

@@ -0,0 +1,32 @@
+[uwsgi]
+xml = true
+yaml = true
+json = false
+zeromq = false
+ssl = true
+pcre = true
+routing = true
+debug = false
+unbit = true
+xml_implementation = expat
+yaml_implementation = auto
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = /opt/unbit/uwsgi19/lib/libuwsgi.so
+append_version = unbit
+plugin_dir = /opt/unbit/uwsgi19/plugins
+embedded_plugins =
+as_shared_library = true
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

buildconf/unbitstaff.ini

@@ -0,0 +1,5 @@
+[uwsgi]
+inherit = unbit
+embedded_plugins = python
+bin_name = ../bin/uwsgi
+plugin_dir = ../bin/uwsgi_plugins

contrib/Uwsgi.pm

@@ -17,10 +17,10 @@ sub new {
 sub run {
     my ($self, $app) = @_;
 
-    my $server ;
+    my $server;
 
     if (exists($ENV{'UWSGI_FD'})) {
-	$server = IO::Socket::UNIX->new_from_fd($ENV{'UWSGI_FD'}, '+<');
+        $server = IO::Socket::UNIX->new_from_fd($ENV{'UWSGI_FD'}, '+<');
     }
     else {	
         $server = IO::Socket::INET->new(LocalPort => $self->{port}, LocalAddr => $self->{host}, Listen => 100, ReuseAddr => 1);
@@ -28,62 +28,62 @@ sub run {
 
     while ( my $client = $server->accept ) {
 
-	my $head = '';
-	my $remains = 4 ;
+        my $head = '';
+        my $remains = 4;
 
-	while($remains) {
-		$client->recv(my $buf, $remains);	
-		last unless $buf;
-		$head.=$buf;
-		$remains -= length($buf);
-	}
+        while($remains) {
+            $client->recv(my $buf, $remains);	
+            last unless $buf;
+            $head.=$buf;
+            $remains -= length($buf);
+        }
 
-	if (length($head) != 4) {
-		$client->close ;
-		next;
-	}
+        if (length($head) != 4) {
+            $client->close;
+            next;
+        }
 
-	my ($mod1, $envsize, $mod2) = unpack('CvC', $head) ;
+        my ($mod1, $envsize, $mod2) = unpack('CvC', $head);
 
-	unless ($envsize) {
-		$client->close ;
-		next;
-	}
+        unless ($envsize) {
+            $client->close;
+            next;
+        }
 
-	$remains = $envsize ;
-	my $envbuf = '' ;
-	while($remains) {
-		my $buf ;
-		if ($remains >= 4096) {
-			$client->recv($buf, 4096);	
-		}
-		else {
-			$client->recv($buf, $remains);	
-		}
+        $remains = $envsize;
+        my $envbuf = '';
+        while($remains) {
+            my $buf;
+            if ($remains >= 4096) {
+                $client->recv($buf, 4096);	
+            }
+            else {
+                $client->recv($buf, $remains);	
+            }
 
-		unless($buf) {
-			$client->close ;
-			next;
-		}
+            unless($buf) {
+                $client->close;
+                next;
+            }
 
-		$envbuf.=$buf;
-		$remains -= length($buf);
-	}
+            $envbuf.=$buf;
+            $remains -= length($buf);
+        }
 
-	if (length($envbuf) != $envsize ) {
-		$client->close ;
-		next;
-	}
+        if (length($envbuf) != $envsize ) {
+            $client->close;
+            next;
+        }
 
-	my %env ;
+        my %env;
 
-	my $i = 0;
-	while($i < $envsize) {
-		my $kl = unpack('v', substr($envbuf, $i, 2)) ; $i+=2;
-		my $key = substr($envbuf, $i, $kl); $i+=$kl;
-		my $vl = unpack('v', substr($envbuf, $i, 2)) ; $i+=2;
-		$env{$key} = substr($envbuf, $i, $vl); $i+=$vl;
-	}
+        my $i = 0;
+        while($i < $envsize) {
+            my $kl = unpack('v', substr($envbuf, $i, 2)); $i+=2;
+            my $key = substr($envbuf, $i, $kl); $i+=$kl;
+            my $vl = unpack('v', substr($envbuf, $i, 2)); $i+=2;
+            $env{$key} = substr($envbuf, $i, $vl); $i+=$vl;
+        }
 
         my $env = {
             %env,
@@ -105,40 +105,40 @@ sub run {
         }
         elsif (ref $res eq 'CODE') {
             $res->(sub {
-                $self->_handle_response($client, $env{'SERVER_PROTOCOL'}, $_[0]);
-            });
+                    $self->_handle_response($client, $env{'SERVER_PROTOCOL'}, $_[0]);
+                });
         }
         else {
             die "Bad response $res";
         }
 
-	$client->close ;
+        $client->close;
 
     }
 }
 
 sub _handle_response {
-	my ($self, $client, $protocol, $res) = @_;
+    my ($self, $client, $protocol, $res) = @_;
 
-	$client->send($protocol.' '.$res->[0].' '.HTTP::Status::status_message( $res->[0] )."\r\n");
+    $client->send($protocol.' '.$res->[0].' '.HTTP::Status::status_message( $res->[0] )."\r\n");
 
-	my $headers = $res->[1];
-	my $hdrs = '';
-	while (my ($k, $v) = splice @$headers, 0, 2) {
-        	$hdrs .= "$k: $v\r\n";
-	}
-	$hdrs .= "\r\n";
+    my $headers = $res->[1];
+    my $hdrs = '';
+    while (my ($k, $v) = splice @$headers, 0, 2) {
+        $hdrs .= "$k: $v\r\n";
+    }
+    $hdrs .= "\r\n";
 
-	$client->send($hdrs);
+    $client->send($hdrs);
 
-	my $cb = sub { $client->send($_[0]) };
-	my $body = $res->[2];
-	if (defined $body) {
-        	Plack::Util::foreach($body, $cb);
-    	}
-	else {
-		return Plack::Util::inline_object write => $cb,close => sub { };
-    	}
+    my $cb = sub { $client->send($_[0]) };
+    my $body = $res->[2];
+    if (defined $body) {
+        Plack::Util::foreach($body, $cb);
+    }
+    else {
+        return Plack::Util::inline_object write => $cb,close => sub { };
+    }
 }
 
 1;

contrib/binder.pl

@@ -0,0 +1,15 @@
+use POSIX;
+use IO::Socket::INET;
+use IO::Socket::INET6;
+use IO::Socket::UNIX;
+
+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);
+my $s4 = IO::Socket::UNIX->new(Local => '/tmp/u.sock', Listen => 1);
+
+dup2($s->fileno, 17);
+dup2($s2->fileno, 22);
+dup2($s3->fileno, 30);
+dup2($s4->fileno, 0);
+exec './uwsgi','-M', '--socket','fd://17', '--http-socket','fd://22', '--socket','fd://30','--stats',':5001';

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/cryptologger.rb

@@ -0,0 +1,24 @@
+require 'socket'
+require 'openssl'
+
+secret = 'ciaociao'
+iv = ''
+address = '127.0.0.1'
+port  = 1717
+algo = 'bf-cbc'
+
+s = UDPSocket.new
+s.bind(address, port)
+cipher = OpenSSL::Cipher.new(algo)
+cipher.decrypt
+cipher.key = secret + ("\0" * (cipher.key_len - secret.length))
+cipher.iv = iv + ("0" * (cipher.iv_len - iv.length))
+
+loop do
+  msg, sender = s.recvfrom(8192)
+  cipher.reset
+  begin
+    puts cipher.update(msg) + cipher.final
+  rescue
+  end
+end

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/fdconf.pl

@@ -0,0 +1,7 @@
+use POSIX;
+
+open CONFIG,'welcome.ini';
+
+dup2(fileno(CONFIG), 17);
+
+exec './uwsgi','--ini','fd://17';

contrib/graphite_uwsgi.py

@@ -0,0 +1,33 @@
+# uwsgi --master --chdir /opt/graphite/webapp/graphite --module graphite_uwsgi ...
+#
+#
+# this module will update a carbon server (used by the graphite tool: http://graphite.wikidot.com/)
+# with requests count made by a Django app (and can track graphite itself as it is a Django app ;)
+#
+#
+
+import os
+import uwsgi
+import time
+from django.core.handlers.wsgi import WSGIHandler
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+CARBON_SERVER = "127.0.0.1:2003"
+
+def update_carbon(signum):
+    # connect to the carbon server
+    carbon_fd = uwsgi.connect(CARBON_SERVER)
+    # send data to the carbon server
+    uwsgi.send(carbon_fd, "uwsgi.%s.requests %d %d\n" % (uwsgi.hostname, uwsgi.total_requests(), int(time.time())))
+    # close the connection with the carbon server
+    uwsgi.close(carbon_fd)
+
+# register a new uwsgi signal (signum: 17)
+uwsgi.register_signal(17, '', update_carbon)
+
+# attach a timer of 10 seconds to signal 17
+uwsgi.add_timer(17, 10)
+
+# the Django app
+application = WSGIHandler()

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/runuwsgi.py

@@ -0,0 +1,66 @@
+import django
+from django.core.management.base import BaseCommand
+from django.conf import settings
+import os
+import sys
+
+class Command(BaseCommand):
+    help = "Runs this project as a uWSGI application. Requires the uwsgi binary in system path."
+
+    http_port = '8000'
+    socket_addr = None
+
+    def handle(self, *args, **options):
+        for arg in args:
+            k,v = arg.split('=')
+            if k == 'http':
+                if self.http_port:
+                   self.http_port = v
+            elif k == 'socket':
+                self.http_port = None
+                self.socket_addr = v
+
+        # load http and python plugin: first the specific version, otherwise try with the generic one
+        if self.http_port:
+            os.environ['UWSGI_PLUGINS'] = 'http,python%d%d:python' % (sys.version_info[0], sys.version_info[1])
+        else:
+            os.environ['UWSGI_PLUGINS'] = 'python%d%d:python' % (sys.version_info[0], sys.version_info[1])
+
+        # load the Django WSGI handler
+        os.environ['UWSGI_MODULE'] = 'django.core.handlers.wsgi:WSGIHandler()'
+        # DJANGO settings
+        if options['settings']:
+            os.environ['DJANGO_SETTINGS_MODULE'] = options['settings']
+        else:
+            os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+        # bind the http server to the default port
+        if self.http_port:
+            os.environ['UWSGI_HTTP'] = ':%s' % self.http_port
+        elif self.socket_addr:
+            os.environ['UWSGI_SOCKET'] = self.socket_addr
+
+	# map admin static files
+	os.environ['UWSGI_STATIC_MAP'] = '%s=%s' % (settings.ADMIN_MEDIA_PREFIX, os.path.join(django.__path__[0], 'contrib', 'admin', 'media'))
+        # remove sockets/pidfile at exit
+        os.environ['UWSGI_VACUUM'] = '1'
+        # retrieve/set the PythonHome
+        os.environ['UWSGI_PYHOME'] = sys.prefix
+        # increase buffer size a bit
+        os.environ['UWSGI_BUFFER_SIZE'] = '8192'
+        # add threads for concurrency
+        os.environ['UWSGI_THREADS'] = '8'
+        # enable the master process
+        os.environ['UWSGI_MASTER'] = '1'
+        # use uWSGI python module aliasing to fix the PYTHONPATH
+        os.environ['UWSGI_PYMODULE_ALIAS'] = '%s=./' % os.path.basename(os.getcwd())
+        # exec the uwsgi binary
+        os.execvp('uwsgi', ('uwsgi',))
+
+    def usage(self, subcomand):
+        return r"""
+run this project on the uWSGI server
+
+  http=PORT		run the embedded http server on port PORT
+  socket=ADDR		bind the uwsgi server on address ADDR (this will disable the http server)
+        """

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'
@@ -9,6 +13,7 @@ require 'optparse'
 
 options = {
         :processes => 1,
+        :threads => 1,
         :master => false,
         :logging => true,
         :static => true,
@@ -19,6 +24,7 @@ options = {
 opts = OptionParser.new do |opts|
 
         opts.on("-p", "--processes=nproc", Integer, '') { |p| options[:processes] = p }
+        opts.on("-t", "--threads=nthreads", Integer, '') { |t| options[:threads] = t }
         opts.on("-M", "--master", '') { options[:master] = true }
         opts.on("-L", "--no-logging", '') { options[:logging] = false }
         opts.on("-S", "--no-static", '') { options[:static] = false }
@@ -37,6 +43,7 @@ end
 
 $requests = 0
 $workers = Array.new
+$mywid = 0
 
 module Rack
 
@@ -74,12 +81,14 @@ module Rack
                         ulog("spawned worker 1 (pid: #{$workers[1]})")
                 elsif $workers[1].to_i == 0
                         $0 = "uRack worker 1"
+			$mywid = 1
                         can_spawn = false
                 end
         else
                 $0 = 'uRack worker 1'
                 $workers[0] = nil
                 $workers[1] = Process.pid
+		$mywid = 1
                 ulog("spawned worker 1 (pid: #{$workers[1]})")
         end
 
@@ -88,6 +97,7 @@ module Rack
                         $workers[p] = Process.fork
                         if $workers[p].to_i == 0
                                 $0 = "uRack worker #{p}"
+				$mywid = p
                                 break
                         elsif $workers[p].to_i > 0
                                 ulog("spawned worker #{p} (pid: #{$workers[p]})")
@@ -107,6 +117,7 @@ module Rack
                                         if $workers[wid].to_i == 0
                                                 $0 = "uRack worker #{wid}"
                                                 i_am_a_child = true
+						$mywid = wid
                                                 break
                                         elsif $workers[wid].to_i > 0
                                                 ulog("respawned worker #{wid} (pid: #{$workers[wid]})")
@@ -118,9 +129,21 @@ module Rack
                 end
         end
         
+	if options[:threads] > 2
+		for t in 2..options[:threads]
+			wt = Thread.new do
+			    ulog("spawning thread #{t} on worker #{$mywid}")
+            		    while client = server.accept
+                		serve client, app, options
+            		    end
+			end
+		end
+	end
+
         while client = server.accept
-          serve client, app, options
+        	serve client, app, options
         end
+
       end
 
       def self.serve(client, app, options)

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/uwsgi.erl

@@ -0,0 +1,30 @@
+-module(uwsgi).
+-export([encode/1,send/3]).
+
+	
+encode(Vars) ->
+	Body = lists:map(fun(X) -> Len = length(X), lists:append( binary_to_list(<<Len:16/little-unsigned-integer>>), X) end, Vars),
+	lists:flatten(Body).
+	
+response(Sock, Output) ->
+	case gen_tcp:recv(Sock,0) of
+		{ ok, Data } ->
+			response(Sock, lists:append(Output, binary_to_list(Data)));
+		{ error, closed } ->
+			gen_tcp:close(Sock),
+			Output
+	end.
+
+send(Host, Port, Message) ->
+	{ ok, Sock } = gen_tcp:connect( Host, Port, [ binary, { active, false} ]),
+
+	Body = encode(Message),
+
+	Len = length(Body),
+
+	ok = gen_tcp:send(Sock, << 0, Len:16/little-unsigned-integer, 0>>),
+
+	ok = gen_tcp:send(Sock, Body),
+
+	response(Sock, []).
+

contrib/uwsgi.java

@@ -6,7 +6,6 @@ import java.util.Enumeration;
 import org.apache.catalina.util.IOTools;
 
 public class uwsgi extends HttpServlet {
-
 	private String mountpoint = null;
 
 	public void init(ServletConfig config) throws ServletException {
@@ -22,34 +21,34 @@ public class uwsgi extends HttpServlet {
 		if (getServletConfig().getInitParameter("mountpoint") != null) {
 			mountpoint = getServletConfig().getInitParameter("mountpoint");
 			if (mountpoint.length() <= 1) {
-				mountpoint = null ;
+				mountpoint = null;
 			}
 		}
 	}
 
-	
+
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
-	throws IOException, ServletException {
+		throws IOException, ServletException {
 		uWSGIHandler(request, response);
 	}
 
 	public void doGet(HttpServletRequest request, HttpServletResponse response)
-	throws IOException, ServletException {
+		throws IOException, ServletException {
 		uWSGIHandler(request, response);
 	}
 
-	
+
 	private void uWSGIHandler(HttpServletRequest request, HttpServletResponse response)
-	throws IOException, ServletException {
+		throws IOException, ServletException {
 
 		Socket client = new Socket("localhost",3017);
-		ByteArrayOutputStream uwsgi_request = new ByteArrayOutputStream() ;
+		ByteArrayOutputStream uwsgi_request = new ByteArrayOutputStream();
 		DataOutputStream wos = new DataOutputStream(uwsgi_request); 
 
 		DataOutputStream os = new DataOutputStream(client.getOutputStream());
 		DataInputStream is = new DataInputStream( client.getInputStream() );
 
-	
+
 		ServletOutputStream out = response.getOutputStream();
 
 		boolean hasBody = false;
@@ -104,14 +103,14 @@ public class uwsgi extends HttpServlet {
 
 		if (mountpoint != null) {
 			wos.writeShort(swapShort( (short) 11));
-                	wos.writeBytes("SCRIPT_NAME");
-			wos.writeShort(swapShort( (short) mountpoint.length() ) ) ;
-			wos.writeBytes( mountpoint ) ;
+			wos.writeBytes("SCRIPT_NAME");
+			wos.writeShort(swapShort( (short) mountpoint.length() ) );
+			wos.writeBytes( mountpoint );
 		}
-		
+
 
 		wos.writeShort(swapShort( (short) 9));
-                wos.writeBytes("PATH_INFO");
+		wos.writeBytes("PATH_INFO");
 		if (mountpoint != null) {
 			wos.writeShort(swapShort( (short) (request.getRequestURI().length() - mountpoint.length()) ) );
 			wos.writeBytes( request.getRequestURI().substring(mountpoint.length())  );
@@ -149,14 +148,14 @@ public class uwsgi extends HttpServlet {
 			hasBody = true;
 		}
 
-		
+
 		// taken from CGI servlet
 
 		Enumeration headers = request.getHeaderNames();
 		String header = null;
 		while (headers.hasMoreElements()) {
-                	header = null;
-                	header = ((String) headers.nextElement()).toUpperCase();
+			header = null;
+			header = ((String) headers.nextElement()).toUpperCase();
 			wos.writeShort(swapShort( (short) ("HTTP_" + header.replace('-', '_')).length() ));
 			wos.writeBytes("HTTP_" + header.replace('-', '_'));
 			wos.writeShort(swapShort( (short) request.getHeader(header).length() ));
@@ -175,16 +174,16 @@ public class uwsgi extends HttpServlet {
 			IOTools.flow(request.getInputStream(), os);
 		}
 
-		boolean statusParsed = false ;
+		boolean statusParsed = false;
 		for(;;) {
-			String line = byte_readline(is) ;
+			String line = byte_readline(is);
 			if (line == "") {
 				break;
 			}
 			if (statusParsed == false) {
 				String[] status = line.split(" ",3);
 				response.setStatus( Integer.parseInt(status[1]) );
-				statusParsed = true ;
+				statusParsed = true;
 			}
 			else {
 				String[] keyval = line.split(": ",2);
@@ -200,7 +199,7 @@ public class uwsgi extends HttpServlet {
 		byte cb[] = new byte[4096];
 		int len = 0;
 		for(;;) {
-			len = is.read(cb,0,4096) ;
+			len = is.read(cb,0,4096);
 			if ( len > 0) {
 				out.write(cb,0,len);	
 			}
@@ -208,7 +207,7 @@ public class uwsgi extends HttpServlet {
 				break;
 			}
 		}
-		
+
 
 	}
 
@@ -218,19 +217,19 @@ public class uwsgi extends HttpServlet {
 		for(;;) {
 			byte b = is.readByte();
 			if (b == 10) {
-				break ;
+				break;
 			}
-			line.write(b) ;
+			line.write(b);
 		}
 
 		return line.toString("ASCII").replaceAll("\\n","").replaceAll("\\r","");
 	}
 
 	private short swapShort(short x) {
-	
-		short tmp1 = (short) (x>>8) ;
-		short tmp2 = (short) (x<<8) ;
-		return (short) (tmp1 | tmp2)  ;
+
+		short tmp1 = (short) (x>>8);
+		short tmp2 = (short) (x<<8);
+		return (short) (tmp1 | tmp2);
 	}	
 
 }

contrib/uwsgi_client.c

@@ -2,8 +2,8 @@
 
  *** uWSGI cgi client ***
 
-to compile:
-        gcc -Wall -o uwsgi_client.cgi uwsgi_client.c
+ to compile:
+ gcc -Wall -o uwsgi_client.cgi uwsgi_client.c
 
 */
 
@@ -18,79 +18,79 @@ to compile:
 #define UWSGI_SOCK "/tmp/uwsgi.sock"
 
 int main() {
-        extern char **environ;
-        char *env ;
-        struct sockaddr_un s_addr ;
-        int uwsgi_socket ;
-        int res, cnt;
-        char *place_holder;
-        
-        unsigned short len ;
-        char message[4096];
-        char *mptr;
+	extern char **environ;
+	char *env;
+	struct sockaddr_un s_addr;
+	int uwsgi_socket;
+	int res, cnt;
+	char *place_holder;
+
+	unsigned short len;
+	char message[4096];
+	char *mptr;
 	char *content_length;
 
-        memset(&s_addr, 0, sizeof(struct sockaddr_un)) ;
+	memset(&s_addr, 0, sizeof(struct sockaddr_un));
 
-        s_addr.sun_family = AF_UNIX;
-        strcpy(s_addr.sun_path, UWSGI_SOCK);
+	s_addr.sun_family = AF_UNIX;
+	strcpy(s_addr.sun_path, UWSGI_SOCK);
 
-        uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (uwsgi_socket < 0) {
-                perror("socket()");
-                exit(1);
-        }
+	uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (uwsgi_socket < 0) {
+		perror("socket()");
+		exit(1);
+	}
 
-        if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
-                perror("connect()");
-                exit(1);
-        }
+	if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
+		perror("connect()");
+		exit(1);
+	}
 
-        memset(message, 0, 4096);
+	memset(message, 0, 4096);
 
-        mptr = message+4;
+	mptr = message+4;
 
-        if (**environ) {
-                while( (env = *environ) ) {
-                        place_holder = strchr(env,'=');
-                        // key
-                        len = place_holder-env ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, env, len);
-                        mptr+=len ;
-                        // value
-                        len = (unsigned short) (env+strlen(env) - (place_holder+1)) ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, place_holder+1, len);
-                        mptr+= len ;    
-                        *environ++;
-                }
-        }
-
-        message[0] = 0;
-        len = (mptr-message)-4 ;
-        memcpy(message+1, &len, 2) ;
-        message[3] = 0 ;
-
-        res = send(uwsgi_socket, message, mptr-message, 0);
-
-	if ( (content_length = getenv("CONTENT_LENGTH")) != NULL) {
-		if (atoi(content_length) > 0) {
-        		while( (cnt = read(0, message, 4096)) ) {
-               			send(uwsgi_socket, message, cnt, 0) ; 
-        		}
+	if (**environ) {
+		while( (env = *environ) ) {
+			place_holder = strchr(env,'=');
+			// key
+			len = place_holder-env;
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, env, len);
+			mptr+=len;
+			// value
+			len = (unsigned short) (env+strlen(env) - (place_holder+1));
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, place_holder+1, len);
+			mptr+= len;
+			*environ++;
 		}
 	}
 
-        if (res == mptr-message) {
-                while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
-                        write(1, message, res) ;
-                }
-        }
-        
-        return 0;
-        
+	message[0] = 0;
+	len = (mptr-message)-4;
+	memcpy(message+1, &len, 2);
+	message[3] = 0;
+
+	res = send(uwsgi_socket, message, mptr-message, 0);
+
+	if ( (content_length = getenv("CONTENT_LENGTH")) != NULL) {
+		if (atoi(content_length) > 0) {
+			while( (cnt = read(0, message, 4096)) ) {
+				send(uwsgi_socket, message, cnt, 0);
+			}
+		}
+	}
+
+	if (res == mptr-message) {
+		while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
+			write(1, message, res);
+		}
+	}
+
+	return 0;
+
 }
 

contrib/uwsgi_dynamic_client.c

@@ -2,8 +2,8 @@
 
  *** uWSGI cgi client ***
 
-to compile:
-        gcc -Wall -o uwsgi_client.cgi uwsgi_dynamic_client.c
+ to compile:
+ gcc -Wall -o uwsgi_client.cgi uwsgi_dynamic_client.c
 
 */
 
@@ -19,77 +19,77 @@ to compile:
 #define UWSGI_SCRIPT "myapp_wsgi"
 
 int main() {
-        extern char **environ;
-        char *env ;
-        struct sockaddr_un s_addr ;
-        int uwsgi_socket ;
-        int res, cnt;
-        char *place_holder;
-        
-        unsigned short len ;
-        char message[4096];
-        char *mptr;
+	extern char **environ;
+	char *env;
+	struct sockaddr_un s_addr;
+	int uwsgi_socket;
+	int res, cnt;
+	char *place_holder;
 
-        memset(&s_addr, 0, sizeof(struct sockaddr_un)) ;
+	unsigned short len;
+	char message[4096];
+	char *mptr;
 
-        s_addr.sun_family = AF_UNIX;
-        strcpy(s_addr.sun_path, UWSGI_SOCK);
+	memset(&s_addr, 0, sizeof(struct sockaddr_un));
 
-        uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (uwsgi_socket < 0) {
-                perror("socket()");
-                exit(1);
-        }
+	s_addr.sun_family = AF_UNIX;
+	strcpy(s_addr.sun_path, UWSGI_SOCK);
 
-        if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
-                perror("connect()");
-                exit(1);
-        }
+	uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (uwsgi_socket < 0) {
+		perror("socket()");
+		exit(1);
+	}
 
-        memset(message, 0, 4096);
+	if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
+		perror("connect()");
+		exit(1);
+	}
 
-        mptr = message+4;
-        if (setenv("UWSGI_SCRIPT", UWSGI_SCRIPT, 1) != 0) {
-                perror("setenv()");
-                exit(1);
-        }
-        if (**environ) {
-                while( (env = *environ) ) {
-                        place_holder = strchr(env,'=');
-                        // key
-                        len = place_holder-env ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, env, len);
-                        mptr+=len ;
-                        // value
-                        len = (unsigned short) (env+strlen(env) - (place_holder+1)) ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, place_holder+1, len);
-                        mptr+= len ;    
-                        *environ++;
-                }
-        }
+	memset(message, 0, 4096);
 
-        message[0] = 0;
-        len = (mptr-message)-4 ;
-        memcpy(message+1, &len, 2) ;
-        message[3] = 0 ;
+	mptr = message+4;
+	if (setenv("UWSGI_SCRIPT", UWSGI_SCRIPT, 1) != 0) {
+		perror("setenv()");
+		exit(1);
+	}
+	if (**environ) {
+		while( (env = *environ) ) {
+			place_holder = strchr(env,'=');
+			// key
+			len = place_holder-env;
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, env, len);
+			mptr+=len;
+			// value
+			len = (unsigned short) (env+strlen(env) - (place_holder+1));
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, place_holder+1, len);
+			mptr+= len;
+			*environ++;
+		}
+	}
 
-        res = send(uwsgi_socket, message, mptr-message, 0);
+	message[0] = 0;
+	len = (mptr-message)-4;
+	memcpy(message+1, &len, 2);
+	message[3] = 0;
 
-        while( (cnt = read(0, message, 4096)) ) {
-                send(uwsgi_socket, message, cnt, 0) ; 
-        }
+	res = send(uwsgi_socket, message, mptr-message, 0);
+
+	while( (cnt = read(0, message, 4096)) ) {
+		send(uwsgi_socket, message, cnt, 0);
+	}
+
+	if (res == mptr-message) {
+		while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
+			write(1, message, res);
+		}
+	}
+
+	return 0;
 
-        if (res == mptr-message) {
-                while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
-                        write(1, message, res) ;
-                }
-        }
-        
-        return 0;
-        
 }
 

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/alarm.c

@@ -0,0 +1,342 @@
+#include "../uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+// generate a uwsgi signal on alarm
+void uwsgi_alarm_init_signal(struct uwsgi_alarm_instance *uai) {
+	uai->data8 = atoi(uai->arg);
+}
+
+void uwsgi_alarm_func_signal(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	uwsgi_route_signal(uai->data8);
+}
+
+// run a command on alarm
+void uwsgi_alarm_init_cmd(struct uwsgi_alarm_instance *uai) {
+	uai->data_ptr = uai->arg;
+}
+
+void uwsgi_alarm_func_cmd(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	int pipe[2];
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipe)) {
+		return;
+	}
+	uwsgi_socket_nb(pipe[0]);
+	uwsgi_socket_nb(pipe[1]);
+	if (write(pipe[1], msg, len) != (ssize_t) len) {
+		close(pipe[0]);
+		close(pipe[1]);
+		return;
+	}
+	uwsgi_run_command(uai->data_ptr, pipe, -1);
+	close(pipe[0]);
+	close(pipe[1]);
+}
+
+// pass the log line to a mule
+
+void uwsgi_alarm_init_mule(struct uwsgi_alarm_instance *uai) {
+	uai->data32 = atoi(uai->arg);
+	if (uai->data32 > (uint32_t) uwsgi.mules_cnt) {
+		uwsgi_log_alarm("] invalid mule_id (%d mules available), fallback to 0\n", uwsgi.mules_cnt);
+		uai->data32 = 0;
+	}
+}
+
+void uwsgi_alarm_func_mule(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	// skip if mules are not available
+	if (uwsgi.mules_cnt == 0)
+		return;
+	int fd = uwsgi.shared->mule_queue_pipe[0];
+	if (uai->data32 > 0) {
+		int mule_id = uai->data32 - 1;
+		fd = uwsgi.mules[mule_id].queue_pipe[0];
+	}
+	mule_send_msg(fd, msg, len);
+}
+
+
+// register a new alarm
+void uwsgi_register_alarm(char *name, void (*init) (struct uwsgi_alarm_instance *), void (*func) (struct uwsgi_alarm_instance *, char *, size_t)) {
+	struct uwsgi_alarm *old_ua = NULL, *ua = uwsgi.alarms;
+	while (ua) {
+		// skip already initialized alarms
+		if (!strcmp(ua->name, name)) {
+			return;
+		}
+		old_ua = ua;
+		ua = ua->next;
+	}
+
+	ua = uwsgi_calloc(sizeof(struct uwsgi_alarm));
+	ua->name = name;
+	ua->init = init;
+	ua->func = func;
+
+	if (old_ua) {
+		old_ua->next = ua;
+	}
+	else {
+		uwsgi.alarms = ua;
+	}
+}
+
+// register embedded alarms
+void uwsgi_register_embedded_alarms() {
+	uwsgi_register_alarm("signal", uwsgi_alarm_init_signal, uwsgi_alarm_func_signal);
+	uwsgi_register_alarm("cmd", uwsgi_alarm_init_cmd, uwsgi_alarm_func_cmd);
+	uwsgi_register_alarm("mule", uwsgi_alarm_init_mule, uwsgi_alarm_func_mule);
+}
+
+static int uwsgi_alarm_add(char *name, char *plugin, char *arg) {
+	struct uwsgi_alarm *ua = uwsgi.alarms;
+	while (ua) {
+		if (!strcmp(ua->name, plugin)) {
+			break;
+		}
+		ua = ua->next;
+	}
+
+	if (!ua)
+		return -1;
+
+	struct uwsgi_alarm_instance *old_uai = NULL, *uai = uwsgi.alarm_instances;
+	while (uai) {
+		old_uai = uai;
+		uai = uai->next;
+	}
+
+	uai = uwsgi_calloc(sizeof(struct uwsgi_alarm_instance));
+	uai->name = name;
+	uai->alarm = ua;
+	uai->arg = arg;
+	uai->last_msg = uwsgi_malloc(uwsgi.log_master_bufsize);
+
+	if (old_uai) {
+		old_uai->next = uai;
+	}
+	else {
+		uwsgi.alarm_instances = uai;
+	}
+
+	ua->init(uai);
+	return 0;
+}
+
+// get an alarm instance by its name
+static struct uwsgi_alarm_instance *uwsgi_alarm_get_instance(char *name) {
+	struct uwsgi_alarm_instance *uai = uwsgi.alarm_instances;
+	while (uai) {
+		if (!strcmp(name, uai->name)) {
+			return uai;
+		}
+		uai = uai->next;
+	}
+	return NULL;
+}
+
+
+#ifdef UWSGI_PCRE
+static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
+
+	struct uwsgi_alarm_log *old_ual = NULL, *ual = uwsgi.alarm_logs;
+	while (ual) {
+		old_ual = ual;
+		ual = ual->next;
+	}
+
+	ual = uwsgi_calloc(sizeof(struct uwsgi_alarm_log));
+	if (uwsgi_regexp_build(regexp, &ual->pattern, &ual->pattern_extra)) {
+		return -1;
+	}
+	ual->negate = negate;
+
+	if (old_ual) {
+		old_ual->next = ual;
+	}
+	else {
+		uwsgi.alarm_logs = ual;
+	}
+
+	// map instances to the log
+	char *list = uwsgi_str(alarms);
+	char *p = strtok(list, ",");
+	while (p) {
+		struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(p);
+		if (!uai) {
+			free(list);
+			return -1;
+		}
+		struct uwsgi_alarm_ll *old_uall = NULL, *uall = ual->alarms;
+		while (uall) {
+			old_uall = uall;
+			uall = uall->next;
+		}
+
+		uall = uwsgi_calloc(sizeof(struct uwsgi_alarm_ll));
+		uall->alarm = uai;
+		if (old_uall) {
+			old_uall->next = uall;
+		}
+		else {
+			ual->alarms = uall;
+		}
+		p = strtok(NULL, ",");
+	}
+	free(list);
+	return 0;
+}
+#endif
+
+static void uwsgi_alarm_thread_loop(struct uwsgi_thread *ut) {
+	char *buf = uwsgi_malloc(uwsgi.alarm_msg_size + sizeof(long));
+	for (;;) {
+		int interesting_fd = -1;
+                int ret = event_queue_wait(ut->queue, -1, &interesting_fd);
+		if (ret > 0) {
+			ssize_t len = read(ut->pipe[1], buf, uwsgi.alarm_msg_size + sizeof(long));
+			if (len > (ssize_t)(sizeof(long) + 1)) {
+				size_t msg_size = len - sizeof(long);
+				char *msg = buf + sizeof(long);
+				long ptr = 0;
+				memcpy(&ptr, buf, sizeof(long));
+				struct uwsgi_alarm_instance *uai = (struct uwsgi_alarm_instance *) ptr;
+				if (!uai)
+					break;
+				uwsgi_alarm_run(uai, msg, msg_size);
+			}
+		}
+	}
+	free(buf);
+}
+
+// initialize alarms, instances and log regexps
+void uwsgi_alarms_init() {
+
+	if (!uwsgi.master_process) return;
+
+	// first of all, create instance of alarms
+	struct uwsgi_string_list *usl = uwsgi.alarm_list;
+	while (usl) {
+		char *line = uwsgi_str(usl->value);
+		char *space = strchr(line, ' ');
+		if (!space) {
+			uwsgi_log("invalid alarm syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*space = 0;
+		char *plugin = space + 1;
+		char *colon = strchr(plugin, ':');
+		if (!colon) {
+			uwsgi_log("invalid alarm syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*colon = 0;
+		char *arg = colon + 1;
+		// here the alarm is mapped to a name and initialized
+		if (uwsgi_alarm_add(line, plugin, arg)) {
+			uwsgi_log("invalid alarm: %s\n", usl->value);
+			exit(1);
+		}
+		usl = usl->next;
+	}
+
+	if (!uwsgi.alarm_instances) return;
+
+#ifdef UWSGI_PCRE
+	// then map log-alarm
+	usl = uwsgi.alarm_logs_list;
+	while (usl) {
+		char *line = uwsgi_str(usl->value);
+		char *space = strchr(line, ' ');
+		if (!space) {
+			uwsgi_log("invalid log-alarm syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*space = 0;
+		char *regexp = space + 1;
+		// here the log-alarm is created
+		if (uwsgi_alarm_log_add(line, regexp, usl->custom)) {
+			uwsgi_log("invalid log-alarm: %s\n", usl->value);
+			exit(1);
+		}
+
+		usl = usl->next;
+	}
+#endif
+}
+
+void uwsgi_alarm_thread_start() {
+	if (!uwsgi.alarm_instances) return;
+	// start the alarm_thread
+	uwsgi.alarm_thread = uwsgi_thread_new(uwsgi_alarm_thread_loop);
+	if (!uwsgi.alarm_thread) {
+		uwsgi_log("unable to spawn alarm thread\n");
+		exit(1);
+	}
+}
+
+#ifdef UWSGI_PCRE
+// check if a log should raise an alarm
+void uwsgi_alarm_log_check(char *msg, size_t len) {
+	if (!uwsgi_strncmp(msg, len, "[uwsgi-alarm", 12))
+		return;
+	struct uwsgi_alarm_log *ual = uwsgi.alarm_logs;
+	while (ual) {
+		if (uwsgi_regexp_match(ual->pattern, ual->pattern_extra, msg, len) >= 0) {
+			if (!ual->negate) {
+				uwsgi_alarm_log_run(ual, msg, len);
+			}
+			else {
+				break;
+			}
+		}
+		ual = ual->next;
+	}
+}
+#endif
+
+// call the alarm func
+void uwsgi_alarm_run(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	time_t now = uwsgi_now();
+	// avoid alarm storming/loop if last message is the same
+	if (!uwsgi_strncmp(msg, len, uai->last_msg, uai->last_msg_size)) {
+		if (now - uai->last_run < uwsgi.alarm_freq)
+			return;
+	}
+	uai->alarm->func(uai, msg, len);
+	uai->last_run = uwsgi_now();
+	memcpy(uai->last_msg, msg, len);
+	uai->last_msg_size = len;
+}
+
+#ifdef UWSGI_PCRE
+// call the alarms mapped to a log line
+void uwsgi_alarm_log_run(struct uwsgi_alarm_log *ual, char *msg, size_t len) {
+	struct uwsgi_alarm_ll *uall = ual->alarms;
+	while (uall) {
+		uwsgi_alarm_run(uall->alarm, msg, len);
+		uall = uall->next;
+	}
+}
+#endif
+
+
+// this is the api function workers,mules and whatever you want can call from code
+void uwsgi_alarm_trigger(char *alarm_instance_name, char *msg, size_t len) {
+	if (!uwsgi.alarm_thread) return;
+	if (len > uwsgi.alarm_msg_size) return;
+	struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(alarm_instance_name);
+	if (!uai) return;
+
+	struct iovec iov[2];
+	iov[0].iov_base = &uai;
+	iov[0].iov_len = sizeof(long);
+	iov[1].iov_base = msg;
+	iov[1].iov_len = len;
+
+	// now send the message to the alarm thread
+	if (writev(uwsgi.alarm_thread->pipe[0], iov, 2) != (ssize_t) (len+sizeof(long))) {
+		uwsgi_error("[uwsgi-alarm-error] uwsgi_alarm_trigger()/writev()");
+	}
+}

core/async.c

@@ -0,0 +1,491 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_async_queue_is_full(time_t now) {
+	if (now > uwsgi.async_queue_is_full) {
+		uwsgi_log_verbose("[DANGER] async queue is full !!!\n");
+		uwsgi.async_queue_is_full = now;
+	}
+}
+
+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];
+}
+
+struct wsgi_request *find_wsgi_req_by_fd(int fd) {
+	return uwsgi.async_waiting_fd_table[fd];
+}
+
+static void runqueue_remove(struct uwsgi_async_request *u_request) {
+
+	struct uwsgi_async_request *parent = u_request->prev;
+	struct uwsgi_async_request *child = u_request->next;
+
+	if (parent) {
+		parent->next = child;
+	}
+	if (child) {
+		child->prev = parent;
+	}
+
+	if (parent == NULL) {
+		uwsgi.async_runqueue = child;
+	}
+
+	if (u_request == uwsgi.async_runqueue_last) {
+		uwsgi.async_runqueue_last = parent;
+	}
+
+	free(u_request);
+
+	uwsgi.async_runqueue_cnt--;
+}
+
+static void runqueue_push(struct wsgi_request *wsgi_req) {
+
+	struct uwsgi_async_request *uar;
+
+	if (uwsgi.async_runqueue == NULL) {
+		// empty runqueue, create a new one
+		uwsgi.async_runqueue = uwsgi_malloc(sizeof(struct uwsgi_async_request));
+		uwsgi.async_runqueue->next = NULL;
+		uwsgi.async_runqueue->prev = NULL;
+		uwsgi.async_runqueue->wsgi_req = wsgi_req;
+		uwsgi.async_runqueue_last = uwsgi.async_runqueue;
+	}
+	else {
+		uar = uwsgi_malloc(sizeof(struct uwsgi_async_request));
+		uar->prev = uwsgi.async_runqueue_last;
+		uar->next = NULL;
+		uar->wsgi_req = wsgi_req;
+		uwsgi.async_runqueue_last->next = uar;
+		uwsgi.async_runqueue_last = uar;
+	}
+
+	uwsgi.async_runqueue_cnt++;
+
+}
+
+struct wsgi_request *find_first_available_wsgi_req() {
+
+	struct wsgi_request *wsgi_req;
+
+	if (uwsgi.async_queue_unused_ptr < 0) {
+		return NULL;
+	}
+
+	wsgi_req = uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr];
+	uwsgi.async_queue_unused_ptr--;
+	return wsgi_req;
+}
+
+static void async_expire_timeouts(uint64_t now) {
+
+	struct wsgi_request *wsgi_req;
+	struct uwsgi_async_fd *uaf = NULL, *current_uaf;
+
+	struct uwsgi_rb_timer *urbt;
+
+	for (;;) {
+
+		urbt = uwsgi_min_rb_timer(uwsgi.rb_async_timeouts, NULL);
+
+		if (urbt == NULL)
+			return;
+
+		if (urbt->value <= now) {
+			wsgi_req = (struct wsgi_request *) urbt->data;
+			// timeout expired
+			wsgi_req->async_timed_out = 1;
+			uwsgi_del_rb_timer(uwsgi.rb_async_timeouts, wsgi_req->async_timeout);
+			free(wsgi_req->async_timeout);
+			wsgi_req->async_timeout = NULL;
+			uaf = wsgi_req->waiting_fds;
+			// remove fds from monitoring (no problem modifying the queue here, as the function is executed only when there are no fd ready)
+			while (uaf) {
+				event_queue_del_fd(uwsgi.async_queue, uaf->fd, uaf->event);
+				uwsgi.async_waiting_fd_table[uaf->fd] = NULL;
+				current_uaf = uaf;
+				uaf = current_uaf->next;
+				free(current_uaf);
+			}
+			wsgi_req->waiting_fds = NULL;
+			// put th request in the runqueue
+			runqueue_push(wsgi_req);
+			continue;
+		}
+
+		break;
+	}
+
+}
+
+int async_add_fd_read(struct wsgi_request *wsgi_req, int fd, int timeout) {
+
+	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
+
+	if (fd < 0)
+		return -1;
+
+	// find first slot
+	while (uad) {
+		last_uad = uad;
+		uad = uad->next;
+	}
+
+	uad = uwsgi_malloc(sizeof(struct uwsgi_async_fd));
+	uad->fd = fd;
+	uad->event = event_queue_read();
+	uad->prev = last_uad;
+	uad->next = NULL;
+
+	if (last_uad) {
+		last_uad->next = uad;
+	}
+	else {
+		wsgi_req->waiting_fds = uad;
+	}
+
+	if (timeout > 0) {
+		async_add_timeout(wsgi_req, timeout);
+	}
+	uwsgi.async_waiting_fd_table[fd] = wsgi_req;
+	wsgi_req->async_force_again = 1;
+	return event_queue_add_fd_read(uwsgi.async_queue, fd);
+}
+
+static int async_wait_fd_read(int fd, int timeout) {
+	struct wsgi_request *wsgi_req = current_wsgi_req();
+	if (async_add_fd_read(wsgi_req, fd, timeout)) {
+		return -1;
+	}
+	if (uwsgi.schedule_to_main) {
+		uwsgi.schedule_to_main(wsgi_req);
+	}
+	if (wsgi_req->async_timed_out) {
+		wsgi_req->async_timed_out = 0;
+		return 0;
+	}
+	return 1;
+}
+
+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, uwsgi_now() + timeout, wsgi_req);
+	}
+
+}
+
+int async_add_fd_write(struct wsgi_request *wsgi_req, int fd, int timeout) {
+
+	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
+
+	if (fd < 0)
+		return -1;
+
+	// find first slot
+	while (uad) {
+		last_uad = uad;
+		uad = uad->next;
+	}
+
+	uad = uwsgi_malloc(sizeof(struct uwsgi_async_fd));
+	uad->fd = fd;
+	uad->event = event_queue_write();
+	uad->prev = last_uad;
+	uad->next = NULL;
+
+	if (last_uad) {
+		last_uad->next = uad;
+	}
+	else {
+		wsgi_req->waiting_fds = uad;
+	}
+
+	if (timeout > 0) {
+		async_add_timeout(wsgi_req, timeout);
+	}
+
+	uwsgi.async_waiting_fd_table[fd] = wsgi_req;
+	wsgi_req->async_force_again = 1;
+	return event_queue_add_fd_write(uwsgi.async_queue, fd);
+}
+
+static int async_wait_fd_write(int fd, int timeout) {
+	struct wsgi_request *wsgi_req = current_wsgi_req();
+	if (async_add_fd_write(wsgi_req, fd, timeout)) {
+		return -1;
+	}
+	if (uwsgi.schedule_to_main) {
+		uwsgi.schedule_to_main(wsgi_req);
+	}
+	if (wsgi_req->async_timed_out) {
+		wsgi_req->async_timed_out = 0;
+		return 0;
+	}
+	return 1;
+}
+
+void async_schedule_to_req(void) {
+	uwsgi.wsgi_req->async_status = uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req);
+}
+
+void async_loop() {
+
+	if (uwsgi.async < 2) {
+		uwsgi_log("the async loop engine requires async mode (--async <n>)\n");
+		exit(1);
+	}
+
+	struct uwsgi_async_fd *tmp_uaf;
+	int interesting_fd, i;
+	struct uwsgi_rb_timer *min_timeout;
+	int timeout;
+	int is_a_new_connection;
+	int proto_parser_status;
+
+	uint64_t now;
+
+	static struct uwsgi_async_request *current_request = NULL, *next_async_request = NULL;
+
+	void *events = event_queue_alloc(64);
+	struct uwsgi_socket *uwsgi_sock;
+
+	uwsgi.async_runqueue = NULL;
+	uwsgi.async_runqueue_cnt = 0;
+
+	uwsgi.wait_write_hook = async_wait_fd_write;
+        uwsgi.wait_read_hook = async_wait_fd_read;
+
+	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;
+
+	if (!uwsgi.schedule_to_main) {
+		uwsgi_log("*** WARNING *** async mode without coroutine/greenthread engine loaded !!!\n");
+	}
+
+	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
+
+		now = (uint64_t) uwsgi_now();
+		if (uwsgi.async_runqueue_cnt) {
+			timeout = 0;
+		}
+		else {
+			min_timeout = uwsgi_min_rb_timer(uwsgi.rb_async_timeouts, NULL);
+			if (min_timeout) {
+				timeout = min_timeout->value - now;
+				if (timeout <= 0) {
+					async_expire_timeouts(now);
+					timeout = 0;
+				}
+			}
+			else {
+				timeout = -1;
+			}
+		}
+
+		uwsgi.async_nevents = event_queue_wait_multi(uwsgi.async_queue, timeout, events, 64);
+
+		now = (uint64_t) uwsgi_now();
+		// timeout ???
+		if (uwsgi.async_nevents == 0) {
+			async_expire_timeouts(now);
+		}
+
+
+		for (i = 0; i < uwsgi.async_nevents; i++) {
+			// 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 ?
+
+			uwsgi_sock = uwsgi.sockets;
+			while (uwsgi_sock) {
+
+				if (interesting_fd == uwsgi_sock->fd) {
+
+					is_a_new_connection = 1;
+
+					uwsgi.wsgi_req = find_first_available_wsgi_req();
+					if (uwsgi.wsgi_req == NULL) {
+						uwsgi_async_queue_is_full((time_t)now);
+						break;
+					}
+
+					wsgi_req_setup(uwsgi.wsgi_req, uwsgi.wsgi_req->async_id, uwsgi_sock);
+					if (wsgi_req_simple_accept(uwsgi.wsgi_req, interesting_fd)) {
+						uwsgi.async_queue_unused_ptr++;
+						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+						break;
+					}
+
+					if (wsgi_req_async_recv(uwsgi.wsgi_req)) {
+						uwsgi.async_queue_unused_ptr++;
+						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+						break;
+					}
+
+					if (uwsgi.wsgi_req->do_not_add_to_async_queue) {
+						runqueue_push(uwsgi.wsgi_req);
+					}
+
+					break;
+				}
+
+				uwsgi_sock = uwsgi_sock->next;
+			}
+
+			if (!is_a_new_connection) {
+				// proto event
+				uwsgi.wsgi_req = find_wsgi_req_proto_by_fd(interesting_fd);
+				if (uwsgi.wsgi_req) {
+					proto_parser_status = uwsgi.wsgi_req->socket->proto(uwsgi.wsgi_req);
+					// reset timeout
+					uwsgi_del_rb_timer(uwsgi.rb_async_timeouts, uwsgi.wsgi_req->async_timeout);
+					free(uwsgi.wsgi_req->async_timeout);
+					uwsgi.wsgi_req->async_timeout = NULL;
+					// parsing complete
+					if (!proto_parser_status) {
+						// remove fd from event poll and fd proto table 
+						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
+						event_queue_del_fd(uwsgi.async_queue, interesting_fd, event_queue_read());
+						// put request in the runqueue
+						runqueue_push(uwsgi.wsgi_req);
+						continue;
+					}
+					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;
+					}
+					// re-add timer
+					async_add_timeout(uwsgi.wsgi_req, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+					continue;
+				}
+
+				// app event
+				uwsgi.wsgi_req = find_wsgi_req_by_fd(interesting_fd);
+				// unknown fd, remove it (for safety)
+				if (uwsgi.wsgi_req == NULL) {
+					close(interesting_fd);
+					continue;
+				}
+
+				// remove all the fd monitors and timeout
+				while (uwsgi.wsgi_req->waiting_fds) {
+					tmp_uaf = uwsgi.wsgi_req->waiting_fds;
+					uwsgi.async_waiting_fd_table[tmp_uaf->fd] = NULL;
+					event_queue_del_fd(uwsgi.async_queue, tmp_uaf->fd, tmp_uaf->event);
+					uwsgi.wsgi_req->waiting_fds = tmp_uaf->next;
+					free(tmp_uaf);
+				}
+				uwsgi.wsgi_req->waiting_fds = NULL;
+				if (uwsgi.wsgi_req->async_timeout) {
+					uwsgi_del_rb_timer(uwsgi.rb_async_timeouts, uwsgi.wsgi_req->async_timeout);
+					free(uwsgi.wsgi_req->async_timeout);
+					uwsgi.wsgi_req->async_timeout = NULL;
+				}
+
+				uwsgi.wsgi_req->async_ready_fd = 1;
+				uwsgi.wsgi_req->async_last_ready_fd = interesting_fd;
+
+				// put the request in the runqueue again
+				runqueue_push(uwsgi.wsgi_req);
+				// avoid managing other enqueued events...
+				break;
+			}
+		}
+
+		// event queue managed, give cpu to runqueue
+		if (!current_request)
+			current_request = uwsgi.async_runqueue;
+
+		if (uwsgi.async_runqueue_cnt) {
+
+			uwsgi.wsgi_req = current_request->wsgi_req;
+
+			uwsgi.schedule_to_req();
+			uwsgi.wsgi_req->switches++;
+
+			next_async_request = current_request->next;
+			// request ended ?
+			if (uwsgi.wsgi_req->async_status <= UWSGI_OK) {
+				// remove all the monitored fds and timeout
+				while (uwsgi.wsgi_req->waiting_fds) {
+					tmp_uaf = uwsgi.wsgi_req->waiting_fds;
+					uwsgi.async_waiting_fd_table[tmp_uaf->fd] = NULL;
+					event_queue_del_fd(uwsgi.async_queue, tmp_uaf->fd, tmp_uaf->event);
+					uwsgi.wsgi_req->waiting_fds = tmp_uaf->next;
+					free(tmp_uaf);
+				}
+				uwsgi.wsgi_req->waiting_fds = NULL;
+				if (uwsgi.wsgi_req->async_timeout) {
+					uwsgi_del_rb_timer(uwsgi.rb_async_timeouts, uwsgi.wsgi_req->async_timeout);
+					free(uwsgi.wsgi_req->async_timeout);
+					uwsgi.wsgi_req->async_timeout = NULL;
+				}
+
+				// remove from the list
+				runqueue_remove(current_request);
+
+				uwsgi_close_request(uwsgi.wsgi_req);
+
+				// push wsgi_request in the unused stack
+				uwsgi.async_queue_unused_ptr++;
+				uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+
+			}
+			else if (uwsgi.wsgi_req->waiting_fds || uwsgi.wsgi_req->async_timeout) {
+				// remove this request from suspended list      
+				runqueue_remove(current_request);
+			}
+
+			current_request = next_async_request;
+
+		}
+
+
+	}
+
+}

core/buffer.c

@@ -0,0 +1,356 @@
+#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_fix(struct uwsgi_buffer *ub, size_t len) {
+	if (ub->limit > 0 && len > ub->limit)
+		return -1;
+	if (ub->len < len) {
+		char *new_buf = realloc(ub->buf, len);
+		if (!new_buf) {
+			uwsgi_error("uwsgi_buffer_fix()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len = len;
+	}
+	return 0;
+}
+
+int uwsgi_buffer_ensure(struct uwsgi_buffer *ub, size_t len) {
+	size_t remains = ub->len - ub->pos;
+	if (remains < len) {
+		size_t new_len = ub->len + (len - remains);
+		if (ub->limit > 0 && new_len > ub->limit) {
+			new_len = ub->limit;
+			if (new_len == ub->len)
+				return -1;
+		}
+		char *new_buf = realloc(ub->buf, new_len);
+		if (!new_buf) {
+			uwsgi_error("uwsgi_buffer_ensure()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len = new_len;
+	}
+	return 0;
+}
+
+int uwsgi_buffer_insert(struct uwsgi_buffer *ub, size_t pos, char *buf, size_t len) {
+	size_t to_move = (ub->pos-pos);
+	if (uwsgi_buffer_ensure(ub, len)) return -1;
+	memmove(ub->buf+pos+len, ub->buf+pos, to_move);
+	memcpy(ub->buf+pos, buf, len);
+	ub->pos += len;
+	return 0;
+}
+
+int uwsgi_buffer_insert_chunked(struct uwsgi_buffer *ub, size_t pos, size_t len) {
+	// 0xFFFFFFFFFFFFFFFF\r\n\0
+	char chunked[19];
+	int ret = snprintf(chunked, 19, "%X\r\n", (unsigned int) len);
+        if (ret <= 0 || ret > 19) {
+                return -1;
+        }
+	return uwsgi_buffer_insert(ub, pos, chunked, ret);
+}
+
+int uwsgi_buffer_append_chunked(struct uwsgi_buffer *ub, size_t len) {
+        // 0xFFFFFFFFFFFFFFFF\r\n\0
+        char chunked[19];
+        int ret = snprintf(chunked, 19, "%X\r\n", (unsigned int) len);
+        if (ret <= 0 || ret > 19) {
+                return -1;
+        }
+        return uwsgi_buffer_append(ub, chunked, ret);
+}
+
+
+int uwsgi_buffer_decapitate(struct uwsgi_buffer *ub, size_t len) {
+	if (len > ub->pos) return -1;
+	memmove(ub->buf, ub->buf + len, ub->pos-len);
+	ub->pos = ub->pos-len;
+	return 0;
+}
+
+int uwsgi_buffer_byte(struct uwsgi_buffer *ub, char byte) {
+	return uwsgi_buffer_append(ub, &byte, 1);
+}
+
+int uwsgi_buffer_u8(struct uwsgi_buffer *ub, uint8_t u8) {
+	return uwsgi_buffer_append(ub, (char *) &u8, 1);
+}
+
+int uwsgi_buffer_append(struct uwsgi_buffer *ub, char *buf, size_t len) {
+
+	size_t remains = ub->len - ub->pos;
+
+	if (len > remains) {
+		size_t chunk_size = UMAX(len, (size_t) uwsgi.page_size);
+		if (ub->limit > 0 && ub->len + chunk_size > ub->limit) {
+			// retry with another minimal size
+			if (len < (size_t) uwsgi.page_size) {
+				chunk_size = len;
+			}
+			if (ub->len + chunk_size > ub->limit)
+				return -1;
+		}
+		char *new_buf = realloc(ub->buf, ub->len + chunk_size);
+		if (!new_buf) {
+			uwsgi_error("uwsgi_buffer_append()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len += chunk_size;
+	}
+
+	memcpy(ub->buf + ub->pos, buf, len);
+	ub->pos += len;
+	return 0;
+}
+
+int uwsgi_buffer_append_json(struct uwsgi_buffer *ub, char *buf, size_t len) {
+	// need to escape \ and "
+	size_t i;
+	for(i=0;i<len;i++) {
+		if (buf[i] == '"') {
+			if (uwsgi_buffer_append(ub, "\\\"", 2)) return -1;
+		}
+		else if (buf[i] == '\\') {
+			if (uwsgi_buffer_append(ub, "\\\\", 2)) return -1;
+		}
+		else {
+			if (uwsgi_buffer_append(ub, buf+i, 1)) return -1;
+		}
+	}
+	return 0;
+}
+
+int uwsgi_buffer_u16le(struct uwsgi_buffer *ub, uint16_t num) {
+	uint8_t buf[2];
+	buf[0] = (uint8_t) (num & 0xff);
+        buf[1] = (uint8_t) ((num >> 8) & 0xff);
+	return uwsgi_buffer_append(ub, (char *) buf, 2);
+}
+
+int uwsgi_buffer_u16be(struct uwsgi_buffer *ub, uint16_t num) {
+        uint8_t buf[2];
+        buf[1] = (uint8_t) (num & 0xff);
+        buf[0] = (uint8_t) ((num >> 8) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 2);
+}
+
+int uwsgi_buffer_u24be(struct uwsgi_buffer *ub, uint32_t num) {
+        uint8_t buf[3];
+        buf[2] = (uint8_t) (num & 0xff);
+        buf[1] = (uint8_t) ((num >> 8) & 0xff);
+        buf[0] = (uint8_t) ((num >> 16) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 3);
+}
+
+int uwsgi_buffer_u32be(struct uwsgi_buffer *ub, uint32_t num) {
+        uint8_t buf[4];
+        buf[3] = (uint8_t) (num & 0xff);
+        buf[2] = (uint8_t) ((num >> 8) & 0xff);
+        buf[1] = (uint8_t) ((num >> 16) & 0xff);
+        buf[0] = (uint8_t) ((num >> 24) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 4);
+}
+
+int uwsgi_buffer_u32le(struct uwsgi_buffer *ub, uint32_t num) {
+        uint8_t buf[4];
+        buf[0] = (uint8_t) (num & 0xff);
+        buf[1] = (uint8_t) ((num >> 8) & 0xff);
+        buf[2] = (uint8_t) ((num >> 16) & 0xff);
+        buf[3] = (uint8_t) ((num >> 24) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 4);
+}
+
+int uwsgi_buffer_u64be(struct uwsgi_buffer *ub, uint64_t num) {
+        uint8_t buf[8];
+        buf[7] = (uint8_t) (num & 0xff);
+        buf[6] = (uint8_t) ((num >> 8) & 0xff);
+        buf[5] = (uint8_t) ((num >> 16) & 0xff);
+        buf[4] = (uint8_t) ((num >> 24) & 0xff);
+        buf[3] = (uint8_t) ((num >> 32) & 0xff);
+        buf[2] = (uint8_t) ((num >> 40) & 0xff);
+        buf[1] = (uint8_t) ((num >> 48) & 0xff);
+        buf[0] = (uint8_t) ((num >> 56) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 8);
+}
+
+
+int uwsgi_buffer_append_ipv4(struct uwsgi_buffer *ub, void *addr) {
+	char ip[INET_ADDRSTRLEN];
+	if (!inet_ntop(AF_INET, addr, ip, INET_ADDRSTRLEN)) {
+		uwsgi_error("uwsgi_buffer_append_ipv4() -> inet_ntop()");
+		return -1;
+	}
+	return uwsgi_buffer_append(ub, ip, strlen(ip));
+}
+
+
+int uwsgi_buffer_num64(struct uwsgi_buffer *ub, int64_t num) {
+	char buf[sizeof(UMAX64_STR)+1];
+	int ret = snprintf(buf, sizeof(UMAX64_STR)+1, "%lld", (long long) num);
+	if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
+		return -1;
+	}
+	return uwsgi_buffer_append(ub, buf, ret);
+}
+
+int uwsgi_buffer_append_keyval(struct uwsgi_buffer *ub, char *key, uint16_t keylen, char *val, uint16_t vallen) {
+	if (uwsgi_buffer_u16le(ub, keylen)) return -1;
+	if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+	if (uwsgi_buffer_u16le(ub, vallen)) return -1;
+	return uwsgi_buffer_append(ub, val, vallen);
+}
+
+int uwsgi_buffer_append_keyval32(struct uwsgi_buffer *ub, char *key, uint32_t keylen, char *val, uint32_t vallen) {
+        if (uwsgi_buffer_u32be(ub, keylen)) return -1;
+        if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+        if (uwsgi_buffer_u32be(ub, vallen)) return -1;
+        return uwsgi_buffer_append(ub, val, vallen);
+}
+
+int uwsgi_buffer_append_keynum(struct uwsgi_buffer *ub, char *key, uint16_t keylen, int64_t num) {
+	char buf[sizeof(UMAX64_STR)+1];
+        int ret = snprintf(buf, (sizeof(UMAX64_STR)+1), "%lld", (long long) num);
+        if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
+                return -1;
+        }
+	if (uwsgi_buffer_u16le(ub, keylen)) return -1;
+	if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+	if (uwsgi_buffer_u16le(ub, ret)) return -1;
+	return uwsgi_buffer_append(ub, buf, ret);
+}
+
+int uwsgi_buffer_append_valnum(struct uwsgi_buffer *ub, int64_t num) {
+        char buf[sizeof(UMAX64_STR)+1];
+        int ret = snprintf(buf, (sizeof(UMAX64_STR)+1), "%lld", (long long) num);
+        if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
+                return -1;
+        }
+        if (uwsgi_buffer_u16le(ub, ret)) return -1;
+        return uwsgi_buffer_append(ub, buf, ret);
+}
+
+
+int uwsgi_buffer_append_keyipv4(struct uwsgi_buffer *ub, char *key, uint16_t keylen, void *addr) {
+        if (uwsgi_buffer_u16le(ub, keylen)) return -1;
+        if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+        if (uwsgi_buffer_u16le(ub, 15)) return -1;
+	char *ptr = ub->buf + (ub->pos - 2);
+        if (uwsgi_buffer_append_ipv4(ub, addr)) return -1;
+	// fix the size
+	*ptr = ((ub->buf+ub->pos) - (ptr+2));
+	return 0;
+}
+
+int uwsgi_buffer_append_base64(struct uwsgi_buffer *ub, char *s, size_t len) {
+	size_t b64_len = 0;
+	char *b64 = uwsgi_base64_encode(s, len, &b64_len);
+	if (!b64) return -1;
+	int ret = uwsgi_buffer_append(ub, b64, b64_len);
+	free(b64);
+	return ret;
+}
+
+
+void uwsgi_buffer_destroy(struct uwsgi_buffer *ub) {
+	if (ub->buf)
+		free(ub->buf);
+	free(ub);
+}
+
+ssize_t uwsgi_buffer_write_simple(struct wsgi_request *wsgi_req, struct uwsgi_buffer *ub) {
+	size_t remains = ub->pos;
+	while(remains) {
+		ssize_t len = write(wsgi_req->fd, ub->buf + (ub->pos - remains), remains);
+		if (len <= 0) {
+			return len;
+		}
+		remains -= len;
+	}
+
+	return ub->pos;
+}
+
+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("uwsgi_buffer_send()");
+				return -1;
+			}
+		}
+		else if (ret == 0) {
+			uwsgi_log("timeout while sending buffer !!!\n");
+			return -1;
+		}
+		else {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int uwsgi_buffer_set_uh(struct uwsgi_buffer *ub, uint8_t modifier1, uint8_t modifier2) {
+	if (ub->pos < 4) return -1;
+	ub->buf[0] = modifier1;
+	ub->buf[1] = (uint8_t) ((ub->pos - 4) & 0xff);
+	ub->buf[2] = (uint8_t) (((ub->pos - 4) >> 8) & 0xff);
+	ub->buf[3] = modifier2;
+	return 0;
+}
+
+struct uwsgi_buffer *uwsgi_buffer_from_file(char *filename) {
+	struct stat st;
+        int fd = open(filename, O_RDONLY);
+        if (fd < 0) {
+		return NULL;
+        }
+
+        if (fstat(fd, &st)) {
+                close(fd);
+		return NULL;
+        }
+
+        struct uwsgi_buffer *ub = uwsgi_buffer_new(st.st_size);
+
+        ssize_t len = read(fd, ub->buf, st.st_size);
+	close(fd);
+        if (len != st.st_size) {
+		uwsgi_buffer_destroy(ub);
+		return NULL;
+        }
+
+	ub->pos = len;
+	return ub;
+}
+

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/config.c

@@ -0,0 +1,33 @@
+#include <uwsgi.h>
+
+/*
+
+	pluggable configuration system
+
+*/
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_configurator *uwsgi_register_configurator(char *name, void (*func)(char *, char **)) {
+	struct uwsgi_configurator *old_uc = NULL,*uc = uwsgi.configurators;
+        while(uc) {
+                if (!strcmp(uc->name, name)) {
+                        return uc;
+                }
+                old_uc = uc;
+                uc = uc->next;
+        }
+
+        uc = uwsgi_calloc(sizeof(struct uwsgi_configurator));
+        uc->name = name;
+        uc->func = func;
+
+        if (old_uc) {
+                old_uc->next = uc;
+        }
+        else {
+                uwsgi.configurators = uc;
+        }
+
+        return uc;
+}

core/cookie.c

@@ -0,0 +1,81 @@
+#include <uwsgi.h>
+
+/*
+
+	cookie management functions (mainly used by the internal routing subsystem)
+
+*/
+
+static char *check_cookie(char *cookie, uint16_t cookie_len, char *key, uint16_t keylen, uint16_t *vallen) {
+	uint16_t orig_cookie_len = cookie_len-1;
+	// first lstrip white spaces
+	char *ptr = cookie;
+	uint16_t i;
+	for(i=0;i<cookie_len;i++) {
+		if (isspace((int)ptr[i])) {
+			cookie++;
+			cookie_len--;
+		}
+		else {
+			break;
+		}
+	}
+
+	// then rstrip (skipping the first char...)
+	for(i=orig_cookie_len;i>0;i--) {
+		if (isspace((int)ptr[i])) {
+			cookie_len--;
+		}
+		else {
+			break;
+		}
+	}
+
+	// now search for the first equal sign
+	char *equal = memchr(cookie, '=', cookie_len);
+	if (!equal) return NULL;
+	
+	if (uwsgi_strncmp(key, keylen, cookie, equal-cookie)) {
+		return NULL;
+	}
+
+	cookie_len -= (equal-cookie)+1;
+	if (cookie_len == 0) return NULL;
+
+	*vallen = cookie_len;
+	return equal+1;
+}
+
+char *uwsgi_get_cookie(struct wsgi_request *wsgi_req, char *key, uint16_t keylen, uint16_t *vallen) {
+	uint16_t i;
+
+	char *cookie = wsgi_req->cookie;
+	uint16_t cookie_len = 0;
+	char *ptr = wsgi_req->cookie;
+	//start splitting by ;
+	for(i=0;i<wsgi_req->cookie_len;i++) {
+		if (!cookie) {
+			cookie = ptr + i;
+		}
+		if (ptr[i] == ';') {
+			char *value = check_cookie(cookie, cookie_len, key, keylen, vallen);
+			if (value) {
+				return value;
+			}
+			cookie_len = 0;
+			cookie = NULL;
+		}
+		else {
+			cookie_len++;
+		}
+	}
+
+	if (cookie_len > 0) {
+		char *value = check_cookie(cookie, cookie_len, key, keylen, vallen);
+		if (value) {
+                	return value;
+                }
+	}
+
+	return NULL;
+}

core/daemons.c

@@ -0,0 +1,314 @@
+#include "../uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	External uwsgi daemons
+
+	There are 3 kind of daemons (read: external applications) that can be managed
+	by uWSGI.
+
+	1) dumb daemons (attached with --attach-daemon)
+		they must not daemonize() and when they exit() the master is notified (via waitpid)
+		and the process is respawned
+	2) smart daemons with daemonization
+		you specify a pidfile and a command
+		- on startup - if the pidfile does not exists or contains a not-available pid (checked with kill(pid, 0))
+		the daemon is respawned
+		- on master ckeck - if the pidfile does not exist or if it point to a non-existent pid
+                the daemon is respawned
+	3) smart daemons without daemonization
+		same as 2, but the daemonization and pidfile creation is managed by uWSGI
+
+	status:
+
+	0 -> never started
+	1 -> just started
+	2 -> started and monitored (only in pidfile based)
+
+*/
+
+void uwsgi_daemons_smart_check() {
+	static time_t last_run = 0;
+
+	time_t now = uwsgi_now();
+
+	if (now - last_run <= 0) {
+		return;
+	}
+
+	last_run = now;
+
+	struct uwsgi_daemon *ud = uwsgi.daemons;
+	while (ud) {
+		if (ud->pidfile) {
+			int checked_pid = uwsgi_check_pidfile(ud->pidfile);
+			if (checked_pid <= 0) {
+				// monitored instance
+				if (ud->status == 2) {
+					uwsgi_spawn_daemon(ud);
+				}
+				else {
+					ud->pidfile_checks++;
+					if (ud->pidfile_checks >= (unsigned int) ud->freq) {
+						uwsgi_log("[uwsgi-daemons] found changed pidfile for \"%s\" (old_pid: %d new_pid: %d)\n", ud->command, (int) ud->pid, (int) checked_pid);
+						uwsgi_spawn_daemon(ud);
+					}
+				}
+			}
+			else if (checked_pid != ud->pid) {
+				uwsgi_log("[uwsgi-daemons] found changed pid for \"%s\" (old_pid: %d new_pid: %d)\n", ud->command, (int) ud->pid, (int) checked_pid);
+				ud->pid = checked_pid;
+			}
+			// all ok, pidfile and process found
+			else {
+				ud->status = 2;
+			}
+		}
+		ud = ud->next;
+	}
+}
+
+// this function is called when a dumb daemon dies and we do not wat to respawn it
+int uwsgi_daemon_check_pid_death(pid_t diedpid) {
+	struct uwsgi_daemon *ud = uwsgi.daemons;
+	while (ud) {
+		if (ud->pid == diedpid && !ud->pidfile) {
+			uwsgi_log("daemon \"%s\" (pid: %d) annihilated\n", ud->command, (int) diedpid);
+			return -1;
+		}
+		ud = ud->next;
+	}
+	return 0;
+}
+
+// this function is called when a dumb daemon dies and we want to respawn it
+int uwsgi_daemon_check_pid_reload(pid_t diedpid) {
+	struct uwsgi_daemon *ud = uwsgi.daemons;
+	while (ud) {
+		if (ud->pid == diedpid && !ud->pidfile) {
+			uwsgi_spawn_daemon(ud);
+			return 1;
+		}
+		ud = ud->next;
+	}
+	return 0;
+}
+
+
+
+int uwsgi_check_pidfile(char *filename) {
+	struct stat st;
+	pid_t ret = -1;
+	int fd = open(filename, O_RDONLY);
+	if (fd < 0) {
+		uwsgi_error_open(filename);
+		goto end;
+	}
+	if (fstat(fd, &st)) {
+		uwsgi_error("fstat()");
+		goto end2;
+	}
+	char *pidstr = uwsgi_calloc(st.st_size + 1);
+	if (read(fd, pidstr, st.st_size) != st.st_size) {
+		uwsgi_error("read()");
+		goto end3;
+	}
+	pid_t pid = atoi(pidstr);
+	if (pid <= 0)
+		goto end3;
+	if (!kill(pid, 0)) {
+		ret = pid;
+	}
+end3:
+	free(pidstr);
+end2:
+	close(fd);
+end:
+	return ret;
+}
+
+void uwsgi_daemons_spawn_all() {
+	struct uwsgi_daemon *ud = uwsgi.daemons;
+	while (ud) {
+		if (!ud->registered) {
+			if (ud->pidfile) {
+				int checked_pid = uwsgi_check_pidfile(ud->pidfile);
+				if (checked_pid <= 0) {
+					uwsgi_spawn_daemon(ud);
+				}
+				else {
+					ud->pid = checked_pid;
+					uwsgi_log("[uwsgi-daemons] found valid/active pidfile for \"%s\" (pid: %d)\n", ud->command, (int) ud->pid);
+				}
+			}
+			else {
+				uwsgi_spawn_daemon(ud);
+			}
+			ud->registered = 1;
+		}
+		ud = ud->next;
+	}
+}
+
+
+void uwsgi_detach_daemons() {
+	struct uwsgi_daemon *ud = uwsgi.daemons;
+	while (ud) {
+		if (ud->pid > 0 && !ud->pidfile)
+			kill(-ud->pid, SIGKILL);
+		ud = ud->next;
+	}
+}
+
+
+void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
+
+	int devnull = -1;
+	int throttle = 0;
+
+	if (uwsgi.current_time - ud->last_spawn <= 3) {
+		throttle = ud->respawns - (uwsgi.current_time - ud->last_spawn);
+	}
+
+	pid_t pid = uwsgi_fork("uWSGI external daemon");
+	if (pid < 0) {
+		uwsgi_error("fork()");
+		return;
+	}
+
+	if (pid > 0) {
+		ud->pid = pid;
+		ud->status = 1;
+		ud->pidfile_checks = 0;
+		if (ud->respawns == 0) {
+			ud->born = uwsgi_now();
+		}
+
+		ud->respawns++;
+		ud->last_spawn = uwsgi_now();
+
+	}
+	else {
+		// close uwsgi sockets
+		uwsgi_close_all_sockets();
+		uwsgi_close_all_fds();
+
+		if (ud->daemonize) {
+			/* refork... */
+			pid = fork();
+			if (pid < 0) {
+				uwsgi_error("fork()");
+				exit(1);
+			}
+			if (pid != 0) {
+				_exit(0);
+			}
+			uwsgi_write_pidfile(ud->pidfile);
+		}
+
+		if (!uwsgi.daemons_honour_stdin) {
+			// /dev/null will became stdin
+			devnull = open("/dev/null", O_RDONLY);
+			if (devnull < 0) {
+				uwsgi_error("/dev/null open()");
+				exit(1);
+			}
+			if (devnull != 0) {
+				if (dup2(devnull, 0) < 0) {
+					uwsgi_error("dup2()");
+					exit(1);
+				}
+				close(devnull);
+			}
+		}
+
+		if (setsid() < 0) {
+			uwsgi_error("setsid()");
+			exit(1);
+		}
+
+		if (!ud->pidfile) {
+#ifdef __linux__
+			if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0)) {
+				uwsgi_error("prctl()");
+			}
+#endif
+		}
+
+
+		if (throttle) {
+			uwsgi_log("[uwsgi-daemons] throttling \"%s\" for %d seconds\n", ud->command, throttle);
+			sleep(throttle);
+		}
+
+		uwsgi_log("[uwsgi-daemons] %sspawning \"%s\"\n", ud->respawns > 0 ? "re" : "", ud->command);
+		uwsgi_exec_command_with_args(ud->command);
+		uwsgi_log("[uwsgi-daemons] unable to spawn \"%s\"\n", ud->command);
+
+		// never here;
+		exit(1);
+	}
+
+	return;
+}
+
+
+void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
+
+	struct uwsgi_daemon *uwsgi_ud = uwsgi.daemons, *old_ud;
+	char *pidfile = NULL;
+	int daemonize = 0;
+	int freq = 10;
+
+	char *command = uwsgi_str(value);
+
+	if (!strcmp(opt, "smart-attach-daemon") || !strcmp(opt, "smart-attach-daemon2")) {
+		char *space = strchr(command, ' ');
+		if (!space) {
+			uwsgi_log("invalid smart-attach-daemon syntax: %s\n", command);
+			exit(1);
+		}
+		*space = 0;
+		pidfile = command;
+		// check for freq
+		char *comma = strchr(pidfile, ',');
+		if (comma) {
+			*comma = 0;
+			freq = atoi(comma + 1);
+		}
+		command = space + 1;
+		if (!strcmp(opt, "smart-attach-daemon2")) {
+			daemonize = 1;
+		}
+	}
+
+	if (!uwsgi_ud) {
+		uwsgi.daemons = uwsgi_malloc(sizeof(struct uwsgi_daemon));
+		uwsgi_ud = uwsgi.daemons;
+	}
+	else {
+		while (uwsgi_ud) {
+			old_ud = uwsgi_ud;
+			uwsgi_ud = uwsgi_ud->next;
+		}
+
+		uwsgi_ud = uwsgi_malloc(sizeof(struct uwsgi_daemon));
+		old_ud->next = uwsgi_ud;
+	}
+
+	uwsgi_ud->command = command;
+	uwsgi_ud->pid = 0;
+	uwsgi_ud->status = 0;
+	uwsgi_ud->freq = freq;
+	uwsgi_ud->registered = 0;
+	uwsgi_ud->next = NULL;
+	uwsgi_ud->respawns = 0;
+	uwsgi_ud->last_spawn = 0;
+	uwsgi_ud->daemonize = daemonize;
+	uwsgi_ud->pidfile = pidfile;
+
+	uwsgi.daemons_cnt++;
+
+}

core/errors.c

@@ -0,0 +1,45 @@
+#include <uwsgi.h>
+
+// generate internal server error message
+void uwsgi_500(struct wsgi_request *wsgi_req) {
+	if (uwsgi_response_prepare_headers(wsgi_req, "500 Internal Server Error", 25)) return;
+	if (uwsgi_response_add_connection_close(wsgi_req)) return;
+	uwsgi_response_write_body_do(wsgi_req, "Internal Server Error", 21);
+}
+
+
+void uwsgi_404(struct wsgi_request *wsgi_req) {
+	if (uwsgi_response_prepare_headers(wsgi_req, "404 Not Found", 13)) return;
+	if (uwsgi_response_add_connection_close(wsgi_req)) return;
+	if (uwsgi_response_add_header(wsgi_req, "Content-Type", 12, "text/plain", 10)) return;
+	uwsgi_response_write_body_do(wsgi_req, "Not Found", 9);
+}
+
+void uwsgi_403(struct wsgi_request *wsgi_req) {
+	if (uwsgi_response_prepare_headers(wsgi_req, "403 Forbidden", 13)) return;
+	if (uwsgi_response_add_connection_close(wsgi_req)) return;
+	if (uwsgi_response_add_content_type(wsgi_req, "text/plain", 10)) return;
+	uwsgi_response_write_body_do(wsgi_req, "Forbidden", 9);
+}
+
+void uwsgi_redirect_to_slash(struct wsgi_request *wsgi_req) {
+
+	char *redirect = NULL;
+	size_t redirect_len = 0;
+
+        if (uwsgi_response_prepare_headers(wsgi_req, "301 Moved Permanently", 21)) return;
+	if (uwsgi_response_add_connection_close(wsgi_req)) return;
+
+	if (wsgi_req->query_string_len == 0) {
+		redirect = uwsgi_concat2n(wsgi_req->path_info, wsgi_req->path_info_len, "/", 1);
+		redirect_len = wsgi_req->path_info_len + 1;
+	}
+        else {
+		redirect = uwsgi_concat3n(wsgi_req->path_info, wsgi_req->path_info_len, "/?", 2, wsgi_req->query_string, wsgi_req->query_string_len);
+		redirect_len = wsgi_req->path_info_len + 2 + wsgi_req->query_string_len;
+        }
+        uwsgi_response_add_header(wsgi_req, "Location", 8, redirect, redirect_len);
+	free(redirect);	
+        return;
+}
+

core/exceptions.c

@@ -0,0 +1,499 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	Exceptions management
+
+	generally exceptions are printed in the logs, but if you enable
+	an exception manager they will be stored in a (relatively big) uwsgi packet
+	with the following structure.
+
+	"vars" -> keyval of request vars
+	"backtrace" -> list of backtrace lines. Each line is a list of 5 elements filename,line,function,text,custom
+	"unix" -> seconds since the epoch
+	"class" -> the exception class
+	"msg" -> a text message mapped to the extension
+	"repr" -> a text message mapped to the extension in language-specific gergo
+	"wid" -> worker id
+	"core" -> the core generating the exception
+	"pid" -> pid of the worker
+	"node" -> hostname
+
+	Other vars can be added, but you cannot be sure they will be used by exceptions handler.
+
+	The exception-uwsgi packet is passed "as is" to the exception handler
+
+	Exceptions hooks:
+	
+		a request plugin can export that hooks:
+	
+		struct uwsgi_buffer *backtrace(struct wsgi_request *);
+		struct uwsgi_buffer *exception_class(struct wsgi_request *);
+		struct uwsgi_buffer *exception_msg(struct wsgi_request *);
+		struct uwsgi_buffer *exception_repr(struct wsgi_request *);
+		void exception_log(struct wsgi_request *);
+
+		Remember to reset the exception status (if possibile) after each call
+
+	Exceptions catcher:
+
+		This is a special development-mode in which exceptions are printed
+		to the HTTP client.
+
+*/
+
+struct uwsgi_buffer *uwsgi_exception_handler_object(struct wsgi_request *wsgi_req) {
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(4096);
+	if (uwsgi_buffer_append_keyval(ub, "vars", 4, wsgi_req->buffer,wsgi_req->uh->pktsize)) goto error;
+	if (uwsgi.p[wsgi_req->uh->modifier1]->backtrace) {
+                struct uwsgi_buffer *bt = uwsgi.p[wsgi_req->uh->modifier1]->backtrace(wsgi_req);
+		if (bt) {
+			if (uwsgi_buffer_append_keyval(ub, "backtrace", 9, bt->buf, bt->pos)) {
+				uwsgi_buffer_destroy(bt);
+				goto error;
+			} 
+			uwsgi_buffer_destroy(bt);
+		}
+	}
+	
+	if (uwsgi.p[wsgi_req->uh->modifier1]->exception_class) {
+		struct uwsgi_buffer *ec = uwsgi.p[wsgi_req->uh->modifier1]->exception_class(wsgi_req);
+		if (ec) {
+			if (uwsgi_buffer_append_keyval(ub, "class", 5, ec->buf, ec->pos)) {
+				uwsgi_buffer_destroy(ec);
+				goto error;
+			}
+			uwsgi_buffer_destroy(ec);
+		}
+	}
+
+	if (uwsgi.p[wsgi_req->uh->modifier1]->exception_msg) {
+                struct uwsgi_buffer *em = uwsgi.p[wsgi_req->uh->modifier1]->exception_msg(wsgi_req);
+                if (em) {
+                        if (uwsgi_buffer_append_keyval(ub, "msg", 3, em->buf, em->pos)) {
+                                uwsgi_buffer_destroy(em);
+                                goto error;
+                        }
+                        uwsgi_buffer_destroy(em);
+                }
+        }
+
+	if (uwsgi.p[wsgi_req->uh->modifier1]->exception_repr) {
+                struct uwsgi_buffer *er = uwsgi.p[wsgi_req->uh->modifier1]->exception_repr(wsgi_req);
+                if (er) {
+                        if (uwsgi_buffer_append_keyval(ub, "repr", 4, er->buf, er->pos)) {
+                                uwsgi_buffer_destroy(er);
+                                goto error;
+                        }
+                        uwsgi_buffer_destroy(er);
+                }
+        }
+
+	if (uwsgi_buffer_append_keynum(ub, "unix", 4, uwsgi_now())) goto error;
+	if (uwsgi_buffer_append_keynum(ub, "wid", 3, uwsgi.mywid)) goto error;
+	if (uwsgi_buffer_append_keynum(ub, "pid", 3, uwsgi.mypid)) goto error;
+	if (uwsgi_buffer_append_keynum(ub, "core", 4, wsgi_req->async_id)) goto error;
+	if (uwsgi_buffer_append_keyval(ub, "node", 4, uwsgi.hostname, uwsgi.hostname_len)) goto error;
+
+	return ub;
+	
+error:
+	uwsgi_buffer_destroy(ub);
+	return NULL;
+}
+
+static void append_vars_to_ubuf(char *key, uint16_t keylen, char *val, uint16_t vallen, void *data) {
+	struct uwsgi_buffer *ub = (struct uwsgi_buffer *) data;
+
+	if (uwsgi_buffer_append(ub, key, keylen)) return;
+	if (uwsgi_buffer_append(ub, " = ", 3)) return;
+	if (uwsgi_buffer_append(ub, val, vallen)) return;
+	if (uwsgi_buffer_append(ub, "\n", 1)) return;
+}
+
+static void append_backtrace_to_ubuf(uint16_t pos, char *value, uint16_t len, void *data) {
+        struct uwsgi_buffer *ub = (struct uwsgi_buffer *) data;
+
+	uint16_t item = 0;
+	if (pos > 0) {
+		item = pos % 5;
+	}
+
+	switch(item) {
+		// filename
+		case 0:
+			if (uwsgi_buffer_append(ub, "filename: \"", 11)) return;
+			if (uwsgi_buffer_append(ub, value, len)) return;
+			if (uwsgi_buffer_append(ub, "\" ", 2)) return;
+			break;
+		// lineno
+		case 1:
+			if (uwsgi_buffer_append(ub, "line: ", 6)) return;
+			if (uwsgi_buffer_append(ub, value, len)) return;
+			if (uwsgi_buffer_append(ub, " ", 1)) return;
+			break;
+		// function
+		case 2:
+			if (uwsgi_buffer_append(ub, "function: \"", 11)) return;
+			if (uwsgi_buffer_append(ub, value, len)) return;
+			if (uwsgi_buffer_append(ub, "\" ", 2)) return;
+			break;
+		// text
+		case 3:
+			if (len > 0) {
+				if (uwsgi_buffer_append(ub, "text/code: \"", 12)) return;
+				if (uwsgi_buffer_append(ub, value, len)) return;
+				if (uwsgi_buffer_append(ub, "\" ", 2)) return;
+			}
+			break;
+		// custom
+		case 4:
+			if (len > 0) {
+				if (uwsgi_buffer_append(ub, "custom: \"", 9)) return;
+                        	if (uwsgi_buffer_append(ub, value, len)) return;
+                        	if (uwsgi_buffer_append(ub, "\" ", 2)) return;
+			}
+			if (uwsgi_buffer_append(ub, "\n", 1)) return;
+			break;
+		default:
+			break;
+	}
+
+}
+
+
+int uwsgi_exceptions_catch(struct wsgi_request *wsgi_req) {
+
+	if (uwsgi_response_prepare_headers(wsgi_req, "500 Internal Server Error", 25)) {
+		return -1;
+	}
+
+	if (uwsgi_response_add_content_type(wsgi_req, "text/plain", 10)) {
+		return -1;
+	}
+
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(4096);
+	if (uwsgi_buffer_append(ub, "uWSGI exceptions catcher for \"", 30)) goto error;
+	if (uwsgi_buffer_append(ub, wsgi_req->method, wsgi_req->method_len)) goto error;
+	if (uwsgi_buffer_append(ub, " ", 1)) goto error;
+	if (uwsgi_buffer_append(ub, wsgi_req->uri, wsgi_req->uri_len)) goto error;
+	if (uwsgi_buffer_append(ub, "\" (request plugin: \"", 20)) goto error;
+	if (uwsgi_buffer_append(ub, (char *) uwsgi.p[wsgi_req->uh->modifier1]->name, strlen(uwsgi.p[wsgi_req->uh->modifier1]->name))) goto error;
+	if (uwsgi_buffer_append(ub, "\", modifier1: ", 14 )) goto error;
+	if (uwsgi_buffer_num64(ub, wsgi_req->uh->modifier1)) goto error;
+	if (uwsgi_buffer_append(ub, ")\n\n", 3)) goto error;
+
+	if (uwsgi_buffer_append(ub, "Exception: ", 11)) goto error;
+                
+        if (uwsgi.p[wsgi_req->uh->modifier1]->exception_repr) {
+                struct uwsgi_buffer *ub_exc_repr = uwsgi.p[wsgi_req->uh->modifier1]->exception_repr(wsgi_req);
+                if (ub_exc_repr) {
+                        if (uwsgi_buffer_append(ub, ub_exc_repr->buf, ub_exc_repr->pos)) {
+                                uwsgi_buffer_destroy(ub_exc_repr);
+                                goto error;
+                        }
+                        uwsgi_buffer_destroy(ub_exc_repr);
+                }
+                else {
+                        goto notavail3;
+                }
+        }
+        else {
+notavail3:
+                if (uwsgi_buffer_append(ub, "-Not available-", 15)) goto error;
+        }
+
+        if (uwsgi_buffer_append(ub, "\n\n", 2)) goto error;
+
+	if (uwsgi_buffer_append(ub, "Exception class: ", 17)) goto error;
+
+	if (uwsgi.p[wsgi_req->uh->modifier1]->exception_class) {
+		struct uwsgi_buffer *ub_exc_class = uwsgi.p[wsgi_req->uh->modifier1]->exception_class(wsgi_req);
+		if (ub_exc_class) {
+			if (uwsgi_buffer_append(ub, ub_exc_class->buf, ub_exc_class->pos)) {
+				uwsgi_buffer_destroy(ub_exc_class);
+				goto error;
+			}
+			uwsgi_buffer_destroy(ub_exc_class);
+		}
+		else {
+			goto notavail;
+		}
+	}
+	else {
+notavail:
+		if (uwsgi_buffer_append(ub, "-Not available-", 15)) goto error;
+	}
+
+	if (uwsgi_buffer_append(ub, "\n\n", 2)) goto error;
+
+	if (uwsgi_buffer_append(ub, "Exception message: ", 19)) goto error;
+
+        if (uwsgi.p[wsgi_req->uh->modifier1]->exception_msg) {
+                struct uwsgi_buffer *ub_exc_msg = uwsgi.p[wsgi_req->uh->modifier1]->exception_msg(wsgi_req);
+                if (ub_exc_msg) {
+                        if (uwsgi_buffer_append(ub, ub_exc_msg->buf, ub_exc_msg->pos)) {
+                                uwsgi_buffer_destroy(ub_exc_msg);
+                                goto error;
+                        }
+                        uwsgi_buffer_destroy(ub_exc_msg);
+                }
+                else {
+                        goto notavail2;
+                }
+        }
+        else {
+notavail2:
+                if (uwsgi_buffer_append(ub, "-Not available-", 15)) goto error;
+        }
+
+	if (uwsgi_buffer_append(ub, "\n\n", 2)) goto error;
+
+	if (uwsgi_buffer_append(ub, "Backtrace:\n", 11)) goto error;
+
+        if (uwsgi.p[wsgi_req->uh->modifier1]->backtrace) {
+                struct uwsgi_buffer *ub_exc_bt = uwsgi.p[wsgi_req->uh->modifier1]->backtrace(wsgi_req);
+                if (ub_exc_bt) {
+			struct uwsgi_buffer *parsed_bt = uwsgi_buffer_new(4096);
+			if (uwsgi_hooked_parse_array(ub_exc_bt->buf, ub_exc_bt->pos, append_backtrace_to_ubuf, parsed_bt)) {
+				uwsgi_buffer_destroy(ub_exc_bt);
+				uwsgi_buffer_destroy(parsed_bt);
+                                goto error;
+			}
+			uwsgi_buffer_destroy(ub_exc_bt);
+                        if (uwsgi_buffer_append(ub, parsed_bt->buf, parsed_bt->pos)) {
+                                uwsgi_buffer_destroy(parsed_bt);
+                                goto error;
+                        }
+                        uwsgi_buffer_destroy(parsed_bt);
+                }
+                else {
+                        goto notavail4;
+                }
+        }
+        else {
+notavail4:
+                if (uwsgi_buffer_append(ub, "-Not available-", 15)) goto error;
+        }
+
+        if (uwsgi_buffer_append(ub, "\n\n", 2)) goto error;
+
+	if (uwsgi_hooked_parse(wsgi_req->buffer, wsgi_req->uh->pktsize, append_vars_to_ubuf, ub)) {
+		goto error;
+	}
+
+	if (uwsgi_response_write_body_do(wsgi_req, ub->buf, ub->pos)) {
+		goto error;
+	}
+
+	uwsgi_buffer_destroy(ub);
+	return 0;
+
+error:
+	uwsgi_buffer_destroy(ub);
+	return -1;
+
+}
+
+static void uwsgi_exception_run_handlers(struct uwsgi_buffer *ub) {
+	struct uwsgi_string_list *usl = uwsgi.exception_handlers_instance;
+	struct iovec iov[2];
+        iov[1].iov_base = ub->buf;
+        iov[1].iov_len = ub->pos;
+	while(usl) {
+		struct uwsgi_exception_handler_instance *uehi = (struct uwsgi_exception_handler_instance *) usl->custom_ptr;
+        	iov[0].iov_base = &uehi;
+        	iov[0].iov_len = sizeof(long);
+        	// now send the message to the exception handler thread
+        	if (writev(uwsgi.exception_handler_thread->pipe[0], iov, 2) != (ssize_t) (ub->pos+sizeof(long))) {
+                	uwsgi_error("[uwsgi-exception-handler-error] uwsgi_exception_run_handlers()/writev()");
+        	}
+		usl = usl->next;
+	}
+}
+
+void uwsgi_manage_exception(struct wsgi_request *wsgi_req,int catch) {
+
+	int do_exit = uwsgi.reload_on_exception;
+
+	if (!wsgi_req) goto log2;
+
+	if (do_exit) goto check_catch;
+
+	if (wsgi_req && uwsgi.exception_handlers_instance) {
+		struct uwsgi_buffer *ehi = uwsgi_exception_handler_object(wsgi_req);
+		if (ehi) {
+			uwsgi_exception_run_handlers(ehi);
+			uwsgi_buffer_destroy(ehi);
+		}
+	}
+
+	uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].exceptions++;
+	uwsgi_apps[wsgi_req->app_id].exceptions++;
+
+	if (uwsgi.reload_on_exception_type && uwsgi.p[wsgi_req->uh->modifier1]->exception_class) {
+		struct uwsgi_buffer *ub = uwsgi.p[wsgi_req->uh->modifier1]->exception_msg(wsgi_req);
+		if (ub) {
+			struct uwsgi_string_list *usl = uwsgi.reload_on_exception_type;
+			while (usl) {
+				if (!uwsgi_strncmp(usl->value, usl->len, ub->buf, ub->len)) {
+					do_exit = 1;
+					uwsgi_buffer_destroy(ub);
+					goto check_catch;
+				}
+				usl = usl->next;
+			}
+			uwsgi_buffer_destroy(ub);
+		}
+	}
+
+	if (uwsgi.reload_on_exception_value && uwsgi.p[wsgi_req->uh->modifier1]->exception_msg) {
+                struct uwsgi_buffer *ub = uwsgi.p[wsgi_req->uh->modifier1]->exception_msg(wsgi_req);
+		if (ub) {
+			struct uwsgi_string_list *usl = uwsgi.reload_on_exception_value;
+                        while (usl) {
+                                if (!uwsgi_strncmp(usl->value, usl->len, ub->buf, ub->len)) {
+                                        do_exit = 1;
+                                        uwsgi_buffer_destroy(ub);
+                                        goto check_catch;
+                                }
+                                usl = usl->next;
+                        }
+			uwsgi_buffer_destroy(ub);
+		}
+        }
+
+        if (uwsgi.reload_on_exception_repr && uwsgi.p[wsgi_req->uh->modifier1]->exception_repr) {
+                struct uwsgi_buffer *ub = uwsgi.p[wsgi_req->uh->modifier1]->exception_msg(wsgi_req);
+		if (ub) {
+			struct uwsgi_string_list *usl = uwsgi.reload_on_exception_repr;
+                        while (usl) {
+                                if (!uwsgi_strncmp(usl->value, usl->len, ub->buf, ub->len)) {
+                                        do_exit = 1;
+                                        uwsgi_buffer_destroy(ub);
+                                        goto check_catch;
+                                }
+                                usl = usl->next;
+                        }
+			uwsgi_buffer_destroy(ub);
+		}
+        }
+
+check_catch:
+	if (catch && wsgi_req) {
+		if (uwsgi_exceptions_catch(wsgi_req)) {
+			// for now, just goto, new features could be added
+			goto log;		
+		}
+	}
+
+log:
+	if (uwsgi.p[wsgi_req->uh->modifier1]->exception_log) {
+		uwsgi.p[wsgi_req->uh->modifier1]->exception_log(wsgi_req);
+	}
+	
+log2:
+	if (do_exit) {
+		exit(UWSGI_EXCEPTION_CODE);		
+	}
+	
+}
+
+struct uwsgi_exception_handler *uwsgi_register_exception_handler(char *name, int (*func)(struct uwsgi_exception_handler_instance *, char *, size_t)) {
+	struct uwsgi_exception_handler *old_ueh = NULL, *ueh = uwsgi.exception_handlers;
+	while(ueh) {
+		if (!strcmp(name, ueh->name)) {
+			return NULL;
+		}
+		old_ueh = ueh;
+		ueh = ueh->next;
+	}
+
+	ueh = uwsgi_calloc(sizeof(struct uwsgi_exception_handler));
+	ueh->name = name;
+	ueh->func = func;
+
+	if (old_ueh) {
+		old_ueh->next = ueh;
+	}
+	else {
+		uwsgi.exception_handlers = ueh;
+	}
+
+	return ueh;
+}
+
+struct uwsgi_exception_handler *uwsgi_exception_handler_by_name(char *name) {
+	struct uwsgi_exception_handler *ueh = uwsgi.exception_handlers;
+	while(ueh) {
+		if (!strcmp(name, ueh->name)) {
+			return ueh;
+		}
+		ueh = ueh->next;
+	}
+	return NULL;
+}
+
+static void uwsgi_exception_handler_thread_loop(struct uwsgi_thread *ut) {
+        char *buf = uwsgi_malloc(uwsgi.exception_handler_msg_size + sizeof(long));
+        for (;;) {
+                int interesting_fd = -1;
+                int ret = event_queue_wait(ut->queue, -1, &interesting_fd);
+                if (ret > 0) {
+                        ssize_t len = read(ut->pipe[1], buf, uwsgi.alarm_msg_size + sizeof(long));
+                        if (len > (ssize_t)(sizeof(long) + 1)) {
+                                size_t msg_size = len - sizeof(long);
+                                char *msg = buf + sizeof(long);
+                                long ptr = 0;
+                                memcpy(&ptr, buf, sizeof(long));
+                                struct uwsgi_exception_handler_instance *uehi = (struct uwsgi_exception_handler_instance *) ptr;
+                                if (!uehi)
+					break;
+				if (uehi->handler->func(uehi, msg, msg_size)) {
+                        		uwsgi_log("[uwsgi-exception] error running the handler \"%s\" args: \"%s\"\n", uehi->handler->name, uehi->arg ? uehi->arg : "");
+                		}
+                        }
+                }
+        }
+	free(buf);
+}
+
+void uwsgi_exception_setup_handlers() {
+
+	struct uwsgi_string_list *usl = uwsgi.exception_handlers_instance;
+	while(usl) {
+		char *handler = uwsgi_str(usl->value);
+		char *colon = strchr(handler, ':');
+		if (colon) {
+			*colon = 0;
+		}
+		struct uwsgi_exception_handler *ueh = uwsgi_exception_handler_by_name(handler);
+		if (!ueh) {
+			uwsgi_log("unable to find exception handler: %s\n", handler);
+			free(handler);
+			exit(1);
+		}
+		free(handler);
+
+		struct uwsgi_exception_handler_instance *uehi = uwsgi_calloc(sizeof(struct uwsgi_exception_handler_instance));
+		uehi->handler = ueh;
+		if (colon) {
+			uehi->arg = colon+1;
+		}
+		usl->custom_ptr = uehi;
+		usl = usl->next;
+	}
+}
+
+void uwsgi_exceptions_handler_thread_start() {
+
+	// start the exception_handler_thread
+        uwsgi.exception_handler_thread = uwsgi_thread_new(uwsgi_exception_handler_thread_loop);
+        if (!uwsgi.exception_handler_thread) {
+                uwsgi_log("unable to spawn exception handler thread\n");
+                exit(1);
+        }
+
+}

core/gateway.c

@@ -0,0 +1,166 @@
+#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;
+}
+
+static void gateway_brutal_end() {
+        _exit(UWSGI_END_CODE);
+}
+
+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();
+		atexit(gateway_brutal_end);
+		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);
+		signal(SIGSTOP, SIG_IGN);
+		signal(SIGTSTP, 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/hash.c

@@ -0,0 +1,93 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+// Bernstein classic hash (this is not static as it is used by other areas)
+uint32_t djb33x_hash(char *key, uint64_t keylen) {
+
+        register uint32_t hash = 5381;
+        uint64_t i;
+
+        for (i = 0; i < keylen; i++) {
+                hash = ((hash << 5) + hash) ^ key[i];
+        }
+
+        return hash;
+}
+
+// Murmur2 hash Copyright (C) Austin Appleby
+// adapted from nginx
+uint32_t murmur2_hash(char *key, uint64_t keylen) {
+
+	uint32_t  h, k;
+	uint8_t *ukey = (uint8_t *) key;
+	h = 0 ^ keylen;
+	while (keylen >= 4) {
+        	k  = ukey[0];
+        	k |= ukey[1] << 8;
+        	k |= ukey[2] << 16;
+        	k |= ukey[3] << 24;
+
+        	k *= 0x5bd1e995;
+        	k ^= k >> 24;
+        	k *= 0x5bd1e995;
+
+        	h *= 0x5bd1e995;
+        	h ^= k;
+
+        	ukey += 4;
+        	keylen -= 4;
+    	}
+
+	switch (keylen) {
+		case 3:
+        		h ^= key[2] << 16;
+    		case 2:
+        		h ^= key[1] << 8;
+    		case 1:
+        		h ^= key[0];
+        		h *= 0x5bd1e995;
+    	}
+
+	h ^= h >> 13;
+	h *= 0x5bd1e995;
+	h ^= h >> 15;
+
+	return h;
+}
+
+
+struct uwsgi_hash_algo *uwsgi_hash_algo_get(char *name) {
+	struct uwsgi_hash_algo *uha = uwsgi.hash_algos;
+	while(uha) {
+		if (!strcmp(name, uha->name)) {
+			return uha;
+		}
+		uha = uha->next;
+	}
+	return NULL;
+}
+void uwsgi_hash_algo_register(char *name, uint32_t (*func)(char *, uint64_t)) {
+
+	struct uwsgi_hash_algo *old_uha = NULL, *uha = uwsgi.hash_algos;
+	while(uha) {
+		if (!strcmp(uha->name, name)) return;
+		old_uha = uha;
+		uha = uha->next;
+	} 
+
+	uha = uwsgi_calloc(sizeof(struct uwsgi_hash_algo));
+	uha->name = name;
+	uha->func = func;
+	if (old_uha) {
+		old_uha->next = uha;
+	}
+	else {
+		uwsgi.hash_algos = uha;
+	}
+}
+
+void uwsgi_hash_algo_register_all() {
+	uwsgi_hash_algo_register("djb33x", djb33x_hash);
+	uwsgi_hash_algo_register("murmur2", murmur2_hash);
+}

core/ini.c

@@ -0,0 +1,169 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+   ini file must be read ALL into memory.
+   This memory must not be freed for all the server lifecycle
+   */
+
+static char *last_file = NULL;
+
+void ini_rstrip(char *line) {
+
+	off_t i;
+
+	for (i = strlen(line) - 1; i >= 0; i--) {
+		if (line[i] == ' ' || line[i] == '\t' || line[i] == '\r') {
+			line[i] = 0;
+			continue;
+		}
+		break;
+	}
+}
+
+char *ini_lstrip(char *line) {
+
+	off_t i;
+	char *ptr = line;
+
+	for (i = 0; i < (int) strlen(line); i++) {
+		if (line[i] == ' ' || line[i] == '\t' || line[i] == '\r') {
+			ptr++;
+			continue;
+		}
+		break;
+	}
+
+	return ptr;
+}
+
+char *ini_get_key(char *key) {
+
+	off_t i;
+	char *ptr = key;
+
+	for (i = 0; i < (int) strlen(key); i++) {
+		ptr++;
+		if (key[i] == '=') {
+			key[i] = 0;
+			return ptr;
+		}
+	}
+
+	return ptr;
+}
+
+char *ini_get_line(char *ini, size_t size) {
+
+	size_t i;
+	char *ptr = ini;
+
+	for (i = 0; i < size; i++) {
+		ptr++;
+		if (ini[i] == '\n') {
+			ini[i] = 0;
+			return ptr;
+		}
+	}
+
+	// check if it is a stupid file without \n at the end
+	if (ptr > ini) {
+		return ptr;
+	}
+
+	return NULL;
+
+}
+
+void uwsgi_ini_config(char *file, char *magic_table[]) {
+
+	size_t len = 0;
+	char *ini;
+
+	char *ini_line;
+
+	char *section = "";
+	char *key;
+	char *val;
+
+	int lines = 1;
+
+	char *section_asked = "uwsgi";
+	char *colon;
+
+
+	if (uwsgi_check_scheme(file)) {
+		colon = uwsgi_get_last_char(file, '/');
+		colon = uwsgi_get_last_char(colon, ':');
+	}
+	else {
+		colon = uwsgi_get_last_char(file, ':');
+	}
+
+	if (colon) {
+		colon[0] = 0;
+		if (colon[1] != 0) {
+			section_asked = colon + 1;
+		}
+
+		if (colon == file) {
+			file = last_file;
+		}
+	}
+
+	if (file[0] != 0 && file != last_file) {
+		uwsgi_log_initial("[uWSGI] getting INI configuration from %s\n", file);
+	}
+
+	ini = uwsgi_open_and_read(file, &len, 1, magic_table);
+	if (file != last_file) {
+		if (last_file) {
+			free(last_file);
+		}
+		last_file = uwsgi_str(file);
+	}
+
+	while (len) {
+		ini_line = ini_get_line(ini, len);
+		if (ini_line == NULL) {
+			break;
+		}
+		lines++;
+
+		// skip empty line
+		key = ini_lstrip(ini);
+		ini_rstrip(key);
+		if (key[0] != 0) {
+			if (key[0] == '[') {
+				section = key + 1;
+				section[strlen(section) - 1] = 0;
+			}
+			else if (key[0] == ';' || key[0] == '#') {
+				// this is a comment
+			}
+			else {
+				// val is always valid, but (obviously) can be ignored
+				val = ini_get_key(key);
+
+				if (!strcmp(section, section_asked)) {
+					ini_rstrip(key);
+					val = ini_lstrip(val);
+					ini_rstrip(val);
+					add_exported_option((char *) key, val, 0);
+				}
+			}
+		}
+
+
+		len -= (ini_line - ini);
+		ini += (ini_line - ini);
+
+	}
+
+	if (colon) {
+		colon[0] = ':';
+	}
+
+
+}

core/init.c

@@ -0,0 +1,450 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct http_status_codes {
+        const char key[3];
+        const char *message;
+        int message_size;
+};
+
+/* statistically ordered */
+struct http_status_codes hsc[] = {
+        {"200", "OK"},
+        {"302", "Found"},
+        {"404", "Not Found"},
+        {"500", "Internal Server Error"},
+        {"301", "Moved Permanently"},
+        {"304", "Not Modified"},
+        {"303", "See Other"},
+        {"403", "Forbidden"},
+        {"307", "Temporary Redirect"},
+        {"401", "Unauthorized"},
+        {"400", "Bad Request"},
+        {"405", "Method Not Allowed"},
+        {"408", "Request Timeout"},
+
+        {"100", "Continue"},
+        {"101", "Switching Protocols"},
+        {"201", "Created"},
+        {"202", "Accepted"},
+        {"203", "Non-Authoritative Information"},
+        {"204", "No Content"},
+        {"205", "Reset Content"},
+        {"206", "Partial Content"},
+        {"300", "Multiple Choices"},
+        {"305", "Use Proxy"},
+        {"402", "Payment Required"},
+        {"406", "Not Acceptable"},
+        {"407", "Proxy Authentication Required"},
+        {"409", "Conflict"},
+        {"410", "Gone"},
+        {"411", "Length Required"},
+        {"412", "Precondition Failed"},
+        {"413", "Request Entity Too Large"},
+        {"414", "Request-URI Too Long"},
+        {"415", "Unsupported Media Type"},
+        {"416", "Requested Range Not Satisfiable"},
+        {"417", "Expectation Failed"},
+        {"501", "Not Implemented"},
+        {"502", "Bad Gateway"},
+        {"503", "Service Unavailable"},
+        {"504", "Gateway Timeout"},
+        {"505", "HTTP Version Not Supported"},
+        {"", NULL},
+};
+
+
+
+
+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.stats_fd = -1;
+
+	uwsgi.stats_pusher_default_freq = 3;
+
+	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.cores = 1;
+	uwsgi.threads = 1;
+
+	// default max number of rpc slot
+	uwsgi.rpc_max = 64;
+
+	uwsgi.offload_threads_events = 64;
+
+	uwsgi.default_app = -1;
+
+	uwsgi.buffer_size = 4096;
+	uwsgi.body_read_warning = 8;
+	uwsgi.numproc = 1;
+
+	uwsgi.forkbomb_delay = 2;
+
+	uwsgi.async = 1;
+	uwsgi.listen_queue = 100;
+
+	uwsgi.cheaper_overload = 3;
+
+	uwsgi.log_master_bufsize = 8192;
+
+	uwsgi.worker_reload_mercy = 60;
+
+	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;
+
+	// a workers hould be running for at least 10 seconds
+	uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME] = 10;
+
+	uwsgi.shared->spooler_frequency = 30;
+
+	uwsgi.shared->spooler_signal_pipe[0] = -1;
+	uwsgi.shared->spooler_signal_pipe[1] = -1;
+
+	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;
+
+	uwsgi.shared->worker_req_log_pipe[0] = -1;
+	uwsgi.shared->worker_req_log_pipe[1] = -1;
+
+	uwsgi.req_log_fd = 2;
+
+#ifdef UWSGI_SSL
+	// 1 day of tolerance
+	uwsgi.subscriptions_sign_check_tolerance = 3600 * 24;
+	uwsgi.ssl_sessions_timeout = 300;
+#endif
+
+	uwsgi.alarm_freq = 3;
+	uwsgi.alarm_msg_size = 8192;
+
+	uwsgi.exception_handler_msg_size = 65536;
+
+	uwsgi.multicast_ttl = 1;
+	uwsgi.multicast_loop = 1;
+
+	// filling http status codes
+	struct http_status_codes *http_sc;
+        for (http_sc = hsc; http_sc->message != NULL; http_sc++) {
+                http_sc->message_size = strlen(http_sc->message);
+        }
+
+	uwsgi.empty = "";
+
+	uwsgi.wait_read_hook = uwsgi_simple_wait_read_hook;
+	uwsgi.wait_write_hook = uwsgi_simple_wait_write_hook;
+
+	uwsgi_websockets_init();
+}
+
+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));
+
+	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);
+
+		// this is a trick for avoiding too much memory areas
+		void *ts = uwsgi_calloc_shared(sizeof(void *) * uwsgi.max_apps * uwsgi.cores);
+		// add 4 bytes for uwsgi header
+		void *buffers = uwsgi_malloc_shared((uwsgi.buffer_size+4) * uwsgi.cores);
+		void *hvec = uwsgi_malloc_shared(sizeof(struct iovec) * uwsgi.vec_size * uwsgi.cores);
+		void *post_buf = NULL;
+		if (uwsgi.post_buffering > 0)
+			post_buf = uwsgi_malloc_shared(uwsgi.post_buffering_bufsize * 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 = ts + ((sizeof(void *) * uwsgi.max_apps) * j);
+			// raw per-request buffer (+4 bytes for uwsgi header)
+			uwsgi.workers[i].cores[j].buffer = buffers + ((uwsgi.buffer_size+4) * j);
+			// iovec for uwsgi vars
+			uwsgi.workers[i].cores[j].hvec = hvec + ((sizeof(struct iovec) * uwsgi.vec_size) * j);
+			if (post_buf)
+				uwsgi.workers[i].cores[j].post_buf = post_buf + (uwsgi.post_buffering_bufsize * j);
+		}
+
+		// 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);
+	}
+
+	uint64_t total_memory = (sizeof(struct uwsgi_app) * uwsgi.max_apps) + (sizeof(struct uwsgi_core) * uwsgi.cores) + (sizeof(void *) * uwsgi.max_apps * uwsgi.cores) + (uwsgi.buffer_size * uwsgi.cores) + (sizeof(struct iovec) * uwsgi.vec_size * uwsgi.cores);
+	if (uwsgi.post_buffering > 0) {
+		total_memory += (uwsgi.post_buffering_bufsize * uwsgi.cores);
+	}
+
+	total_memory *= (uwsgi.numproc + uwsgi.master_process);
+	if (uwsgi.numproc > 0)
+		uwsgi_log("mapped %llu bytes (%llu KB) for %d cores\n", (unsigned long long) total_memory, (unsigned long long) (total_memory / 1024), uwsgi.cores * uwsgi.numproc);
+
+	// allocate signal table
+        uwsgi.shared->signal_table = uwsgi_calloc_shared(sizeof(struct uwsgi_signal_entry) * 256 * (uwsgi.numproc + 1));
+
+}
+
+pid_t uwsgi_daemonize2() {
+	if (uwsgi.has_emperor) {
+		logto(uwsgi.daemonize2);
+	}
+	else {
+		if (!uwsgi.is_a_reload) {
+			uwsgi_log("*** daemonizing uWSGI ***\n");
+			daemonize(uwsgi.daemonize2);
+		}
+		else if (uwsgi.log_reopen) {
+			logto(uwsgi.daemonize2);
+		}
+	}
+	uwsgi.mypid = getpid();
+
+	uwsgi.workers[0].pid = uwsgi.mypid;
+
+	if (uwsgi.pidfile && !uwsgi.is_a_reload) {
+		uwsgi_write_pidfile(uwsgi.pidfile);
+	}
+
+	if (uwsgi.pidfile2 && !uwsgi.is_a_reload) {
+		uwsgi_write_pidfile(uwsgi.pidfile2);
+	}
+
+	return uwsgi.mypid;
+}
+
+// fix/check related options
+void sanitize_args() {
+
+        if (uwsgi.async > 1) {
+                uwsgi.cores = uwsgi.async;
+        }
+
+        if (uwsgi.threads > 1) {
+                uwsgi.has_threads = 1;
+                uwsgi.cores = uwsgi.threads;
+        }
+
+        if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+                if (!uwsgi.post_buffering) {
+                        uwsgi_log(" *** WARNING: you have enabled harakiri without post buffering. Slow upload could be rejected on post-unbuffered webservers *** \n");
+                }
+        }
+
+        if (uwsgi.write_errors_exception_only) {
+                uwsgi.ignore_sigpipe = 1;
+                uwsgi.ignore_write_errors = 1;
+        }
+
+        if (uwsgi.cheaper_count == 0) uwsgi.cheaper = 0;
+
+        if (uwsgi.cheaper_count > 0 && uwsgi.cheaper_count >= uwsgi.numproc) {
+                uwsgi_log("invalid cheaper value: must be lower than processes\n");
+                exit(1);
+        }
+
+        if (uwsgi.cheaper && uwsgi.cheaper_count) {
+		if (uwsgi.cheaper_initial) {
+                	if (uwsgi.cheaper_initial < uwsgi.cheaper_count) {
+                        	uwsgi_log("warning: invalid cheaper-initial value (%d), must be equal or higher than cheaper (%d), using %d as initial number of workers\n",
+                                	uwsgi.cheaper_initial, uwsgi.cheaper_count, uwsgi.cheaper_count);
+                        	uwsgi.cheaper_initial = uwsgi.cheaper_count;
+                	}
+                	else if (uwsgi.cheaper_initial > uwsgi.numproc) {
+                        	uwsgi_log("warning: invalid cheaper-initial value (%d), must be lower or equal than worker count (%d), using %d as initial number of workers\n",
+                                	uwsgi.cheaper_initial, uwsgi.numproc, uwsgi.numproc);
+                        	uwsgi.cheaper_initial = uwsgi.numproc;
+                	}
+		}
+		else {
+                        uwsgi.cheaper_initial = uwsgi.cheaper_count;
+		}
+        }
+
+        if (uwsgi.auto_snapshot > 0 && uwsgi.auto_snapshot > uwsgi.numproc) {
+                uwsgi_log("invalid auto-snapshot value: must be <= than processes\n");
+                exit(1);
+        }
+
+	if (uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] > 0 && uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME] >= uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME]) {
+		uwsgi_log("invalid min-worker-lifetime value (%d), must be lower than max-worker-lifetime (%d)\n",
+			uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME], uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME]);
+		exit(1);
+	}
+
+}
+
+const char *uwsgi_http_status_msg(char *status, uint16_t *len) {
+	struct http_status_codes *http_sc;
+	for (http_sc = hsc; http_sc->message != NULL; http_sc++) {
+                if (!strncmp(http_sc->key, status, 3)) {
+                        *len = http_sc->message_size;
+			return http_sc->message;
+                }
+        }
+	return NULL;
+}

core/json.c

@@ -0,0 +1,111 @@
+#ifdef UWSGI_JSON
+
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+#include <jansson.h>
+
+
+/*
+	I really love the jansson library...
+   */
+
+void uwsgi_json_config(char *file, char *magic_table[]) {
+
+	size_t len = 0;
+	char *json_data;
+
+
+	const char *key;
+
+	json_t *root;
+	json_error_t error;
+	json_t *config;
+	json_t *config_value, *config_array_item;
+
+	void *config_iter;
+
+	char *object_asked = "uwsgi";
+	char *colon;
+	int i;
+
+	if (uwsgi_check_scheme(file)) {
+		colon = uwsgi_get_last_char(file, '/');
+		colon = uwsgi_get_last_char(colon, ':');
+	}
+	else {
+		colon = uwsgi_get_last_char(file, ':');
+	}
+
+	if (colon) {
+		colon[0] = 0;
+		if (colon[1] != 0) {
+			object_asked = colon + 1;
+		}
+	}
+
+	uwsgi_log_initial("[uWSGI] getting JSON configuration from %s\n", file);
+
+	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);
+		exit(1);
+	}
+
+	config = json_object_get(root, object_asked);
+
+	if (!json_is_object(config)) {
+		uwsgi_log("you must define a object named %s in your JSON data\n", object_asked);
+		exit(1);
+	}
+
+	config_iter = json_object_iter(config);
+
+	while (config_iter) {
+		key = json_object_iter_key(config_iter);
+		config_value = json_object_iter_value(config_iter);
+
+		if (json_is_string(config_value)) {
+			add_exported_option((char *) key, (char *) json_string_value(config_value), 0);
+		}
+		else if (json_is_true(config_value)) {
+			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, strdup("0"), 0);
+		}
+		else if (json_is_integer(config_value)) {
+			add_exported_option((char *) key, uwsgi_num2str(json_integer_value(config_value)), 0);
+		}
+		else if (json_is_array(config_value)) {
+			for (i = 0; i < (int) json_array_size(config_value); i++) {
+				config_array_item = json_array_get(config_value, i);
+				if (json_is_string(config_array_item)) {
+					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, strdup("1"), 0);
+				}
+				else if (json_is_false(config_array_item) || json_is_null(config_array_item)) {
+					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);
+				}
+			}
+		}
+
+		config_iter = json_object_iter_next(config, config_iter);
+	}
+
+}
+
+#endif

core/lock.c

@@ -0,0 +1,773 @@
+#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 OBSOLETE_LINUX_KERNEL
+#undef EOWNERDEAD
+#endif
+
+#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
+
+#ifndef PTHREAD_PRIO_INHERIT
+int pthread_mutexattr_setprotocol (pthread_mutexattr_t *__attr,
+                                          int __protocol);
+#define PTHREAD_PRIO_INHERIT 1
+#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
+#ifndef PTHREAD_MUTEX_ROBUST
+#define PTHREAD_MUTEX_ROBUST PTHREAD_MUTEX_ROBUST_NP
+#endif
+	if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) {
+		uwsgi_log("unable to set PTHREAD_PRIO_INHERIT\n");
+		exit(1);
+	}
+	if (uwsgi_pthread_robust_mutexes_enabled) {
+		if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST)) {
+			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);
+}
+
+#elif defined(UWSGI_LOCK_USE_WINDOWS_MUTEX)
+
+#define UWSGI_LOCK_ENGINE_NAME "windows mutexes"
+#define UWSGI_LOCK_SIZE         sizeof(HANDLE)
+#define UWSGI_RWLOCK_SIZE       sizeof(HANDLE)
+
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+
+        struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+	struct _SECURITY_ATTRIBUTES sa;
+	memset(&sa, 0, sizeof(struct _SECURITY_ATTRIBUTES));
+	sa.bInheritHandle = 1;
+	uli->lock_ptr = CreateMutex(&sa, FALSE, NULL);
+        return uli;
+}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+	WaitForSingleObject(uli->lock_ptr, INFINITE);
+        uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+	ReleaseMutex(uli->lock_ptr);
+        uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (WaitForSingleObject(uli->lock_ptr, 0) == WAIT_TIMEOUT) {
+		return 0;
+	}
+        return uli->pid;
+}
+
+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);
+}
+
+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));
+
+retry:
+	if (semop(semid, &sb, 1)) {
+		if (errno == EINTR) goto retry; 
+		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));
+
+retry:
+	if (semop(semid, &sb, 1)) {
+		if (errno == EINTR) goto retry; 
+		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() {
+
+	int i;
+
+	if (uwsgi.locking_setup) return;
+
+	// 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;
+			goto ready;
+		}
+		uwsgi_log("unable to find lock engine \"%s\"\n", uwsgi.lock_engine);
+		exit(1);
+	}
+
+	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;
+
+ready:
+	// application generic lock
+	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");
+
+		// rb_timer table lock
+		uwsgi.rb_timer_table_lock = uwsgi_lock_init("rbtimer");
+
+		// cron table lock
+		uwsgi.cron_table_lock = uwsgi_lock_init("cron");
+	}
+
+	if (uwsgi.use_thunder_lock) {
+		// process shared thunder lock
+		uwsgi.the_thunder_lock = uwsgi_lock_init("thunder");	
+	}
+
+	uwsgi.rpc_table_lock = uwsgi_lock_init("rpc");
+
+#ifdef UWSGI_SSL
+	// register locking for legions
+	struct uwsgi_legion *ul = uwsgi.legions;
+	while(ul) {
+		ul->lock = uwsgi_lock_init(uwsgi_concat2("legion_", ul->legion));
+		ul = ul->next;
+	}
+#endif
+	uwsgi.locking_setup = 1;
+}
+
+
+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;
+	}
+
+}
+
+void uwsgi_user_lock(int lock_num) {
+	uwsgi_lock(uwsgi.user_lock[lock_num]);
+}
+
+void uwsgi_user_unlock(int lock_num) {
+	uwsgi_unlock(uwsgi.user_lock[lock_num]);
+}

core/loop.c

@@ -0,0 +1,166 @@
+#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 (*func) (void)) {
+
+	struct uwsgi_loop *old_loop = NULL, *loop = uwsgi.loops;
+
+	while (loop) {
+		// check if the loop engine is already registered
+		if (!strcmp(name, loop->name))
+			return;
+		old_loop = loop;
+		loop = loop->next;
+	}
+
+	loop = uwsgi_calloc(sizeof(struct uwsgi_loop));
+	loop->name = name;
+	loop->loop = func;
+
+	if (old_loop) {
+		old_loop->next = loop;
+	}
+	else {
+		uwsgi.loops = loop;
+	}
+}
+
+void *uwsgi_get_loop(char *name) {
+
+	struct uwsgi_loop *loop = uwsgi.loops;
+
+	while (loop) {
+		if (!strcmp(name, loop->name)) {
+			return loop->loop;
+		}
+		loop = loop->next;
+	}
+	return NULL;
+}
+
+/*
+
+	this is the default (simple) loop.
+
+	it will run simple_loop_run function for each spawned thread
+
+	simple_loop_run monitors sockets and signals descriptors
+	and manages them.
+
+*/
+
+void simple_loop() {
+	uwsgi_loop_cores_run(simple_loop_run);
+}
+
+void uwsgi_loop_cores_run(void *(*func) (void *)) {
+	int i;
+	for (i = 1; i < uwsgi.threads; i++) {
+		long j = i;
+		pthread_create(&uwsgi.workers[uwsgi.mywid].cores[i].thread_id, &uwsgi.threads_attr, func, (void *) j);
+	}
+	long y = 0;
+	func((void *) y);
+}
+
+void uwsgi_setup_thread_req(long core_id, struct wsgi_request *wsgi_req) {
+	int i;
+	sigset_t smask;
+
+
+	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);
+			}
+		}
+	}
+
+}
+
+void simple_loop_run_int(int core_id) {
+	long y = core_id;
+	simple_loop_run((void *) y);
+}
+
+void *simple_loop_run(void *arg1) {
+
+	long core_id = (long) arg1;
+
+	struct wsgi_request *wsgi_req = &uwsgi.workers[uwsgi.mywid].cores[core_id].req;
+
+	if (uwsgi.threads > 1) {
+		uwsgi_setup_thread_req(core_id, wsgi_req);
+	}
+	// 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(main_queue, 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/master.c

@@ -0,0 +1,908 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_restore_auto_snapshot(int signum) {
+
+	if (uwsgi.workers[1].snapshot > 0) {
+		uwsgi.restore_snapshot = 1;
+	}
+	else {
+		uwsgi_log("[WARNING] no snapshot available\n");
+	}
+
+}
+
+void uwsgi_block_signal(int signum) {
+	sigset_t smask;
+	sigemptyset(&smask);
+	sigaddset(&smask, signum);
+	if (sigprocmask(SIG_BLOCK, &smask, NULL)) {
+		uwsgi_error("sigprocmask()");
+	}
+}
+
+void uwsgi_unblock_signal(int signum) {
+	sigset_t smask;
+	sigemptyset(&smask);
+	sigaddset(&smask, signum);
+	if (sigprocmask(SIG_UNBLOCK, &smask, NULL)) {
+		uwsgi_error("sigprocmask()");
+	}
+}
+
+void uwsgi_master_manage_udp(int udp_fd) {
+	struct sockaddr_in udp_client;
+	char udp_client_addr[16];
+	int i;
+
+	socklen_t udp_len = sizeof(udp_client);
+	ssize_t rlen = recvfrom(udp_fd, uwsgi.wsgi_req->buffer, uwsgi.buffer_size, 0, (struct sockaddr *) &udp_client, &udp_len);
+
+	if (rlen < 0) {
+		uwsgi_error("recvfrom()");
+	}
+	else if (rlen > 0) {
+
+		memset(udp_client_addr, 0, 16);
+		if (inet_ntop(AF_INET, &udp_client.sin_addr.s_addr, udp_client_addr, 16)) {
+			if (uwsgi.wsgi_req->buffer[0] == UWSGI_MODIFIER_MULTICAST_ANNOUNCE) {
+			}
+			else if (uwsgi.wsgi_req->buffer[0] == 0x30 && uwsgi.snmp) {
+				manage_snmp(udp_fd, (uint8_t *) uwsgi.wsgi_req->buffer, rlen, &udp_client);
+			}
+			else {
+
+				// loop the various udp manager until one returns true
+				int udp_managed = 0;
+				for (i = 0; i < 256; i++) {
+					if (uwsgi.p[i]->manage_udp) {
+						if (uwsgi.p[i]->manage_udp(udp_client_addr, udp_client.sin_port, uwsgi.wsgi_req->buffer, rlen)) {
+							udp_managed = 1;
+							break;
+						}
+					}
+				}
+
+				// else a simple udp logger
+				if (!udp_managed) {
+					uwsgi_log("[udp:%s:%d] %.*s", udp_client_addr, ntohs(udp_client.sin_port), (int) rlen, uwsgi.wsgi_req->buffer);
+				}
+			}
+		}
+		else {
+			uwsgi_error("inet_ntop()");
+		}
+
+	}
+}
+
+void uwsgi_master_manage_emperor() {
+	char byte;
+	ssize_t rlen = read(uwsgi.emperor_fd, &byte, 1);
+	if (rlen > 0) {
+		uwsgi_log_verbose("received message %d from emperor\n", byte);
+		// remove me
+		if (byte == 0) {
+			close(uwsgi.emperor_fd);
+			if (!uwsgi.status.brutally_reloading)
+				kill_them_all(0);
+		}
+		// reload me
+		else if (byte == 1) {
+			// un-lazy the stack to trigger a real reload
+			uwsgi.lazy = 0;
+			uwsgi_block_signal(SIGHUP);
+			grace_them_all(0);
+			uwsgi_unblock_signal(SIGHUP);
+		}
+	}
+	else {
+		uwsgi_log("lost connection with my emperor !!!\n");
+		close(uwsgi.emperor_fd);
+		if (!uwsgi.status.brutally_reloading)
+			kill_them_all(0);
+		sleep(2);
+		exit(1);
+	}
+
+}
+
+
+void uwsgi_master_restore_snapshot() {
+	int i, waitpid_status;
+	uwsgi_log("[snapshot] restoring workers...\n");
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid == 0)
+			continue;
+		kill(uwsgi.workers[i].pid, SIGKILL);
+		if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+			uwsgi_error("waitpid()");
+		}
+		if (uwsgi.auto_snapshot > 0 && i > uwsgi.auto_snapshot) {
+			uwsgi.workers[i].pid = 0;
+			uwsgi.workers[i].snapshot = 0;
+		}
+		else {
+			uwsgi.workers[i].pid = uwsgi.workers[i].snapshot;
+			uwsgi.workers[i].snapshot = 0;
+			kill(uwsgi.workers[i].pid, SIGURG);
+			uwsgi_log("Restored uWSGI worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
+		}
+	}
+
+	uwsgi.restore_snapshot = 0;
+}
+
+void suspend_resume_them_all(int signum) {
+
+	int i;
+	int suspend = 0;
+
+	if (uwsgi.workers[0].suspended == 1) {
+		uwsgi_log_verbose("*** (SIGTSTP received) resuming workers ***\n");
+		uwsgi.workers[0].suspended = 0;
+	}
+	else {
+		uwsgi_log_verbose("*** PAUSE (press start to resume, if you do not have a joypad send SIGTSTP) ***\n");
+		suspend = 1;
+		uwsgi.workers[0].suspended = 1;
+	}
+
+	// subscribe/unsubscribe if needed
+	uwsgi_subscribe_all(suspend, 1);
+
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		uwsgi.workers[i].suspended = suspend;
+		if (uwsgi.workers[i].pid > 0) {
+			if (kill(uwsgi.workers[i].pid, SIGTSTP)) {
+				uwsgi_error("kill()");
+			}
+		}
+	}
+}
+
+
+void uwsgi_master_check_mercy() {
+
+	int i;
+
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cursed_at) {
+			if (uwsgi_now() > uwsgi.workers[i].no_mercy_at) {
+				uwsgi_log_verbose("worker %d (pid: %d) is taking too much time to die...NO MERCY !!!\n", i, uwsgi.workers[i].pid);
+				// yes that look strangem but we avoid callign it again if we skip waitpid() call below
+				uwsgi_curse(i, SIGKILL);
+			}
+		}
+	}
+}
+
+
+void expire_rb_timeouts(struct uwsgi_rbtree *tree) {
+
+	uint64_t current = (uint64_t) uwsgi_now();
+	struct uwsgi_rb_timer *urbt;
+	struct uwsgi_signal_rb_timer *usrbt;
+
+	for (;;) {
+
+		urbt = uwsgi_min_rb_timer(tree, NULL);
+
+		if (urbt == NULL)
+			return;
+
+		if (urbt->value <= current) {
+			// remove the timeout and add another
+			usrbt = (struct uwsgi_signal_rb_timer *) urbt->data;
+			uwsgi_del_rb_timer(tree, urbt);
+			free(urbt);
+			usrbt->iterations_done++;
+			uwsgi_route_signal(usrbt->sig);
+			if (!usrbt->iterations || usrbt->iterations_done < usrbt->iterations) {
+				usrbt->uwsgi_rb_timer = uwsgi_add_rb_timer(tree, uwsgi_now() + usrbt->value, usrbt);
+			}
+			continue;
+		}
+
+		break;
+	}
+}
+
+int uwsgi_get_tcp_info(int fd) {
+
+#if defined(__linux__) || defined(__FreeBSD__)
+	socklen_t tis = sizeof(struct tcp_info);
+
+	if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &uwsgi.shared->ti, &tis)) {
+
+		// checks for older kernels
+#if defined(__linux__)
+		if (!uwsgi.shared->ti.tcpi_sacked) {
+#elif defined(__FreeBSD__)
+		if (!uwsgi.shared->ti.__tcpi_sacked) {
+#endif
+                        return 0;
+                }
+
+#if defined(__linux__)
+		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.tcpi_unacked;
+		uwsgi.shared->max_load = (uint64_t) uwsgi.shared->ti.tcpi_sacked;
+#elif defined(__FreeBSD__)
+		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.__tcpi_unacked;
+		uwsgi.shared->max_load = (uint64_t) uwsgi.shared->ti.__tcpi_sacked;
+#endif
+
+		uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = uwsgi.shared->load;
+		if (uwsgi.vassal_sos_backlog > 0 && uwsgi.has_emperor) {
+			if (uwsgi.shared->load >= (uint64_t) uwsgi.vassal_sos_backlog) {
+				// ask emperor for help
+				char byte = 30;
+				if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
+					uwsgi_error("write()");
+				}
+				else {
+					uwsgi_log("asking emperor for reinforcements (backlog: %llu)...\n", (unsigned long long ) uwsgi.shared->load);
+				}
+			}
+		}
+		if (uwsgi.shared->load >= uwsgi.shared->max_load) {
+			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%llu/%llu) ***\n", fd, (unsigned long long ) uwsgi.shared->load, (unsigned long long ) uwsgi.shared->max_load);
+			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
+		}
+
+		return uwsgi.shared->load;
+	}
+#endif
+
+	return 0;
+}
+
+
+#ifdef __linux__
+#include <linux/sockios.h>
+
+#ifdef UNBIT
+#define SIOBKLGQ 0x8908
+#endif
+
+#ifdef SIOBKLGQ
+
+int get_linux_unbit_SIOBKLGQ(int fd) {
+
+	int queue = 0;
+	if (ioctl(fd, SIOBKLGQ, &queue) >= 0) {
+		uwsgi.shared->load = queue;
+		uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = queue;
+		if (queue >= uwsgi.listen_queue) {
+			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, queue, uwsgi.listen_queue);
+			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
+		}
+		return queue;
+	}
+
+	return 0;
+
+}
+#endif
+#endif
+
+
+int master_loop(char **argv, char **environ) {
+
+	struct timeval last_respawn;
+	int last_respawn_rate = 0;
+
+	pid_t diedpid;
+	int waitpid_status;
+
+	time_t now = 0;
+
+	int i = 0;
+	int rlen;
+
+	int check_interval = 1;
+
+	struct uwsgi_rb_timer *min_timeout;
+	struct uwsgi_rbtree *rb_timers = uwsgi_init_rb_timer();
+
+
+	if (uwsgi.procname_master) {
+		uwsgi_set_processname(uwsgi.procname_master);
+	}
+	else if (uwsgi.procname) {
+		uwsgi_set_processname(uwsgi.procname);
+	}
+	else if (uwsgi.auto_procname) {
+		uwsgi_set_processname("uWSGI master");
+	}
+
+
+	uwsgi.current_time = uwsgi_now();
+
+	uwsgi_unix_signal(SIGTSTP, suspend_resume_them_all);
+	uwsgi_unix_signal(SIGHUP, grace_them_all);
+	if (uwsgi.die_on_term) {
+		uwsgi_unix_signal(SIGTERM, kill_them_all);
+		uwsgi_unix_signal(SIGQUIT, reap_them_all);
+	}
+	else {
+		uwsgi_unix_signal(SIGTERM, reap_them_all);
+		uwsgi_unix_signal(SIGQUIT, kill_them_all);
+	}
+	uwsgi_unix_signal(SIGINT, kill_them_all);
+	uwsgi_unix_signal(SIGUSR1, stats);
+	if (uwsgi.auto_snapshot) {
+		uwsgi_unix_signal(SIGURG, uwsgi_restore_auto_snapshot);
+	}
+
+	atexit(uwsgi_master_cleanup_hooks);
+
+	uwsgi.master_queue = event_queue_init();
+
+	/* route signals to workers... */
+#ifdef UWSGI_DEBUG
+	uwsgi_log("adding %d to signal poll\n", uwsgi.shared->worker_signal_pipe[0]);
+#endif
+	event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->worker_signal_pipe[0]);
+
+	if (uwsgi.spoolers) {
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->spooler_signal_pipe[0]);
+	}
+
+	if (uwsgi.mules_cnt > 0) {
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->mule_signal_pipe[0]);
+	}
+
+	if (uwsgi.log_master) {
+		uwsgi.log_master_buf = uwsgi_malloc(uwsgi.log_master_bufsize);
+		if (!uwsgi.threaded_logger) {
+#ifdef UWSGI_DEBUG
+			uwsgi_log("adding %d to master logging\n", uwsgi.shared->worker_log_pipe[0]);
+#endif
+			event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->worker_log_pipe[0]);
+			if (uwsgi.req_log_master) {
+				event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->worker_req_log_pipe[0]);
+			}
+		}
+		else {
+			uwsgi_threaded_logger_spawn();
+		}
+
+	}
+
+#ifdef UWSGI_SSL
+	uwsgi_start_legions();
+#endif
+
+	uwsgi_cache_start_sweepers();
+	uwsgi_cache_start_sync_servers();
+
+	uwsgi.wsgi_req->buffer = uwsgi.workers[0].cores[0].buffer;
+
+	if (uwsgi.has_emperor) {
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd);
+	}
+
+	if (uwsgi.zerg_server) {
+		uwsgi.zerg_server_fd = bind_to_unix(uwsgi.zerg_server, uwsgi.listen_queue, 0, 0);
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.zerg_server_fd);
+		uwsgi_log("*** Zerg server enabled on %s ***\n", uwsgi.zerg_server);
+	}
+
+	if (uwsgi.stats) {
+		char *tcp_port = strchr(uwsgi.stats, ':');
+		if (tcp_port) {
+			// disable deferred accept for this socket
+			int current_defer_accept = uwsgi.no_defer_accept;
+			uwsgi.no_defer_accept = 1;
+			uwsgi.stats_fd = bind_to_tcp(uwsgi.stats, uwsgi.listen_queue, tcp_port);
+			uwsgi.no_defer_accept = current_defer_accept;
+		}
+		else {
+			uwsgi.stats_fd = bind_to_unix(uwsgi.stats, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
+		}
+
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.stats_fd);
+		uwsgi_log("*** Stats server enabled on %s fd: %d ***\n", uwsgi.stats, uwsgi.stats_fd);
+	}
+
+
+	if (uwsgi.stats_pusher_instances) {
+		if (!uwsgi_thread_new(uwsgi_stats_pusher_loop)) {
+			uwsgi_log("!!! unable to spawn stats pusher thread !!!\n");
+			exit(1);
+		}
+	}
+
+	if (uwsgi.udp_socket) {
+		uwsgi.udp_fd = bind_to_udp(uwsgi.udp_socket, 0, 0);
+		if (uwsgi.udp_fd < 0) {
+			uwsgi_log("unable to bind to udp socket. SNMP services will be disabled.\n");
+		}
+		else {
+			uwsgi_log("UDP server enabled.\n");
+			event_queue_add_fd_read(uwsgi.master_queue, uwsgi.udp_fd);
+		}
+	}
+
+	uwsgi.snmp_fd = uwsgi_setup_snmp();
+
+	if (uwsgi.status.is_cheap) {
+		uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
+		for (i = 1; i <= uwsgi.numproc; i++) {
+			uwsgi.workers[i].cheaped = 1;
+		}
+		uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
+	}
+
+
+	// spawn mules
+	for (i = 0; i < uwsgi.mules_cnt; i++) {
+		size_t mule_patch_size = 0;
+		uwsgi.mules[i].patch = uwsgi_string_get_list(&uwsgi.mules_patches, i, &mule_patch_size);
+		uwsgi_mule(i + 1);
+	}
+
+	// spawn gateways
+	for (i = 0; i < ushared->gateways_cnt; i++) {
+		if (ushared->gateways[i].pid == 0) {
+			gateway_respawn(i);
+		}
+	}
+
+	// spawn daemons
+	uwsgi_daemons_spawn_all();
+
+	// first subscription
+	uwsgi_subscribe_all(0, 1);
+
+	// sync the cache store if needed
+	uwsgi_cache_sync_all();
+
+	if (uwsgi.queue_store && uwsgi.queue_filesize) {
+		if (msync(uwsgi.queue_header, uwsgi.queue_filesize, MS_ASYNC)) {
+			uwsgi_error("msync()");
+		}
+	}
+
+	// update touches timestamps
+	uwsgi_check_touches(uwsgi.touch_reload);
+	uwsgi_check_touches(uwsgi.touch_logrotate);
+	uwsgi_check_touches(uwsgi.touch_logreopen);
+	uwsgi_check_touches(uwsgi.touch_chain_reload);
+	uwsgi_check_touches(uwsgi.touch_workers_reload);
+	uwsgi_check_touches(uwsgi.touch_gracefully_stop);
+
+	// setup cheaper algos (can be stacked)
+	uwsgi.cheaper_algo = uwsgi_cheaper_algo_spare;
+	if (uwsgi.requested_cheaper_algo) {
+		uwsgi.cheaper_algo = NULL;
+		struct uwsgi_cheaper_algo *uca = uwsgi.cheaper_algos;
+		while (uca) {
+			if (!strcmp(uca->name, uwsgi.requested_cheaper_algo)) {
+				uwsgi.cheaper_algo = uca->func;
+				break;
+			}
+			uca = uca->next;
+		}
+
+		if (!uwsgi.cheaper_algo) {
+			uwsgi_log("unable to find requested cheaper algorithm, falling back to spare\n");
+			uwsgi.cheaper_algo = uwsgi_cheaper_algo_spare;
+		}
+
+	}
+
+	// here really starts the master loop
+
+	for (;;) {
+		//uwsgi_log("uwsgi.ready_to_reload %d %d\n", uwsgi.ready_to_reload, uwsgi.numproc);
+
+		// run master_cycle hook for every plugin
+		for (i = 0; i < uwsgi.gp_cnt; i++) {
+			if (uwsgi.gp[i]->master_cycle) {
+				uwsgi.gp[i]->master_cycle();
+			}
+		}
+		for (i = 0; i < 256; i++) {
+			if (uwsgi.p[i]->master_cycle) {
+				uwsgi.p[i]->master_cycle();
+			}
+		}
+
+		// check for death (before reload !!!)
+		uwsgi_master_check_death();
+		// check for realod
+		if (uwsgi_master_check_reload(argv)) {
+			return -1;
+		}
+
+		// check chain reload
+		uwsgi_master_check_chain();
+
+		// check if some worker is taking too much to die...
+		uwsgi_master_check_mercy();
+
+		// check for daemons (smart and dumb)
+		uwsgi_daemons_smart_check();
+
+
+		if (uwsgi.respawn_snapshots) {
+			for (i = 1; i <= uwsgi.respawn_snapshots; i++) {
+				if (uwsgi_respawn_worker(i))
+					return 0;
+			}
+
+			uwsgi.respawn_snapshots = 0;
+		}
+
+		if (uwsgi.restore_snapshot) {
+			uwsgi_master_restore_snapshot();
+			continue;
+		}
+
+		// cheaper management
+		if (uwsgi.cheaper && !uwsgi.status.is_cheap && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
+			if (!uwsgi_calc_cheaper())
+				return 0;
+		}
+
+
+		// check if someone is dead
+		diedpid = waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
+		if (diedpid == -1) {
+			if (errno == ECHILD) {
+				// something did not work as expected, just assume all has been cleared
+				uwsgi_master_commit_status();
+				diedpid = 0;
+			}
+			else {
+				uwsgi_error("waitpid()");
+				/* here is better to reload all the uWSGI stack */
+				uwsgi_log("something horrible happened...\n");
+				reap_them_all(0);
+				exit(1);
+			}
+		}
+
+		// no one died just run all of the standard master tasks
+		if (diedpid == 0) {
+
+			/* all processes ok, doing status scan after N seconds */
+			check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+			if (!check_interval)
+				check_interval = 1;
+
+
+			// add unregistered file monitors
+			// locking is not needed as monitors can only increase
+			for (i = 0; i < ushared->files_monitored_cnt; i++) {
+				if (!ushared->files_monitored[i].registered) {
+					ushared->files_monitored[i].fd = event_queue_add_file_monitor(uwsgi.master_queue, ushared->files_monitored[i].filename, &ushared->files_monitored[i].id);
+					ushared->files_monitored[i].registered = 1;
+				}
+			}
+
+
+			// add unregistered timers
+			// locking is not needed as timers can only increase
+			for (i = 0; i < ushared->timers_cnt; i++) {
+				if (!ushared->timers[i].registered) {
+					ushared->timers[i].fd = event_queue_add_timer(uwsgi.master_queue, &ushared->timers[i].id, ushared->timers[i].value);
+					ushared->timers[i].registered = 1;
+				}
+			}
+
+			// add unregistered rb_timers
+			// locking is not needed as rb_timers can only increase
+			for (i = 0; i < ushared->rb_timers_cnt; i++) {
+				if (!ushared->rb_timers[i].registered) {
+					ushared->rb_timers[i].uwsgi_rb_timer = uwsgi_add_rb_timer(rb_timers, uwsgi_now() + ushared->rb_timers[i].value, &ushared->rb_timers[i]);
+					ushared->rb_timers[i].registered = 1;
+				}
+			}
+
+			int interesting_fd = -1;
+
+			if (ushared->rb_timers_cnt > 0) {
+				min_timeout = uwsgi_min_rb_timer(rb_timers, NULL);
+				if (min_timeout == NULL) {
+					check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+				}
+				else {
+					check_interval = min_timeout->value - uwsgi_now();
+					if (check_interval <= 0) {
+						expire_rb_timeouts(rb_timers);
+						check_interval = 0;
+					}
+				}
+			}
+
+			// wait for event
+			rlen = event_queue_wait(uwsgi.master_queue, check_interval, &interesting_fd);
+
+			if (rlen == 0) {
+				if (ushared->rb_timers_cnt > 0) {
+					expire_rb_timeouts(rb_timers);
+				}
+			}
+
+
+			// check uwsgi-cron table
+			if (ushared->cron_cnt) {
+				uwsgi_manage_signal_cron(uwsgi_now());
+			}
+
+			if (uwsgi.crons) {
+				uwsgi_manage_command_cron(uwsgi_now());
+			}
+
+			// some event returned
+			if (rlen > 0) {
+				// if the following function returns -1, a new worker has just spawned
+				if (uwsgi_master_manage_events(interesting_fd)) {
+					return 0;
+				}
+			}
+
+			now = uwsgi_now();
+			if (now - uwsgi.current_time < 1) {
+				continue;
+			}
+			uwsgi.current_time = now;
+
+			// checking logsize
+			if (uwsgi.logfile) {
+				uwsgi_check_logrotate();
+			}
+
+			// this will be incremented at (more or less) regular intervals
+			uwsgi.master_cycles++;
+
+			// recalculate requests counter on race conditions risky configurations
+			// a bit of inaccuracy is better than locking;)
+			uwsgi_master_fix_request_counters();
+
+			// check for idle
+			uwsgi_master_check_idle();
+
+			check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+			if (!check_interval)
+				check_interval = 1;
+
+
+			// get listen_queue status
+			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+			while (uwsgi_sock) {
+				if (uwsgi_sock->family == AF_INET) {
+					uwsgi_sock->queue = uwsgi_get_tcp_info(uwsgi_sock->fd);
+				}
+#ifdef __linux__
+#ifdef SIOBKLGQ
+				else if (uwsgi_sock->family == AF_UNIX) {
+					uwsgi_sock->queue = get_linux_unbit_SIOBKLGQ(uwsgi_sock->fd);
+				}
+#endif
+#endif
+				uwsgi_sock = uwsgi_sock->next;
+			}
+
+			// check if some worker has to die (harakiri, evil checks...)
+			uwsgi_master_check_workers_deadline();
+
+			uwsgi_master_check_gateways_deadline();
+			uwsgi_master_check_mules_deadline();
+			uwsgi_master_check_spoolers_deadline();
+
+#ifdef __linux__
+#ifdef MADV_MERGEABLE
+			if (uwsgi.linux_ksm > 0 && (uwsgi.master_cycles % uwsgi.linux_ksm) == 0) {
+				uwsgi_linux_ksm_map();
+			}
+#endif
+#endif
+
+			// resubscribe every 10 cycles by default
+			if (( (uwsgi.subscriptions || uwsgi.subscriptions2) && ((uwsgi.master_cycles % uwsgi.subscribe_freq) == 0 || uwsgi.master_cycles == 1)) && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
+				uwsgi_subscribe_all(0, 0);
+			}
+
+			uwsgi_cache_sync_all();
+
+			if (uwsgi.queue_store && uwsgi.queue_filesize && uwsgi.queue_store_sync && ((uwsgi.master_cycles % uwsgi.queue_store_sync) == 0)) {
+				if (msync(uwsgi.queue_header, uwsgi.queue_filesize, MS_ASYNC)) {
+					uwsgi_error("msync()");
+				}
+			}
+
+			// check touch_reload
+			if (!uwsgi_instance_is_reloading && !uwsgi_instance_is_dying) {
+				char *touched = uwsgi_check_touches(uwsgi.touch_reload);
+				if (touched) {
+					uwsgi_log_verbose("*** %s has been touched... grace them all !!! ***\n", touched);
+					uwsgi_block_signal(SIGHUP);
+					grace_them_all(0);
+					uwsgi_unblock_signal(SIGHUP);
+					continue;
+				}
+				touched = uwsgi_check_touches(uwsgi.touch_workers_reload);
+				if (touched) {
+                                        uwsgi_log_verbose("*** %s has been touched... workers reload !!! ***\n", touched);
+					uwsgi_block_signal(SIGHUP);
+					for(i=1;i<=uwsgi.numproc;i++) {
+						if (uwsgi.workers[i].pid > 0) {
+							uwsgi_curse(i, SIGHUP);
+						}
+					}
+					uwsgi_unblock_signal(SIGHUP);
+                                        continue;
+                                }
+				touched = uwsgi_check_touches(uwsgi.touch_chain_reload);
+				if (touched) {
+					if (uwsgi.status.chain_reloading == 0) {
+                                        	uwsgi_log_verbose("*** %s has been touched... chain reload !!! ***\n", touched);
+						uwsgi.status.chain_reloading = 1;
+					}
+					else {
+                                        	uwsgi_log_verbose("*** %s has been touched... but chain reload is already running ***\n", touched);
+					}
+				}
+			}
+
+			continue;
+
+		}
+
+		// no one died
+		if (diedpid <= 0)
+			continue;
+
+		// check for deadlocks first
+		uwsgi_deadlock_check(diedpid);
+
+		// reload gateways and daemons only on normal workflow (+outworld status)
+		if (!uwsgi_instance_is_reloading && !uwsgi_instance_is_dying) {
+
+			if (uwsgi_master_check_emperor_death(diedpid)) continue;
+			if (uwsgi_master_check_spoolers_death(diedpid)) continue;
+			if (uwsgi_master_check_mules_death(diedpid)) continue;
+			if (uwsgi_master_check_gateways_death(diedpid)) continue;
+			if (uwsgi_master_check_daemons_death(diedpid)) continue;
+		}
+
+
+		/* What happens here ?
+
+		   case 1) the diedpid is not a worker, report it and continue
+		   case 2) the diedpid is a worker and we are not in a reload procedure -> reload it
+		   case 3) the diedpid is a worker and we are in graceful reload -> uwsgi.ready_to_reload++ and continue
+		   case 3) the diedpid is a worker and we are in brutal reload -> uwsgi.ready_to_die++ and continue
+
+
+		 */
+
+		int thewid = find_worker_id(diedpid);
+		if (thewid <= 0) {
+			// check spooler, mules, gateways and daemons
+			struct uwsgi_spooler *uspool = uwsgi.spoolers;
+			while (uspool) {
+				if (uspool->pid > 0 && diedpid == uspool->pid) {
+					uwsgi_log("spooler (pid: %d) annihilated\n", (int) diedpid);
+					goto next;
+				}
+				uspool = uspool->next;
+			}
+
+			for (i = 0; i < uwsgi.mules_cnt; i++) {
+				if (uwsgi.mules[i].pid == diedpid) {
+					uwsgi_log("mule %d (pid: %d) annihilated\n", i + 1, (int) diedpid);
+					goto next;
+				}
+			}
+
+			for (i = 0; i < ushared->gateways_cnt; i++) {
+				if (ushared->gateways[i].pid == diedpid) {
+					uwsgi_log("gateway %d (%s, pid: %d) annihilated\n", i + 1, ushared->gateways[i].fullname, (int) diedpid);
+					goto next;
+				}
+			}
+
+			if (uwsgi_daemon_check_pid_death(diedpid))
+				goto next;
+
+			if (WIFEXITED(waitpid_status)) {
+				uwsgi_log("subprocess %d exited with code %d\n", (int) diedpid, WEXITSTATUS(waitpid_status));
+			}
+			else if (WIFSIGNALED(waitpid_status)) {
+				uwsgi_log("subprocess %d exited by signal %d\n", (int) diedpid, WTERMSIG(waitpid_status));
+			}
+			else if (WIFSTOPPED(waitpid_status)) {
+				uwsgi_log("subprocess %d stopped\n", (int) diedpid);
+			}
+next:
+			continue;
+		}
+
+
+		// ok a worker died...
+		uwsgi.workers[thewid].pid = 0;
+		// only to be safe :P
+		uwsgi.workers[thewid].harakiri = 0;
+
+		// ok, if we are reloading or dying, just continue the master loop
+		// as soon as all of the workers have pid == 0, the action (exit, or reload) is triggered
+		if (uwsgi_instance_is_reloading || uwsgi_instance_is_dying) {
+			uwsgi_log("worker %d buried after %d seconds\n", thewid, (int) (uwsgi_now()-uwsgi.workers[thewid].cursed_at));
+			uwsgi.workers[thewid].cursed_at = 0;
+			continue;
+		}
+
+		// if we are stopping workers, just end here
+
+		if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_FAILED_APP_CODE) {
+			uwsgi_log("OOPS ! failed loading app in worker %d (pid %d) :( trying again...\n", thewid, (int) diedpid);
+		}
+		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_DE_HIJACKED_CODE) {
+			uwsgi_log("...restoring worker %d (pid: %d)...\n", thewid, (int) diedpid);
+		}
+		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_EXCEPTION_CODE) {
+			uwsgi_log("... monitored exception detected, respawning worker %d (pid: %d)...\n", thewid, (int) diedpid);
+		}
+		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_QUIET_CODE) {
+			// noop
+		}
+		else if (uwsgi.workers[thewid].manage_next_request) {
+			if (WIFSIGNALED(waitpid_status)) {
+				uwsgi_log("DAMN ! worker %d (pid: %d) died, killed by signal %d :( trying respawn ...\n", thewid, (int) diedpid, (int) WTERMSIG(waitpid_status));
+			}
+			else {
+				uwsgi_log("DAMN ! worker %d (pid: %d) died :( trying respawn ...\n", thewid, (int) diedpid);
+			}
+		}
+		else if (uwsgi.workers[thewid].cursed_at > 0) {
+			uwsgi_log("worker %d killed successfully (pid: %d)\n", thewid, (int) diedpid);
+		}
+		// manage_next_request is zero, but killed by signal...
+		else if (WIFSIGNALED(waitpid_status)) {
+			uwsgi_log("DAMN ! worker %d (pid: %d) MISTERIOUSLY killed by signal %d :( trying respawn ...\n", thewid, (int) diedpid, (int) WTERMSIG(waitpid_status));
+		}
+
+		if (uwsgi.workers[thewid].cheaped == 1) {
+			uwsgi_log("uWSGI worker %d cheaped.\n", thewid);
+			continue;
+		}
+
+		// avoid fork bombing
+		gettimeofday(&last_respawn, NULL);
+		if (last_respawn.tv_sec <= uwsgi.respawn_delta + check_interval) {
+			last_respawn_rate++;
+			if (last_respawn_rate > uwsgi.numproc) {
+				if (uwsgi.forkbomb_delay > 0) {
+					uwsgi_log("worker respawning too fast !!! i have to sleep a bit (%d seconds)...\n", uwsgi.forkbomb_delay);
+					/* use --forkbomb-delay 0 to disable sleeping */
+					sleep(uwsgi.forkbomb_delay);
+				}
+				last_respawn_rate = 0;
+			}
+		}
+		else {
+			last_respawn_rate = 0;
+		}
+		gettimeofday(&last_respawn, NULL);
+		uwsgi.respawn_delta = last_respawn.tv_sec;
+
+		// are we chain reloading it ?
+		if (uwsgi.status.chain_reloading == thewid) {
+			uwsgi.status.chain_reloading++;
+		}
+
+		// respawn the worker (if needed)
+		if (uwsgi_respawn_worker(thewid))
+			return 0;
+
+		// end of the loop
+	}
+
+	// never here
+}

core/master_checks.c

@@ -0,0 +1,278 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+// check if all of the workers are dead and exit uWSGI
+void uwsgi_master_check_death() {
+	if (uwsgi_instance_is_dying) {
+		int i;
+		for(i=1;i<=uwsgi.numproc;i++) {
+			if (uwsgi.workers[i].pid > 0) {
+				return;
+			}
+		}
+		uwsgi_log("goodbye to uWSGI.\n");
+		exit(0);
+	}
+}
+
+// check if all of the workers are dead, and trigger a reload
+int uwsgi_master_check_reload(char **argv) {
+        if (uwsgi_instance_is_reloading) {
+                int i;
+                for(i=1;i<=uwsgi.numproc;i++) {
+                        if (uwsgi.workers[i].pid > 0) {
+                                return 0;
+                        }
+                }
+		uwsgi_reload(argv);
+		// never here (unless in shared library mode)
+		return -1;
+        }
+	return 0;
+}
+
+// check for chain reload
+void uwsgi_master_check_chain() {
+	if (!uwsgi.status.chain_reloading) return;
+	if (uwsgi.status.chain_reloading > uwsgi.numproc) {
+		uwsgi.status.chain_reloading = 0;
+                uwsgi_log_verbose("chain reloading complete\n");
+	}
+	int i;
+	uwsgi_block_signal(SIGHUP);
+	for(i=1;i<=uwsgi.numproc;i++) {
+		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].cursed_at == 0 && i == uwsgi.status.chain_reloading) {
+			uwsgi_curse(i, SIGHUP);
+			break;
+		}
+	}
+	uwsgi_unblock_signal(SIGHUP);
+}
+
+
+// special function for assuming all of the workers are dead
+void uwsgi_master_commit_status() {
+	int i;
+	for(i=1;i<=uwsgi.numproc;i++) {
+		uwsgi.workers[i].pid = 0;
+	}
+}
+
+void uwsgi_master_check_idle() {
+
+	static time_t last_request_timecheck = 0;
+	static uint64_t last_request_count = 0;
+	int i;
+	int waitpid_status;
+
+	if (!uwsgi.idle || uwsgi.status.is_cheap)
+		return;
+
+	uwsgi.current_time = uwsgi_now();
+	if (!last_request_timecheck)
+		last_request_timecheck = uwsgi.current_time;
+
+	// security check, stop the check if there are busy workers
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].pid > 0) {
+			if (uwsgi_worker_is_busy(i)) {
+				return;
+			}
+		}
+	}
+
+	if (last_request_count != uwsgi.workers[0].requests) {
+		last_request_timecheck = uwsgi.current_time;
+		last_request_count = uwsgi.workers[0].requests;
+	}
+	// a bit of over-engeneering to avoid clock skews
+	else if (last_request_timecheck < uwsgi.current_time && (uwsgi.current_time - last_request_timecheck > uwsgi.idle)) {
+		uwsgi_log("workers have been inactive for more than %d seconds (%llu-%llu)\n", uwsgi.idle, (unsigned long long) uwsgi.current_time, (unsigned long long) last_request_timecheck);
+		uwsgi.status.is_cheap = 1;
+		if (uwsgi.die_on_idle) {
+			if (uwsgi.has_emperor) {
+				char byte = 22;
+				if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
+					uwsgi_error("write()");
+					kill_them_all(0);
+				}
+			}
+			else {
+				kill_them_all(0);
+			}
+			return;
+		}
+		for (i = 1; i <= uwsgi.numproc; i++) {
+			uwsgi.workers[i].cheaped = 1;
+			if (uwsgi.workers[i].pid == 0)
+				continue;
+			kill(uwsgi.workers[i].pid, SIGKILL);
+			if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+				if (errno != ECHILD)
+					uwsgi_error("uwsgi_master_check_idle()/waitpid()");
+			}
+		}
+		uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
+		uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
+		last_request_timecheck = 0;
+	}
+
+}
+
+void uwsgi_master_check_workers_deadline() {
+	int i;
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		/* first check for harakiri */
+		if (uwsgi.workers[i].harakiri > 0) {
+			if (uwsgi.workers[i].harakiri < (time_t) uwsgi.current_time) {
+				trigger_harakiri(i);
+			}
+		}
+		/* then user-defined harakiri */
+		if (uwsgi.workers[i].user_harakiri > 0) {
+			if (uwsgi.workers[i].user_harakiri < (time_t) uwsgi.current_time) {
+				trigger_harakiri(i);
+			}
+		}
+		// then for evil memory checkers
+		if (uwsgi.evil_reload_on_as) {
+			if ((rlim_t) uwsgi.workers[i].vsz_size >= uwsgi.evil_reload_on_as) {
+				uwsgi_log("*** EVIL RELOAD ON WORKER %d ADDRESS SPACE: %lld (pid: %d) ***\n", i, (long long) uwsgi.workers[i].vsz_size, uwsgi.workers[i].pid);
+				kill(uwsgi.workers[i].pid, SIGKILL);
+				uwsgi.workers[i].vsz_size = 0;
+			}
+		}
+		if (uwsgi.evil_reload_on_rss) {
+			if ((rlim_t) uwsgi.workers[i].rss_size >= uwsgi.evil_reload_on_rss) {
+				uwsgi_log("*** EVIL RELOAD ON WORKER %d RSS: %lld (pid: %d) ***\n", i, (long long) uwsgi.workers[i].rss_size, uwsgi.workers[i].pid);
+				kill(uwsgi.workers[i].pid, SIGKILL);
+				uwsgi.workers[i].rss_size = 0;
+			}
+		}
+		// check if worker was running longer than allowed lifetime
+		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] > 0) {
+			uint64_t lifetime = uwsgi_now() - uwsgi.workers[i].last_spawn;
+			if (lifetime > uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] && uwsgi.workers[i].manage_next_request == 1) {
+				uwsgi_log("worker %d lifetime reached, it was running for %llu second(s)\n", i, (unsigned long long) lifetime);
+				uwsgi.workers[i].manage_next_request = 0;
+				kill(uwsgi.workers[i].pid, SIGWINCH);
+			}
+		}
+
+		// need to find a better way
+		//uwsgi.workers[i].last_running_time = uwsgi.workers[i].running_time;
+	}
+
+
+
+}
+
+
+void uwsgi_master_check_gateways_deadline() {
+
+	int i;
+
+	for (i = 0; i < ushared->gateways_cnt; i++) {
+		if (ushared->gateways_harakiri[i] > 0) {
+			if (ushared->gateways_harakiri[i] < (time_t) uwsgi.current_time) {
+				if (ushared->gateways[i].pid > 0) {
+					kill(ushared->gateways[i].pid, SIGKILL);
+				}
+				ushared->gateways_harakiri[i] = 0;
+			}
+		}
+	}
+}
+
+void uwsgi_master_check_mules_deadline() {
+	int i;
+
+	for (i = 0; i < uwsgi.mules_cnt; i++) {
+		if (uwsgi.mules[i].harakiri > 0) {
+			if (uwsgi.mules[i].harakiri < (time_t) uwsgi.current_time) {
+				uwsgi_log("*** HARAKIRI ON MULE %d HANDLING SIGNAL %d (pid: %d) ***\n", i + 1, uwsgi.mules[i].signum, uwsgi.mules[i].pid);
+				kill(uwsgi.mules[i].pid, SIGKILL);
+				uwsgi.mules[i].harakiri = 0;
+			}
+		}
+	}
+}
+
+void uwsgi_master_check_spoolers_deadline() {
+	struct uwsgi_spooler *uspool = uwsgi.spoolers;
+	while (uspool) {
+		if (uspool->harakiri > 0 && uspool->harakiri < (time_t) uwsgi.current_time) {
+			uwsgi_log("*** HARAKIRI ON THE SPOOLER (pid: %d) ***\n", uspool->pid);
+			kill(uspool->pid, SIGKILL);
+			uspool->harakiri = 0;
+		}
+		uspool = uspool->next;
+	}
+}
+
+
+int uwsgi_master_check_spoolers_death(int diedpid) {
+
+	struct uwsgi_spooler *uspool = uwsgi.spoolers;
+	while (uspool) {
+		if (uspool->pid > 0 && diedpid == uspool->pid) {
+			uwsgi_log("OOOPS the spooler is no more...trying respawn...\n");
+			uspool->respawned++;
+			uspool->pid = spooler_start(uspool);
+			return -1;
+		}
+		uspool = uspool->next;
+	}
+	return 0;
+}
+
+int uwsgi_master_check_emperor_death(int diedpid) {
+	if (uwsgi.emperor_pid >= 0 && diedpid == uwsgi.emperor_pid) {
+		uwsgi_log_verbose("!!! Emperor died !!!\n");
+		uwsgi_emperor_start();
+		return -1;
+	}
+	return 0;
+}
+
+int uwsgi_master_check_mules_death(int diedpid) {
+	int i;
+	for (i = 0; i < uwsgi.mules_cnt; i++) {
+		if (uwsgi.mules[i].pid == diedpid) {
+			uwsgi_log("OOOPS mule %d (pid: %d) crippled...trying respawn...\n", i + 1, uwsgi.mules[i].pid);
+			uwsgi_mule(i + 1);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+int uwsgi_master_check_gateways_death(int diedpid) {
+	int i;
+	for (i = 0; i < ushared->gateways_cnt; i++) {
+		if (ushared->gateways[i].pid == diedpid) {
+			gateway_respawn(i);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+int uwsgi_master_check_daemons_death(int diedpid) {
+	/* reload the daemons */
+	if (uwsgi_daemon_check_pid_reload(diedpid)) {
+		return -1;
+	}
+	return 0;
+}
+
+int uwsgi_worker_is_busy(int wid) {
+	int i;
+	for(i=0;i<uwsgi.cores;i++) {
+		if (uwsgi.workers[wid].cores[i].in_request) {
+			return 1;
+		}
+	}
+	return 0;
+}