support for multiple tuntap devices

allow setting cheaper rss memory limits

.gitignore

@@ -9,3 +9,5 @@
 /uwsgibuild.*
 
 /t/ring/target
+
+core/dot_h.c

.hgignore

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

.hgtags

@@ -1,58 +0,0 @@
-d3850b52334a91d005b0fe45e1e38ba0997a1fb8 no_server mode
-2d8a617299153ed2efa6ecee7920e9d36c29e0f5 0.9.5beta1
-04722a2d0121080d14a64df097c278860db5ce8a 0.9.5rc1
-820cc64ab296dc4589ef72a33a6b804c22a0430c 0.9.5rc2
-b0db39cfad5ac6d4f00bbb3f9c57cf73206e2afb 0.9.5
-9f8b98ad1dfa51b86b13fa624c65f73523075fc4 0.9.5.1
-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

CONTRIBUTORS

@@ -22,3 +22,6 @@ Aarni Koskela
 C Anthony Risinger
 Stephen Pierce
 Mingli Yuan
+Natanael Copa
+Roberto Leandrini
+Ryan Petrello

buildconf/base.ini

@@ -6,6 +6,7 @@ zeromq = auto
 ssl = auto
 pcre = auto
 routing = auto
+matheval = auto
 debug = false
 unbit = false
 xml_implementation = libxml2
@@ -16,7 +17,7 @@ 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, spooler, cheaper_busyness, symcall, transformation_tofile, transformation_gzip, transformation_chunked, transformation_offload, router_memcached, router_redis, router_hash
+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, spooler, cheaper_busyness, symcall, transformation_tofile, transformation_gzip, transformation_chunked, transformation_offload, router_memcached, router_redis, router_hash, router_expires
 as_shared_library = false
 
 locking = auto

buildconf/coroae.ini

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

buildconf/default.ini

@@ -1,3 +1,4 @@
 [uwsgi]
 main_plugin = python,gevent
 inherit = base
+debug = false

buildconf/glusterfs.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+main_plugin = glusterfs
+inherit = base
+matheval = false

buildconf/rados.ini

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

buildconf/ruby2.ini

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

buildconf/servlet.ini

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

buildconf/v8.ini

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

contrib/pypy/uwsgi_pypy_greenlets.py

@@ -0,0 +1,61 @@
+"""
+Greenlets support
+
+simply --pypy-exec this file to enable PyPy's greenlet mode
+
+Example:
+
+uwsgi --http-socket :9090 --pypy-home /opt/pypy --pypy-wsgi werkzeug.testapp:test_app --pypy-exec contrib/pypy/uwsgi_pypy_greenlets.py --async 8
+"""
+
+import greenlet
+
+uwsgi_pypy_greenlets = {}
+
+def uwsgi_pypy_greenlet_wrapper():
+    lib.async_schedule_to_req_green()
+
+@ffi.callback("void()")
+def uwsgi_pypy_greenlet_schedule():
+    id = lib.uwsgi.wsgi_req.async_id
+    modifier1 = lib.uwsgi.wsgi_req.uh.modifier1;
+
+    # generate a new greenlet
+    if not lib.uwsgi.wsgi_req.suspended:
+        uwsgi_pypy_greenlets[id] = greenlet.greenlet(uwsgi_pypy_greenlet_wrapper)
+        lib.uwsgi.wsgi_req.suspended = 1
+
+    # this is called in the main stack
+    if lib.uwsgi.p[modifier1].suspend:
+        lib.uwsgi.p[modifier1].suspend(ffi.NULL)
+
+    # let's switch
+    uwsgi_pypy_greenlets[id].switch()
+
+    # back to the main stack
+    if lib.uwsgi.p[modifier1].resume:
+        lib.uwsgi.p[modifier1].resume(ffi.NULL)
+
+@ffi.callback("void(struct wsgi_request *)")
+def uwsgi_pypy_greenlet_switch(wsgi_req):
+    id = wsgi_req.async_id
+    modifier1 = wsgi_req.uh.modifier1;
+
+    # this is called in the current greenlet
+    if lib.uwsgi.p[modifier1].suspend:
+        lib.uwsgi.p[modifier1].suspend(wsgi_req)
+
+    uwsgi_pypy_main_greenlet.switch()
+
+    # back to the greenlet
+    if lib.uwsgi.p[modifier1].resume:
+        lib.uwsgi.p[modifier1].resume(wsgi_req)
+
+    # update current running greenlet
+    lib.uwsgi.wsgi_req = wsgi_req
+
+if lib.uwsgi.async <= 1:
+    raise Exception("pypy greenlets require async mode !!!")
+lib.uwsgi.schedule_to_main = uwsgi_pypy_greenlet_switch
+lib.uwsgi.schedule_to_req = uwsgi_pypy_greenlet_schedule
+uwsgi_pypy_main_greenlet = greenlet.getcurrent()

contrib/upstart/emperor.conf

@@ -0,0 +1,15 @@
+# uWSGI - Emperor
+#
+
+description     "uWSGI Emperor"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+env LOGTO=/tmp/uwsgi.log
+env BINPATH=/home/foo/uwsgi/uwsgi
+env VASSALS=/etc/uwsgi
+
+exec $BINPATH --emperor $VASSALS --logto $LOGTO

contrib/upstart/uwsgi.conf

@@ -11,7 +11,6 @@ respawn
 env LOGTO=/tmp/uwsgi.log
 env BINPATH=/home/foo/uwsgi/uwsgi
 
-# --no-orphans avoid workers without master
-# --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
+# --die-on-term is upstart friendly
+exec $BINPATH --die-on-term --socket :3033 --uid 1001 --gid 1001 --limit-as 256 -w simple_app --logto $LOGTO -M -p 4
 

core/async.c

@@ -206,7 +206,11 @@ int async_add_fd_read(struct wsgi_request *wsgi_req, int fd, int timeout) {
 }
 
 static int async_wait_fd_read(int fd, int timeout) {
+
 	struct wsgi_request *wsgi_req = current_wsgi_req();
+
+	wsgi_req->async_ready_fd = 0;
+
 	if (async_add_fd_read(wsgi_req, fd, timeout)) {
 		return -1;
 	}
@@ -222,6 +226,8 @@ static int async_wait_fd_read(int fd, int timeout) {
 
 void async_add_timeout(struct wsgi_request *wsgi_req, int timeout) {
 
+	wsgi_req->async_ready_fd = 0;
+
 	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);
 	}
@@ -265,6 +271,9 @@ int async_add_fd_write(struct wsgi_request *wsgi_req, int fd, int timeout) {
 
 static int async_wait_fd_write(int fd, int timeout) {
 	struct wsgi_request *wsgi_req = current_wsgi_req();
+
+	wsgi_req->async_ready_fd = 0;
+
 	if (async_add_fd_write(wsgi_req, fd, timeout)) {
 		return -1;
 	}
@@ -359,7 +368,7 @@ void async_loop() {
 		uwsgi.schedule_to_req = async_schedule_to_req;
 
 	if (!uwsgi.schedule_to_main) {
-		uwsgi_log("*** WARNING *** async mode without coroutine/greenthread engine loaded !!!\n");
+		uwsgi_log("*** DANGER *** async mode without coroutine/greenthread engine loaded !!!\n");
 	}
 
 	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {

core/buffer.c

@@ -3,6 +3,9 @@
 extern struct uwsgi_server uwsgi;
 
 struct uwsgi_buffer *uwsgi_buffer_new(size_t len) {
+#ifdef UWSGI_DEBUG_BUFFER
+	uwsgi_log("[uwsgi-buffer] allocating a new buffer of %llu\n", (unsigned long long) len);
+#endif
 	struct uwsgi_buffer *ub = uwsgi_calloc(sizeof(struct uwsgi_buffer));
 
 	if (len) {
@@ -169,6 +172,16 @@ int uwsgi_buffer_u32be(struct uwsgi_buffer *ub, uint32_t num) {
         return uwsgi_buffer_append(ub, (char *) buf, 4);
 }
 
+int uwsgi_buffer_f32be(struct uwsgi_buffer *ub, float num) {
+        uint8_t buf[4];
+	uint32_t *pnum = (uint32_t *) #
+        buf[3] = (uint8_t) (*pnum & 0xff);
+        buf[2] = (uint8_t) ((*pnum >> 8) & 0xff);
+        buf[1] = (uint8_t) ((*pnum >> 16) & 0xff);
+        buf[0] = (uint8_t) ((*pnum >> 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);
@@ -192,6 +205,20 @@ int uwsgi_buffer_u64be(struct uwsgi_buffer *ub, uint64_t num) {
 }
 
 
+int uwsgi_buffer_f64be(struct uwsgi_buffer *ub, double num) {
+        uint8_t buf[8];
+	uint64_t *pnum = (uint64_t *) #
+        buf[7] = (uint8_t) (*pnum & 0xff);
+        buf[6] = (uint8_t) ((*pnum >> 8) & 0xff);
+        buf[5] = (uint8_t) ((*pnum >> 16) & 0xff);
+        buf[4] = (uint8_t) ((*pnum >> 24) & 0xff);
+        buf[3] = (uint8_t) ((*pnum >> 32) & 0xff);
+        buf[2] = (uint8_t) ((*pnum >> 40) & 0xff);
+        buf[1] = (uint8_t) ((*pnum >> 48) & 0xff);
+        buf[0] = (uint8_t) ((*pnum >> 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)) {
@@ -270,6 +297,13 @@ int uwsgi_buffer_append_base64(struct uwsgi_buffer *ub, char *s, size_t len) {
 
 
 void uwsgi_buffer_destroy(struct uwsgi_buffer *ub) {
+#ifdef UWSGI_DEBUG_BUFFER
+	uwsgi_log("[uwsgi-buffer] destroying buffer of %llu bytes\n", (unsigned long long) ub->len);
+	if (ub->freed) {
+		uwsgi_log("[uwsgi-buffer][BUG] buffer at %p already destroyed !!!\n", ub);
+	}
+	ub->freed = 1;
+#endif
 	if (ub->buf)
 		free(ub->buf);
 	free(ub);

core/cache.c

@@ -171,6 +171,42 @@ static void cache_sync_hook(char *k, uint16_t kl, char *v, uint16_t vl, void *da
 	}
 }
 
+static void uwsgi_cache_add_items(struct uwsgi_cache *uc) {
+	struct uwsgi_string_list *usl = uwsgi.add_cache_item;
+        while(usl) {
+                char *space = strchr(usl->value, ' ');
+		char *key = usl->value;
+		uint16_t key_len = usl->len;
+                if (space) {
+                        // need to skip ?
+                        if (uwsgi_strncmp(uc->name, uc->name_len, usl->value, space-usl->value)) {
+                                goto next;
+                        }
+                        key = space+1;
+                        key_len = usl->len - ((space-usl->value)+1);
+                }
+		char *value = strchr(key, '=');
+		if (!value) {
+			uwsgi_log("[cache] unable to store item %s\n", usl->value);
+			goto next;
+		}
+		key_len = value - key;
+		value++;
+		uint64_t len = (usl->value + usl->len) - value;
+                uwsgi_wlock(uc->lock);
+                if (!uwsgi_cache_set2(uc, key, key_len, value, len, 0, 0)) {
+                	uwsgi_log("[cache] stored \"%.*s\" in \"%s\"\n", key_len, key, uc->name);
+                }
+                else {
+                	uwsgi_log("[cache-error] unable to store \"%.*s\" in \"%s\"\n", key_len, key, uc->name);
+                }
+                uwsgi_rwunlock(uc->lock);
+next:
+                usl = usl->next;
+        }
+
+}
+
 static void uwsgi_cache_load_files(struct uwsgi_cache *uc) {
 
 	struct uwsgi_string_list *usl = uwsgi.load_file_in_cache;
@@ -341,6 +377,8 @@ void uwsgi_cache_init(struct uwsgi_cache *uc) {
 
 	uwsgi_cache_load_files(uc);
 
+	uwsgi_cache_add_items(uc);
+
 }
 
 static uint64_t uwsgi_cache_get_index(struct uwsgi_cache *uc, char *key, uint16_t keylen) {
@@ -461,6 +499,27 @@ char *uwsgi_cache_get3(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint6
         return NULL;
 }
 
+char *uwsgi_cache_get4(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint64_t * valsize, uint64_t *hits) {
+
+        uint64_t index = uwsgi_cache_get_index(uc, key, keylen);
+
+        if (index) {
+                struct uwsgi_cache_item *uci = cache_item(index);
+                if (uci->flags & UWSGI_CACHE_FLAG_UNGETTABLE)
+                        return NULL;
+                *valsize = uci->valsize;
+                if (hits)
+                        *hits = uci->hits;
+                uci->hits++;
+                uc->hits++;
+                return uc->data + (uci->first_block * uc->blocksize);
+        }
+
+        uc->miss++;
+
+        return NULL;
+}
+
 
 int uwsgi_cache_del2(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint64_t index, uint16_t flags) {
 
@@ -1862,3 +1921,36 @@ void uwsgi_cache_setup_nodes(struct uwsgi_cache *uc) {
 	}
 }
 
+struct uwsgi_cache_item *uwsgi_cache_keys(struct uwsgi_cache *uc, uint64_t *pos, struct uwsgi_cache_item **uci) {
+
+	// security check
+	if (*pos >= uc->hashsize) return NULL;
+	// iterate hashtable
+	uint64_t orig_pos = *pos;
+	for(;*pos<uc->hashsize;(*pos)++) {
+		// get the cache slot
+		uint64_t slot = uc->hashtable[*pos];
+		if (*pos == orig_pos && *uci) {
+			slot = (*uci)->next;	
+		}
+		if (slot == 0) continue;
+
+		*uci = cache_item(slot);
+		return *uci;
+	}
+
+	(*pos)++;
+	return NULL;
+}
+
+void uwsgi_cache_rlock(struct uwsgi_cache *uc) {
+	uwsgi_rlock(uc->lock);
+}
+
+void uwsgi_cache_rwunlock(struct uwsgi_cache *uc) {
+	uwsgi_rwunlock(uc->lock);
+}
+
+char *uwsgi_cache_item_key(struct uwsgi_cache_item *uci) {
+	return uci->key;
+}

core/chunked.c

@@ -0,0 +1,162 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	Chunked input implementation
+
+	--chunked-input-limit <bytes> (default 1MB)
+
+	--chunked-input-timeout <s> (default --socket-timeout)
+
+	chunk = uwsgi.chunked_read([timeout])
+
+	timeout = -1 (wait forever)
+	timeout = 0 (default)
+
+*/
+
+static ssize_t uwsgi_chunked_input_recv(struct wsgi_request *wsgi_req, int timeout, int nb) {
+
+	if (timeout == 0) timeout = uwsgi.chunked_input_timeout;
+	if (timeout == 0) timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
+
+	int ret = -1;
+
+	for(;;) {
+		ssize_t rlen = wsgi_req->socket->proto_read_body(wsgi_req, wsgi_req->chunked_input_buf->buf + wsgi_req->chunked_input_buf->pos, wsgi_req->chunked_input_buf->len - wsgi_req->chunked_input_buf->pos);
+		if (rlen > 0) return rlen;
+		if (rlen == 0) return -1;
+		if (rlen < 0) {
+                        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) {
+				if (nb) return -1; 
+                                goto wait;
+                        }
+                        uwsgi_error("uwsgi_chunked_input_recv()");
+                        return -1;
+                }
+
+wait:
+                ret = uwsgi.wait_read_hook(wsgi_req->fd, timeout);
+                if (ret > 0) {
+			rlen = wsgi_req->socket->proto_read_body(wsgi_req, wsgi_req->chunked_input_buf->buf + wsgi_req->chunked_input_buf->pos, wsgi_req->chunked_input_buf->len - wsgi_req->chunked_input_buf->pos);
+			if (rlen > 0) return rlen;
+			if (rlen <= 0) return -1;
+		}
+                if (ret < 0) {
+			uwsgi_error("uwsgi_chunked_input_recv()");
+                }
+		return -1;
+	}
+
+        return -1;
+}
+
+static ssize_t uwsgi_chunked_readline(struct wsgi_request *wsgi_req) {
+	size_t i;
+	int found = 0;
+	for(i=0;i<wsgi_req->chunked_input_buf->pos;i++) {
+		if (found) {
+			if (wsgi_req->chunked_input_buf->buf[i] == '\n') {
+				// strtoul will stop at \r
+				size_t num =  strtoul(wsgi_req->chunked_input_buf->buf, NULL, 16);
+				if (uwsgi_buffer_decapitate(wsgi_req->chunked_input_buf, i+1)) return -1;
+				return num;
+			}
+			return -1;
+		}
+		if ((wsgi_req->chunked_input_buf->buf[i] >= '0' && wsgi_req->chunked_input_buf->buf[i] <= '9') || 
+			(wsgi_req->chunked_input_buf->buf[i] >= 'a' && wsgi_req->chunked_input_buf->buf[i] <= 'z') ||
+			(wsgi_req->chunked_input_buf->buf[i] >= 'A' && wsgi_req->chunked_input_buf->buf[i] <= 'Z')) continue;
+		if (wsgi_req->chunked_input_buf->buf[i] == '\r') { found = 1; continue; }
+		return -1;
+	}
+
+	return -2;
+}
+
+/*
+
+	0 -> waiting for \r\n
+	1 -> waiting for whole body
+
+*/
+
+char *uwsgi_chunked_read(struct wsgi_request *wsgi_req, size_t *len, int timeout, int nb) {
+
+	if (!wsgi_req->chunked_input_buf) {
+		wsgi_req->chunked_input_buf = uwsgi_buffer_new(uwsgi.page_size);
+		wsgi_req->chunked_input_buf->limit = uwsgi.chunked_input_limit;
+	}
+
+	// the whole chunk stream has been consumed
+	if (wsgi_req->chunked_input_complete) {
+		*len = 0;
+		return wsgi_req->chunked_input_buf->buf;
+	}
+
+	if (wsgi_req->chunked_input_decapitate > 0) {
+		if (uwsgi_buffer_decapitate(wsgi_req->chunked_input_buf, wsgi_req->chunked_input_decapitate)) return NULL;
+		wsgi_req->chunked_input_decapitate = 0;
+	}
+
+	for(;;) {
+		if (wsgi_req->chunked_input_need > 0 || wsgi_req->chunked_input_buf->pos == 0) {
+			if (uwsgi_buffer_ensure(wsgi_req->chunked_input_buf, UMAX((uint64_t)uwsgi.page_size, wsgi_req->chunked_input_need))) return NULL;
+			ssize_t rlen = uwsgi_chunked_input_recv(wsgi_req, timeout, nb);	
+			if (rlen <= 0) return NULL;
+			// update buffer position
+			wsgi_req->chunked_input_buf->pos += rlen;
+			if (wsgi_req->chunked_input_need > 0) {
+				if ((size_t)rlen > wsgi_req->chunked_input_need) {
+					wsgi_req->chunked_input_need = 0;
+				}
+				else {
+					wsgi_req->chunked_input_need -= rlen;
+				}
+			}
+		}
+
+		if (wsgi_req->chunked_input_need > 0) continue;
+
+		// ok we have a frame, let's parse it
+		if (wsgi_req->chunked_input_buf->pos > 0) {
+			switch(wsgi_req->chunked_input_parser_status) {
+				case 0:
+					wsgi_req->chunked_input_chunk_len = uwsgi_chunked_readline(wsgi_req);
+					if (wsgi_req->chunked_input_chunk_len == -2) {
+						wsgi_req->chunked_input_need++;
+						break;
+					}
+					else if (wsgi_req->chunked_input_chunk_len < 0) {
+						return NULL;
+					}
+					else if (wsgi_req->chunked_input_chunk_len == 0) {
+						*len = 0;
+						wsgi_req->chunked_input_complete = 1;
+						return wsgi_req->chunked_input_buf->buf;
+					}
+					// if here the buffer has been already decapitated
+					if ((size_t)(wsgi_req->chunked_input_chunk_len+2) > wsgi_req->chunked_input_buf->pos) {
+						wsgi_req->chunked_input_need = (wsgi_req->chunked_input_chunk_len+2) - wsgi_req->chunked_input_buf->pos;
+						wsgi_req->chunked_input_parser_status = 1;
+						break;
+					}
+					*len = wsgi_req->chunked_input_chunk_len;
+					wsgi_req->chunked_input_decapitate = wsgi_req->chunked_input_chunk_len+2;
+					return wsgi_req->chunked_input_buf->buf;
+				case 1:
+					if ((size_t)(wsgi_req->chunked_input_chunk_len+2) > wsgi_req->chunked_input_buf->pos) {
+                                                wsgi_req->chunked_input_need = (wsgi_req->chunked_input_chunk_len+2) - wsgi_req->chunked_input_buf->pos;
+						break;
+                                        }	
+					*len = wsgi_req->chunked_input_chunk_len;
+					wsgi_req->chunked_input_decapitate = wsgi_req->chunked_input_chunk_len+2;
+					wsgi_req->chunked_input_parser_status = 0;
+                                        return wsgi_req->chunked_input_buf->buf;
+					
+			}
+		}
+	}
+}

core/clang_fake.c

@@ -0,0 +1 @@
+int main() {}

core/config.c

@@ -31,3 +31,450 @@ struct uwsgi_configurator *uwsgi_register_configurator(char *name, void (*func)(
 
         return uc;
 }
+
+int uwsgi_logic_opt_if_exists(char *key, char *value) {
+
+        if (uwsgi_file_exists(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_exists(char *key, char *value) {
+
+        if (!uwsgi_file_exists(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+int uwsgi_logic_opt_for(char *key, char *value) {
+
+        char *p = strtok(uwsgi.logic_opt_data, " ");
+        while (p) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+                p = strtok(NULL, " ");
+        }
+
+        return 1;
+}
+
+int uwsgi_logic_opt_for_glob(char *key, char *value) {
+
+        glob_t g;
+        int i;
+        if (glob(uwsgi.logic_opt_data, GLOB_MARK | GLOB_NOCHECK, NULL, &g)) {
+                uwsgi_error("uwsgi_logic_opt_for_glob()");
+                return 0;
+        }
+
+        for (i = 0; i < (int) g.gl_pathc; i++) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", g.gl_pathv[i]), 0);
+        }
+
+        globfree(&g);
+
+        return 1;
+}
+
+int uwsgi_logic_opt_for_times(char *key, char *value) {
+
+        int num = atoi(uwsgi.logic_opt_data);
+        int i;
+        char str_num[11];
+
+        for (i = 1; i <= num; i++) {
+                int ret = uwsgi_num2str2(i, str_num);
+                // security check
+                if (ret < 0 || ret > 11) {
+                        exit(1);
+                }
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", str_num), 0);
+        }
+
+        return 1;
+}
+
+
+int uwsgi_logic_opt_if_opt(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = uwsgi_get_exported_opt(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (strcmp(equal + 1, p))
+                                return 0;
+                }
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+int uwsgi_logic_opt_if_not_opt(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = uwsgi_get_exported_opt(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (!strcmp(equal + 1, p))
+                                return 0;
+                }
+                else {
+                        return 0;
+                }
+        }
+
+        add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+        return 1;
+}
+
+
+
+int uwsgi_logic_opt_if_env(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = getenv(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (strcmp(equal + 1, p))
+                                return 0;
+                }
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+int uwsgi_logic_opt_if_not_env(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = getenv(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (!strcmp(equal + 1, p))
+                                return 0;
+                }
+                else {
+                        return 0;
+                }
+        }
+
+        add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+        return 1;
+}
+
+int uwsgi_logic_opt_if_reload(char *key, char *value) {
+        if (uwsgi.is_a_reload) {
+                add_exported_option(key, value, 0);
+                return 1;
+        }
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_reload(char *key, char *value) {
+        if (!uwsgi.is_a_reload) {
+                add_exported_option(key, value, 0);
+                return 1;
+        }
+        return 0;
+}
+
+int uwsgi_logic_opt_if_file(char *key, char *value) {
+
+        if (uwsgi_is_file(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_file(char *key, char *value) {
+
+        if (!uwsgi_is_file(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_dir(char *key, char *value) {
+
+        if (uwsgi_is_dir(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_dir(char *key, char *value) {
+
+        if (!uwsgi_is_dir(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+
+int uwsgi_logic_opt_if_plugin(char *key, char *value) {
+
+        if (plugin_already_loaded(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_plugin(char *key, char *value) {
+
+        if (!plugin_already_loaded(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_count_options(struct uwsgi_option *uopt) {
+
+        struct uwsgi_option *aopt;
+        int count = 0;
+
+        while ((aopt = uopt)) {
+                if (!aopt->name)
+                        break;
+                count++;
+                uopt++;
+        }
+
+        return count;
+}
+
+struct uwsgi_option *uwsgi_opt_get(char *name) {
+        struct uwsgi_option *op = uwsgi.options;
+
+        while (op->name) {
+                if (!strcmp(name, op->name)) {
+                        return op;
+                }
+                op++;
+        }
+
+        return NULL;
+}
+
+void add_exported_option(char *key, char *value, int configured) {
+
+	struct uwsgi_string_list *blacklist = uwsgi.blacklist;
+	struct uwsgi_string_list *whitelist = uwsgi.whitelist;
+
+	while (blacklist) {
+		if (!strcmp(key, blacklist->value)) {
+			uwsgi_log("uWSGI error: forbidden option \"%s\" (by blacklist)\n", key);
+			exit(1);
+		}
+		blacklist = blacklist->next;
+	}
+
+	if (whitelist) {
+		int allowed = 0;
+		while (whitelist) {
+			if (!strcmp(key, whitelist->value)) {
+				allowed = 1;
+				break;
+			}
+			whitelist = whitelist->next;
+		}
+		if (!allowed) {
+			uwsgi_log("uWSGI error: forbidden option \"%s\" (by whitelist)\n", key);
+			exit(1);
+		}
+	}
+
+	if (uwsgi.blacklist_context) {
+		if (uwsgi_list_has_str(uwsgi.blacklist_context, key)) {
+			uwsgi_log("uWSGI error: forbidden option \"%s\" (by blacklist)\n", key);
+			exit(1);
+		}
+	}
+
+	if (uwsgi.whitelist_context) {
+                if (!uwsgi_list_has_str(uwsgi.whitelist_context, key)) {
+                        uwsgi_log("uWSGI error: forbidden option \"%s\" (by whitelist)\n", key);
+                        exit(1);
+                }
+        }
+
+	if (uwsgi.logic_opt_running)
+		goto add;
+
+	if (!strcmp(key, "end") || !strcmp(key, "endfor") || !strcmp(key, "endif")) {
+		if (uwsgi.logic_opt_data) {
+			free(uwsgi.logic_opt_data);
+		}
+		uwsgi.logic_opt = NULL;
+		uwsgi.logic_opt_arg = NULL;
+		uwsgi.logic_opt_cycles = 0;
+		uwsgi.logic_opt_data = NULL;
+	}
+
+	if (uwsgi.logic_opt) {
+		if (uwsgi.logic_opt_data) {
+			free(uwsgi.logic_opt_data);
+		}
+		uwsgi.logic_opt_data = uwsgi_str(uwsgi.logic_opt_arg);
+		uwsgi.logic_opt_cycles++;
+		uwsgi.logic_opt_running = 1;
+		uwsgi.logic_opt(key, value);
+		uwsgi.logic_opt_running = 0;
+		return;
+	}
+
+add:
+
+	if (!uwsgi.exported_opts) {
+		uwsgi.exported_opts = uwsgi_malloc(sizeof(struct uwsgi_opt *));
+	}
+	else {
+		uwsgi.exported_opts = realloc(uwsgi.exported_opts, sizeof(struct uwsgi_opt *) * (uwsgi.exported_opts_cnt + 1));
+		if (!uwsgi.exported_opts) {
+			uwsgi_error("realloc()");
+			exit(1);
+		}
+	}
+
+	int id = uwsgi.exported_opts_cnt;
+	uwsgi.exported_opts[id] = uwsgi_malloc(sizeof(struct uwsgi_opt));
+	uwsgi.exported_opts[id]->key = key;
+	uwsgi.exported_opts[id]->value = value;
+	uwsgi.exported_opts[id]->configured = configured;
+	uwsgi.exported_opts_cnt++;
+	uwsgi.dirty_config = 1;
+
+	struct uwsgi_option *op = uwsgi_opt_get(key);
+	if (op) {
+		// requires master ?
+		if (op->flags & UWSGI_OPT_MASTER) {
+			uwsgi.master_process = 1;
+		}
+		// requires log_master ?
+		if (op->flags & UWSGI_OPT_LOG_MASTER) {
+			uwsgi.master_process = 1;
+			uwsgi.log_master = 1;
+		}
+		if (op->flags & UWSGI_OPT_REQ_LOG_MASTER) {
+			uwsgi.master_process = 1;
+			uwsgi.log_master = 1;
+			uwsgi.req_log_master = 1;
+		}
+		// requires threads ?
+		if (op->flags & UWSGI_OPT_THREADS) {
+			uwsgi.has_threads = 1;
+		}
+		// requires cheaper mode ?
+		if (op->flags & UWSGI_OPT_CHEAPER) {
+			uwsgi.cheaper = 1;
+		}
+		// requires virtualhosting ?
+		if (op->flags & UWSGI_OPT_VHOST) {
+			uwsgi.vhost = 1;
+		}
+		// requires memusage ?
+		if (op->flags & UWSGI_OPT_MEMORY) {
+			uwsgi.force_get_memusage = 1;
+		}
+		// requires auto procname ?
+		if (op->flags & UWSGI_OPT_PROCNAME) {
+			uwsgi.auto_procname = 1;
+		}
+		// requires lazy ?
+		if (op->flags & UWSGI_OPT_LAZY) {
+			uwsgi.lazy = 1;
+		}
+		// requires no_initial ?
+		if (op->flags & UWSGI_OPT_NO_INITIAL) {
+			uwsgi.no_initial_output = 1;
+		}
+		// requires no_server ?
+		if (op->flags & UWSGI_OPT_NO_SERVER) {
+			uwsgi.no_server = 1;
+		}
+		// requires post_buffering ?
+		if (op->flags & UWSGI_OPT_POST_BUFFERING) {
+			if (!uwsgi.post_buffering)
+				uwsgi.post_buffering = 4096;
+		}
+		// requires building mime dict ?
+		if (op->flags & UWSGI_OPT_MIME) {
+			uwsgi.build_mime_dict = 1;
+		}
+		// immediate ?
+		if (op->flags & UWSGI_OPT_IMMEDIATE) {
+			op->func(key, value, op->data);
+			uwsgi.exported_opts[id]->configured = 1;
+		}
+	}
+	else if (uwsgi.strict) {
+		uwsgi_log("[strict-mode] unknown config directive: %s\n", key);
+		exit(1);
+	}
+
+}
+
+void uwsgi_fallback_config() {
+	if (uwsgi.fallback_config && uwsgi.last_exit_code == 1) {
+		uwsgi_log_verbose("!!! %s (pid: %d) exited with status %d !!!\n", uwsgi.binary_path, (int) getpid(), uwsgi.last_exit_code);
+		uwsgi_log_verbose("!!! Fallback config to %s !!!\n", uwsgi.fallback_config);
+		char *argv[3];
+		argv[0] = uwsgi.binary_path;
+		argv[1] = uwsgi.fallback_config;
+		argv[2] = NULL;
+        	execvp(uwsgi.binary_path, argv);
+        	uwsgi_error("execvp()");
+        	// never here
+	}
+}

core/daemons.c

@@ -77,8 +77,14 @@ void uwsgi_daemons_smart_check() {
 				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);
+						if (!ud->has_daemonized) {
+							uwsgi_log_verbose("[uwsgi-daemons] \"%s\" (pid: %d) did not daemonize !!!\n", ud->command, (int) ud->pid);
+							ud->pidfile_checks = 0;
+						}
+						else {
+							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);
+						}
 					}
 				}
 			}
@@ -99,10 +105,20 @@ void uwsgi_daemons_smart_check() {
 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);
-			ud->pid = -1;
-			return -1;
+		if (ud->pid == diedpid) {
+			if (!ud->pidfile) {
+				uwsgi_log("daemon \"%s\" (pid: %d) annihilated\n", ud->command, (int) diedpid);
+				ud->pid = -1;
+				return -1;
+			}
+			else {
+				if (!ud->has_daemonized) {
+					ud->has_daemonized = 1;
+				}
+				else {
+					uwsgi_log("[uwsgi-daemons] BUG !!! daemon \"%s\" has already daemonized !!!\n", ud->command);
+				}
+			}
 		}
 		ud = ud->next;
 	}
@@ -251,6 +267,7 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 	}
 
 	if (pid > 0) {
+		ud->has_daemonized = 0;
 		ud->pid = pid;
 		ud->status = 1;
 		ud->pidfile_checks = 0;

core/emperor.c

@@ -234,11 +234,18 @@ void uwsgi_imperial_monitor_directory(struct uwsgi_emperor_scanner *ues) {
 		if (!uwsgi_emperor_is_valid(de->d_name))
 			continue;
 
-		if (stat(de->d_name, &st))
-			continue;
-
-		if (!S_ISREG(st.st_mode))
-			continue;
+		if (uwsgi.emperor_nofollow) {
+			if (lstat(de->d_name, &st))
+				continue;
+			if (!S_ISLNK(st.st_mode) && !S_ISREG(st.st_mode))
+				continue;
+		}
+		else {
+			if (stat(de->d_name, &st))
+				continue;
+			if (!S_ISREG(st.st_mode))
+				continue;
+		}
 
 		ui_current = emperor_get(de->d_name);
 
@@ -294,16 +301,30 @@ void uwsgi_imperial_monitor_directory(struct uwsgi_emperor_scanner *ues) {
 				else {
 					char *filename = uwsgi_calloc(0xff);
 					memcpy(filename, c_ui->name, colon - c_ui->name);
-					if (stat(filename, &st)) {
-						emperor_stop(c_ui);
+					if (uwsgi.emperor_nofollow) {
+						if (lstat(filename, &st)) {
+							emperor_stop(c_ui);
+						}
+					}
+					else {
+						if (stat(filename, &st)) {
+							emperor_stop(c_ui);
+						}
 					}
 					free(filename);
 				}
 			}
 			else {
-                                if (stat(c_ui->name, &st)) {
-                                       	emperor_stop(c_ui);
-                                }
+				if (uwsgi.emperor_nofollow) {
+                                	if (lstat(c_ui->name, &st)) {
+                                       		emperor_stop(c_ui);
+                                	}
+				}
+				else {
+                                	if (stat(c_ui->name, &st)) {
+                                       		emperor_stop(c_ui);
+                                	}
+				}
 			}
 		}
 		c_ui = c_ui->ui_next;
@@ -328,11 +349,18 @@ void uwsgi_imperial_monitor_glob(struct uwsgi_emperor_scanner *ues) {
 		if (!uwsgi_emperor_is_valid(g.gl_pathv[i]))
 			continue;
 
-		if (stat(g.gl_pathv[i], &st))
-			continue;
-
-		if (!S_ISREG(st.st_mode))
-			continue;
+		if (uwsgi.emperor_nofollow) {
+			if (lstat(g.gl_pathv[i], &st))
+				continue;
+			if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
+				continue;
+		}
+		else {
+			if (stat(g.gl_pathv[i], &st))
+				continue;
+			if (!S_ISREG(st.st_mode))
+				continue;
+		}
 
 		ui_current = emperor_get(g.gl_pathv[i]);
 
@@ -389,16 +417,30 @@ void uwsgi_imperial_monitor_glob(struct uwsgi_emperor_scanner *ues) {
                                 else {
                                         char *filename = uwsgi_calloc(0xff);
                                         memcpy(filename, c_ui->name, colon - c_ui->name);
-                                        if (stat(filename, &st)) {
-                                                emperor_stop(c_ui);
-                                        }
+					if (uwsgi.emperor_nofollow) {
+                                        	if (lstat(filename, &st)) {
+                                                	emperor_stop(c_ui);
+                                        	}
+					}
+					else {
+                                        	if (stat(filename, &st)) {
+                                                	emperor_stop(c_ui);
+                                        	}
+					}
                                         free(filename);
                                 }
                         }
                         else {
-                                if (stat(c_ui->name, &st)) { 
-                                        emperor_stop(c_ui);
-                                }       
+				if (uwsgi.emperor_nofollow) {
+                                	if (lstat(c_ui->name, &st)) { 
+                                        	emperor_stop(c_ui);
+                                	}
+				}
+				else {
+                                	if (stat(c_ui->name, &st)) { 
+                                        	emperor_stop(c_ui);
+                                	}
+				}
                         }
 		}
 		c_ui = c_ui->ui_next;
@@ -578,7 +620,7 @@ void emperor_stop(struct uwsgi_instance *c_ui) {
 	// remove uWSGI instance
 
 	if (write(c_ui->pipe[0], "\0", 1) != 1) {
-		uwsgi_error("write()");
+		uwsgi_error("emperor_stop()/write()");
 	}
 
 	c_ui->status = 1;
@@ -592,7 +634,7 @@ void emperor_respawn(struct uwsgi_instance *c_ui, time_t mod) {
 
 	// reload the uWSGI instance
 	if (write(c_ui->pipe[0], "\1", 1) != 1) {
-		uwsgi_error("write()");
+		uwsgi_error("emperor_respawn/write()");
 	}
 
 	// push the config to the config pipe (if needed)
@@ -748,15 +790,10 @@ void emperor_add(struct uwsgi_emperor_scanner *ues, char *name, time_t born, cha
 	}
 }
 
+static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *);
 
 int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 
-	int i;
-	char *colon = NULL;
-	int counter;
-	char **uenvs;
-	char *uef;
-	char **vassal_argv;
 	pid_t pid;
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, n_ui->pipe)) {
@@ -780,9 +817,19 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 	// TODO pre-start hook
 
 	// a new uWSGI instance will start 
+#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL)
+	if (uwsgi.emperor_clone) {
+		char stack[PTHREAD_STACK_MIN];
+		pid = clone((int (*)(void *))uwsgi_emperor_spawn_vassal, stack + PTHREAD_STACK_MIN, SIGCHLD | uwsgi.emperor_clone, (void *) n_ui);
+	}
+	else {
+#endif
 	pid = fork();
+#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL)
+	}
+#endif
 	if (pid < 0) {
-		uwsgi_error("fork()")
+		uwsgi_error("uwsgi_emperor_spawn_vassal()/fork()")
 	}
 	else if (pid > 0) {
 		n_ui->pid = pid;
@@ -812,9 +859,86 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
                 	}
 
 		}
+
+		// once the config is sent we can run hooks (they can fail)
+		// exec hooks have access to all of the currently defined vars + UWSGI_VASSAL_PID, UWSGI_VASSAL_UID, UWSGI_VASSAL_GID, UWSGI_VASSAL_CONFIG
+		uwsgi_hooks_run(uwsgi.hook_as_emperor, "as-emperor", 0);
+		struct uwsgi_string_list *usl;
+		uwsgi_foreach(usl, uwsgi.mount_as_emperor) {
+                                uwsgi_log("mounting \"%s\" (as-emperor for vassal \"%s\" pid: %d uid: %d gid: %d)...\n", usl->value, n_ui->name, n_ui->pid, n_ui->uid, n_ui->gid);
+                                if (uwsgi_mount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+
+                        uwsgi_foreach(usl, uwsgi.umount_as_emperor) {
+                                uwsgi_log("un-mounting \"%s\" (as-emperor for vassal \"%s\" pid: %d uid: %d gid: %d)...\n", usl->value, n_ui->name, n_ui->pid, n_ui->uid, n_ui->gid);
+                                if (uwsgi_umount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+		uwsgi_foreach(usl, uwsgi.exec_as_emperor) {
+			uwsgi_log("running \"%s\" (as-emperor for vassal \"%s\" pid: %d uid: %d gid: %d)...\n", usl->value, n_ui->name, n_ui->pid, n_ui->uid, n_ui->gid);
+			char *argv[4];
+			argv[0] = uwsgi_concat2("UWSGI_VASSAL_CONFIG=", n_ui->name);
+			char argv_pid[17+11]; snprintf(argv_pid, 17 + 11, "UWSGI_VASSAL_PID=%d", (int) n_ui->pid); argv[1] = argv_pid;
+			char argv_uid[17+11]; snprintf(argv_uid, 17 + 11, "UWSGI_VASSAL_UID=%d", (int) n_ui->uid); argv[2] = argv_uid;
+			char argv_gid[17+11]; snprintf(argv_gid, 17 + 11, "UWSGI_VASSAL_GID=%d", (int) n_ui->gid); argv[3] = argv_gid;
+                        int ret = uwsgi_run_command_putenv_and_wait(NULL, usl->value, argv, 4);
+                        uwsgi_log("command \"%s\" exited with code: %d\n", usl->value, ret);
+			free(argv[0]);
+		}
+		// 4 call hooks
+		// config / config + pid / config + pid + uid + gid
+		// call
+		uwsgi_foreach(usl, uwsgi.call_as_emperor) {
+			void (*func)(void) = dlsym(RTLD_DEFAULT, usl->value);
+			if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+                        }
+			else {
+				func();
+			}
+                }
+
+		uwsgi_foreach(usl, uwsgi.call_as_emperor1) {
+                        void (*func)(char *) = dlsym(RTLD_DEFAULT, usl->value);
+                        if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+                        }
+                        else {
+                                func(n_ui->name);
+                        }
+                }
+
+		uwsgi_foreach(usl, uwsgi.call_as_emperor2) {
+                        void (*func)(char *, pid_t) = dlsym(RTLD_DEFAULT, usl->value);
+                        if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+                        }
+                        else {
+                                func(n_ui->name, n_ui->pid);
+                        }
+                }
+
+		uwsgi_foreach(usl, uwsgi.call_as_emperor4) {
+                        void (*func)(char *, pid_t, uid_t, gid_t) = dlsym(RTLD_DEFAULT, usl->value);
+                        if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+                        }
+                        else {
+                                func(n_ui->name, n_ui->pid, n_ui->uid, n_ui->gid);
+                        }
+                }
 		return 0;
 	}
 	else {
+		uwsgi_emperor_spawn_vassal(n_ui);
+	}
+	return -1;
+}
+
+static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
 
 		if (uwsgi.emperor_tyrant) {
 			uwsgi_log("[emperor-tyrant] dropping privileges to %d %d for instance %s\n", (int) n_ui->uid, (int) n_ui->gid, n_ui->name);
@@ -837,7 +961,7 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 		unsetenv("UWSGI_RELOADS");
 		unsetenv("NOTIFY_SOCKET");
 
-		uef = uwsgi_num2str(n_ui->pipe[1]);
+		char *uef = uwsgi_num2str(n_ui->pipe[1]);
 		if (setenv("UWSGI_EMPEROR_FD", uef, 1)) {
 			uwsgi_error("setenv()");
 			exit(1);
@@ -863,15 +987,19 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 			free(uef);
 		}
 
-		uenvs = environ;
+		char **uenvs = environ;
 		while (*uenvs) {
 			if (!strncmp(*uenvs, "UWSGI_VASSAL_", 13) && strchr(*uenvs, '=')) {
 				char *oe = uwsgi_concat2n(*uenvs, strchr(*uenvs, '=') - *uenvs, "", 0), *ne;
+#ifdef UNSETENV_VOID
+				unsetenv(oe);
+#else
 				if (unsetenv(oe)) {
 					uwsgi_error("unsetenv()");
 					free(oe);
 					break;
 				}
+#endif
 				free(oe);
 
 				ne = uwsgi_concat2("UWSGI_", *uenvs + 13);
@@ -896,17 +1024,19 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 			close(n_ui->pipe_config[0]);
 		}
 
-		counter = 4;
+		int counter = 4;
 		struct uwsgi_string_list *uct = uwsgi.vassals_templates;
 		while (uct) {
 			counter += 2;
 			uct = uct->next;
 		}
 
-		vassal_argv = uwsgi_malloc(sizeof(char *) * counter);
+		char **vassal_argv = uwsgi_malloc(sizeof(char *) * counter);
 		// set args
 		vassal_argv[0] = uwsgi.binary_path;
 
+		char *colon = NULL;
+
 		if (uwsgi.emperor_broodlord) {
 			colon = strchr(n_ui->name, ':');
 			if (colon) {
@@ -991,7 +1121,9 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 		}
 
 		// close all of the unneded fd
+		int i;
 		for (i = 3; i < (int) uwsgi.max_fd; i++) {
+			if (uwsgi_fd_is_safe(i)) continue;
 			if (n_ui->use_config) {
 				if (i == n_ui->pipe_config[1])
 					continue;
@@ -1001,6 +1133,7 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 			}
 		}
 
+		// run start hook (can fail)
 		if (uwsgi.vassals_start_hook) {
 			uwsgi_log("[emperor] running vassal start-hook: %s %s\n", uwsgi.vassals_start_hook, n_ui->name);
 			if (uwsgi.emperor_absolute_dir) {
@@ -1012,6 +1145,60 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 			uwsgi_log("[emperor] %s start-hook returned %d\n", n_ui->name, start_hook_ret);
 		}
 
+		uwsgi_hooks_run(uwsgi.hook_as_vassal, "as-vassal", 1);
+
+		uwsgi_foreach(usl, uwsgi.mount_as_vassal) {
+                                uwsgi_log("mounting \"%s\" (as-vassal)...\n", usl->value);
+                                if (uwsgi_mount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+
+                        uwsgi_foreach(usl, uwsgi.umount_as_vassal) {
+                                uwsgi_log("un-mounting \"%s\" (as-vassal)...\n", usl->value);
+                                if (uwsgi_umount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+
+		// run exec hooks (cannot fail)
+		uwsgi_foreach(usl, uwsgi.exec_as_vassal) {
+                        uwsgi_log("running \"%s\" (as-vassal)...\n", usl->value);
+                        int ret = uwsgi_run_command_and_wait(NULL, usl->value);
+                        if (ret != 0) {
+                                uwsgi_log("command \"%s\" exited with non-zero code: %d\n", usl->value, ret);
+                                exit(1);
+                        }
+                }
+	
+		// run low-level hooks
+		uwsgi_foreach(usl, uwsgi.call_as_vassal) {
+			void (*func)(void) = dlsym(RTLD_DEFAULT, usl->value);
+			if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+				exit(1);
+                        }
+			func();
+                }
+
+		uwsgi_foreach(usl, uwsgi.call_as_vassal1) {
+                        void (*func)(char *) = dlsym(RTLD_DEFAULT, usl->value);
+                        if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+                                exit(1);
+                        }
+                        func(n_ui->name);
+                }
+
+		uwsgi_foreach(usl, uwsgi.call_as_vassal3) {
+                        void (*func)(char *, uid_t, gid_t) = dlsym(RTLD_DEFAULT, usl->value);
+                        if (!func) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+                                exit(1);
+                        }
+                        func(n_ui->name, n_ui->uid, n_ui->gid);
+                }
+
 		// start !!!
 		if (execvp(vassal_argv[0], vassal_argv)) {
 			uwsgi_error("execvp()");
@@ -1019,9 +1206,6 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 		uwsgi_log("[emperor] is the uwsgi binary in your system PATH ?\n");
 		// never here
 		exit(UWSGI_EXILE_CODE);
-	}
-
-	return -1;
 }
 
 void uwsgi_imperial_monitor_glob_init(struct uwsgi_emperor_scanner *ues) {

core/fsmon.c

@@ -0,0 +1,213 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_INOTIFY
+#ifndef OBSOLETE_LINUX_KERNEL
+#include <sys/inotify.h>
+#endif
+#endif
+
+
+void uwsgi_fsmon_setup() {
+	struct uwsgi_string_list *usl = uwsgi.fs_reload;
+        while(usl) {
+                if (uwsgi_register_fsmon(usl)) {
+                        uwsgi_log("[uwsgi-fsmon] unable to register monitor for \"%s\"\n", usl->value);
+                }
+                else {
+                        uwsgi_log("[uwsgi-fsmon] registered monitor for \"%s\"\n", usl->value);
+                }
+                usl = usl->next;
+        }
+
+	usl = uwsgi.fs_brutal_reload;
+        while(usl) {
+                if (uwsgi_register_fsmon(usl)) {
+                        uwsgi_log("[uwsgi-fsmon] unable to register monitor for \"%s\"\n", usl->value);
+                }
+                else {
+                        uwsgi_log("[uwsgi-fsmon] registered monitor for \"%s\"\n", usl->value);
+                }
+                usl = usl->next;
+        }
+
+	usl = uwsgi.fs_signal;
+        while(usl) {
+		char *copy = uwsgi_str(usl->value);
+		char *space = strchr(copy, ' ');
+		if (!space) {
+			uwsgi_log("[uwsgi-fsmon] invalid syntax: \"%s\"\n", usl->value);
+			goto next;			
+		}
+		*space = 0;
+		usl->value = copy;
+		usl->len = strlen(copy);
+		usl->custom_ptr = space+1;	
+                if (uwsgi_register_fsmon(usl)) {
+                        uwsgi_log("[uwsgi-fsmon] unable to register monitor for \"%s\"\n", usl->value);
+                }
+                else {
+                        uwsgi_log("[uwsgi-fsmon] registered monitor for \"%s\"\n", usl->value);
+                }
+next:
+                usl = usl->next;
+        }
+}
+
+
+int uwsgi_register_fsmon(struct uwsgi_string_list *usl) {
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_INOTIFY
+#ifndef OBSOLETE_LINUX_KERNEL
+	static int inotify_fd = -1;
+	if (inotify_fd == -1) {
+		inotify_fd = inotify_init();
+		if (inotify_fd < 0) {
+			uwsgi_error("uwsgi_register_fsmon()/inotify_init()");
+			return -1;
+		}
+		if (event_queue_add_fd_read(uwsgi.master_queue, inotify_fd)) {
+			uwsgi_error("uwsgi_register_fsmon()/event_queue_add_fd_read()");
+			return -1;
+		}
+	}
+	int wd = inotify_add_watch(inotify_fd, usl->value, IN_ATTRIB | IN_CREATE | IN_DELETE | IN_DELETE_SELF | IN_MODIFY | IN_MOVE_SELF | IN_MOVED_FROM | IN_MOVED_TO);
+	if (wd < 0) {
+		uwsgi_error("uwsgi_register_fsmon()/inotify_add_watch()");
+		return -1;
+	}
+	usl->custom = inotify_fd;
+	usl->custom2 = wd;
+	return 0;
+#endif
+#endif
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_KQUEUE
+        struct kevent kev;
+        int fd = open(usl->value, O_RDONLY);
+        if (fd < 0) {
+                uwsgi_error_open(usl->value);
+		uwsgi_error("uwsgi_register_fsmon()/open()");	
+                return -1;
+        }
+
+        EV_SET(&kev, fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE | NOTE_DELETE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME | NOTE_REVOKE, 0, 0);
+        if (kevent(uwsgi.master_queue, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("uwsgi_register_fsmon()/kevent()");
+                return -1;
+        }
+	usl->custom = fd;
+	usl->custom2 = fd;
+	return 0;
+#endif
+
+	uwsgi_log("[uwsgi-fsmon] filesystem monitoring interface not available in this platform !!!\n");
+	return 1;
+}
+
+static struct uwsgi_string_list *uwsgi_fsmon_ack(int interesting_fd) {
+	int found_fd = -1;
+	struct uwsgi_string_list *usl = uwsgi.fs_reload;
+	while(usl) {
+		if ((int)usl->custom == interesting_fd) {
+			found_fd = usl->custom;
+			goto found;
+		}
+		usl = usl->next;
+	}
+	usl = uwsgi.fs_brutal_reload;
+	while(usl) {
+                if ((int)usl->custom == interesting_fd) {
+                        found_fd = usl->custom;
+                        goto found;
+                }
+                usl = usl->next;
+        }
+	usl = uwsgi.fs_signal;
+        while(usl) {
+                if ((int)usl->custom == interesting_fd) {
+                        found_fd = usl->custom;
+                        goto found;
+                }
+                usl = usl->next;
+        }
+found:
+	if (found_fd == -1) return NULL;
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_INOTIFY
+#ifndef OBSOLETE_LINUX_KERNEL
+	unsigned int isize = 0;
+	if (ioctl(found_fd, FIONREAD, &isize) < 0) {
+                uwsgi_error("uwsgi_fsmon_ack()/ioctl()");
+                return 0;
+        }
+	if (isize == 0) return NULL;
+	struct inotify_event *ie = uwsgi_malloc(isize);
+	// read from the inotify descriptor
+	ssize_t len = read(found_fd, ie, isize);
+	if (len < 0) { free(ie); uwsgi_error("uwsgi_fsmon_ack()/read()"); return NULL;}
+	found_fd = ie->wd;
+	free(ie);
+#endif
+#endif
+	// search for the item id and print it
+	usl = uwsgi.fs_reload;	
+        while(usl) {
+                if ((int)usl->custom2 == found_fd) {
+                        uwsgi_log("[uwsgi-fsmon] \"%s\" has been modified\n", usl->value);
+                        return uwsgi.fs_reload;
+                }
+                usl = usl->next;
+        }
+
+	usl = uwsgi.fs_brutal_reload;
+        while(usl) {
+                if ((int)usl->custom2 == found_fd) {
+                        uwsgi_log("[uwsgi-fsmon] \"%s\" has been modified\n", usl->value);
+                        return uwsgi.fs_brutal_reload;
+                } 
+                usl = usl->next;
+        }
+
+	usl = uwsgi.fs_signal;
+        while(usl) {
+                if ((int)usl->custom2 == found_fd) {
+                        uwsgi_log("[uwsgi-fsmon] \"%s\" has been modified\n", usl->value);
+                        return usl;
+                } 
+                usl = usl->next;
+        }
+
+	return NULL;
+}
+
+int uwsgi_fsmon_event(int interesting_fd) {
+
+	struct uwsgi_string_list *usl = uwsgi_fsmon_ack(interesting_fd);
+
+	if (!usl) return 0;
+
+	if (usl == uwsgi.fs_reload) {
+		uwsgi_block_signal(SIGHUP);
+                grace_them_all(0);
+                uwsgi_unblock_signal(SIGHUP);
+                return 1;
+        }
+
+	if (usl == uwsgi.fs_brutal_reload) {
+                if (uwsgi.die_on_term) {
+                        uwsgi_block_signal(SIGQUIT);
+                        reap_them_all(0);
+                        uwsgi_unblock_signal(SIGQUIT);
+                }
+                else {
+                        uwsgi_block_signal(SIGTERM);
+                        reap_them_all(0);
+                        uwsgi_unblock_signal(SIGTERM);
+                }
+                return 1;
+        }
+
+	// fallback to signal
+        uwsgi_route_signal(atoi(usl->custom_ptr));
+	return 1;
+}
+

core/gateway.c

@@ -41,7 +41,7 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop) (int, void *), v
 	uwsgi_socket_nb(ug->internal_subscription_pipe[0]);
 	uwsgi_socket_nb(ug->internal_subscription_pipe[1]);
 
-	if (!uwsgi.master_process)
+	if (!uwsgi.master_process && !uwsgi.force_gateway)
 		gateway_respawn(ushared->gateways_cnt);
 
 	ushared->gateways_cnt++;

core/hooks.c

@@ -0,0 +1,217 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	advanced (pluggable) hooks
+
+	they are executed before the other hooks, and can be extended by plugins
+
+	if a plugin tries to register an hook with a name already available in the list, its function
+	will be overridden
+
+*/
+
+struct uwsgi_hook *uwsgi_hook_by_name(char *name) {
+	struct uwsgi_hook *uh = uwsgi.hooks;
+	while(uh) {
+		if (!strcmp(uh->name, name)) {
+			return uh;
+		}
+		uh = uh->next;
+	}
+	return NULL;
+}
+
+void uwsgi_register_hook(char *name, int (*func)(char *)) {
+	struct uwsgi_hook *old_uh = NULL, *uh = uwsgi.hooks;
+        while(uh) {
+                if (!strcmp(uh->name, name)) {
+                        uh->func = func;
+			return;
+                }
+		old_uh = uh;
+		uh = uh->next;
+        }
+
+	uh = uwsgi_calloc(sizeof(struct uwsgi_hook));
+	uh->name = name;
+	uh->func = func;
+
+	if (old_uh) {
+		old_uh->next = uh;
+	}
+	else {
+		uwsgi.hooks = uh;
+	}
+}
+
+static int uwsgi_hook_chdir(char *arg) {
+	int ret = chdir(arg);
+	if (ret) {
+		uwsgi_error("uwsgi_hook_chdir()");
+	}
+	return ret;
+}
+
+static int uwsgi_hook_exec(char *arg) {
+	int ret = uwsgi_run_command_and_wait(NULL, arg);
+	if (ret != 0) {
+        	uwsgi_log("command \"%s\" exited with non-zero code: %d\n", arg, ret);
+        }
+	return ret;
+}
+
+static int uwsgi_hook_exit(char *arg) {
+	int exit_code = 0;
+	if (strlen(arg) > 1) {
+		exit_code = atoi(arg);
+	}
+	exit(exit_code);
+}
+
+static int uwsgi_hook_print(char *arg) {
+	char *line = uwsgi_concat2(arg, "\n");
+	uwsgi_log(line);
+	free(line);
+	return 0;
+}
+
+static int uwsgi_hook_callint(char *arg) {
+        char *space = strchr(arg, ' ');
+        if (space) {
+                *space = 0;
+                int num = atoi(space+1);
+                void (*func)(int) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                	uwsgi_log("unable to call function \"%s(%d)\"\n", arg, num);
+                        *space = ' ';
+                        return -1;
+		}
+                *space = ' ';
+                func(num);
+        }
+        else {
+                void (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                        uwsgi_log("unable to call function \"%s\"\n", arg);
+                        return -1;
+                }
+                func();
+        }
+        return 0;
+}
+
+
+static int uwsgi_hook_call(char *arg) {
+	char *space = strchr(arg, ' ');
+	if (space) {
+		*space = 0;
+		void (*func)(char *) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                	uwsgi_log("unable to call function \"%s(%s)\"\n", arg, space + 1);
+			*space = ' ';
+			return -1;
+		}
+		*space = ' ';
+                func(space + 1);
+	}
+	else {
+		void (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                	uwsgi_log("unable to call function \"%s\"\n", arg);
+			return -1;
+		}
+                func();
+	}
+	return 0;
+}
+
+static int uwsgi_hook_callintret(char *arg) {
+        char *space = strchr(arg, ' ');
+        if (space) {
+                *space = 0;
+                int num = atoi(space+1);
+                int (*func)(int) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                        uwsgi_log("unable to call function \"%s(%d)\"\n", arg, num);
+                        *space = ' ';
+                        return -1;
+                }
+                *space = ' ';
+                return func(num);
+        }
+        int (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+        if (!func) {
+        	uwsgi_log("unable to call function \"%s\"\n", arg);
+                return -1;
+        }
+	return func();
+}
+
+
+static int uwsgi_hook_callret(char *arg) {
+        char *space = strchr(arg, ' ');
+        if (space) {
+                *space = 0;
+                int (*func)(char *) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                        uwsgi_log("unable to call function \"%s(%s)\"\n", arg, space + 1);
+                        *space = ' ';
+                        return -1;
+                }
+                *space = ' ';
+                return func(space + 1);
+        }
+        int (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+        if (!func) {
+        	uwsgi_log("unable to call function \"%s\"\n", arg);
+                return -1;
+        }
+        return func();
+}
+
+
+void uwsgi_register_base_hooks() {
+	uwsgi_register_hook("cd", uwsgi_hook_chdir);
+	uwsgi_register_hook("exec", uwsgi_hook_exec);
+
+	uwsgi_register_hook("mount", uwsgi_mount_hook);
+	uwsgi_register_hook("umount", uwsgi_umount_hook);
+
+	uwsgi_register_hook("call", uwsgi_hook_call);
+	uwsgi_register_hook("callret", uwsgi_hook_callret);
+
+	uwsgi_register_hook("callint", uwsgi_hook_callint);
+	uwsgi_register_hook("callintret", uwsgi_hook_callintret);
+
+	// for testing
+	uwsgi_register_hook("exit", uwsgi_hook_exit);
+	uwsgi_register_hook("print", uwsgi_hook_print);
+}
+
+void uwsgi_hooks_run(struct uwsgi_string_list *l, char *phase, int fatal) {
+	struct uwsgi_string_list *usl = NULL;
+	uwsgi_foreach(usl, l) {
+		char *colon = strchr(usl->value, ':');
+		if (!colon) {
+			uwsgi_log("invalid hook syntax, must be hook:args\n");
+			exit(1);
+		}
+		*colon = 0;
+		struct uwsgi_hook *uh = uwsgi_hook_by_name(usl->value);
+		if (!uh) {
+			uwsgi_log("hook not found: %s\n", usl->value);
+			exit(1);
+		}
+		*colon = ':';
+
+		uwsgi_log("running \"%s\" (%s)...\n", usl->value, phase);
+			
+		int ret = uh->func(colon+1);
+		if (fatal && ret != 0) {
+			exit(1);
+		}
+	}
+}

core/init.c

@@ -169,6 +169,9 @@ void uwsgi_init_default() {
 	uwsgi.wait_write_hook = uwsgi_simple_wait_write_hook;
 
 	uwsgi_websockets_init();
+	
+	// 1 MB default limit
+	uwsgi.chunked_input_limit = 1024*1024;
 }
 
 void uwsgi_setup_reload() {
@@ -354,6 +357,7 @@ void uwsgi_setup_workers() {
 #ifdef UWSGI_ROUTING
 	uwsgi_fixup_routes(uwsgi.routes);
 	uwsgi_fixup_routes(uwsgi.error_routes);
+	uwsgi_fixup_routes(uwsgi.response_routes);
 	uwsgi_fixup_routes(uwsgi.final_routes);
 #endif
 
@@ -384,6 +388,8 @@ pid_t uwsgi_daemonize2() {
 		uwsgi_write_pidfile(uwsgi.pidfile2);
 	}
 
+	if (uwsgi.log_master) uwsgi_setup_log_master();
+
 	return uwsgi.mypid;
 }
 
@@ -446,6 +452,25 @@ void sanitize_args() {
 		exit(1);
 	}
 
+	if (uwsgi.cheaper_rss_limit_soft && uwsgi.shared->options[UWSGI_OPTION_MEMORY_DEBUG] != 1 && uwsgi.force_get_memusage != 1) {
+		uwsgi_log("enabling cheaper-rss-limit-soft requires enabling also memory-report\n");
+		exit(1);
+	}
+	if (uwsgi.cheaper_rss_limit_hard && !uwsgi.cheaper_rss_limit_soft) {
+		uwsgi_log("enabling cheaper-rss-limit-hard requires setting also cheaper-rss-limit-soft\n");
+		exit(1);
+	}
+	if ( uwsgi.cheaper_rss_limit_soft && uwsgi.cheaper_rss_limit_hard <= uwsgi.cheaper_rss_limit_soft) {
+		uwsgi_log("cheaper-rss-limit-hard value must be higher than cheaper-rss-limit-soft value\n");
+		exit(1);
+	}
+
+	/* here we try to choose if thunder lock is a good thing */
+#ifdef UNBIT
+	if (uwsgi.numproc > 1 && !uwsgi.map_socket) {
+		uwsgi.use_thunder_lock = 1;
+	}
+#endif
 }
 
 const char *uwsgi_http_status_msg(char *status, uint16_t *len) {

core/io.c

@@ -1078,3 +1078,22 @@ void uwsgi_add_safe_fd(int fd) {
 	uwsgi.safe_fds[uwsgi.safe_fds_cnt] = fd;	
 	uwsgi.safe_fds_cnt++;
 }
+
+int uwsgi_is_again() {
+	if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) {
+		return 1;
+	}
+	return 0;
+}
+
+void uwsgi_disconnect(struct wsgi_request *wsgi_req) {
+	if (wsgi_req->socket) {
+                wsgi_req->socket->proto_close(wsgi_req);
+        }
+        wsgi_req->fd_closed = 1;
+}
+
+int uwsgi_ready_fd(struct wsgi_request *wsgi_req) {
+	if (wsgi_req->async_ready_fd) return wsgi_req->async_last_ready_fd;
+	return -1;
+}

core/legion.c

@@ -79,6 +79,9 @@ void uwsgi_parse_legion(char *key, uint16_t keylen, char *value, uint16_t vallen
 		ul->scroll = value;
 		ul->scroll_len = vallen;
 	}
+	else if (!uwsgi_strncmp(key, keylen, "dead", 4)) {
+		ul->dead = 1;
+	}
 }
 
 // this function is called when a node is added or removed (heavy locking is needed)
@@ -611,6 +614,14 @@ static void *legion_loop(void *foobar) {
 					usl = usl->next;
 				}
 			}
+			// remove node announcing death
+			else if (legion_msg.dead) {
+				uwsgi_log("[uwsgi-legion] %s: %.*s valor: %llu uuid: %.*s announced its death to Legion %s\n", node->valor > 0 ? "node" : "arbiter", node->name_len, node->name, node->valor, 36, node->uuid, ul->legion);
+                                uwsgi_wlock(ul->lock);
+                                uwsgi_legion_remove_node(ul, node);
+                                uwsgi_rwunlock(ul->lock);
+				continue;
+			}
 
 			node->last_seen = uwsgi_now();
 			node->lord_valor = legion_msg.lord_valor;
@@ -752,8 +763,11 @@ int uwsgi_legion_announce(struct uwsgi_legion *ul) {
 		if (uwsgi_buffer_append_keyval(ub, "scroll", 6, ul->scroll, ul->scroll_len))
                 	goto err;
 	}
-#ifdef UWSGI_UUID
-#endif
+
+	if (ul->dead) {
+		if (uwsgi_buffer_append_keyval(ub, "dead", 4, "1", 1))
+                	goto err;
+	}
 
 	unsigned char *encrypted = uwsgi_malloc(ub->pos + 4 + EVP_MAX_BLOCK_LENGTH);
 	if (EVP_EncryptInit_ex(ul->encrypt_ctx, NULL, NULL, NULL, NULL) <= 0) {
@@ -1122,6 +1136,14 @@ void uwsgi_legion_action_register(char *name, int (*func) (struct uwsgi_legion *
 	}
 }
 
+void uwsgi_legion_announce_death(void) {
+	struct uwsgi_legion *legion = uwsgi.legions;
+        while (legion) {
+                legion->dead = 1;
+                uwsgi_legion_announce(legion);
+                legion = legion->next;
+        }
+}
 
 void uwsgi_legion_atexit(void) {
 	struct uwsgi_legion *legion = uwsgi.legions;
@@ -1140,6 +1162,7 @@ next:
 		legion = legion->next;
 	}
 
+	uwsgi_legion_announce_death();
 }
 
 int uwsgi_legion_i_am_the_lord(char *name) {

core/lock.c

@@ -493,7 +493,7 @@ struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 	if (uwsgi.ftok) {
 		myKey = ftok(uwsgi.ftok, counter);
 		if (myKey < 0) {
-			uwsgi_error("ftok()");
+			uwsgi_error("uwsgi_lock_ipcsem_init()/ftok()");
 			exit(1);
 		}
 		counter++;
@@ -504,7 +504,7 @@ struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 	}
 
 	if (semid < 0) {
-		uwsgi_error("semget()");
+		uwsgi_error("uwsgi_lock_ipcsem_init()/semget()");
 		exit(1);
 	}
 	// do this now, to allows triggering of atexit hook in case of problems
@@ -512,7 +512,7 @@ struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 
 	semu.val = 1;
 	if (semctl(semid, 0, SETVAL, semu)) {
-		uwsgi_error("semctl()");
+		uwsgi_error("uwsgi_lock_ipcsem_init()/semctl()");
 		exit(1);
 	}
 
@@ -532,7 +532,13 @@ void uwsgi_lock_ipcsem(struct uwsgi_lock_item *uli) {
 retry:
 	if (semop(semid, &sb, 1)) {
 		if (errno == EINTR) goto retry; 
-		uwsgi_error("semop()");
+		uwsgi_error("uwsgi_lock_ipcsem()/semop()");
+#ifdef EIDRM
+		if (errno == EIDRM) {
+			exit(UWSGI_BRUTAL_RELOAD_CODE);
+		}
+#endif
+		exit(1);
 	}
 }
 
@@ -549,7 +555,13 @@ void uwsgi_unlock_ipcsem(struct uwsgi_lock_item *uli) {
 retry:
 	if (semop(semid, &sb, 1)) {
 		if (errno == EINTR) goto retry; 
-		uwsgi_error("semop()");
+		uwsgi_error("uwsgi_unlock_ipcsem()/semop()");
+#ifdef EIDRM
+		if (errno == EIDRM) {
+			exit(UWSGI_BRUTAL_RELOAD_CODE);
+		}
+#endif
+		exit(1);
 	}
 
 }
@@ -574,6 +586,8 @@ pid_t uwsgi_lock_ipcsem_check(struct uwsgi_lock_item *uli) {
 
 void uwsgi_ipcsem_clear(void) {
 
+	if (uwsgi.persistent_ipcsem) return;
+
 	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
 
 	if (!uwsgi.workers)
@@ -594,12 +608,27 @@ clear:
 
 #ifdef UWSGI_DEBUG
 	uwsgi_log("removing sysvipc semaphores...\n");
+#endif
+#ifdef GETPID
+	while (uli) {
+		int semid = 0;
+		memcpy(&semid, uli->lock_ptr, sizeof(int));
+		int ret = semctl(semid, 0, GETPID);
+		if (ret > 0) {
+			if (ret != (int) getpid() && !kill((pid_t) ret, 0)) {
+				uwsgi_log("found ipcsem mapped to alive pid %d. skipping ipcsem removal.\n", ret);
+				return;
+			}
+		}
+		uli = uli->next;
+	}
+	uli = uwsgi.registered_locks;
 #endif
 	while (uli) {
 		int semid = 0;
 		memcpy(&semid, uli->lock_ptr, sizeof(int));
 		if (semctl(semid, 0, IPC_RMID)) {
-			uwsgi_error("semctl()");
+			uwsgi_error("uwsgi_ipcsem_clear()/semctl()");
 		}
 		uli = uli->next;
 	}
@@ -610,6 +639,32 @@ pid_t uwsgi_rwlock_ipcsem_check(struct uwsgi_lock_item *uli) {
 	return uwsgi_lock_ipcsem_check(uli);
 }
 
+#ifdef UNBIT
+/*
+	Unbit-specific workaround for robust-mutexes
+*/
+void *uwsgi_robust_mutexes_watchdog_loop(void *arg) {
+	for(;;) {
+		uwsgi_lock(uwsgi.the_thunder_lock);
+		uwsgi_unlock(uwsgi.the_thunder_lock);
+	}
+	return NULL;
+}
+void uwsgi_robust_mutexes_watchdog() {
+	pthread_t tid;
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+        // 32K should be more than enough...
+        pthread_attr_setstacksize(&attr, 32 * 1024);
+
+        if (pthread_create(&tid, &attr, uwsgi_robust_mutexes_watchdog_loop, NULL)) {
+                uwsgi_error("uwsgi_robust_mutexes_watchdog()/pthread_create()");
+		exit(1);
+        }
+}
+
+#endif
 
 void uwsgi_setup_locking() {
 
@@ -689,6 +744,14 @@ ready:
 	if (uwsgi.use_thunder_lock) {
 		// process shared thunder lock
 		uwsgi.the_thunder_lock = uwsgi_lock_init("thunder");	
+#ifdef UNBIT
+		// we have a serious bug on Unbit (and very probably on older libc)
+		// when all of the workers die in the same moment the pthread robust mutes is left
+		// in inconsistent state and we have no way to recover
+		// we span a thread in the master constantly ensuring the lock is ok
+		// for now we apply it only for Unbit (where thunder-lock is automatically enabled)
+		uwsgi_robust_mutexes_watchdog();		
+#endif
 	}
 
 	uwsgi.rpc_table_lock = uwsgi_lock_init("rpc");

core/logging.c

@@ -45,7 +45,7 @@ void uwsgi_log(const char *fmt, ...) {
 		}
 		else {
 			gettimeofday(&tv, NULL);
-#ifdef __sun__
+#if defined(__sun__) && !defined(__clang__)
 			ctime_r((const time_t *) &tv.tv_sec, ctime_storage, 26);
 #else
 			ctime_r((const time_t *) &tv.tv_sec, ctime_storage);
@@ -97,7 +97,7 @@ void uwsgi_log_verbose(const char *fmt, ...) {
 	}
 	else {
 		gettimeofday(&tv, NULL);
-#ifdef __sun__
+#if defined(__sun__) && !defined(__clang__)
 		ctime_r((const time_t *) &tv.tv_sec, ctime_storage, 26);
 #else
 		ctime_r((const time_t *) &tv.tv_sec, ctime_storage);
@@ -120,17 +120,54 @@ void uwsgi_log_verbose(const char *fmt, ...) {
 
 
 
+static void fix_logpipe_buf(int *fd) {
+	int so_bufsize;
+        socklen_t so_bufsize_len = sizeof(int);
+
+        if (getsockopt(fd[0], SOL_SOCKET, SO_RCVBUF, &so_bufsize, &so_bufsize_len)) {
+                uwsgi_error("fix_logpipe_buf()/getsockopt()");
+		return;
+        }
+
+	if ((size_t)so_bufsize < uwsgi.log_master_bufsize) {
+		so_bufsize = uwsgi.log_master_bufsize;
+		if (setsockopt(fd[0], SOL_SOCKET, SO_RCVBUF, &so_bufsize, so_bufsize_len)) {
+                        uwsgi_error("fix_logpipe_buf()/setsockopt()");
+        	}
+	}
+
+	if (getsockopt(fd[1], SOL_SOCKET, SO_SNDBUF, &so_bufsize, &so_bufsize_len)) {
+                uwsgi_error("fix_logpipe_buf()/getsockopt()");
+                return;
+        }
+
+        if ((size_t)so_bufsize < uwsgi.log_master_bufsize) {
+                so_bufsize = uwsgi.log_master_bufsize;
+                if (setsockopt(fd[1], SOL_SOCKET, SO_SNDBUF, &so_bufsize, so_bufsize_len)) {
+                        uwsgi_error("fix_logpipe_buf()/setsockopt()");
+                }
+        }
+}
 
 // create the logpipe
 void create_logpipe(void) {
 
+	if (uwsgi.log_master_stream) {
+		if (socketpair(AF_UNIX, SOCK_STREAM, 0, uwsgi.shared->worker_log_pipe)) {
+			uwsgi_error("create_logpipe()/socketpair()\n");
+			exit(1);
+		}
+	}
+	else {
 #if defined(SOCK_SEQPACKET) && defined(__linux__)
-	if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, uwsgi.shared->worker_log_pipe)) {
+		if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, uwsgi.shared->worker_log_pipe)) {
 #else
-	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, uwsgi.shared->worker_log_pipe)) {
+		if (socketpair(AF_UNIX, SOCK_DGRAM, 0, uwsgi.shared->worker_log_pipe)) {
 #endif
-		uwsgi_error("socketpair()\n");
-		exit(1);
+			uwsgi_error("create_logpipe()/socketpair()\n");
+			exit(1);
+		}
+		fix_logpipe_buf(uwsgi.shared->worker_log_pipe);
 	}
 
 	uwsgi_socket_nb(uwsgi.shared->worker_log_pipe[0]);
@@ -149,13 +186,22 @@ void create_logpipe(void) {
 	}
 
 	if (uwsgi.req_log_master) {
+		if (uwsgi.log_master_req_stream) {
+			if (socketpair(AF_UNIX, SOCK_STREAM, 0, uwsgi.shared->worker_req_log_pipe)) {
+				uwsgi_error("create_logpipe()/socketpair()\n");
+				exit(1);
+			}
+		}
+		else {
 #if defined(SOCK_SEQPACKET) && defined(__linux__)
-		if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, uwsgi.shared->worker_req_log_pipe)) {
+			if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, uwsgi.shared->worker_req_log_pipe)) {
 #else
-		if (socketpair(AF_UNIX, SOCK_DGRAM, 0, uwsgi.shared->worker_req_log_pipe)) {
+			if (socketpair(AF_UNIX, SOCK_DGRAM, 0, uwsgi.shared->worker_req_log_pipe)) {
 #endif
-			uwsgi_error("socketpair()\n");
-			exit(1);
+				uwsgi_error("create_logpipe()/socketpair()\n");
+				exit(1);
+			}
+			fix_logpipe_buf(uwsgi.shared->worker_req_log_pipe);
 		}
 
 		uwsgi_socket_nb(uwsgi.shared->worker_req_log_pipe[0]);
@@ -287,6 +333,8 @@ void logto(char *logfile) {
 
 
 void uwsgi_setup_log() {
+	
+	uwsgi_setup_log_encoders();
 
 	if (uwsgi.daemonize) {
 		if (uwsgi.has_emperor) {
@@ -616,7 +664,7 @@ void uwsgi_logit_simple(struct wsgi_request *wsgi_req) {
 			break;	
 	}
 
-#ifdef __sun__
+#if defined(__sun__) && !defined(__clang__)
 	ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, time_request, 26);
 #else
 	ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, time_request);
@@ -1035,7 +1083,7 @@ static ssize_t uwsgi_lf_epoch(struct wsgi_request * wsgi_req, char **buf) {
 
 static ssize_t uwsgi_lf_ctime(struct wsgi_request * wsgi_req, char **buf) {
 	*buf = uwsgi_malloc(26);
-#ifdef __sun__
+#if defined(__sun__) && !defined(__clang__)
 	ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, *buf, 26);
 #else
 	ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, *buf);
@@ -1060,6 +1108,19 @@ static ssize_t uwsgi_lf_ltime(struct wsgi_request * wsgi_req, char **buf) {
 	return ret;
 }
 
+static ssize_t uwsgi_lf_ftime(struct wsgi_request * wsgi_req, char **buf) {
+	if (!uwsgi.log_strftime) {
+		return uwsgi_lf_ltime(wsgi_req, buf);
+	}
+	*buf = uwsgi_malloc(64);
+	time_t now = wsgi_req->start_of_request / 1000000;
+	size_t ret = strftime(*buf, 64, uwsgi.log_strftime, localtime(&now));
+	if (ret == 0) {
+		*buf[0] = 0;
+		return 0;
+	}
+	return ret;
+}
 
 static ssize_t uwsgi_lf_micros(struct wsgi_request * wsgi_req, char **buf) {
 	*buf = uwsgi_num2str(wsgi_req->end_of_request - wsgi_req->start_of_request);
@@ -1246,6 +1307,11 @@ void uwsgi_add_logchunk(int variable, int pos, char *ptr, size_t len) {
 			logchunk->func = uwsgi_lf_ltime;
 			logchunk->free = 1;
 		}
+		else if (!uwsgi_strncmp(ptr, len, "ftime", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_ftime;
+			logchunk->free = 1;
+		}
 		else if (!uwsgi_strncmp(ptr, len, "ctime", 5)) {
 			logchunk->type = 3;
 			logchunk->func = uwsgi_lf_ctime;
@@ -1328,6 +1394,34 @@ void uwsgi_add_logchunk(int variable, int pos, char *ptr, size_t len) {
 	}
 }
 
+static void uwsgi_log_func_do(struct uwsgi_string_list *encoders, struct uwsgi_logger *ul, char *msg, size_t len) {
+	struct uwsgi_string_list *usl = encoders;
+	// note: msg must not be freed !!!
+	char *new_msg = msg;
+	size_t new_msg_len = len;
+	while(usl) {
+		struct uwsgi_log_encoder *ule = (struct uwsgi_log_encoder *) usl->custom_ptr;
+		size_t rlen = 0;
+		char *buf = ule->func(ule, new_msg, new_msg_len, &rlen);
+		if (new_msg != msg) {
+                	free(new_msg);
+        	}
+		new_msg = buf;
+		new_msg_len = rlen;
+		usl = usl->next;
+	}
+	if (ul) {
+		ul->func(ul, new_msg, new_msg_len);
+	}
+	else {
+		new_msg_len = (size_t) write(uwsgi.original_log_fd, new_msg, new_msg_len);
+	}
+	if (new_msg != msg) {
+		free(new_msg);
+	}
+
+}
+
 int uwsgi_master_log(void) {
 
         ssize_t rlen = read(uwsgi.shared->worker_log_pipe[0], uwsgi.log_master_buf, uwsgi.log_master_bufsize);
@@ -1361,7 +1455,7 @@ int uwsgi_master_log(void) {
                         if (uwsgi_regexp_match(url->pattern, url->pattern_extra, uwsgi.log_master_buf, rlen) >= 0) {
                                 struct uwsgi_logger *ul_route = (struct uwsgi_logger *) url->custom_ptr;
                                 if (ul_route) {
-                                        ul_route->func(ul_route, uwsgi.log_master_buf, rlen);
+					uwsgi_log_func_do(uwsgi.requested_log_encoders, ul_route, uwsgi.log_master_buf, rlen);
                                         finish = 1;
                                 }
                         }
@@ -1379,14 +1473,14 @@ int uwsgi_master_log(void) {
                         if (ul->id) {
                                 goto next;
                         }
-                        ul->func(ul, uwsgi.log_master_buf, rlen);
+                        uwsgi_log_func_do(uwsgi.requested_log_encoders, ul, uwsgi.log_master_buf, rlen);
                         raw_log = 0;
 next:
                         ul = ul->next;
                 }
 
                 if (raw_log) {
-                        rlen = write(uwsgi.original_log_fd, uwsgi.log_master_buf, rlen);
+			uwsgi_log_func_do(uwsgi.requested_log_encoders, NULL, uwsgi.log_master_buf, rlen);
                 }
                 return 0;
         }
@@ -1405,7 +1499,7 @@ int uwsgi_master_req_log(void) {
                         if (uwsgi_regexp_match(url->pattern, url->pattern_extra, uwsgi.log_master_buf, rlen) >= 0) {
                                 struct uwsgi_logger *ul_route = (struct uwsgi_logger *) url->custom_ptr;
                                 if (ul_route) {
-                                        ul_route->func(ul_route, uwsgi.log_master_buf, rlen);
+                                        uwsgi_log_func_do(uwsgi.requested_log_req_encoders, ul_route, uwsgi.log_master_buf, rlen);
                                         finish = 1;
                                 }
                         }
@@ -1423,14 +1517,14 @@ int uwsgi_master_req_log(void) {
                         if (ul->id) {
                                 goto next;
                         }
-                        ul->func(ul, uwsgi.log_master_buf, rlen);
+                        uwsgi_log_func_do(uwsgi.requested_log_req_encoders, ul, uwsgi.log_master_buf, rlen);
                         raw_log = 0;
 next:
                         ul = ul->next;
                 }
 
                 if (raw_log) {
-                        rlen = write(uwsgi.original_log_fd, uwsgi.log_master_buf, rlen);
+			uwsgi_log_func_do(uwsgi.requested_log_req_encoders, NULL, uwsgi.log_master_buf, rlen);
                 }
                 return 0;
         }
@@ -1493,3 +1587,361 @@ void uwsgi_threaded_logger_spawn() {
 	}
 }
 
+void uwsgi_register_log_encoder(char *name, char *(*func)(struct uwsgi_log_encoder *, char *, size_t, size_t *)) {
+	struct uwsgi_log_encoder *old_ule = NULL, *ule = uwsgi.log_encoders;
+
+	while(ule) {
+		if (!strcmp(ule->name, name)) {
+			ule->func = func;
+			return;
+		}
+		old_ule = ule;
+		ule = ule->next;
+	}
+
+	ule = uwsgi_calloc(sizeof(struct uwsgi_log_encoder));
+	ule->name = name;
+	ule->func = func;
+
+	if (old_ule) {
+		old_ule->next = ule;
+	}
+	else {
+		uwsgi.log_encoders = ule;
+	}
+}
+
+struct uwsgi_log_encoder *uwsgi_log_encoder_by_name(char *name) {
+	struct uwsgi_log_encoder *ule = uwsgi.log_encoders;
+	while(ule) {
+		if (!strcmp(name, ule->name)) return ule;
+		ule = ule->next;
+	}
+	return NULL;
+}
+
+void uwsgi_setup_log_encoders() {
+	struct uwsgi_string_list *usl = NULL;
+	uwsgi_foreach(usl, uwsgi.requested_log_encoders) {
+		char *space = strchr(usl->value, ' ');
+		if (space) *space = 0;
+		struct uwsgi_log_encoder *ule = uwsgi_log_encoder_by_name(usl->value);
+		if (!ule) {
+			uwsgi_log("log encoder \"%s\" not found\n", usl->value);
+			exit(1);
+		}
+		if (space) *space = ' ';
+		struct uwsgi_log_encoder *ule2 = uwsgi_malloc(sizeof(struct uwsgi_log_encoder));
+		memcpy(ule2, ule, sizeof(struct uwsgi_log_encoder)); 
+		// we use a copy
+		if (space) {
+			ule2->args = uwsgi_str(space+1);
+		}
+		else {
+			ule2->args = uwsgi_str("");
+		}
+		usl->custom_ptr = ule2;
+		uwsgi_log("[log-encoder] registered %s\n", usl->value);
+	}
+
+	uwsgi_foreach(usl, uwsgi.requested_log_req_encoders) {
+                char *space = strchr(usl->value, ' ');
+                if (space) *space = 0;
+                struct uwsgi_log_encoder *ule = uwsgi_log_encoder_by_name(usl->value);
+                if (!ule) {
+                        uwsgi_log("log encoder \"%s\" not found\n", usl->value);
+                        exit(1);
+                }
+                if (space) *space = ' ';
+                struct uwsgi_log_encoder *ule2 = uwsgi_malloc(sizeof(struct uwsgi_log_encoder));
+                memcpy(ule2, ule, sizeof(struct uwsgi_log_encoder));
+                // we use a copy
+		if (space) {
+                	ule2->args = uwsgi_str(space+1);
+		}
+		else {
+			ule2->args = uwsgi_str("");
+		}
+                usl->custom_ptr = ule2;
+		uwsgi_log("[log-req-encoder] registered %s\n", usl->value);
+        }
+}
+
+#ifdef UWSGI_ZLIB
+static char *uwsgi_log_encoder_gzip(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+	struct uwsgi_buffer *ub = uwsgi_gzip(msg, len);
+	if (!ub) return NULL;
+	*rlen = ub->pos;
+	// avoid destruction
+	char *buf = ub->buf;
+	ub->buf = NULL;
+	uwsgi_buffer_destroy(ub);
+	return buf;
+}
+
+static char *uwsgi_log_encoder_compress(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+	size_t c_len = (size_t) compressBound(len);
+	uLongf destLen = c_len;
+	char *buf = uwsgi_malloc(c_len);
+	if (compress((Bytef *) buf, &destLen, (Bytef *)msg, (uLong) len) == Z_OK) {
+		*rlen = destLen;
+		return buf;
+	}
+	free(buf);
+	return NULL;
+}
+#endif
+
+/*
+
+really fast encoder adding only a prefix
+
+*/
+static char *uwsgi_log_encoder_prefix(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+	char *buf = NULL;
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(len + strlen(ule->args));
+	if (uwsgi_buffer_append(ub, ule->args, strlen(ule->args))) goto end;
+	if (uwsgi_buffer_append(ub, msg, len)) goto end;
+	*rlen = ub->pos;
+	buf = ub->buf;
+	ub->buf = NULL;
+end:
+	uwsgi_buffer_destroy(ub);
+	return buf;
+}
+
+/*
+
+really fast encoder adding only a newline
+
+*/
+static char *uwsgi_log_encoder_nl(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+        char *buf = NULL;
+        struct uwsgi_buffer *ub = uwsgi_buffer_new(len + 1);
+        if (uwsgi_buffer_append(ub, msg, len)) goto end;
+        if (uwsgi_buffer_byte(ub, '\n')) goto end;
+        *rlen = ub->pos;
+        buf = ub->buf;
+        ub->buf = NULL;
+end:
+        uwsgi_buffer_destroy(ub);
+        return buf;
+}
+
+/*
+
+really fast encoder adding only a suffix
+
+*/
+static char *uwsgi_log_encoder_suffix(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+        char *buf = NULL;
+        struct uwsgi_buffer *ub = uwsgi_buffer_new(len + strlen(ule->args));
+        if (uwsgi_buffer_append(ub, msg, len)) goto end;
+        if (uwsgi_buffer_append(ub, ule->args, strlen(ule->args))) goto end;
+        *rlen = ub->pos;
+        buf = ub->buf;
+        ub->buf = NULL;
+end:
+        uwsgi_buffer_destroy(ub);
+        return buf;
+}
+
+
+
+void uwsgi_log_encoder_parse_vars(struct uwsgi_log_encoder *ule) {
+		char *ptr = ule->args;
+		size_t remains = strlen(ptr);
+		char *base = ptr;
+		size_t base_len = 0;
+		char *var = NULL;
+		size_t var_len = 0;
+		int status = 0; // 1 -> $ 2-> { end -> }
+		while(remains--) {
+			char b = *ptr++;
+			if (status == 1) {
+				if (b == '{') {
+					status = 2;
+					continue;
+				}
+				base_len+=2;
+				status = 0;
+				continue;
+			}
+			else if (status == 2) {
+				if (b == '}') {
+					status = 0;
+					uwsgi_string_new_list((struct uwsgi_string_list **) &ule->data, uwsgi_concat2n(base, base_len, "", 0));
+					struct uwsgi_string_list *usl = uwsgi_string_new_list((struct uwsgi_string_list **) &ule->data, uwsgi_concat2n(var, var_len, "", 0));
+					usl->custom = 1;
+					var = NULL;
+					var_len = 0;
+					base = NULL;
+					base_len = 0;
+					continue;
+				}
+				if (!var) var = (ptr-1);
+				var_len++;
+				continue;
+			}
+			// status == 0
+			if (b == '$') {
+				status = 1;
+			}
+			else {
+				if (!base) base = (ptr-1);
+				base_len++;
+			}
+		}
+
+		if (base) {
+			if (status == 1) {
+				base_len+=2;
+			}
+			else if (status == 2) {
+				base_len+=3;
+			}
+			uwsgi_string_new_list((struct uwsgi_string_list **) &ule->data, uwsgi_concat2n(base, base_len, "", 0));
+		}
+}
+
+/*
+        // format: foo ${var} bar
+        msg (the logline)
+        msgnl (the logine with newline)
+        unix (the time_t value)
+        micros (current microseconds)
+        strftime (strftime)
+*/
+static char *uwsgi_log_encoder_format(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+	
+	if (!ule->configured) {
+		uwsgi_log_encoder_parse_vars(ule);
+		ule->configured = 1;
+	}
+
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(strlen(ule->args) + len);
+	struct uwsgi_string_list *usl = (struct uwsgi_string_list *) ule->data;
+	char *buf = NULL;
+	while(usl) {
+		if (usl->custom) {
+			if (!uwsgi_strncmp(usl->value, usl->len, "msg", 3)) {
+				if (msg[len-1] == '\n') {
+					if (uwsgi_buffer_append(ub, msg, len-1)) goto end;
+				}
+				else {
+					if (uwsgi_buffer_append(ub, msg, len)) goto end;
+				}
+			}
+			else if (!uwsgi_strncmp(usl->value, usl->len, "msgnl", 5)) {
+				if (uwsgi_buffer_append(ub, msg, len)) goto end;
+			}
+			else if (!uwsgi_strncmp(usl->value, usl->len, "unix", 4)) {
+				if (uwsgi_buffer_num64(ub, uwsgi_now())) goto end;
+			}
+			else if (!uwsgi_strncmp(usl->value, usl->len, "micros", 6)) {
+				if (uwsgi_buffer_num64(ub, uwsgi_micros())) goto end;
+			}
+			else if (!uwsgi_starts_with(usl->value, usl->len, "strftime:", 9)) {
+				char sftime[64];
+                                time_t now = uwsgi_now();
+				char *buf = uwsgi_concat2n(usl->value+9, usl->len-9,"", 0);
+                                int strftime_len = strftime(sftime, 64, buf, localtime(&now));
+				free(buf);
+				if (strftime_len > 0) {
+					if (uwsgi_buffer_append(ub, sftime, strftime_len)) goto end;
+				}
+			}
+		}
+		else {
+			if (uwsgi_buffer_append(ub, usl->value, usl->len)) goto end;
+		}
+		usl = usl->next;
+	}
+	buf = ub->buf;
+	*rlen = ub->pos;
+	ub->buf = NULL;
+end:
+	uwsgi_buffer_destroy(ub);
+	return buf;
+}
+
+static char *uwsgi_log_encoder_json(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+
+        if (!ule->configured) {
+                uwsgi_log_encoder_parse_vars(ule);
+                ule->configured = 1;
+        }
+
+        struct uwsgi_buffer *ub = uwsgi_buffer_new(strlen(ule->args) + len);
+        struct uwsgi_string_list *usl = (struct uwsgi_string_list *) ule->data;
+        char *buf = NULL;
+        while(usl) {
+                if (usl->custom) {
+                        if (!uwsgi_strncmp(usl->value, usl->len, "msg", 3)) {
+				size_t msg_len = len;
+                                if (msg[len-1] == '\n') msg_len--;
+				char *e_json = uwsgi_malloc(msg_len * 2);
+				escape_json(msg, msg_len, e_json);
+				if (uwsgi_buffer_append(ub, e_json, strlen(e_json))){
+                                	free(e_json);
+                                        goto end;
+                                }
+                                free(e_json);
+                        }
+                        else if (!uwsgi_strncmp(usl->value, usl->len, "msgnl", 5)) {
+				char *e_json = uwsgi_malloc(len * 2);
+                                escape_json(msg, len, e_json);
+                                if (uwsgi_buffer_append(ub, e_json, strlen(e_json))){
+                                        free(e_json);
+                                        goto end;
+                                }
+                                free(e_json);
+                        }
+                        else if (!uwsgi_strncmp(usl->value, usl->len, "unix", 4)) {
+                                if (uwsgi_buffer_num64(ub, uwsgi_now())) goto end;
+                        }
+                        else if (!uwsgi_strncmp(usl->value, usl->len, "micros", 6)) {
+                                if (uwsgi_buffer_num64(ub, uwsgi_micros())) goto end;
+                        }
+                        else if (!uwsgi_starts_with(usl->value, usl->len, "strftime:", 9)) {
+                                char sftime[64];
+                                time_t now = uwsgi_now();
+                                char *buf = uwsgi_concat2n(usl->value+9, usl->len-9, "", 0);
+                                int strftime_len = strftime(sftime, 64, buf, localtime(&now));
+                                free(buf);
+                                if (strftime_len > 0) {
+					char *e_json = uwsgi_malloc(strftime_len * 2);
+					escape_json(sftime, strftime_len, e_json);
+                                        if (uwsgi_buffer_append(ub, e_json, strlen(e_json))){
+						free(e_json);
+						goto end;
+					}
+					free(e_json);
+                                }
+                        }
+                }
+                else {
+                        if (uwsgi_buffer_append(ub, usl->value, usl->len)) goto end;
+                }
+                usl = usl->next;
+        }
+        buf = ub->buf;
+        *rlen = ub->pos;
+        ub->buf = NULL;
+end:
+        uwsgi_buffer_destroy(ub);
+        return buf;
+}
+
+
+void uwsgi_log_encoders_register_embedded() {
+	uwsgi_register_log_encoder("prefix", uwsgi_log_encoder_prefix);
+	uwsgi_register_log_encoder("suffix", uwsgi_log_encoder_suffix);
+	uwsgi_register_log_encoder("nl", uwsgi_log_encoder_nl);
+	uwsgi_register_log_encoder("format", uwsgi_log_encoder_format);
+	uwsgi_register_log_encoder("json", uwsgi_log_encoder_json);
+#ifdef UWSGI_ZLIB
+	uwsgi_register_log_encoder("gzip", uwsgi_log_encoder_gzip);
+	uwsgi_register_log_encoder("compress", uwsgi_log_encoder_compress);
+#endif
+}

core/master.c

@@ -375,6 +375,8 @@ int master_loop(char **argv, char **environ) {
 	uwsgi_start_legions();
 #endif
 
+	uwsgi_add_reload_fds();
+
 	uwsgi_cache_start_sweepers();
 	uwsgi_cache_start_sync_servers();
 
@@ -391,7 +393,7 @@ int master_loop(char **argv, char **environ) {
 	}
 
 	if (uwsgi.stats) {
-		char *tcp_port = strchr(uwsgi.stats, ':');
+		char *tcp_port = strrchr(uwsgi.stats, ':');
 		if (tcp_port) {
 			// disable deferred accept for this socket
 			int current_defer_accept = uwsgi.no_defer_accept;
@@ -498,6 +500,9 @@ int master_loop(char **argv, char **environ) {
         }
         uwsgi_check_touches(uwsgi.touch_signal);
 
+	// fsmon
+	uwsgi_fsmon_setup();
+
 	// setup cheaper algos (can be stacked)
 	uwsgi.cheaper_algo = uwsgi_cheaper_algo_spare;
 	if (uwsgi.requested_cheaper_algo) {
@@ -698,6 +703,7 @@ int master_loop(char **argv, char **environ) {
 
 			// get listen_queue status
 			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+			int tmp_queue = 0;
 			while (uwsgi_sock) {
 				if (uwsgi_sock->family == AF_INET) {
 					uwsgi_sock->queue = uwsgi_get_tcp_info(uwsgi_sock->fd);
@@ -709,8 +715,14 @@ int master_loop(char **argv, char **environ) {
 				}
 #endif
 #endif
+
+				if (uwsgi_sock->queue > tmp_queue) {
+					tmp_queue = uwsgi_sock->queue;
+				}
 				uwsgi_sock = uwsgi_sock->next;
 			}
+			// fix queue size on multiple sockets
+			uwsgi.shared->load = tmp_queue;
 
 			// check if some worker has to die (harakiri, evil checks...)
 			uwsgi_master_check_workers_deadline();
@@ -893,6 +905,11 @@ next:
 		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_QUIET_CODE) {
 			// noop
 		}
+		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_BRUTAL_RELOAD_CODE) {
+			uwsgi_log("!!! inconsistent state reported by worker %d (pid: %d) !!!\n", thewid, (int) diedpid);
+			reap_them_all(0);
+			continue;
+		}
 		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));

core/master_checks.c

@@ -197,6 +197,14 @@ void uwsgi_master_check_mules_deadline() {
 				uwsgi.mules[i].harakiri = 0;
 			}
 		}
+		// user harakiri
+		if (uwsgi.mules[i].user_harakiri > 0) {
+                        if (uwsgi.mules[i].user_harakiri < (time_t) uwsgi.current_time) {
+                                uwsgi_log("*** HARAKIRI ON MULE %d (pid: %d) ***\n", i + 1, uwsgi.mules[i].pid);
+                                kill(uwsgi.mules[i].pid, SIGKILL);
+                                uwsgi.mules[i].user_harakiri = 0;
+                        }
+                }
 	}
 }
 
@@ -208,6 +216,11 @@ void uwsgi_master_check_spoolers_deadline() {
 			kill(uspool->pid, SIGKILL);
 			uspool->harakiri = 0;
 		}
+		if (uspool->user_harakiri > 0 && uspool->user_harakiri < (time_t) uwsgi.current_time) {
+                        uwsgi_log("*** HARAKIRI ON THE SPOOLER (pid: %d) ***\n", uspool->pid);
+                        kill(uspool->pid, SIGKILL);
+                        uspool->user_harakiri = 0;
+                }
 		uspool = uspool->next;
 	}
 }

core/master_events.c

@@ -42,6 +42,79 @@ int uwsgi_master_manage_events(int interesting_fd) {
 		}
 	}
 
+	if (uwsgi_fsmon_event(interesting_fd)) {
+                return 0;
+	}
+
+	// reload on fd
+	if (uwsgi.reload_on_fd) {
+		// custom -> fd
+		// custom2 -> len (optional, default 1)
+		// custom_ptr -> log message (optional)
+		struct uwsgi_string_list *usl = uwsgi.reload_on_fd;
+		while(usl) {
+			if (interesting_fd == (int) usl->custom) {
+				char stack_tmp[8];
+				char *tmp = stack_tmp;
+				if (usl->custom2 > 8) {
+					tmp = uwsgi_malloc(usl->custom2);
+				}
+				if (read(interesting_fd, tmp, usl->custom2) <= 0) {
+					uwsgi_error("[reload-on-fd] read()");
+				}
+				if (usl->custom_ptr) {
+					uwsgi_log_verbose("*** fd %d ready: %s ***\n", interesting_fd, usl->custom_ptr);
+				}
+				else {
+					uwsgi_log_verbose("*** fd %d ready !!! ***\n", interesting_fd);
+				}
+                                uwsgi_block_signal(SIGHUP);
+                                grace_them_all(0);
+                                uwsgi_unblock_signal(SIGHUP);				
+				return 0;
+			}
+			usl = usl->next;
+		}
+	}
+
+	// brutal reload on fd
+        if (uwsgi.brutal_reload_on_fd) {
+                // custom -> fd
+                // custom2 -> len (optional, default 1)
+                // custom_ptr -> log message (optional)
+                struct uwsgi_string_list *usl = uwsgi.brutal_reload_on_fd;
+                while(usl) {
+                        if (interesting_fd == (int) usl->custom) {
+				char stack_tmp[8];
+                                char *tmp = stack_tmp;
+                                if (usl->custom2 > 8) {
+                                        tmp = uwsgi_malloc(usl->custom2);
+                                }
+                                if (read(interesting_fd, tmp, usl->custom2) <= 0) {
+                                        uwsgi_error("[brutal-reload-on-fd] read()");
+                                }
+                                if (usl->custom_ptr) {
+                                        uwsgi_log_verbose("*** fd %d ready: %s ***\n", interesting_fd, usl->custom_ptr);
+                                }
+                                else {
+                                        uwsgi_log_verbose("*** fd %d ready !!! ***\n", interesting_fd);
+                                }
+				if (uwsgi.die_on_term) {
+                                	uwsgi_block_signal(SIGQUIT);
+                                	reap_them_all(0);
+                                	uwsgi_unblock_signal(SIGQUIT);
+				}
+				else {
+                                	uwsgi_block_signal(SIGTERM);
+                                	reap_them_all(0);
+                                	uwsgi_unblock_signal(SIGTERM);
+				}
+                                return 0;
+                        }
+                        usl = usl->next;
+                }
+        }
+
 
 	// wakeup from cheap mode ?
 	if (uwsgi.status.is_cheap) {

core/master_utils.c

@@ -115,7 +115,34 @@ int uwsgi_calc_cheaper(void) {
 
 	last_check = now;
 
-	int needed_workers = uwsgi.cheaper_algo();
+	int ignore_algo = 0;
+	int needed_workers = 0;
+
+	// first check if memory usage is not exceeded
+	if (uwsgi.cheaper_rss_limit_soft) {
+		unsigned long long total_rss = 0;
+		int i;
+		int active_workers = 0;
+		for(i=1;i<=uwsgi.numproc;i++) {
+			if (!uwsgi.workers[i].cheaped) {
+				total_rss += uwsgi.workers[i].rss_size;
+				active_workers++;
+			}
+		}
+		if (uwsgi.cheaper_rss_limit_hard && active_workers > 1 && total_rss >= uwsgi.cheaper_rss_limit_hard) {
+			uwsgi_log("cheaper hard rss memory limit exceeded, cheap one of %d workers\n", active_workers);
+			needed_workers = -1;
+			ignore_algo = 1;
+		}
+		else if (total_rss >= uwsgi.cheaper_rss_limit_soft) {
+#ifdef UWSGI_DEBUG
+			uwsgi_log("cheaper soft rss memory limit exceeded, can't spawn more workers\n");
+#endif
+			ignore_algo = 1;
+		}
+	}
+
+	if (!ignore_algo) needed_workers = uwsgi.cheaper_algo();
 
 	if (needed_workers > 0) {
 		for (i = 1; i <= uwsgi.numproc; i++) {
@@ -1458,3 +1485,30 @@ int uwsgi_cron_task_needs_execution(struct tm *uwsgi_cron_delta, int minute, int
 
 }
 
+static void add_reload_fds(struct uwsgi_string_list *list, char *type) {
+	struct uwsgi_string_list *usl = list;
+	while(usl) {
+		char *strc = uwsgi_str(usl->value);
+		char *space = strchr(strc, ' ');
+		if (space) {
+			*space = 0;
+			usl->custom_ptr = space+1;
+		}
+		char *colon = strchr(strc, ':');
+		if (colon) {
+			*colon = 0;
+			usl->custom2 = strtoul(colon+1, NULL, 10);
+		}
+		usl->custom = strtoul(strc, NULL, 10);
+		if (!usl->custom2) usl->custom2 = 1;
+		event_queue_add_fd_read(uwsgi.master_queue, usl->custom);
+		uwsgi_add_safe_fd(usl->custom);
+		uwsgi_log("added %s reload monitor for fd %d (read size: %llu)\n", type, (int) usl->custom, usl->custom2);
+		usl = usl->next;
+	}
+}
+
+void uwsgi_add_reload_fds() {
+	add_reload_fds(uwsgi.reload_on_fd, "graceful");
+	add_reload_fds(uwsgi.brutal_reload_on_fd, "brutal");
+}

core/mount.c

@@ -0,0 +1,240 @@
+#include <uwsgi.h>
+
+/*
+
+	jail systems (Linux namespaces, FreeBSD jails...) heavily rely on mount/umount
+
+	to simplify setups (expecially because the mount command could not be available in
+	the initial phase of jailing, we need an api to mount/umount filesystems
+
+	int uwsgi_mount(char *fs, char *what, char *where, int flags);
+	int uwsgi_umount(char *where, int flags);
+
+*/
+
+#ifdef __linux__
+#ifndef MS_REC
+#define MS_REC 16384
+#endif
+#endif
+
+struct uwsgi_mount_flag {
+	char *key;
+	uint64_t value;
+};
+
+static struct uwsgi_mount_flag umflags[] = {
+#ifdef MS_BIND
+	{"bind", MS_BIND},
+#endif
+#ifdef MS_DIRSYNC
+	{"dirsync", MS_DIRSYNC},
+#endif
+#ifdef MS_MANDLOCK
+	{"mandlock", MS_MANDLOCK},
+#endif
+#ifdef MS_MOVE
+	{"move", MS_MOVE},
+#endif
+#ifdef MS_NOATIME
+	{"noatime", MS_NOATIME},
+#endif
+#ifdef MS_NODEV
+	{"nodev", MS_NODEV},
+#endif
+#ifdef MS_NOEXEC
+	{"noexec", MS_NOEXEC},
+#endif
+#ifdef MS_RDONLY
+	{"rdonly", MS_RDONLY},
+	{"readonly", MS_RDONLY},
+	{"ro", MS_RDONLY},
+#endif
+#ifdef MS_REMOUNT
+	{"remount", MS_REMOUNT},
+#endif
+#ifdef MS_SYNCHRONOUS
+	{"sync", MS_SYNCHRONOUS},
+#endif
+#ifdef MNT_FORCE
+	{"force", MNT_FORCE},
+#endif
+#ifdef MNT_DETACH
+	{"detach", MNT_DETACH},
+#endif
+#ifdef MS_REC
+	{"rec", MS_REC},
+	{"recursive", MS_REC},
+#endif
+#ifdef MS_PRIVATE
+	{"private", MS_PRIVATE},
+#endif
+#ifdef MS_SHARED
+	{"shared", MS_SHARED},
+#endif
+#ifdef MNT_RDONLY
+	{"rdonly", MNT_RDONLY},
+	{"readonly", MNT_RDONLY},
+	{"ro", MNT_RDONLY},
+#endif
+#ifdef MNT_NOEXEC
+	{"noexec", MNT_NOEXEC},
+#endif
+#ifdef MNT_NOSUID
+	{"nosuid", MNT_NOSUID},
+#endif
+#ifdef MNT_NOATIME
+	{"noatime", MNT_NOATIME},
+#endif
+#ifdef MNT_SNAPSHOT
+	{"snapshot", MNT_SNAPSHOT},
+#endif
+	{NULL, 0},
+};
+
+uint64_t uwsgi_mount_flag(char *mflag) {
+	struct uwsgi_mount_flag *umf = umflags;
+	while(umf->key) {
+		if (!strcmp(umf->key, mflag)) return umf->value;
+		umf++; 
+	}
+	return 0;
+}
+
+int uwsgi_mount(char *fs, char *what, char *where, char *flags) {
+#ifdef __FreeBSD__
+	struct iovec iov[6];
+#endif
+	unsigned long mountflags = 0;
+	if (!flags) goto parsed;
+	char *mflags = uwsgi_str(flags);
+	char *p = strtok(mflags, ",");
+	while(p) {
+		unsigned long flag = (unsigned long) uwsgi_mount_flag(p);
+		if (!flag) {
+			uwsgi_log("unknown mount flag \"%s\"\n", p);
+			exit(1);
+		}
+		mountflags |= flag;
+		p = strtok(NULL, ",");
+	}
+	free(mflags);
+parsed:
+#ifdef __linux__
+	return mount(what, where, fs, mountflags, NULL);
+#elif defined(__FreeBSD__)
+	iov[0].iov_base = "fstype";
+	iov[0].iov_len = 7;
+	iov[1].iov_base = fs;
+	iov[1].iov_len = strlen(fs) + 1;
+
+	iov[2].iov_base = "fspath";
+	iov[2].iov_len = 7;
+	iov[3].iov_base = where;
+	iov[3].iov_len = strlen(where) + 1;
+
+	iov[4].iov_base = "target";
+        iov[4].iov_len = 7;
+        iov[5].iov_base = what;
+        iov[5].iov_len = strlen(what) + 1;
+
+	return nmount(iov, 6, (int) mountflags);
+#endif
+	return -1;
+}
+
+int uwsgi_umount(char *where, char *flags) {
+	unsigned long mountflags = 0;
+        if (!flags) goto parsed;
+        char *mflags = uwsgi_str(flags);
+        char *p = strtok(mflags, ",");
+        while(p) {
+                unsigned long flag = (unsigned long) uwsgi_mount_flag(p);
+                if (!flag) {
+                        uwsgi_log("unknown umount flag \"%s\"\n", p);
+                        exit(1);
+                }
+                mountflags |= flag;
+                p = strtok(NULL, ",");
+        }
+        free(mflags);
+parsed:
+#ifdef __linux__
+	// we need a special case for recursive umount
+	if (mountflags & MS_REC) {
+		mountflags &= ~MS_REC;
+		int unmounted = 1;
+		char *slashed = uwsgi_concat2(where, "/");
+		while (unmounted) {
+                	unmounted = 0;
+                	FILE *procmounts = fopen("/proc/self/mounts", "r");
+                	if (!procmounts) {
+				uwsgi_log("the /proc filesystem must be mounted for recursive umount\n");
+				uwsgi_error("open()");
+				exit(1);
+			}
+			char line[1024];
+                	while (fgets(line, 1024, procmounts) != NULL) {
+                        	char *delim0 = strchr(line, ' ');
+                        	if (!delim0) continue;
+                        	delim0++;
+                        	char *delim1 = strchr(delim0, ' ');
+                        	if (!delim1) continue;
+                        	*delim1 = 0;
+				if (!uwsgi_starts_with(delim0, strlen(delim0), slashed, strlen(slashed))) goto unmountable; 
+                                continue;
+unmountable:
+                        	if (!umount2(delim0, mountflags)) unmounted++;
+                	}
+                	fclose(procmounts);
+        	}
+		free(slashed);
+	}
+        return umount2(where, mountflags);
+#elif defined(__FreeBSD__)
+	return unmount(where, mountflags);
+#endif
+        return -1;
+}
+
+int uwsgi_mount_hook(char *arg) {
+	char *tmp_arg = uwsgi_str(arg);
+	char *fs = tmp_arg;
+	char *what = strchr(fs, ' ');
+	if (!what) goto error;
+	*what = 0; what++;
+	char *where = strchr(what, ' ');
+	if (!where) goto error;
+	*where = 0; where++;
+	char *flags = strchr(where, ' ');
+	if (flags) {
+		*flags = 0; flags++;
+	}
+	if (uwsgi_mount(fs, what, where, flags)) {
+		uwsgi_error("uwsgi_mount()");
+		free(tmp_arg);
+		return -1;
+	}	
+	free(tmp_arg);
+	return 0;
+error:
+	free(tmp_arg);
+	uwsgi_log("uwsgi_mount_hook() invalid syntax\n");
+	return -1;
+}
+
+int uwsgi_umount_hook(char *arg) {
+	char *tmp_arg = uwsgi_str(arg);
+	char *where = tmp_arg;
+        char *flags = strchr(where, ' ');
+        if (flags) {
+        	*flags = 0; flags++;
+	}
+        if (uwsgi_umount(where, flags)) {
+                uwsgi_error("uwsgi_umount()");
+                free(tmp_arg);
+                return -1;
+        }       
+        free(tmp_arg);
+        return 0;
+}

core/offload.c

@@ -345,7 +345,7 @@ static int u_offload_sendfile_do(struct uwsgi_thread *ut, struct uwsgi_offload_r
 		uwsgi_offload_retry
                 uwsgi_error("u_offload_sendfile_do()");
 	}
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && !defined(NO_SENDFILE)
 	off_t len = 0;
         int ret = sendfile(uor->fd, uor->fd2, uor->pos, &len, NULL, 0);
         // transfer finished

core/plugins.c

@@ -24,7 +24,7 @@ static void uwsgi_plugin_parse_section(char *filename) {
 }
 #endif
 
-int plugin_already_loaded(const char *plugin) {
+struct uwsgi_plugin *uwsgi_plugin_get(const char *plugin) {
 	int i;
 
 	for (i = 0; i < 256; i++) {
@@ -33,7 +33,7 @@ int plugin_already_loaded(const char *plugin) {
 #ifdef UWSGI_DEBUG
 				uwsgi_log("%s plugin already available\n", plugin);
 #endif
-				return 1;
+				return uwsgi.p[i];
 			}
 		}
 		if (uwsgi.p[i]->alias) {
@@ -41,7 +41,7 @@ int plugin_already_loaded(const char *plugin) {
 #ifdef UWSGI_DEBUG
 				uwsgi_log("%s plugin already available\n", plugin);
 #endif
-				return 1;
+				return uwsgi.p[i];
 			}
 		}
 	}
@@ -53,7 +53,7 @@ int plugin_already_loaded(const char *plugin) {
 #ifdef UWSGI_DEBUG
 				uwsgi_log("%s plugin already available\n", plugin);
 #endif
-				return 1;
+				return uwsgi.p[i];
 			}
 		}
 		if (uwsgi.gp[i]->alias) {
@@ -61,14 +61,21 @@ int plugin_already_loaded(const char *plugin) {
 #ifdef UWSGI_DEBUG
 				uwsgi_log("%s plugin already available\n", plugin);
 #endif
-				return 1;
+				return uwsgi.p[i];
 			}
 		}
 	}
 
+	return NULL;
+}
+
+int plugin_already_loaded(const char *plugin) {
+	struct uwsgi_plugin *up = uwsgi_plugin_get(plugin);
+	if (up) return 1;
 	return 0;
 }
 
+
 void *uwsgi_load_plugin(int modifier, char *plugin, char *has_option) {
 
 	void *plugin_handle = NULL;
@@ -91,6 +98,12 @@ void *uwsgi_load_plugin(int modifier, char *plugin, char *has_option) {
 		colon[0] = ':';
 	}
 
+	char *init_func = strchr(plugin_name, '|');
+	if (init_func) {
+		init_func[0] = 0;
+		init_func++;	
+	}
+
 	if (!uwsgi_endswith(plugin_name, "_plugin.so")) {
 		plugin_name = uwsgi_concat2(plugin_name, "_plugin.so");
 		need_free = 1;
@@ -150,6 +163,12 @@ success:
 			uwsgi_log("!!! UNABLE to load uWSGI plugin: %s !!!\n", dlerror());
 	}
 	else {
+		if (init_func) {
+			void (*plugin_init_func)() = dlsym(plugin_handle, init_func);
+			if (plugin_init_func) {
+				plugin_init_func();
+			}
+		}
 		char *plugin_entry_symbol = uwsgi_concat2n(plugin_symbol_name_start, strlen(plugin_symbol_name_start) - 3, "", 0);
 		up = dlsym(plugin_handle, plugin_entry_symbol);
 		if (!up) {

core/routing.c

@@ -180,6 +180,10 @@ int uwsgi_apply_routes_do(struct uwsgi_route *routes, struct wsgi_request *wsgi_
 		r_goto = &wsgi_req->error_route_goto;
 		r_pc = &wsgi_req->error_route_pc;
 	}
+	else if (routes == uwsgi.response_routes) {
+                r_goto = &wsgi_req->response_route_goto;
+                r_pc = &wsgi_req->response_route_pc;
+        }
 	else if (routes == uwsgi.final_routes) {
 		r_goto = &wsgi_req->final_route_goto;
 		r_pc = &wsgi_req->final_route_pc;
@@ -306,6 +310,20 @@ int uwsgi_apply_error_routes(struct wsgi_request *wsgi_req) {
 	return uwsgi_apply_routes_do(uwsgi.error_routes, wsgi_req, NULL, 0);
 }
 
+int uwsgi_apply_response_routes(struct wsgi_request *wsgi_req) {
+
+        if (!uwsgi.response_routes) return 0;
+        if (wsgi_req->response_routes_applied) return 0;
+
+        // do not forget to check it !!!
+        if (wsgi_req->is_response_routing) return 0;
+
+        wsgi_req->is_response_routing = 1;
+
+        int ret = uwsgi_apply_routes_do(uwsgi.response_routes, wsgi_req, NULL, 0);
+	wsgi_req->response_routes_applied = 1;
+	return ret;
+}
 
 static void *uwsgi_route_get_condition_func(char *name) {
 	struct uwsgi_route_condition *urc = uwsgi.route_conditions;
@@ -337,6 +355,9 @@ void uwsgi_opt_add_route(char *opt, char *value, void *foobar) {
 	else if (!uwsgi_starts_with(opt, strlen(opt), "error", 5)) {
                 ur = uwsgi.error_routes;
         }
+	else if (!uwsgi_starts_with(opt, strlen(opt), "response", 8)) {
+                ur = uwsgi.response_routes;
+        }
 	uint64_t pos = 0;
 	while(ur) {
 		old_ur = ur;
@@ -354,6 +375,9 @@ void uwsgi_opt_add_route(char *opt, char *value, void *foobar) {
 		else if (!uwsgi_starts_with(opt, strlen(opt), "error", 5)) {
                         uwsgi.error_routes = ur;
                 }
+		else if (!uwsgi_starts_with(opt, strlen(opt), "response", 8)) {
+                        uwsgi.response_routes = ur;
+                }
 		else {
 			uwsgi.routes = ur;
 		}
@@ -564,7 +588,7 @@ static int uwsgi_router_harakiri_func(struct wsgi_request *wsgi_req, struct uwsg
 	if (route->custom > 0) {	
 		set_user_harakiri(route->custom);
 	}
-	return UWSGI_ROUTE_CONTINUE;
+	return UWSGI_ROUTE_NEXT;
 }
 
 static int uwsgi_router_harakiri(struct uwsgi_route *ur, char *arg) {
@@ -701,6 +725,11 @@ static int uwsgi_router_goto_func(struct wsgi_request *wsgi_req, struct uwsgi_ro
 		r_goto = &wsgi_req->final_route_goto;
 		r_pc = &wsgi_req->final_route_pc;
 	}
+	else if (wsgi_req->is_response_routing) {
+                routes = uwsgi.response_routes;
+                r_goto = &wsgi_req->response_route_goto;
+                r_pc = &wsgi_req->response_route_pc;
+        }
 	while(routes) {
 		if (!routes->label) goto next;
 		if (!uwsgi_strncmp(routes->label, routes->label_len, ub->buf, ub->pos)) {
@@ -806,6 +835,31 @@ static int uwsgi_router_remheader(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
+// clearheaders route
+static int uwsgi_router_clearheaders_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+
+	if (uwsgi_response_prepare_headers(wsgi_req, ub->buf, ub->pos)) {
+        	uwsgi_buffer_destroy(ub);
+        	return UWSGI_ROUTE_BREAK;
+	}
+	
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+
+
+static int uwsgi_router_clearheaders(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_clearheaders_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
 
 
 // signal route
@@ -889,6 +943,126 @@ static int uwsgi_router_setscriptname(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
+// setmethod route
+static int uwsgi_router_setmethod_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "REQUEST_METHOD", 14, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->method = ptr;
+        wsgi_req->method_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_setmethod(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_setmethod_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+// seturi route
+static int uwsgi_router_seturi_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "REQUEST_URI", 11, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->uri = ptr;
+        wsgi_req->uri_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_seturi(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_seturi_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+// setdocroot route
+static int uwsgi_router_setdocroot_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "DOCUMENT_ROOT", 13, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->document_root = ptr;
+        wsgi_req->document_root_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_setdocroot(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_setdocroot_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+
+// setpathinfo route
+static int uwsgi_router_setpathinfo_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "PATH_INFO", 9, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->path_info = ptr;
+        wsgi_req->path_info_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_setpathinfo(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_setpathinfo_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+// setscheme route
+static int uwsgi_router_setscheme_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "UWSGI_SCHEME", 12, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->scheme = ptr;
+        wsgi_req->scheme_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_setscheme(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_setscheme_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
 
 // setuser route
 static int uwsgi_router_setuser_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
@@ -1389,6 +1563,11 @@ static char *uwsgi_route_var_uwsgi(struct wsgi_request *wsgi_req, char *key, uin
                 *vallen = strlen(ret);
         }
 
+	else if (!uwsgi_strncmp(key, keylen, "lq", 2)) {
+                ret = uwsgi_num2str(uwsgi.shared->load);
+                *vallen = strlen(ret);
+        }
+
 	return ret;
 }
 
@@ -1505,6 +1684,8 @@ void uwsgi_register_embedded_routers() {
         uwsgi_register_router("addheader", uwsgi_router_addheader);
         uwsgi_register_router("delheader", uwsgi_router_remheader);
         uwsgi_register_router("remheader", uwsgi_router_remheader);
+        uwsgi_register_router("clearheaders", uwsgi_router_clearheaders);
+        uwsgi_register_router("resetheaders", uwsgi_router_clearheaders);
         uwsgi_register_router("signal", uwsgi_router_signal);
         uwsgi_register_router("send", uwsgi_router_send);
         uwsgi_register_router("send-crnl", uwsgi_router_send_crnl);
@@ -1514,6 +1695,11 @@ void uwsgi_register_embedded_routers() {
         uwsgi_register_router("sethome", uwsgi_router_sethome);
         uwsgi_register_router("setfile", uwsgi_router_setfile);
         uwsgi_register_router("setscriptname", uwsgi_router_setscriptname);
+        uwsgi_register_router("setmethod", uwsgi_router_setmethod);
+        uwsgi_register_router("seturi", uwsgi_router_seturi);
+        uwsgi_register_router("setpathinfo", uwsgi_router_setpathinfo);
+        uwsgi_register_router("setdocroot", uwsgi_router_setdocroot);
+        uwsgi_register_router("setscheme", uwsgi_router_setscheme);
         uwsgi_register_router("setprocname", uwsgi_router_setprocname);
         uwsgi_register_router("alarm", uwsgi_router_alarm);
 
@@ -1620,6 +1806,7 @@ struct uwsgi_route_condition *uwsgi_register_route_condition(char *name, int (*f
 }
 
 void uwsgi_routing_dump() {
+	struct uwsgi_string_list *usl = NULL;
 	struct uwsgi_route *routes = uwsgi.routes;
 	if (!routes) goto next;
 	uwsgi_log("*** dumping internal routing table ***\n");
@@ -1654,8 +1841,25 @@ next:
         }
         uwsgi_log("*** end of the internal error routing table ***\n");
 next2:
+	routes = uwsgi.response_routes;
+        if (!routes) goto next3;
+        uwsgi_log("*** dumping internal response routing table ***\n");
+        while(routes) {
+                if (routes->label) {
+                        uwsgi_log("[rule: %llu] label: %s\n", (unsigned long long ) routes->pos, routes->label);
+                }
+                else if (!routes->subject_str && !routes->if_func) {
+                        uwsgi_log("[rule: %llu] action: %s\n", (unsigned long long ) routes->pos, routes->action);
+                }
+                else {
+                        uwsgi_log("[rule: %llu] subject: %s %s: %s%s action: %s\n", (unsigned long long ) routes->pos, routes->subject_str, routes->if_func ? "func" : "regexp", routes->if_negate ? "!" : "", routes->regexp, routes->action);
+                }
+                routes = routes->next;
+        }
+        uwsgi_log("*** end of the internal response routing table ***\n");
+next3:
 	routes = uwsgi.final_routes;
-	if (!routes) return;
+	if (!routes) goto next4;
         uwsgi_log("*** dumping internal final routing table ***\n");
         while(routes) {
                 if (routes->label) {
@@ -1670,5 +1874,20 @@ next2:
                 routes = routes->next;
         }
         uwsgi_log("*** end of the internal final routing table ***\n");
+
+next4:
+	uwsgi_foreach(usl, uwsgi.collect_headers) {
+		char *space = strchr(usl->value, ' ');
+		if (!space) {
+			uwsgi_log("invalid collect header syntax, must be <header> <var>\n");
+			exit(1);
+		}
+		*space = 0;
+		usl->custom = strlen(usl->value);
+		*space = ' ';
+		usl->custom_ptr = space+1;
+		usl->custom2 = strlen(space+1);
+		uwsgi_log("collecting header %.*s to var %s\n", usl->custom, usl->value, usl->custom_ptr);
+	}
 }
 #endif

core/sendfile.c

@@ -4,13 +4,18 @@ extern struct uwsgi_server uwsgi;
 
 // sendfile() abstraction
 ssize_t uwsgi_sendfile_do(int sockfd, int filefd, size_t pos, size_t len) {
+	// for platform not supporting sendfile we need to rely on boring read/write
+	// generally that platforms have very low memory, so use a 8k buffer
+	char buf[8192];
+
+	if (uwsgi.disable_sendfile) goto no_sendfile;
 
 #if defined(__FreeBSD__) || defined(__DragonFly__)
 	off_t sf_len = len;
         int sf_ret = sendfile(filefd, sockfd, pos, len, NULL,  &sf_len, 0);
         if (sf_ret == 0 || (sf_ret == -1 && errno == EAGAIN)) return sf_len;
         return -1;
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && !defined(NO_SENDFILE)
 	off_t sf_len = len;
 	int sf_ret = sendfile(filefd, sockfd, pos, &sf_len, NULL, 0);
 	if (sf_ret == 0 || (sf_ret == -1 && errno == EAGAIN)) return sf_len;
@@ -18,12 +23,11 @@ ssize_t uwsgi_sendfile_do(int sockfd, int filefd, size_t pos, size_t len) {
 #elif defined(__linux__) || defined(__sun__)
 	off_t off = pos;
 	return sendfile(sockfd, filefd, &off, len);
-#else
-	// for platform not supporting sendfile we need to rely on boring read/write
-	// generally that platforms have very low memory, so use a 8k buffer
-	char buf[8192];
+#endif
+
+no_sendfile:
 	if (pos > 0) {
-		if (lseek(filefd, pos, SEEK_SET)) {
+		if (lseek(filefd, pos, SEEK_SET) < 0) {
 			uwsgi_error("uwsgi_sendfile_do()/seek()");
 			return -1;
 		}
@@ -34,7 +38,6 @@ ssize_t uwsgi_sendfile_do(int sockfd, int filefd, size_t pos, size_t len) {
 		return -1;
 	}
 	return write(sockfd, buf, rlen);
-#endif
 
 }
 
@@ -71,5 +74,6 @@ int uwsgi_simple_sendfile(struct wsgi_request *wsgi_req, int fd, size_t pos, siz
                         return -1;
                 }
         }
+
 	return 0;
 }

core/socket.c

@@ -74,7 +74,7 @@ int bind_to_unix_dgram(char *socket_name) {
 	}
 
 	if (unlink(socket_name) != 0 && errno != ENOENT) {
-		uwsgi_error("unlink()");
+		uwsgi_error("error removing unix socket, unlink()");
 	}
 
 	uws_addr = uwsgi_calloc(sizeof(struct sockaddr_un));
@@ -1714,6 +1714,10 @@ void uwsgi_bind_sockets() {
 					uwsgi_chown(uwsgi_sock->name, uwsgi.chown_socket);
 				}
 				uwsgi_log("uwsgi socket %d bound to UNIX address %s fd %d\n", uwsgi_get_socket_num(uwsgi_sock), uwsgi_sock->name, uwsgi_sock->fd);
+				struct stat st;
+				if (uwsgi_sock->name[0] != '@' && !stat(uwsgi_sock->name, &st)) {
+					uwsgi_sock->inode = st.st_ino;
+				}
 			}
 			else {
 #ifdef AF_INET6
@@ -1781,7 +1785,8 @@ void uwsgi_bind_sockets() {
 			int fd = open("/dev/null", O_RDONLY);
 			if (fd < 0) {
 				uwsgi_error_open("/dev/null");
-				exit(1);
+				uwsgi_log("WARNING: unable to remap stdin, /dev/null not available\n");
+				goto stdin_done;
 			}
 			if (fd != 0) {
 				if (dup2(fd, 0) < 0) {
@@ -1799,6 +1804,8 @@ void uwsgi_bind_sockets() {
 
 	}
 
+stdin_done:
+
 	// check for auto_port socket
 	uwsgi_sock = uwsgi.sockets;
 	while (uwsgi_sock) {
@@ -1951,3 +1958,21 @@ void uwsgi_tcp_nodelay(int fd) {
 #endif
 }
 
+int uwsgi_accept(int server_fd) {
+	struct sockaddr_un client_src;
+        memset(&client_src, 0, sizeof(struct sockaddr_un));
+        socklen_t client_src_len = 0;
+#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+        return accept4(server_fd, (struct sockaddr *) &client_src, &client_src_len, SOCK_NONBLOCK);
+#elif defined(__linux__)
+        int client_fd = accept(server_fd, (struct sockaddr *) &client_src, &client_src_len);
+        if (client_fd >= 0) {
+                uwsgi_socket_nb(client_fd);
+        }
+        return client_fd;
+#else
+ 	return accept(server_fd, (struct sockaddr *) &client_src, &client_src_len);
+#endif
+
+
+}

core/spooler.c

@@ -227,20 +227,33 @@ int spool_request(struct uwsgi_spooler *uspool, char *filename, int rn, int core
 #endif
 
 	if (write(fd, &uh, 4) != 4) {
+		uwsgi_log("[spooler] unable to write header for %s\n", filename);
 		goto clear;
 	}
 
 	if (write(fd, buffer, size) != size) {
+		uwsgi_log("[spooler] unable to write args for %s\n", filename);
 		goto clear;
 	}
 
 	if (body && body_len > 0) {
 		if ((size_t) write(fd, body, body_len) != body_len) {
+			uwsgi_log("[spooler] unable to write body for %s\n", filename);
 			goto clear;
 		}
 	}
 
 	if (at > 0) {
+#ifdef __UCLIBC__
+		struct timespec ts[2]; 
+		ts[0].tv_sec = at; 
+		ts[0].tv_nsec = 0;
+		ts[1].tv_sec = at;
+		ts[1].tv_nsec = 0; 
+		if (futimens(fd, ts)) {
+			uwsgi_error("futimens()");	
+		}
+#else
 		struct timeval tv[2];
 		tv[0].tv_sec = at;
 		tv[0].tv_usec = 0;
@@ -253,6 +266,7 @@ int spool_request(struct uwsgi_spooler *uspool, char *filename, int rn, int core
 #endif
 			uwsgi_error("futimes()");
 		}
+#endif
 	}
 
 	// here the file will be unlocked too
@@ -380,7 +394,7 @@ void spooler(struct uwsgi_spooler *uspool) {
 static void spooler_scandir(struct uwsgi_spooler *uspool, char *dir) {
 
 	struct dirent **tasklist;
-	int n;
+	int n, i;
 
 	if (!dir)
 		dir = uspool->dir;
@@ -391,9 +405,9 @@ static void spooler_scandir(struct uwsgi_spooler *uspool, char *dir) {
 		return;
 	}
 
-	while (n--) {
-		spooler_manage_task(uspool, dir, tasklist[n]->d_name);
-		free(tasklist[n]);
+	for (i = 0; i < n; i++) {
+		spooler_manage_task(uspool, dir, tasklist[i]->d_name);
+		free(tasklist[i]);
 	}
 
 	free(tasklist);

core/ssl.c

@@ -71,7 +71,11 @@ SSL_SESSION *uwsgi_ssl_session_get_cb(SSL *ssl, unsigned char *key, int keylen,
                 }
                 return NULL;
         }
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
         SSL_SESSION *sess = d2i_SSL_SESSION(NULL, (const unsigned char **)&value, valsize);
+#else
+        SSL_SESSION *sess = d2i_SSL_SESSION(NULL, (unsigned char **)&value, valsize);
+#endif
         uwsgi_rwunlock(uwsgi.ssl_sessions_cache->lock);
         return sess;
 }

core/strings.c

@@ -1,5 +1,46 @@
 #include <uwsgi.h>
 
+char *uwsgi_str_split_nget(char *str, size_t len, char what, size_t pos, size_t *rlen) {
+	size_t i;
+	size_t current = 0;
+	char *choosen = str;
+	size_t choosen_len = 0;
+	*rlen = 0;
+	for(i=0;i<len;i++) {
+		if (!choosen) choosen = str + i;
+		if (str[i] == what) {
+			if (current == pos) {
+				if (choosen_len == 0) return NULL;
+				*rlen = choosen_len;
+				return choosen;
+			}
+			current++;
+			choosen = NULL;
+			choosen_len = 0;
+		}
+		else {
+			choosen_len ++;
+		}
+	}
+
+	if (current == pos) {
+		if (choosen_len == 0) return NULL;
+		*rlen = choosen_len;
+		return choosen;
+	}
+
+	return NULL;
+}
+
+size_t uwsgi_str_occurence(char *str, size_t len, char what) {
+	size_t count = 0;
+	size_t i;
+	for(i=0;i<len;i++) {
+		if (str[i] == what) count++;
+	}
+	return count;
+}
+
 // check if a string_list contains an item
 struct uwsgi_string_list *uwsgi_string_list_has_item(struct uwsgi_string_list *list, char *key, size_t keylen) {
         struct uwsgi_string_list *usl = list;

core/transformations.c

@@ -82,6 +82,8 @@ int uwsgi_apply_final_transformations(struct wsgi_request *wsgi_req) {
 				found_nostream = 1;
 			}
 			else {
+				// stop the chain if no chunk is available
+				if (!ut->chunk) return 0;
 				t_buf = ut->chunk->buf;
                 		t_len = ut->chunk->pos;
 				goto next;

core/uwsgi.c

@@ -59,7 +59,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"undeferred-shared-socket", required_argument, 0, "create a shared sacket for advanced jailing or ipc (undeferred mode)", uwsgi_opt_add_shared_socket, NULL, 0},
 	{"processes", required_argument, 'p', "spawn the specified number of workers/processes", uwsgi_opt_set_int, &uwsgi.numproc, 0},
 	{"workers", required_argument, 'p', "spawn the specified number of workers/processes", uwsgi_opt_set_int, &uwsgi.numproc, 0},
-	{"thunder-lock", no_argument, 0, "serialize accept() usage (if possibie)", uwsgi_opt_true, &uwsgi.use_thunder_lock, 0},
+	{"thunder-lock", no_argument, 0, "serialize accept() usage (if possible)", uwsgi_opt_true, &uwsgi.use_thunder_lock, 0},
 	{"harakiri", required_argument, 't', "set harakiri timeout", uwsgi_opt_set_dyn, (void *) UWSGI_OPTION_HARAKIRI, 0},
 	{"harakiri-verbose", no_argument, 0, "enable verbose mode for harakiri", uwsgi_opt_true, &uwsgi.harakiri_verbose, 0},
 	{"harakiri-no-arh", no_argument, 0, "do not enable harakiri during after-request-hook", uwsgi_opt_true, &uwsgi.harakiri_no_arh, 0},
@@ -72,6 +72,8 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"xml", required_argument, 'x', "load config from xml file", uwsgi_opt_load_xml, NULL, UWSGI_OPT_IMMEDIATE},
 #endif
 	{"config", required_argument, 0, "load configuration using the pluggable system", uwsgi_opt_load_config, NULL, UWSGI_OPT_IMMEDIATE},
+	{"fallback-config", required_argument, 0, "re-exec uwsgi with the specified config when exit code is 1", uwsgi_opt_set_str, &uwsgi.fallback_config, UWSGI_OPT_IMMEDIATE},
+	{"strict", no_argument, 0, "enable strict mode (placeholder cannot be used)", uwsgi_opt_true, &uwsgi.strict, UWSGI_OPT_IMMEDIATE},
 
 	{"skip-zero", no_argument, 0, "skip check of file descriptor 0", uwsgi_opt_true, &uwsgi.skip_zero, 0},
 	{"skip-atexit", no_argument, 0, "skip atexit hooks (ignored by the master)", uwsgi_opt_true, &uwsgi.skip_atexit, 0},
@@ -171,6 +173,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"master", no_argument, 'M', "enable master process", uwsgi_opt_true, &uwsgi.master_process, 0},
 	{"honour-stdin", no_argument, 0, "do not remap stdin to /dev/null", uwsgi_opt_true, &uwsgi.honour_stdin, 0},
 	{"emperor", required_argument, 0, "run the Emperor", uwsgi_opt_add_string_list, &uwsgi.emperor, 0},
+	{"emperor-nofollow", no_argument, 0, "do not follow symlinks when checking for mtime", uwsgi_opt_true, &uwsgi.emperor_nofollow, 0},
 	{"emperor-procname", required_argument, 0, "set the Emperor process name", uwsgi_opt_set_str, &uwsgi.emperor_procname, 0},
 	{"emperor-freq", required_argument, 0, "set the Emperor scan frequency (default 3 seconds)", uwsgi_opt_set_int, &uwsgi.emperor_freq, 0},
 	{"emperor-required-heartbeat", required_argument, 0, "set the Emperor tolerance about heartbeats", uwsgi_opt_set_int, &uwsgi.emperor_heartbeat, 0},
@@ -191,6 +194,9 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"emperor-on-demand-exec", required_argument, 0, "use the output of the specified command as on demand socket name (the vassal name is passed as the only argument)", uwsgi_opt_set_str, &uwsgi.emperor_on_demand_exec, 0},
 	{"emperor-extra-extension", required_argument, 0, "allows the specified extension in the Emperor (vassal will be called with --config)", uwsgi_opt_add_string_list, &uwsgi.emperor_extra_extension, 0},
 	{"emperor-extra-ext", required_argument, 0, "allows the specified extension in the Emperor (vassal will be called with --config)", uwsgi_opt_add_string_list, &uwsgi.emperor_extra_extension, 0},
+#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL)
+	{"emperor-use-clone", required_argument, 0, "use clone() instead of fork() passing the specified unshare() flags", uwsgi_opt_set_unshare, &uwsgi.emperor_clone, 0},
+#endif
 	{"imperial-monitor-list", no_argument, 0, "list enabled imperial monitors", uwsgi_opt_true, &uwsgi.imperial_monitor_list, 0},
 	{"imperial-monitors-list", no_argument, 0, "list enabled imperial monitors", uwsgi_opt_true, &uwsgi.imperial_monitor_list, 0},
 	{"vassals-inherit", required_argument, 0, "add config templates to vassals config", uwsgi_opt_add_string_list, &uwsgi.vassals_templates, 0},
@@ -203,6 +209,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"worker-reload-mercy", required_argument, 0, "set the maximum time (in seconds) a worker can take to reload/shutdown (default is 60)", uwsgi_opt_set_int, &uwsgi.worker_reload_mercy, 0},
 	{"exit-on-reload", no_argument, 0, "force exit even if a reload is requested", uwsgi_opt_true, &uwsgi.exit_on_reload, 0},
 	{"die-on-term", no_argument, 0, "exit instead of brutal reload on SIGTERM", uwsgi_opt_true, &uwsgi.die_on_term, 0},
+	{"force-gateway", no_argument, 0, "force teh spawn of the first registered gateway without a master", uwsgi_opt_true, &uwsgi.force_gateway, 0},
 	{"help", no_argument, 'h', "show this help", uwsgi_help, NULL, UWSGI_OPT_IMMEDIATE},
 	{"usage", no_argument, 'h', "show this help", uwsgi_help, NULL, UWSGI_OPT_IMMEDIATE},
 
@@ -219,10 +226,11 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"locks", required_argument, 0, "create the specified number of shared locks", uwsgi_opt_set_int, &uwsgi.locks, 0},
 	{"lock-engine", required_argument, 0, "set the lock engine", uwsgi_opt_set_str, &uwsgi.lock_engine, 0},
 	{"ftok", required_argument, 0, "set the ipcsem key via ftok() for avoiding duplicates", uwsgi_opt_set_str, &uwsgi.ftok, 0},
+	{"persistent-ipcsem", no_argument, 0, "do not remove ipcsem's on shutdown", uwsgi_opt_true, &uwsgi.persistent_ipcsem, 0},
 	{"sharedarea", required_argument, 'A', "create a raw shared memory area of specified pages", uwsgi_opt_set_int, &uwsgi.sharedareasize, 0},
 
-	{"safe-fd", no_argument, 0, "do not close the specified file descriptor", uwsgi_opt_safe_fd, NULL, 0},
-	{"fd-safe", no_argument, 0, "do not close the specified file descriptor", uwsgi_opt_safe_fd, NULL, 0},
+	{"safe-fd", required_argument, 0, "do not close the specified file descriptor", uwsgi_opt_safe_fd, NULL, 0},
+	{"fd-safe", required_argument, 0, "do not close the specified file descriptor", uwsgi_opt_safe_fd, NULL, 0},
 
 	{"cache", required_argument, 0, "create a shared cache containing given elements", uwsgi_opt_set_64bit, &uwsgi.cache_max_items, 0},
 	{"cache-blocksize", required_argument, 0, "set cache blocksize", uwsgi_opt_set_64bit, &uwsgi.cache_blocksize, 0},
@@ -236,6 +244,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"cache-sync", required_argument, 0, "copy the whole content of another uWSGI cache server on server startup", uwsgi_opt_set_str, &uwsgi.cache_sync, 0},
 	{"cache-use-last-modified", no_argument, 0, "update last_modified_at timestamp on every cache item modification (default is disabled)", uwsgi_opt_true, &uwsgi.cache_use_last_modified, 0},
 
+	{"add-cache-item", required_argument, 0, "add an item in the cache", uwsgi_opt_add_string_list, &uwsgi.add_cache_item, 0},
 	{"load-file-in-cache", required_argument, 0, "load a static file in the cache", uwsgi_opt_add_string_list, &uwsgi.load_file_in_cache, 0},
 #ifdef UWSGI_ZLIB
 	{"load-file-in-cache-gzip", required_argument, 0, "load a static file in the cache with gzip compression", uwsgi_opt_add_string_list, &uwsgi.load_file_in_cache_gzip, 0},
@@ -253,7 +262,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"spooler-external", required_argument, 0, "map spoolers requests to a spooler directory managed by an external instance", uwsgi_opt_add_spooler, (void *) UWSGI_SPOOLER_EXTERNAL, UWSGI_OPT_MASTER},
 	{"spooler-ordered", no_argument, 0, "try to order the execution of spooler tasks", uwsgi_opt_true, &uwsgi.spooler_ordered, 0},
 	{"spooler-chdir", required_argument, 0, "chdir() to specified directory before each spooler task", uwsgi_opt_set_str, &uwsgi.spooler_chdir, 0},
-	{"spooler-processes", required_argument, 0, "set the number of processes for spoolers", uwsgi_opt_set_int, &uwsgi.spooler_numproc, 0},
+	{"spooler-processes", required_argument, 0, "set the number of processes for spoolers", uwsgi_opt_set_int, &uwsgi.spooler_numproc, UWSGI_OPT_IMMEDIATE},
 	{"spooler-quiet", no_argument, 0, "do not be verbose with spooler tasks", uwsgi_opt_true, &uwsgi.spooler_quiet, 0},
 	{"spooler-max-tasks", required_argument, 0, "set the maximum number of tasks to run before recycling a spooler", uwsgi_opt_set_int, &uwsgi.spooler_max_tasks, 0},
 	{"spooler-harakiri", required_argument, 0, "set harakiri timeout for spooler tasks", uwsgi_opt_set_dyn, (void *) UWSGI_OPTION_SPOOLER_HARAKIRI, 0},
@@ -280,8 +289,14 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"pidfile", required_argument, 0, "create pidfile (before privileges drop)", uwsgi_opt_set_str, &uwsgi.pidfile, 0},
 	{"pidfile2", required_argument, 0, "create pidfile (after privileges drop)", uwsgi_opt_set_str, &uwsgi.pidfile2, 0},
 	{"chroot", required_argument, 0, "chroot() to the specified directory", uwsgi_opt_set_str, &uwsgi.chroot, 0},
+#ifdef __linux__
+	{"pivot-root", required_argument, 0, "pivot_root() to the specified directories (new_root and put_old must be separated with a space)", uwsgi_opt_set_str, &uwsgi.pivot_root, 0},
+	{"pivot_root", required_argument, 0, "pivot_root() to the specified directories (new_root and put_old must be separated with a space)", uwsgi_opt_set_str, &uwsgi.pivot_root, 0},
+#endif
+
 	{"uid", required_argument, 0, "setuid to the specified user/uid", uwsgi_opt_set_uid, NULL, 0},
 	{"gid", required_argument, 0, "setgid to the specified group/gid", uwsgi_opt_set_gid, NULL, 0},
+	{"add-gid", required_argument, 0, "add the specified group id to the process credentials", uwsgi_opt_add_string_list, &uwsgi.additional_gids, 0},
 	{"immediate-uid", required_argument, 0, "setuid to the specified user/uid IMMEDIATELY", uwsgi_opt_set_immediate_uid, NULL, UWSGI_OPT_IMMEDIATE},
 	{"immediate-gid", required_argument, 0, "setgid to the specified group/gid IMMEDIATELY", uwsgi_opt_set_immediate_gid, NULL, UWSGI_OPT_IMMEDIATE},
 	{"no-initgroups", no_argument, 0, "disable additional groups set via initgroups()", uwsgi_opt_true, &uwsgi.no_initgroups, 0},
@@ -289,8 +304,39 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"cap", required_argument, 0, "set process capability", uwsgi_opt_set_cap, NULL, 0},
 #endif
 #ifdef __linux__
-	{"unshare", required_argument, 0, "unshare() part of the processes and put it in a new namespace", uwsgi_opt_set_unshare, 0},
+	{"unshare", required_argument, 0, "unshare() part of the processes and put it in a new namespace", uwsgi_opt_set_unshare, &uwsgi.unshare, 0},
 #endif
+#ifdef __FreeBSD__
+	{"jail", required_argument, 0, "put the instance in a FreeBSD jail", uwsgi_opt_set_str, &uwsgi.jail, 0},
+	{"jail-ip4", required_argument, 0, "add an ipv4 address to the FreeBSD jail", uwsgi_opt_add_string_list, &uwsgi.jail_ip4, 0},
+	{"jail-ip6", required_argument, 0, "add an ipv6 address to the FreeBSD jail", uwsgi_opt_add_string_list, &uwsgi.jail_ip6, 0},
+	{"jidfile", required_argument, 0, "save the jid of a FreeBSD jail in the specified file", uwsgi_opt_set_str, &uwsgi.jidfile, 0},
+	{"jid-file", required_argument, 0, "save the jid of a FreeBSD jail in the specified file", uwsgi_opt_set_str, &uwsgi.jidfile, 0},
+#ifdef UWSGI_HAS_FREEBSD_LIBJAIL
+	{"jail2", required_argument, 0, "add an option to the FreeBSD jail", uwsgi_opt_add_string_list, &uwsgi.jail2, 0},
+	{"libjail", required_argument, 0, "add an option to the FreeBSD jail", uwsgi_opt_add_string_list, &uwsgi.jail2, 0},
+	{"jail-attach", required_argument, 0, "attach to the FreeBSD jail", uwsgi_opt_set_str, &uwsgi.jail_attach, 0},
+#endif
+#endif
+	{"refork", no_argument, 0, "fork() again after privileges drop. Useful for jailing systems", uwsgi_opt_true, &uwsgi.refork, 0},
+	{"re-fork", no_argument, 0, "fork() again after privileges drop. Useful for jailing systems", uwsgi_opt_true, &uwsgi.refork, 0},
+	{"refork-as-root", no_argument, 0, "fork() again before privileges drop. Useful for jailing systems", uwsgi_opt_true, &uwsgi.refork_as_root, 0},
+	{"re-fork-as-root", no_argument, 0, "fork() again before privileges drop. Useful for jailing systems", uwsgi_opt_true, &uwsgi.refork_as_root, 0},
+	{"refork-post-jail", no_argument, 0, "fork() again after jailing. Useful for jailing systems", uwsgi_opt_true, &uwsgi.refork_post_jail, 0},
+	{"re-fork-post-jail", no_argument, 0, "fork() again after jailing. Useful for jailing systems", uwsgi_opt_true, &uwsgi.refork_post_jail, 0},
+
+	{"hook-pre-jail", required_argument, 0, "run the specified hook before jailing", uwsgi_opt_add_string_list, &uwsgi.hook_pre_jail, 0},
+        {"hook-post-jail", required_argument, 0, "run the specified hook after jailing", uwsgi_opt_add_string_list, &uwsgi.hook_post_jail, 0},
+        {"hook-in-jail", required_argument, 0, "run the specified hook in jail after initialization", uwsgi_opt_add_string_list, &uwsgi.hook_in_jail, 0},
+        {"hook-as-root", required_argument, 0, "run the specified hook before privileges drop", uwsgi_opt_add_string_list, &uwsgi.hook_as_root, 0},
+        {"hook-as-user", required_argument, 0, "run the specified hook after privileges drop", uwsgi_opt_add_string_list, &uwsgi.hook_as_user, 0},
+        {"hook-as-user-atexit", required_argument, 0, "run the specified hook before app exit and reload", uwsgi_opt_add_string_list, &uwsgi.hook_as_user_atexit, 0},
+        {"hook-pre-app", required_argument, 0, "run the specified hook before app loading", uwsgi_opt_add_string_list, &uwsgi.hook_pre_app, 0},
+        {"hook-post-app", required_argument, 0, "run the specified hook after app loading", uwsgi_opt_add_string_list, &uwsgi.hook_post_app, 0},
+
+        {"hook-as-vassal", required_argument, 0, "run the specified command before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.hook_as_vassal, 0},
+        {"hook-as-emperor", required_argument, 0, "run the specified command in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.hook_as_emperor, 0},
+
 	{"exec-pre-jail", required_argument, 0, "run the specified command before jailing", uwsgi_opt_add_string_list, &uwsgi.exec_pre_jail, 0},
 	{"exec-post-jail", required_argument, 0, "run the specified command after jailing", uwsgi_opt_add_string_list, &uwsgi.exec_post_jail, 0},
 	{"exec-in-jail", required_argument, 0, "run the specified command in jail after initialization", uwsgi_opt_add_string_list, &uwsgi.exec_in_jail, 0},
@@ -299,6 +345,58 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"exec-as-user-atexit", required_argument, 0, "run the specified command before app exit and reload", uwsgi_opt_add_string_list, &uwsgi.exec_as_user_atexit, 0},
 	{"exec-pre-app", required_argument, 0, "run the specified command before app loading", uwsgi_opt_add_string_list, &uwsgi.exec_pre_app, 0},
 	{"exec-post-app", required_argument, 0, "run the specified command after app loading", uwsgi_opt_add_string_list, &uwsgi.exec_post_app, 0},
+
+	{"exec-as-vassal", required_argument, 0, "run the specified command before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.exec_as_vassal, 0},
+	{"exec-as-emperor", required_argument, 0, "run the specified command in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.exec_as_emperor, 0},
+
+	{"mount-pre-jail", required_argument, 0, "mount filesystem before jailing", uwsgi_opt_add_string_list, &uwsgi.mount_pre_jail, 0},
+        {"mount-post-jail", required_argument, 0, "mount filesystem after jailing", uwsgi_opt_add_string_list, &uwsgi.mount_post_jail, 0},
+        {"mount-in-jail", required_argument, 0, "mount filesystem in jail after initialization", uwsgi_opt_add_string_list, &uwsgi.mount_in_jail, 0},
+        {"mount-as-root", required_argument, 0, "mount filesystem before privileges drop", uwsgi_opt_add_string_list, &uwsgi.mount_as_root, 0},
+
+        {"mount-as-vassal", required_argument, 0, "mount filesystem before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.mount_as_vassal, 0},
+        {"mount-as-emperor", required_argument, 0, "mount filesystem in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.mount_as_emperor, 0},
+
+	{"umount-pre-jail", required_argument, 0, "unmount filesystem before jailing", uwsgi_opt_add_string_list, &uwsgi.umount_pre_jail, 0},
+        {"umount-post-jail", required_argument, 0, "unmount filesystem after jailing", uwsgi_opt_add_string_list, &uwsgi.umount_post_jail, 0},
+        {"umount-in-jail", required_argument, 0, "unmount filesystem in jail after initialization", uwsgi_opt_add_string_list, &uwsgi.umount_in_jail, 0},
+        {"umount-as-root", required_argument, 0, "unmount filesystem before privileges drop", uwsgi_opt_add_string_list, &uwsgi.umount_as_root, 0},
+
+        {"umount-as-vassal", required_argument, 0, "unmount filesystem before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.umount_as_vassal, 0},
+        {"umount-as-emperor", required_argument, 0, "unmount filesystem in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.umount_as_emperor, 0},
+
+	{"wait-for-interface", required_argument, 0, "wait for the specified network interface to come up before running root hooks", uwsgi_opt_add_string_list, &uwsgi.wait_for_interface, 0},
+	{"wait-for-interface-timeout", required_argument, 0, "set the timeout for wait-for-interface", uwsgi_opt_set_int, &uwsgi.wait_for_interface_timeout, 0},
+
+	{"wait-interface", required_argument, 0, "wait for the specified network interface to come up before running root hooks", uwsgi_opt_add_string_list, &uwsgi.wait_for_interface, 0},
+	{"wait-interface-timeout", required_argument, 0, "set the timeout for wait-for-interface", uwsgi_opt_set_int, &uwsgi.wait_for_interface_timeout, 0},
+
+	{"wait-for-iface", required_argument, 0, "wait for the specified network interface to come up before running root hooks", uwsgi_opt_add_string_list, &uwsgi.wait_for_interface, 0},
+	{"wait-for-iface-timeout", required_argument, 0, "set the timeout for wait-for-interface", uwsgi_opt_set_int, &uwsgi.wait_for_interface_timeout, 0},
+
+	{"wait-iface", required_argument, 0, "wait for the specified network interface to come up before running root hooks", uwsgi_opt_add_string_list, &uwsgi.wait_for_interface, 0},
+	{"wait-iface-timeout", required_argument, 0, "set the timeout for wait-for-interface", uwsgi_opt_set_int, &uwsgi.wait_for_interface_timeout, 0},
+
+	{"call-pre-jail", required_argument, 0, "call the specified function before jailing", uwsgi_opt_add_string_list, &uwsgi.call_pre_jail, 0},
+	{"call-post-jail", required_argument, 0, "call the specified function after jailing", uwsgi_opt_add_string_list, &uwsgi.call_post_jail, 0},
+	{"call-in-jail", required_argument, 0, "call the specified function in jail after initialization", uwsgi_opt_add_string_list, &uwsgi.call_in_jail, 0},
+	{"call-as-root", required_argument, 0, "call the specified function before privileges drop", uwsgi_opt_add_string_list, &uwsgi.call_as_root, 0},
+	{"call-as-user", required_argument, 0, "call the specified function after privileges drop", uwsgi_opt_add_string_list, &uwsgi.call_as_user, 0},
+	{"call-as-user-atexit", required_argument, 0, "call the specified function before app exit and reload", uwsgi_opt_add_string_list, &uwsgi.call_as_user_atexit, 0},
+	{"call-pre-app", required_argument, 0, "call the specified function before app loading", uwsgi_opt_add_string_list, &uwsgi.call_pre_app, 0},
+	{"call-post-app", required_argument, 0, "call the specified function after app loading", uwsgi_opt_add_string_list, &uwsgi.call_post_app, 0},
+
+	{"call-as-vassal", required_argument, 0, "call the specified function() before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.call_as_vassal, 0},
+	{"call-as-vassal1", required_argument, 0, "call the specified function(char *) before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.call_as_vassal1, 0},
+	{"call-as-vassal3", required_argument, 0, "call the specified function(char *, uid_t, gid_t) before exec()ing the vassal", uwsgi_opt_add_string_list, &uwsgi.call_as_vassal3, 0},
+
+	{"call-as-emperor", required_argument, 0, "call the specified function() in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.call_as_emperor, 0},
+	{"call-as-emperor1", required_argument, 0, "call the specified function(char *) in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.call_as_emperor1, 0},
+	{"call-as-emperor2", required_argument, 0, "call the specified function(char *, pid_t) in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.call_as_emperor2, 0},
+	{"call-as-emperor4", required_argument, 0, "call the specified function(char *, pid_t, uid_t, gid_t) in the emperor after the vassal has been started", uwsgi_opt_add_string_list, &uwsgi.call_as_emperor4, 0},
+
+
+
 	{"ini", required_argument, 0, "load config from ini file", uwsgi_opt_load_ini, NULL, UWSGI_OPT_IMMEDIATE},
 #ifdef UWSGI_YAML
 	{"yaml", required_argument, 'y', "load config from yaml file", uwsgi_opt_load_yml, NULL, UWSGI_OPT_IMMEDIATE},
@@ -334,6 +432,9 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"evil-reload-on-as", required_argument, 0, "force the master to reload a worker if its address space is higher than specified megabytes", uwsgi_opt_set_megabytes, &uwsgi.evil_reload_on_as, UWSGI_OPT_MASTER | UWSGI_OPT_MEMORY},
 	{"evil-reload-on-rss", required_argument, 0, "force the master to reload a worker if its rss memory is higher than specified megabytes", uwsgi_opt_set_megabytes, &uwsgi.evil_reload_on_rss, UWSGI_OPT_MASTER | UWSGI_OPT_MEMORY},
 
+	{"reload-on-fd", required_argument, 0, "reload if the specified file descriptor is ready", uwsgi_opt_add_string_list, &uwsgi.reload_on_fd, UWSGI_OPT_MASTER},
+	{"brutal-reload-on-fd", required_argument, 0, "brutal reload if the specified file descriptor is ready", uwsgi_opt_add_string_list, &uwsgi.brutal_reload_on_fd, UWSGI_OPT_MASTER},
+
 #ifdef __linux__
 #ifdef MADV_MERGEABLE
 	{"ksm", optional_argument, 0, "enable Linux KSM", uwsgi_opt_set_int, &uwsgi.linux_ksm, 0},
@@ -350,6 +451,11 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"touch-logreopen", required_argument, 0, "trigger log reopen if the specified file is modified/touched", uwsgi_opt_add_string_list, &uwsgi.touch_logreopen, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
 	{"touch-exec", required_argument, 0, "run command when the specified file is modified/touched (syntax: file command)", uwsgi_opt_add_string_list, &uwsgi.touch_exec, UWSGI_OPT_MASTER},
 	{"touch-signal", required_argument, 0, "signal when the specified file is modified/touched (syntax: file signal)", uwsgi_opt_add_string_list, &uwsgi.touch_signal, UWSGI_OPT_MASTER},
+
+	{"fs-reload", required_argument, 0, "graceful reload when the specified filesystem object is modified", uwsgi_opt_add_string_list, &uwsgi.fs_reload, UWSGI_OPT_MASTER},
+	{"fs-brutal-reload", required_argument, 0, "brutal reload when the specified filesystem object is modified", uwsgi_opt_add_string_list, &uwsgi.fs_brutal_reload, UWSGI_OPT_MASTER},
+	{"fs-signal", required_argument, 0, "raise a uwsgi signal when the specified filesystem object is modified (syntax: file signal)", uwsgi_opt_add_string_list, &uwsgi.fs_signal, UWSGI_OPT_MASTER},
+
 	{"propagate-touch", no_argument, 0, "over-engineering option for system with flaky signal mamagement", uwsgi_opt_true, &uwsgi.propagate_touch, 0},
 	{"limit-post", required_argument, 0, "limit request body", uwsgi_opt_set_64bit, &uwsgi.limit_post, 0},
 	{"no-orphans", no_argument, 0, "automatically kill workers if master dies (can be dangerous for availability)", uwsgi_opt_true, &uwsgi.no_orphans, 0},
@@ -454,12 +560,21 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"logger-list", no_argument, 0, "list enabled loggers", uwsgi_opt_true, &uwsgi.loggers_list, 0},
 	{"loggers-list", no_argument, 0, "list enabled loggers", uwsgi_opt_true, &uwsgi.loggers_list, 0},
 	{"threaded-logger", no_argument, 0, "offload log writing to a thread", uwsgi_opt_true, &uwsgi.threaded_logger, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
+
+
+	{"log-encoder", required_argument, 0, "add an item in the log encoder chain", uwsgi_opt_add_string_list, &uwsgi.requested_log_encoders, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
+	{"log-req-encoder", required_argument, 0, "add an item in the log req encoder chain", uwsgi_opt_add_string_list, &uwsgi.requested_log_req_encoders, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
+	
+
 #ifdef UWSGI_PCRE
 	{"log-drain", required_argument, 0, "drain (do not show) log lines matching the specified regexp", uwsgi_opt_add_regexp_list, &uwsgi.log_drain_rules, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
 	{"log-filter", required_argument, 0, "show only log lines matching the specified regexp", uwsgi_opt_add_regexp_list, &uwsgi.log_filter_rules, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
 	{"log-route", required_argument, 0, "log to the specified named logger if regexp applied on logline matches", uwsgi_opt_add_regexp_custom_list, &uwsgi.log_route, UWSGI_OPT_MASTER | UWSGI_OPT_LOG_MASTER},
 	{"log-req-route", required_argument, 0, "log requests to the specified named logger if regexp applied on logline matches", uwsgi_opt_add_regexp_custom_list, &uwsgi.log_req_route, UWSGI_OPT_REQ_LOG_MASTER},
 #endif
+
+	{"use-abort", no_argument, 0, "call abort() on segfault/fpe, could be useful for generating a core dump", uwsgi_opt_true, &uwsgi.use_abort, 0},
+
 	{"alarm", required_argument, 0, "create a new alarm, syntax: <alarm> <plugin:args>", uwsgi_opt_add_string_list, &uwsgi.alarm_list, UWSGI_OPT_MASTER},
 	{"alarm-freq", required_argument, 0, "tune the anti-loop alam system (default 3 seconds)", uwsgi_opt_set_int, &uwsgi.alarm_freq, 0},
 	{"alarm-fd", required_argument, 0, "raise the specified alarm when an fd is read for read (by default it reads 1 byte, set 8 for eventfd)", uwsgi_opt_add_string_list, &uwsgi.alarm_fd_list, UWSGI_OPT_MASTER},
@@ -479,6 +594,8 @@ static struct uwsgi_option uwsgi_base_options[] = {
 #endif
 	{"log-master", no_argument, 0, "delegate logging to master process", uwsgi_opt_true, &uwsgi.log_master, UWSGI_OPT_MASTER},
 	{"log-master-bufsize", required_argument, 0, "set the buffer size for the master logger. bigger log messages will be truncated", uwsgi_opt_set_64bit, &uwsgi.log_master_bufsize, 0},
+	{"log-master-stream", no_argument, 0, "create the master logpipe as SOCK_STREAM", uwsgi_opt_true, &uwsgi.log_master_stream, 0},
+	{"log-master-req-stream", no_argument, 0, "create the master requests logpipe as SOCK_STREAM", uwsgi_opt_true, &uwsgi.log_master_req_stream, 0},
 	{"log-reopen", no_argument, 0, "reopen log after reload", uwsgi_opt_true, &uwsgi.log_reopen, 0},
 	{"log-truncate", no_argument, 0, "truncate log on startup", uwsgi_opt_true, &uwsgi.log_truncate, 0},
 	{"log-maxsize", required_argument, 0, "set maximum logfile size", uwsgi_opt_set_int, &uwsgi.log_maxsize, UWSGI_OPT_LOG_MASTER},
@@ -497,6 +614,12 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"log-micros", no_argument, 0, "report response time in microseconds instead of milliseconds", uwsgi_opt_true, &uwsgi.log_micros, 0},
 	{"log-x-forwarded-for", no_argument, 0, "use the ip from X-Forwarded-For header instead of REMOTE_ADDR", uwsgi_opt_true, &uwsgi.log_x_forwarded_for, 0},
 	{"master-as-root", no_argument, 0, "leave master process running as root", uwsgi_opt_true, &uwsgi.master_as_root, 0},
+
+	{"drop-after-init", no_argument, 0, "run privileges drop after plugin initialization", uwsgi_opt_true, &uwsgi.drop_after_init, 0},
+	{"drop-after-apps", no_argument, 0, "run privileges drop after apps loading", uwsgi_opt_true, &uwsgi.drop_after_apps, 0},
+
+	{"force-cwd", required_argument, 0, "force the initial working directory to the specified value", uwsgi_opt_set_str, &uwsgi.force_cwd, 0},
+	{"binsh", required_argument, 0, "override /bin/sh (used by exec hooks, it always fallback to /bin/sh)", uwsgi_opt_add_string_list, &uwsgi.binsh, 0},
 	{"chdir", required_argument, 0, "chdir to specified directory before apps loading", uwsgi_opt_set_str, &uwsgi.chdir, 0},
 	{"chdir2", required_argument, 0, "chdir to specified directory after apps loading", uwsgi_opt_set_str, &uwsgi.chdir2, 0},
 	{"lazy", no_argument, 0, "set lazy mode (load apps in workers instead of master)", uwsgi_opt_true, &uwsgi.lazy, 0},
@@ -510,6 +633,8 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"cheaper-algo-list", no_argument, 0, "list enabled cheapers algorithms", uwsgi_opt_true, &uwsgi.cheaper_algo_list, 0},
 	{"cheaper-algos-list", no_argument, 0, "list enabled cheapers algorithms", uwsgi_opt_true, &uwsgi.cheaper_algo_list, 0},
 	{"cheaper-list", no_argument, 0, "list enabled cheapers algorithms", uwsgi_opt_true, &uwsgi.cheaper_algo_list, 0},
+	{"cheaper-rss-limit-soft", required_argument, 0, "don't spawn new workers if total resident memory usage of all workers is higher than this limit", uwsgi_opt_set_64bit, &uwsgi.cheaper_rss_limit_soft, UWSGI_OPT_MASTER | UWSGI_OPT_CHEAPER},
+	{"cheaper-rss-limit-hard", required_argument, 0, "if total workers resident memory usage is higher try to stop workers", uwsgi_opt_set_64bit, &uwsgi.cheaper_rss_limit_hard, UWSGI_OPT_MASTER | UWSGI_OPT_CHEAPER},
 	{"idle", required_argument, 0, "set idle mode (put uWSGI in cheap mode after inactivity)", uwsgi_opt_set_int, &uwsgi.idle, UWSGI_OPT_MASTER},
 	{"die-on-idle", no_argument, 0, "shutdown uWSGI when idle", uwsgi_opt_true, &uwsgi.die_on_idle, 0},
 	{"mount", required_argument, 0, "load application under mountpoint", uwsgi_opt_add_string_list, &uwsgi.mounts, 0},
@@ -567,6 +692,20 @@ static struct uwsgi_option uwsgi_base_options[] = {
         {"error-route-if-not", required_argument, 0, "add an error route based on condition (negate version)", uwsgi_opt_add_route, "if-not", 0},
         {"error-route-run", required_argument, 0, "always run the specified error route action", uwsgi_opt_add_route, "run", 0},
 
+	{"response-route", required_argument, 0, "add a response route", uwsgi_opt_add_route, "path_info", 0},
+        {"response-route-status", required_argument, 0, "add a response route for the specified status", uwsgi_opt_add_route, "status", 0},
+        {"response-route-host", required_argument, 0, "add a response route based on Host header", uwsgi_opt_add_route, "http_host", 0},
+        {"response-route-uri", required_argument, 0, "add a response route based on REQUEST_URI", uwsgi_opt_add_route, "request_uri", 0},
+        {"response-route-qs", required_argument, 0, "add a response route based on QUERY_STRING", uwsgi_opt_add_route, "query_string", 0},
+        {"response-route-remote-addr", required_argument, 0, "add a response route based on REMOTE_ADDR", uwsgi_opt_add_route, "remote_addr", 0},
+        {"response-route-user-agent", required_argument, 0, "add a response route based on HTTP_USER_AGENT", uwsgi_opt_add_route, "user_agent", 0},
+        {"response-route-remote-user", required_argument, 0, "add a response route based on REMOTE_USER", uwsgi_opt_add_route, "remote_user", 0},
+        {"response-route-referer", required_argument, 0, "add a response route based on HTTP_REFERER", uwsgi_opt_add_route, "referer", 0},
+        {"response-route-label", required_argument, 0, "add a response routing label (for use with goto)", uwsgi_opt_add_route, NULL, 0},
+        {"response-route-if", required_argument, 0, "add a response route based on condition", uwsgi_opt_add_route, "if", 0},
+        {"response-route-if-not", required_argument, 0, "add a response route based on condition (negate version)", uwsgi_opt_add_route, "if-not", 0},
+        {"response-route-run", required_argument, 0, "always run the specified response route action", uwsgi_opt_add_route, "run", 0},
+
 	{"router-list", no_argument, 0, "list enabled routers", uwsgi_opt_true, &uwsgi.router_list, 0},
 	{"routers-list", no_argument, 0, "list enabled routers", uwsgi_opt_true, &uwsgi.router_list, 0},
 #endif
@@ -580,6 +719,9 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"websockets-max-size", required_argument, 0, "set the max allowed size of websocket messages (in Kbytes, default 1024)", uwsgi_opt_set_64bit, &uwsgi.websockets_max_size, 0},
 	{"websocket-max-size", required_argument, 0, "set the max allowed size of websocket messages (in Kbytes, default 1024)", uwsgi_opt_set_64bit, &uwsgi.websockets_max_size, 0},
 
+	{"chunked-input-limit", required_argument, 0, "set the max size of a chunked input part (default 1MB, in bytes)", uwsgi_opt_set_64bit, &uwsgi.chunked_input_limit, 0},
+	{"chunked-input-timeout", required_argument, 0, "set default timeout for chunked input", uwsgi_opt_set_int, &uwsgi.chunked_input_timeout, 0},
+
 	{"clock", required_argument, 0, "set a clock source", uwsgi_opt_set_str, &uwsgi.requested_clock, 0},
 
 	{"clock-list", no_argument, 0, "list enabled clocks", uwsgi_opt_true, &uwsgi.clock_list, 0},
@@ -588,6 +730,8 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"add-header", required_argument, 0, "automatically add HTTP headers to response", uwsgi_opt_add_string_list, &uwsgi.additional_headers, 0},
 	{"rem-header", required_argument, 0, "automatically remove specified HTTP header from the response", uwsgi_opt_add_string_list, &uwsgi.remove_headers, 0},
 	{"del-header", required_argument, 0, "automatically remove specified HTTP header from the response", uwsgi_opt_add_string_list, &uwsgi.remove_headers, 0},
+	{"collect-header", required_argument, 0, "store the specified response header in a request var (syntax: header var)", uwsgi_opt_add_string_list, &uwsgi.collect_headers, 0},
+	{"response-header-collect", required_argument, 0, "store the specified response header in a request var (syntax: header var)", uwsgi_opt_add_string_list, &uwsgi.collect_headers, 0},
 
 	{"check-static", required_argument, 0, "check for static files in the specified directory", uwsgi_opt_check_static, NULL, UWSGI_OPT_MIME},
 	{"check-static-docroot", no_argument, 0, "check for static files in the requested DOCUMENT_ROOT", uwsgi_opt_true, &uwsgi.check_static_docroot, UWSGI_OPT_MIME},
@@ -599,8 +743,13 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"static-safe", required_argument, 0, "skip security checks if the file is under the specified path", uwsgi_opt_add_string_list, &uwsgi.static_safe, UWSGI_OPT_MIME},
 	{"static-cache-paths", required_argument, 0, "put resolved paths in the uWSGI cache for the specified amount of seconds", uwsgi_opt_set_int, &uwsgi.use_static_cache_paths, UWSGI_OPT_MIME|UWSGI_OPT_MASTER},
 	{"static-cache-paths-name", required_argument, 0, "use the specified cache for static paths", uwsgi_opt_set_str, &uwsgi.static_cache_paths_name, UWSGI_OPT_MIME|UWSGI_OPT_MASTER},
+#ifdef __APPLE__
+	{"mimefile", required_argument, 0, "set mime types file path (default /etc/apache2/mime.types)", uwsgi_opt_add_string_list, &uwsgi.mime_file, UWSGI_OPT_MIME},
+	{"mime-file", required_argument, 0, "set mime types file path (default /etc/apache2/mime.types)", uwsgi_opt_add_string_list, &uwsgi.mime_file, UWSGI_OPT_MIME},
+#else
 	{"mimefile", required_argument, 0, "set mime types file path (default /etc/mime.types)", uwsgi_opt_add_string_list, &uwsgi.mime_file, UWSGI_OPT_MIME},
 	{"mime-file", required_argument, 0, "set mime types file path (default /etc/mime.types)", uwsgi_opt_add_string_list, &uwsgi.mime_file, UWSGI_OPT_MIME},
+#endif
 
 	{"static-expires-type", required_argument, 0, "set the Expires header based on content type", uwsgi_opt_add_dyn_dict, &uwsgi.static_expires_type, UWSGI_OPT_MIME},
 	{"static-expires-type-mtime", required_argument, 0, "set the Expires header based on content type and file mtime", uwsgi_opt_add_dyn_dict, &uwsgi.static_expires_type_mtime, UWSGI_OPT_MIME},
@@ -630,10 +779,14 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"file-serve-mode", required_argument, 0, "set static file serving mode", uwsgi_opt_fileserve_mode, NULL, UWSGI_OPT_MIME},
 	{"fileserve-mode", required_argument, 0, "set static file serving mode", uwsgi_opt_fileserve_mode, NULL, UWSGI_OPT_MIME},
 
+	{"disable-sendfile", no_argument, 0, "disable sendfile() and rely on boring read()/write()", uwsgi_opt_true, &uwsgi.disable_sendfile, 0},
+
 	{"check-cache", optional_argument, 0, "check for response data in the specified cache (empty for default cache)", uwsgi_opt_set_str, &uwsgi.use_check_cache, 0},
 	{"close-on-exec", no_argument, 0, "set close-on-exec on sockets (could be required for spawning processes in requests)", uwsgi_opt_true, &uwsgi.close_on_exec, 0},
 	{"mode", required_argument, 0, "set uWSGI custom mode", uwsgi_opt_set_str, &uwsgi.mode, 0},
 	{"env", required_argument, 0, "set environment variable", uwsgi_opt_set_env, NULL, 0},
+	{"envdir", required_argument, 0, "load a daemontools compatible envdir", uwsgi_opt_add_string_list, &uwsgi.envdirs, 0},
+	{"early-envdir", required_argument, 0, "load a daemontools compatible envdir ASAP", uwsgi_opt_envdir, NULL, UWSGI_OPT_IMMEDIATE},
 	{"unenv", required_argument, 0, "unset environment variable", uwsgi_opt_unset_env, NULL, 0},
 	{"vacuum", no_argument, 0, "try to remove all of the generated file/sockets", uwsgi_opt_true, &uwsgi.vacuum, 0},
 	{"file-write", required_argument, 0, "write the specified content to the specified file (syntax: file=value) before privileges drop", uwsgi_opt_add_string_list, &uwsgi.file_write_list, 0},
@@ -670,6 +823,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"loop-list", no_argument, 0, "list enabled loop engines", uwsgi_opt_true, &uwsgi.loop_list, 0},
 	{"loops-list", no_argument, 0, "list enabled loop engines", uwsgi_opt_true, &uwsgi.loop_list, 0},
 	{"worker-exec", required_argument, 0, "run the specified command as worker", uwsgi_opt_set_str, &uwsgi.worker_exec, 0},
+	{"worker-exec2", required_argument, 0, "run the specified command as worker (after post_fork hook)", uwsgi_opt_set_str, &uwsgi.worker_exec2, 0},
 	{"attach-daemon", required_argument, 0, "attach a command/daemon to the master process (the command has to not go in background)", uwsgi_opt_add_daemon, NULL, UWSGI_OPT_MASTER},
 	{"smart-attach-daemon", required_argument, 0, "attach a command/daemon to the master process managed by a pidfile (the command has to daemonize)", uwsgi_opt_add_daemon, NULL, UWSGI_OPT_MASTER},
 	{"smart-attach-daemon2", required_argument, 0, "attach a command/daemon to the master process managed by a pidfile (the command has to NOT daemonize)", uwsgi_opt_add_daemon, NULL, UWSGI_OPT_MASTER},
@@ -681,6 +835,8 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"daemons-honour-stdin", no_argument, 0, "do not change the stdin of external daemons to /dev/null", uwsgi_opt_true, &uwsgi.daemons_honour_stdin, UWSGI_OPT_MASTER},
 	{"plugins", required_argument, 0, "load uWSGI plugins", uwsgi_opt_load_plugin, NULL, UWSGI_OPT_IMMEDIATE},
 	{"plugin", required_argument, 0, "load uWSGI plugins", uwsgi_opt_load_plugin, NULL, UWSGI_OPT_IMMEDIATE},
+	{"need-plugins", required_argument, 0, "load uWSGI plugins (exit on error)", uwsgi_opt_load_plugin, NULL, UWSGI_OPT_IMMEDIATE},
+	{"need-plugin", required_argument, 0, "load uWSGI plugins (exit on error)", uwsgi_opt_load_plugin, NULL, UWSGI_OPT_IMMEDIATE},
 	{"plugins-dir", required_argument, 0, "add a directory to uWSGI plugin search path", uwsgi_opt_add_string_list, &uwsgi.plugins_dir, UWSGI_OPT_IMMEDIATE},
 	{"plugin-dir", required_argument, 0, "add a directory to uWSGI plugin search path", uwsgi_opt_add_string_list, &uwsgi.plugins_dir, UWSGI_OPT_IMMEDIATE},
 	{"plugins-list", no_argument, 0, "list enabled plugins", uwsgi_opt_true, &uwsgi.plugins_list, 0},
@@ -694,6 +850,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"show-config", no_argument, 0, "show the current config reformatted as ini", uwsgi_opt_true, &uwsgi.show_config, 0},
 	{"print", required_argument, 0, "simple print", uwsgi_opt_print, NULL, 0},
 	{"cflags", no_argument, 0, "report uWSGI CFLAGS (useful for building external plugins)", uwsgi_opt_cflags, NULL, UWSGI_OPT_IMMEDIATE},
+	{"dot-h", no_argument, 0, "dump the uwsgi.h used for building the core  (useful for building external plugins)", uwsgi_opt_dot_h, NULL, UWSGI_OPT_IMMEDIATE},
 	{"version", no_argument, 0, "print uWSGI version", uwsgi_opt_print, UWSGI_VERSION, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
@@ -1084,6 +1241,10 @@ void grace_them_all(int signum) {
 
 	uwsgi_log("...gracefully killing workers...\n");
 
+#ifdef UWSGI_SSL
+	uwsgi_legion_announce_death();
+#endif
+
 	if (uwsgi.unsubscribe_on_graceful_reload) {
 		uwsgi_unsubscribe_all();
 	}
@@ -1153,6 +1314,10 @@ void reap_them_all(int signum) {
 
 	uwsgi_log("...brutally killing workers...\n");
 
+#ifdef UWSGI_SSL
+        uwsgi_legion_announce_death();
+#endif
+
 	// unsubscribe if needed
 	uwsgi_unsubscribe_all();
 
@@ -1234,7 +1399,7 @@ void what_i_am_doing() {
 		for (i = 0; i < uwsgi.cores; i++) {
 			wsgi_req = &uwsgi.workers[uwsgi.mywid].cores[i].req;
 			if (wsgi_req->uri_len > 0) {
-#ifdef __sun__
+#if defined(__sun__) && !defined(__clang__)
 				ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, ctime_storage, 26);
 #else
 				ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, ctime_storage);
@@ -1251,7 +1416,7 @@ void what_i_am_doing() {
 	else {
 		wsgi_req = &uwsgi.workers[uwsgi.mywid].cores[0].req;
 		if (wsgi_req->uri_len > 0) {
-#ifdef __sun__
+#if defined(__sun__) && !defined(__clang__)
 			ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, ctime_storage, 26);
 #else
 			ctime_r((const time_t *) &wsgi_req->start_of_request_in_sec, ctime_storage);
@@ -1289,16 +1454,24 @@ struct uwsgi_plugin unconfigured_plugin = {
 
 void uwsgi_exec_atexit(void) {
 	if (getpid() == masterpid) {
+	
+		uwsgi_hooks_run(uwsgi.hook_as_user_atexit, "atexit", 0);
 		// now run exit scripts needed by the user
-		struct uwsgi_string_list *usl = uwsgi.exec_as_user_atexit;
-		while (usl) {
+		struct uwsgi_string_list *usl;
+
+		uwsgi_foreach(usl, uwsgi.exec_as_user_atexit) {
 			uwsgi_log("running \"%s\" (as uid: %d gid: %d) ...\n", usl->value, (int) getuid(), (int) getgid());
 			int ret = uwsgi_run_command_and_wait(NULL, usl->value);
 			if (ret != 0) {
 				uwsgi_log("command \"%s\" exited with non-zero code: %d\n", usl->value, ret);
 			}
-			usl = usl->next;
 		}
+
+		uwsgi_foreach(usl, uwsgi.call_as_user_atexit) {
+                	if (uwsgi_call_symbol(usl->value)) {
+                        	uwsgi_log("unaable to call function \"%s\"\n", usl->value);
+                	}
+        	}
 	}
 }
 
@@ -1340,6 +1513,13 @@ static void vacuum(void) {
 			}
 			while (uwsgi_sock) {
 				if (uwsgi_sock->family == AF_UNIX && uwsgi_sock->name[0] != '@') {
+					struct stat st;
+					if (!stat(uwsgi_sock->name, &st)) {
+						if (st.st_ino != uwsgi_sock->inode) {
+							uwsgi_log("VACUUM WARNING: unix socket %s changed inode. Skip removal\n", uwsgi_sock->name);
+							goto next;
+						}
+					}
 					if (unlink(uwsgi_sock->name)) {
 						uwsgi_error("unlink()");
 					}
@@ -1347,6 +1527,7 @@ static void vacuum(void) {
 						uwsgi_log("VACUUM: unix socket %s removed.\n", uwsgi_sock->name);
 					}
 				}
+next:
 				uwsgi_sock = uwsgi_sock->next;
 			}
 		}
@@ -1404,14 +1585,17 @@ void signal_pidfile(int sig, char *filename) {
 	exit(0);
 }
 
-void fixup_argv_and_environ(int argc, char **argv, char **environ) {
-
+static void fixup_argv_and_environ(int argc, char **argv, char **environ, char **envp) {
 
 	uwsgi.orig_argv = argv;
 	uwsgi.argv = argv;
 	uwsgi.argc = argc;
 	uwsgi.environ = environ;
 
+	// avoid messing with fake environ
+	if (envp && *environ != *envp) return;
+	
+
 #if defined(__linux__) || defined(__sun__)
 
 	int i;
@@ -1485,7 +1669,7 @@ void uwsgi_plugins_atexit(void) {
 
 void uwsgi_backtrace(int depth) {
 
-#if defined(__linux__) || defined(__APPLE__) || defined(UWSGI_HAS_EXECINFO)
+#if defined(__linux__) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO)
 
 #include <execinfo.h>
 
@@ -1528,6 +1712,8 @@ void uwsgi_segfault(int signum) {
 	uwsgi_log("!!! uWSGI process %d got Segmentation Fault !!!\n", (int) getpid());
 	uwsgi_backtrace(uwsgi.backtrace_depth);
 
+	if (uwsgi.use_abort) abort();
+
 	// restore default handler to generate core
 	signal(signum, SIG_DFL);
 	kill(getpid(), signum);
@@ -1541,6 +1727,8 @@ void uwsgi_fpe(int signum) {
 	uwsgi_log("!!! uWSGI process %d got Floating Point Exception !!!\n", (int) getpid());
 	uwsgi_backtrace(uwsgi.backtrace_depth);
 
+	if (uwsgi.use_abort) abort();
+
 	// restore default handler to generate core
 	signal(signum, SIG_DFL);
 	kill(getpid(), signum);
@@ -1738,6 +1926,8 @@ int main(int argc, char *argv[], char *envp[]) {
 	uwsgi_register_clock(&uwsgi_unix_clock);
 	uwsgi_set_clock("unix");
 
+	// fallback config
+	atexit(uwsgi_fallback_config);
 	// manage/flush logs
 	atexit(uwsgi_flush_logs);
 	// clear sockets, pidfiles...
@@ -1819,7 +2009,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	uwsgi.binary_path = uwsgi_get_binary_path(argv[0]);
 
 	// ok we can now safely play with argv and environ
-	fixup_argv_and_environ(argc, argv, environ);
+	fixup_argv_and_environ(argc, argv, environ, envp);
 
 	if (gethostname(uwsgi.hostname, 255)) {
 		uwsgi_error("gethostname()");
@@ -1835,6 +2025,10 @@ int main(int argc, char *argv[], char *envp[]) {
 	uwsgi_register_embedded_routers();
 #endif
 
+	// call here to allows plugin to override hooks
+	uwsgi_register_base_hooks();
+	uwsgi_log_encoders_register_embedded();
+
 	//initialize embedded plugins
 	UWSGI_LOAD_EMBEDDED_PLUGINS
 		// now a bit of magic, if the executable basename contains a 'uwsgi_' string,
@@ -1882,6 +2076,9 @@ int main(int argc, char *argv[], char *envp[]) {
 	// ok, the options dictionary is available, lets manage it
 	uwsgi_configure();
 
+	// manage envdirs ASAP
+	uwsgi_envdirs(uwsgi.envdirs);
+
 	// --get management
 	struct uwsgi_string_list *get_list = uwsgi.get_list;
 	while(get_list) {
@@ -1916,7 +2113,7 @@ int main(int argc, char *argv[], char *envp[]) {
 		uwsgi_opt_flock(NULL, uwsgi.flock_wait2, NULL);
 
 	// setup master logging
-	if (uwsgi.log_master)
+	if (uwsgi.log_master && !uwsgi.daemonize2)
 		uwsgi_setup_log_master();
 
 	// setup offload engines
@@ -2056,6 +2253,8 @@ int main(int argc, char *argv[], char *envp[]) {
 
 #ifdef UWSGI_ROUTING
 	uwsgi_routing_dump();
+#else
+	uwsgi_log("!!! no internal routing support, rebuild with pcre support !!!\n");
 #endif
 
 	// initialize shared sockets
@@ -2066,16 +2265,38 @@ int main(int argc, char *argv[], char *envp[]) {
 		uwsgi_emperor_start();
 	}
 
-	// run the pre-jail scripts
-	struct uwsgi_string_list *usl = uwsgi.exec_pre_jail;
-	while (usl) {
-		uwsgi_log("running \"%s\" (pre-jail)...\n", usl->value);
-		int ret = uwsgi_run_command_and_wait(NULL, usl->value);
-		if (ret != 0) {
-			uwsgi_log("command \"%s\" exited with non-zero code: %d\n", usl->value, ret);
-			exit(1);
+	if (!uwsgi.reloads) {
+		uwsgi_hooks_run(uwsgi.hook_pre_jail, "pre-jail", 1);
+		struct uwsgi_string_list *usl = NULL;
+		uwsgi_foreach(usl, uwsgi.mount_pre_jail) {
+                                uwsgi_log("mounting \"%s\" (pre-jail)...\n", usl->value);
+                                if (uwsgi_mount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+
+                        uwsgi_foreach(usl, uwsgi.umount_pre_jail) {
+                                uwsgi_log("un-mounting \"%s\" (pre-jail)...\n", usl->value);
+                                if (uwsgi_umount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+		// run the pre-jail scripts
+		uwsgi_foreach(usl, uwsgi.exec_pre_jail) {
+			uwsgi_log("running \"%s\" (pre-jail)...\n", usl->value);
+			int ret = uwsgi_run_command_and_wait(NULL, usl->value);
+			if (ret != 0) {
+				uwsgi_log("command \"%s\" exited with non-zero code: %d\n", usl->value, ret);
+				exit(1);
+			}
+		}
+
+		uwsgi_foreach(usl, uwsgi.call_pre_jail) {
+			if (uwsgi_call_symbol(usl->value)) {
+				uwsgi_log("unaable to call function \"%s\"\n", usl->value);
+				exit(1);
+			}
 		}
-		usl = usl->next;
 	}
 
 	// we could now patch the binary
@@ -2130,9 +2351,44 @@ int uwsgi_start(void *v_argv) {
 	}
 #endif
 
+	uwsgi_hooks_run(uwsgi.hook_in_jail, "in-jail", 1);
+
+	struct uwsgi_string_list *usl;
+
+	uwsgi_foreach(usl, uwsgi.mount_in_jail) {
+                                uwsgi_log("mounting \"%s\" (in-jail)...\n", usl->value);
+                                if (uwsgi_mount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+
+                        uwsgi_foreach(usl, uwsgi.umount_in_jail) {
+                                uwsgi_log("un-mounting \"%s\" (in-jail)...\n", usl->value);
+                                if (uwsgi_umount_hook(usl->value)) {
+                                        exit(1);
+                                }
+                        }
+
+	uwsgi_foreach(usl, uwsgi.exec_in_jail) {
+                uwsgi_log("running \"%s\" (in-jail)...\n", usl->value);
+                int ret = uwsgi_run_command_and_wait(NULL, usl->value);
+                if (ret != 0) {
+                        uwsgi_log("command \"%s\" exited with non-zero code: %d\n", usl->value, ret);
+                        exit(1);
+                }
+        }
+
+        uwsgi_foreach(usl, uwsgi.call_in_jail) {
+                if (uwsgi_call_symbol(usl->value)) {
+                        uwsgi_log("unable to call function \"%s\"\n", usl->value);
+			exit(1);
+                }
+        }
+
+
 	uwsgi_file_write_do(uwsgi.file_write_list);
 
-	if (!uwsgi.master_as_root && !uwsgi.chown_socket) {
+	if (!uwsgi.master_as_root && !uwsgi.chown_socket && !uwsgi.drop_after_init && !uwsgi.drop_after_apps) {
 		uwsgi_as_root();
 	}
 
@@ -2237,7 +2493,11 @@ int uwsgi_start(void *v_argv) {
 	// build mime.types dictionary
 	if (uwsgi.build_mime_dict) {
 		if (!uwsgi.mime_file)
+#ifdef __APPLE__
+			uwsgi_string_new_list(&uwsgi.mime_file, "/etc/apache2/mime.types");
+#else
 			uwsgi_string_new_list(&uwsgi.mime_file, "/etc/mime.types");
+#endif
 		struct uwsgi_string_list *umd = uwsgi.mime_file;
 		while (umd) {
 			if (!access(umd->value, R_OK)) {
@@ -2280,6 +2540,12 @@ int uwsgi_start(void *v_argv) {
 
 	// setup locking
 	uwsgi_setup_locking();
+	if (uwsgi.use_thunder_lock) {
+		uwsgi_log("thunder lock: enabled\n");
+	}
+	else {
+		uwsgi_log("thunder lock: disabled (you can enable it with --thunder-lock)\n");
+	}
 
 	// allocate rpc structures
         uwsgi_rpc_init();
@@ -2372,6 +2638,11 @@ int uwsgi_start(void *v_argv) {
 		}
 	}
 
+	if (uwsgi.drop_after_init) {
+		uwsgi_as_root();
+	}
+
+
 	/* gp/plugin initialization */
 	for (i = 0; i < uwsgi.gp_cnt; i++) {
 		if (uwsgi.gp[i]->post_init) {
@@ -2439,6 +2710,11 @@ int uwsgi_start(void *v_argv) {
 	else if (!uwsgi.sockets && ushared->gateways_cnt && !uwsgi.no_server && !uwsgi.master_process) {
 		// here we will have a zombie... sorry
 		uwsgi_log("...you should enable the master process... really...\n");
+		if (uwsgi.force_gateway) {
+			struct uwsgi_gateway *ug = &ushared->gateways[0];
+			ug->loop(0, ug->data);
+			// when we are here the gateway is dead :(
+		}
 		exit(0);
 	}
 
@@ -2573,7 +2849,7 @@ unsafe:
 		}
 	}
 
-	// initialize locks and socket as soon as possibile, as the master could enqueue tasks
+	// initialize locks and socket as soon as possible, as the master could enqueue tasks
 	if (uwsgi.spoolers != NULL && (uwsgi.sockets || uwsgi.loop)) {
 		create_signal_pipe(uwsgi.shared->spooler_signal_pipe);
 		struct uwsgi_spooler *uspool = uwsgi.spoolers;
@@ -2606,6 +2882,10 @@ next:
 		uwsgi_init_all_apps();
 	}
 
+	if (uwsgi.drop_after_apps) {
+		uwsgi_as_root();
+	}
+
 	// postinit apps (setup specific features after app initialization)
 	for (i = 0; i < 256; i++) {
 		if (uwsgi.p[i]->postinit_apps) {
@@ -2794,7 +3074,7 @@ next2:
 			exit(1);
 		}
 
-		if (uwsgi.sockets->fd != 0) {
+		if (uwsgi.sockets->fd != 0 && !uwsgi.honour_stdin) {
 			if (dup2(uwsgi.sockets->fd, 0) < 0) {
 				uwsgi_error("dup2()");
 			}
@@ -2832,6 +3112,34 @@ next2:
 		}
 	}
 
+	for (i = 0; i < uwsgi.gp_cnt; i++) {
+                if (uwsgi.gp[i]->post_fork) {
+                        uwsgi.gp[i]->post_fork();
+                }
+        }
+
+	if (uwsgi.worker_exec2) {
+                char *w_argv[2];
+                w_argv[0] = uwsgi.worker_exec2;
+                w_argv[1] = NULL;
+
+                uwsgi.sockets->arg &= (~O_NONBLOCK);
+                if (fcntl(uwsgi.sockets->fd, F_SETFL, uwsgi.sockets->arg) < 0) {
+                        uwsgi_error("fcntl()");
+                        exit(1);
+                }
+
+                if (uwsgi.sockets->fd != 0 && !uwsgi.honour_stdin) {
+                        if (dup2(uwsgi.sockets->fd, 0) < 0) {
+                                uwsgi_error("dup2()");
+                        }
+                }
+                execvp(w_argv[0], w_argv);
+                // never here
+                uwsgi_error("execvp()");
+                exit(1);
+        }
+
 	uwsgi_worker_run();
 	// never here
 	_exit(0);
@@ -3129,7 +3437,7 @@ void build_options() {
 
 /*
 
-this function build the help output from the uwsgi.options structure
+this function builds the help output from the uwsgi.options structure
 
 */
 void uwsgi_help(char *opt, char *val, void *none) {
@@ -3171,6 +3479,8 @@ void uwsgi_init_all_apps() {
 
 	int i, j;
 
+	uwsgi_hooks_run(uwsgi.hook_pre_app, "pre app", 1);
+
 	// now run the pre-app scripts
 	struct uwsgi_string_list *usl = uwsgi.exec_pre_app;
 	while (usl) {
@@ -3183,6 +3493,13 @@ void uwsgi_init_all_apps() {
 		usl = usl->next;
 	}
 
+	uwsgi_foreach(usl, uwsgi.call_pre_app) {
+                if (uwsgi_call_symbol(usl->value)) {
+                        uwsgi_log("unaable to call function \"%s\"\n", usl->value);
+			exit(1);
+                }
+        }
+
 
 	for (i = 0; i < 256; i++) {
 		if (uwsgi.p[i]->init_apps) {
@@ -3231,6 +3548,8 @@ void uwsgi_init_all_apps() {
 		}
 	}
 
+	uwsgi_hooks_run(uwsgi.hook_post_app, "post app", 1);
+
 	usl = uwsgi.exec_post_app;
         while (usl) {
                 uwsgi_log("running \"%s\" (post app)...\n", usl->value);
@@ -3242,6 +3561,11 @@ void uwsgi_init_all_apps() {
                 usl = usl->next;
         }
 
+	uwsgi_foreach(usl, uwsgi.call_post_app) {
+                if (uwsgi_call_symbol(usl->value)) {
+                        uwsgi_log("unaable to call function \"%s\"\n", usl->value);
+                }
+        }
 
 }
 
@@ -3387,7 +3711,9 @@ void uwsgi_opt_set_16bit(char *opt, char *value, void *key) {
         uint16_t *ptr = (uint16_t *) key;
 
         if (value) {
-                *ptr = (strtoul(value, NULL, 10));
+		unsigned long n = strtoul(value, NULL, 10);
+		if (n > 65535) n = 65535;
+                *ptr = n;
         }
         else {
                 *ptr = 1;
@@ -3636,8 +3962,8 @@ void uwsgi_opt_set_cap(char *opt, char *value, void *none) {
 }
 #endif
 #ifdef __linux__
-void uwsgi_opt_set_unshare(char *opt, char *value, void *none) {
-	uwsgi_build_unshare(value);
+void uwsgi_opt_set_unshare(char *opt, char *value, void *mask) {
+	uwsgi_build_unshare(value, (int *) mask);
 }
 #endif
 
@@ -3648,9 +3974,13 @@ void uwsgi_opt_set_env(char *opt, char *value, void *none) {
 }
 
 void uwsgi_opt_unset_env(char *opt, char *value, void *none) {
+#ifdef UNSETENV_VOID
+	unsetenv(value);
+#else
 	if (unsetenv(value)) {
 		uwsgi_error("unsetenv()");
 	}
+#endif
 }
 
 void uwsgi_opt_pidfile_signal(char *opt, char *pidfile, void *sig) {
@@ -3678,6 +4008,10 @@ void uwsgi_opt_load_plugin(char *opt, char *value, void *none) {
 		if (uwsgi_load_plugin(-1, p, NULL)) {
 			build_options();
 		}
+		else if (!uwsgi_startswith(opt, "need-", 5)) {
+			uwsgi_log("unable to load plugin \"%s\"\n", p);
+			exit(1);
+		}
 		p = strtok(NULL, ",");
 	}
 	free(p);
@@ -4058,20 +4392,61 @@ void uwsgi_opt_flock_wait(char *opt, char *filename, void *none) {
 // report CFLAGS used for compiling the server
 // use that values to build external plugins
 void uwsgi_opt_cflags(char *opt, char *filename, void *foobar) {
-	size_t len = sizeof(UWSGI_CFLAGS);
-	char *src = UWSGI_CFLAGS;
-	char *ptr = uwsgi_malloc(len / 2);
-	char *base = ptr;
-	size_t i;
-	unsigned int u;
-	for (i = 0; i < len; i += 2) {
-		sscanf(src + i, "%2x", &u);
-		*ptr++ = (char) u;
-	}
-	fprintf(stdout, "%.*s\n", (int) len / 2, base);
+	fprintf(stdout, "%s\n", uwsgi_get_cflags());
 	exit(0);
 }
 
+char *uwsgi_get_cflags() {
+	size_t len = sizeof(UWSGI_CFLAGS) -1;
+        char *src = UWSGI_CFLAGS;
+        char *ptr = uwsgi_malloc((len / 2) + 1);
+        char *base = ptr;
+        size_t i;
+        unsigned int u;
+        for (i = 0; i < len; i += 2) {
+                sscanf(src + i, "%2x", &u);
+                *ptr++ = (char) u;
+        }
+	*ptr ++= 0;
+	return base;
+}
+
+// report uwsgi.h used for compiling the server
+// use that values to build external plugins
+extern char *uwsgi_dot_h;
+char *uwsgi_get_dot_h() {
+	char *src = uwsgi_dot_h;
+	size_t len = strlen(src);
+        char *ptr = uwsgi_malloc(len / 2);
+        char *base = ptr;
+        size_t i;
+        unsigned int u;
+        for (i = 0; i < len; i += 2) {
+                sscanf(src + i, "%2x", &u);
+                *ptr++ = (char) u;
+        }
+#ifdef UWSGI_ZLIB
+	struct uwsgi_buffer *ub = uwsgi_zlib_decompress(base, ptr-base);
+	if (!ub) {
+		free(base);
+		return "";
+	}
+	// add final null byte
+	uwsgi_buffer_append(ub, "\0", 1);
+	free(base);
+	// base is the final blob
+	base = ub->buf;
+	ub->buf = NULL;
+	uwsgi_buffer_destroy(ub);
+#endif
+	return base;
+}
+void uwsgi_opt_dot_h(char *opt, char *filename, void *foobar) {
+        fprintf(stdout, "%s\n", uwsgi_get_dot_h());
+        exit(0);
+}
+
+
 void uwsgi_opt_connect_and_read(char *opt, char *address, void *foobar) {
 
 	char buf[8192];
@@ -4108,9 +4483,9 @@ void uwsgi_opt_extract(char *opt, char *address, void *foobar) {
 }
 
 void uwsgi_print_sym(char *opt, char *symbol, void *foobar) {
-	char *sym = dlsym(RTLD_DEFAULT, symbol);
+	char **sym = dlsym(RTLD_DEFAULT, symbol);
 	if (sym) {
-		uwsgi_log("%s", sym);
+		uwsgi_log("%s", *sym);
 		exit(0);
 	}
 	

core/writer.c

@@ -120,6 +120,19 @@ error:
 
 //each protocol has its header generator
 static int uwsgi_response_add_header_do(struct wsgi_request *wsgi_req, char *key, uint16_t key_len, char *value, uint16_t value_len) {
+
+
+	// collect the header ?
+	struct uwsgi_string_list *usl = NULL;
+
+	uwsgi_foreach(usl, uwsgi.collect_headers) {
+		if (!uwsgi_strnicmp(key, key_len, usl->value, usl->custom)) {
+			if (!uwsgi_req_append(wsgi_req, usl->custom_ptr, usl->custom2, value, value_len)) {
+				wsgi_req->write_errors++ ; return -1;
+			}
+		}
+	}
+
         if (!wsgi_req->headers) {
                 wsgi_req->headers = uwsgi_buffer_new(uwsgi.page_size);
                 wsgi_req->headers->limit = UMAX16;
@@ -171,6 +184,16 @@ int uwsgi_response_write_headers_do(struct wsgi_request *wsgi_req) {
 		return UWSGI_OK;
 	}
 
+#ifdef UWSGI_ROUTING
+        // apply response routes
+        if (uwsgi_apply_response_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
+                // from now on ignore write body requests...
+                wsgi_req->ignore_body = 1;
+                return -1;
+        }
+        wsgi_req->is_response_routing = 0;
+#endif
+
 	struct uwsgi_string_list *ah = uwsgi.additional_headers;
 	while(ah) {
 		if (uwsgi_response_add_header(wsgi_req, NULL, 0, ah->value, ah->len)) return -1;
@@ -221,6 +244,19 @@ int uwsgi_response_write_body_do(struct wsgi_request *wsgi_req, char *buf, size_
 	if (wsgi_req->write_errors) return -1;
 	if (wsgi_req->ignore_body) return UWSGI_OK;
 
+#ifdef UWSGI_ROUTING
+	// special case here, we could need to set transformations before
+	if (!wsgi_req->headers_sent) {
+        	// apply response routes
+        	if (uwsgi_apply_response_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
+                	// from now on ignore write body requests...
+                	wsgi_req->ignore_body = 1;
+                	return -1;
+        	}
+        	wsgi_req->is_response_routing = 0;
+	}
+#endif
+
 	// if the transformation chain returns 1, we are in buffering mode
 	if (wsgi_req->transformed_chunk_len == 0 && wsgi_req->transformations) {
 		int t_ret = uwsgi_apply_transformations(wsgi_req, buf, len);

core/zeus.c

@@ -0,0 +1,66 @@
+/*
+
+	*** WORK IN PROGRESS ***
+
+	Zeus mode
+
+	A Zeus instance can load all of the available imperial monitor plugins, but instead of spawning
+	vassals it delegates actions to Emperors connected to it.
+
+	The Zeus instance try to distribute vassals evenly between Emperors.
+
+	Emperors register to one (ore more, maybe...) Zeus instance, passing various informations (like the maximum number
+	of vassals it can manage)
+
+	to spawn a Zeus:
+
+
+	# unencrypted mode
+	uwsgi --zeus "192.168.173.17:4040 /etc/uwsgi/vassals"
+	# crypted mode
+	uwsgi --zeus "192.168.173.17:4040,foobar.crt,foobar.key /etc/uwsgi/vassals"
+	# crypted + authentication mode
+	uwsgi --zeus "192.168.173.17:4040,foobar.crt,foobar.key,clients.pem /etc/uwsgi/vassals"
+
+
+	to connect an Emperor to Zeus
+
+	# unencrypted mode
+	uwsgi --emperor zeus:192.168.173.17:4040
+	# crypted mode
+	uwsgi --emperor zeus-ssl:192.168.173.17:4040
+	# crypted + authentication mode
+	uwsgi --emperor zeus-ssl:192.168.173.17:4040,myself.key
+
+
+	Protocol
+
+	(each message is a basic uwsgi packet: modifier1 pktsize modifier2 payload)
+	
+	modifier2 identifies the type of the message
+
+	0 -> I_AM_ALIVE {node: 'node001', max_vassals: '100', running_vassals: '17'} [ emperor -> zeus ]
+
+	1 -> NEW_VASSAL {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	2 -> ACCEPTED_VASSAL {name: 'foobar.ini'} [ emperor -> zeus ]
+
+        3 -> CONFIG_CHUNK {name: 'foobar.ini', body: '[uwsgi].....'} [ zeus -> the choosen emperor ]
+
+	4 -> CONFIG_END {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	5 -> VASSAL_SPAWNED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+	6 -> VASSAL_REJECTED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+	7 -> VASSAL_RELOAD {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	8 -> VASSAL_UPDATE {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	9 -> VASSAL_DESTROY {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	10 -> VASSAL_RELOADED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+	11 -> VASSAL_DESTROYED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+*/

core/zlib.c

@@ -2,6 +2,8 @@
 
 char gzheader[10] = { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
 
+extern struct uwsgi_server uwsgi;
+
 char *uwsgi_gzip_chunk(z_stream *z, uint32_t *crc32, char *buf, size_t len, size_t *dlen) {
 	uwsgi_crc32(crc32, buf, len);
 	return uwsgi_deflate(z, buf, len, dlen);
@@ -38,6 +40,45 @@ end:
 	return ub;
 }
 
+struct uwsgi_buffer *uwsgi_zlib_decompress(char *buf, size_t len) {
+        z_stream z;
+
+	z.zalloc = Z_NULL;
+        z.zfree = Z_NULL;
+        z.opaque = Z_NULL;
+        if (inflateInit(&z) != Z_OK) {
+		return NULL;
+        }
+
+        struct uwsgi_buffer *ub = uwsgi_buffer_new(uwsgi.page_size);
+	unsigned char out[8192];
+
+	z.next_in = (unsigned char *)buf;
+	z.avail_in = len;
+	z.next_out = out;
+
+	do {
+		z.avail_out = 8192;
+		z.next_out = out;
+		int ret = inflate(&z, Z_NO_FLUSH);
+		if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT || ret == Z_DATA_ERROR || ret == Z_MEM_ERROR) {
+			uwsgi_buffer_destroy(ub);
+			ub = NULL;
+			goto end;			
+		}
+		if (uwsgi_buffer_append(ub, (char *)out, 8192 - z.avail_out)) {
+			uwsgi_buffer_destroy(ub);
+			ub = NULL;
+			goto end;			
+		}
+	}
+	while (z.avail_out == 0);
+end:
+        inflateEnd(&z);
+        return ub;
+}
+
+
 int uwsgi_deflate_init(z_stream *z, char *dict, size_t dict_len) {
         z->zalloc = Z_NULL;
         z->zfree = Z_NULL;
@@ -54,6 +95,21 @@ int uwsgi_deflate_init(z_stream *z, char *dict, size_t dict_len) {
 	return 0;
 }
 
+int uwsgi_inflate_init(z_stream *z, char *dict, size_t dict_len) {
+        z->zalloc = Z_NULL;
+        z->zfree = Z_NULL;
+        z->opaque = Z_NULL;
+        if (inflateInit2(z, 16+MAX_WBITS) != Z_OK) {
+                return -1;
+        }
+        if (dict && dict_len) {
+                if (inflateSetDictionary(z, (Bytef *) dict, dict_len) != Z_OK) {
+                        return -1;
+                }
+        }
+        return 0;
+}
+
 int uwsgi_gzip_prepare(z_stream *z, char *dict, size_t dict_len, uint32_t *crc32) {
 	uwsgi_crc32(crc32, NULL, 0);
 	if (uwsgi_deflate_init(z, NULL, 0)) return -1;

examples/xmlindex-html.xsl

@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:html="http://www.w3.org/TR/html4/"
+  xmlns="http://www.w3.org/TR/html4/"
+  exclude-result-prefixes="html">
+  <xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Strict//EN"
+    indent="yes" doctype-system="http://www.w3.org/TR/html4/strict.dtd"
+    encoding="UTF-8" />
+
+  <xsl:template name="format-date">
+    <xsl:param name="date" />
+
+    <xsl:value-of select="substring-before($date, 'T')" />
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="substring-after($date, 'T')" />
+  </xsl:template>
+
+  <xsl:template match="index">
+    <html>
+    <head>
+    <xsl:choose>
+      <xsl:when test="$stylesheet">
+      <link rel="stylesheet" type="text/css" media="all" href="{$stylesheet}" />
+      </xsl:when>
+      <xsl:otherwise>
+      <style type="text/css">
+      html {
+        color: #000000;
+        background-color: #fefefe;
+        font-family: sans-serif;
+      }
+      h1 {
+        font-size: 1.5em;
+        font-weight: bold;
+        margin: .67em 0;
+      }
+      th {
+        text-align: left;
+      }
+      td {
+        font-family: mono;
+      }
+      td, th {
+        padding: 0 1em;
+      }
+      td.size {
+        text-align: right;
+      }
+      :link, :visited {
+        text-decoration: none;
+      }
+      :link {
+        color: #000099;
+      }
+      :visited {
+        color: #6600cc;
+      }
+      :link:hover,
+      :visited:hover {
+        text-decoration: underline;
+      }
+      :link:focus,
+      :visited:focus {
+        text-decoration: underline;
+      }
+      :link:active,
+      :visited:active {
+        text-decoration: underline;
+      }
+      </style>
+      </xsl:otherwise>
+    </xsl:choose>
+    <title>Index of <xsl:value-of select="@path" /></title>
+    </head>
+    <body>
+    <h1>Index of <xsl:value-of select="@path" /></h1>
+    <table>
+    <tr>
+    <th class="name">Name</th>
+    <th class="mtime">Last Modified</th>
+    <th class="size">Size</th>
+    </tr>
+    <tr>
+    <td class="name" colspan="3"><a href=".." title="Parent">Parent directory</a></td>
+    </tr>
+    <xsl:apply-templates select="directory" />
+    <xsl:apply-templates select="file" />
+    </table>
+    </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="directory">
+    <tr class="directory">
+    <td class="name">
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:value-of select="." />
+        <xsl:text>/</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:value-of select="." />
+        <xsl:text>/</xsl:text>
+      </xsl:attribute>
+      <xsl:value-of select="." />
+      <xsl:text>/</xsl:text>
+    </xsl:element>
+    </td>
+    <td class="mtime">
+    <xsl:call-template name="format-date">
+      <xsl:with-param name="date" select="@mtime" />
+    </xsl:call-template>
+    </td>
+    <td class="size">
+    <xsl:value-of select="@size" />
+    </td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="file">
+    <tr class="file">
+    <td class="name">
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:value-of select="." />
+      </xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:value-of select="." />
+      </xsl:attribute>
+      <xsl:value-of select="." />
+    </xsl:element>
+    </td>
+    <td class="mtime">
+    <xsl:call-template name="format-date">
+      <xsl:with-param name="date" select="@mtime" />
+    </xsl:call-template>
+    </td>
+    <td class="size">
+    <xsl:value-of select="@size" />
+    </td>
+    </tr>
+  </xsl:template>
+</xsl:stylesheet>
+

examples/xmlindex.ini

@@ -0,0 +1,17 @@
+[uwsgi]
+plugin = 0:notfound, router_xmldir, xslt
+http-socket = :8080
+
+docroot = .
+check-static = %(docroot)
+
+route-if = isdir:%(docroot)/${PATH_INFO} goto:index
+route-run = last:
+
+route-label = index
+; uncomment to link CSS stylesheet /css/default.css
+;route-run = toxslt:stylesheet=examples/xmlindex-html.xsl,params=stylesheet=/css/default.css,content_type=text/html
+; use embedded CSS
+route-run = toxslt:stylesheet=examples/xmlindex-html.xsl,params=stylesheet=,content_type=text/html
+route-run = xmldir:%(docroot)/${PATH_INFO}
+

ext/uwsgi/extconf.rb

@@ -7,7 +7,14 @@ Net::HTTP.start("uwsgi.it") do |http|
   end
 end
 
-system("bash install.sh rack #{Dir.pwd}/uwsgi.ruby")
+major,minor = RUBY_VERSION.split('.')
+if major.to_i >= 2 or (major.to_i == 1 and minor.to_i >= 9)
+  # a trick for installations with messy PATH
+  ENV['UWSGICONFIG_RUBYPATH'] = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
+  system("bash install.sh ruby2 #{Dir.pwd}/uwsgi.ruby")
+else
+  system("bash install.sh rack #{Dir.pwd}/uwsgi.ruby")
+end
 
 open("Makefile", "w") do |file|
   file.write("all:\n")

hello_world.py

@@ -1,54 +0,0 @@
-import uwsgi
-if uwsgi.loop == 'gevent':
-    import gevent
-
-from threading import Thread
-import time
-from uwsgidecorators import postfork
-
-def foobar():
-    while True:
-        time.sleep(3)
-        print "threee second elapsed in worker %d" % uwsgi.worker_id()
-
-@postfork
-def spawn_thread():
-    t = Thread(target=foobar)
-    t.daemon = True
-    t.start()
-
-@postfork
-def spawn_thread2():
-    t = Thread(target=foobar)
-    t.daemon = True
-    t.start()
-
-def gl_func():
-    while True:
-        gevent.sleep(2)
-        print "i am a greenltet running in worker %d" % uwsgi.worker_id()
-
-@postfork
-def spawn_greenlet():
-    gevent.spawn(gl_func)
-
-print uwsgi.version
-print uwsgi.workers()
-try:
-    uwsgi.cache_set('foo', "Hello World from cache")
-except:
-    pass
-def application(env, start_response):
-    print env['wsgi.input'].read()
-    if uwsgi.loop == 'gevent':
-        gevent.sleep()
-    start_response('200 OK', [('Content-Type', 'text/html')])
-    yield "foobar<br/>"
-    if uwsgi.loop == 'gevent':
-        gevent.sleep(3)
-    yield str(env['wsgi.input'].fileno())
-    yield "<h1>Hello World</h1>"
-    try:
-        yield uwsgi.cache_get('foo')
-    except:
-        pass

hello_world_rrdtool.py

@@ -1,31 +0,0 @@
-import uwsgi
-import time
-import rrdtool
-
-# rrdtool create test.rrd --start 1270879004 -s 10 DS:requests:COUNTER:300:U:U RRA:AVERAGE:0.5:3:105120
-
-s_freq = 10
-
-# this task will be executed every s_freq seconds
-def rrdtool_updater(sig, sec):
-	rrdtool.update('test.rrd', str(int(time.time()))+':'+str(uwsgi.total_requests()))
-
-	
-uwsgi.register_timer(0, s_freq, uwsgi.KIND_WORKER, rrdtool_updater)
-	
-
-
-def hello_world(env, start_response):
-	start_response('200 Ok', [('Content-type', 'text/plain')])
-	return 'Hello world !'
-
-
-def graph(env, start_response):
-	start_response('200 Ok', [('Content-type', 'image/png')])
-	now = int(time.time())
-	graph_range = (3600*24)
-	rrdtool.graph('uwsgi_graph.png', '--start', str(now - graph_range), '--end', str(now), 'DEF:urequests=test.rrd:requests:AVERAGE', 'LINE2:urequests#00FF00')
-	# send file to client
-	uwsgi.sendfile('uwsgi_graph.png')
-
-uwsgi.applications = {'/': hello_world, '/graph':graph}

lib/linux_ns.c

@@ -66,11 +66,17 @@ void linux_namespace_start(void *argv) {
 			uwsgi_error("clone()");
 			exit(1);
 		}
-
+#if defined(MS_REC) && defined(MS_PRIVATE)
+		if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL)) {
+			uwsgi_error("mount()");
+			exit(1);
+		}
+#endif
 		// run the post-jail scripts
 		if (setenv("UWSGI_JAIL_PID", uwsgi_num2str((int) pid), 1)) {
 			uwsgi_error("setenv()");
 		}
+		uwsgi_hooks_run(uwsgi.hook_post_jail, "post-jail", 1);
         	struct uwsgi_string_list *usl = uwsgi.exec_post_jail;
         	while(usl) {
                 	uwsgi_log("running \"%s\" (post-jail)...\n", usl->value);
@@ -82,6 +88,13 @@ void linux_namespace_start(void *argv) {
                 	usl = usl->next;
         	}
 
+		uwsgi_foreach(usl, uwsgi.call_post_jail) {
+                        if (uwsgi_call_symbol(usl->value)) {
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+				exit(1);
+                        }
+                }
+
 		uwsgi_log("waiting for jailed master (pid: %d) death...\n", (int) pid);
 		pid = waitpid(pid, &waitpid_status, 0);
 		if (pid < 0) {
@@ -167,6 +180,7 @@ void linux_namespace_jail() {
 	uwsgi_log("remounting /proc\n");
 	if (mount("proc", "/proc", "proc", 0, NULL)) {
 		uwsgi_error("mount()");
+		exit(1);
 	}
 
 	struct uwsgi_string_list *usl = uwsgi.ns_keep_mount;

logo_uWSGI.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+   width="768px" height="272.667px" viewBox="0 0 768 272.667" enable-background="new 0 0 768 272.667" xml:space="preserve">
+<g>
+	<path fill="#AEC84D" d="M170.667,41.334"/>
+	<path fill="#AEC84D" d="M46.167,106.667v92.5c0,0-0.667,52.667,48.5,51.5c7.667-0.333,36,1,43-21c0-0.5,0,17,0,17h34l0.062-140h-34
+		l-0.062,86.5c0,0,1,31-28,29.5s-28.5-27-28.5-27l-0.167-89H46.167z"/>
+	<polygon fill="#141215" points="227,250.334 241,250.334 286.667,137.334 332.333,250.001 346.333,250.001 403,41.334 
+		368.667,32.667 334.333,161.667 293.667,60.001 279.333,60.001 240,160.667 204.667,32.667 170.667,41.334 	"/>
+	<path fill="#141215" d="M402,203c0,0,8.667,26.001,23,35.334s38.666,12.999,50.333,12.666s71.001-1.333,71.667-56.333
+		c5-28-19.333-48.334-26-52.334s-28.334-18-45.667-23s-34.334-16-35.667-24.666s0.001-34,37.334-34.334
+		c26,2.668,27,13.668,31,19.668l7,14.332l28.666-13.332c0,0-11.334-27-14-29.334s-13.333-19-55.333-18.666
+		c-42,0.332-66.666,17.666-68.333,47.666s4.666,44,35.333,62.666c19,10.334,39.001,12.667,59.667,28.334
+		c14.333,11.667,11.334,25.001,11,30.667s-7.334,21.666-36.334,20.333S441,209.668,439,206.334s-9-17-9-17L402,203z"/>
+	<rect x="710.667" y="36.334" fill="#141215" width="35.333" height="211.333"/>
+	<path fill="#141215" d="M636.333,135.001v27.666h27.333v56c0,0-8.334,5.001-26.667,4.334s-47.332,1.666-49.666-81.667
+		s37.334-80.667,42-80.667s28,0.334,40,33.334C669.667,94.334,698,80.667,698,80.667s-12.334-50.333-67-47.666
+		c-54.666,2.666-75.666,30.999-78.666,102c-3,71,21.999,117.334,81.666,115s64-7.334,64-7.334l-0.083-107.583L636.333,135.001z"/>
+	<g>
+		<circle fill="#AEC84D" cx="521.333" cy="71.001" r="11.667"/>
+		<circle fill="#252326" cx="521.333" cy="71.001" r="3.5"/>
+	</g>
+	<g>
+		<path fill="none" d="M81.147,185.163L81,106.667H46.167v90.88C56.139,192.016,68.027,187.752,81.147,185.163z"/>
+		<path fill="none" d="M171.729,106.667h-34l-0.057,78.023c12.606,2.254,24.141,6.043,34.017,11.019L171.729,106.667z"/>
+		<path opacity="0.1" fill="#FFFFFF" d="M46.167,199.167c0,0-0.667,52.667,48.5,51.5c7.667-0.333,36,1,43-21c0-0.5,0,17,0,17h34
+			l0.023-50.958c-9.876-4.976-21.411-8.765-34.017-11.019l-0.006,8.477c0,0,1,31-28,29.5s-28.5-27-28.5-27l-0.02-10.504
+			c-13.12,2.589-25.008,6.853-34.98,12.384V199.167z"/>
+	</g>
+	<g>
+		<path fill="none" d="M342.89,129.517l-8.557,32.15l-13.896-34.738c-22.89-2.918-44.071-6.524-63.071-10.708L240,160.667
+			l-14.526-52.621c-16.399-4.896-30.286-10.312-41.175-16.132L227,250.334h14l45.667-113l45.667,112.667h14l31.898-117.459
+			C366.127,131.707,354.33,130.695,342.89,129.517z"/>
+		<path opacity="0.1" fill="#FFFFFF" d="M403,41.334l-34.333-8.667l-25.776,96.85c11.44,1.178,23.237,2.19,35.341,3.025L403,41.334z
+			"/>
+		<path opacity="0.1" fill="#FFFFFF" d="M204.667,32.667l-34,8.667l13.633,50.58c10.889,5.82,24.775,11.236,41.175,16.132
+			L204.667,32.667z"/>
+		<path opacity="0.1" fill="#FFFFFF" d="M293.667,60.001h-14.333l-21.967,56.22c19,4.185,40.182,7.79,63.071,10.708L293.667,60.001z
+			"/>
+	</g>
+	<path opacity="0.1" fill="#FFFFFF" d="M474.333,33.001c-42,0.332-66.666,17.666-68.333,47.666
+		c-1.409,25.351,2.897,39.276,22.77,54.247c10.646,0.275,21.452,0.419,32.396,0.419c15.9,0,31.514-0.299,46.756-0.872
+		c-9.466-5.486-21.856-12.032-32.589-15.128c-17.333-5-34.334-16-35.667-24.666s0.001-34,37.334-34.334
+		c26,2.668,27,13.668,31,19.668l7,14.332l28.666-13.332c0,0-11.334-27-14-29.334S516.333,32.667,474.333,33.001z"/>
+	<path opacity="0.1" fill="#FFFFFF" d="M631,33.001c-53.87,2.627-75.047,30.182-78.522,98.93c11.947-0.916,23.576-2.007,34.838-3.26
+		c1.845-70.377,37.603-68.004,42.019-68.004c4.666,0,28,0.334,40,33.334C669.667,94.334,698,80.667,698,80.667
+		S685.666,30.334,631,33.001z"/>
+	<path opacity="0.1" fill="#FFFFFF" d="M710.667,103.59c14.42-5.033,26.342-10.521,35.333-16.36V36.334h-35.333V103.59z"/>
+</g>
+</svg>

plugins/airbrake/airbrake_plugin.c

@@ -229,6 +229,7 @@ static void uwsgi_airbrake_loop(struct uwsgi_thread *ut) {
 	curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	struct curl_slist *expect = NULL; expect = curl_slist_append(expect, "Expect:");
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, expect);
+	curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
 
 	struct uwsgi_airbrake_config *uacc = (struct uwsgi_airbrake_config *) ut->data;
 	char *opts = uwsgi_str(uacc->arg);

plugins/alarm_curl/alarm_curl_plugin.c

@@ -154,6 +154,7 @@ static void uwsgi_alarm_curl_loop(struct uwsgi_thread *ut) {
 	curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	struct curl_slist *expect = NULL; expect = curl_slist_append(expect, "Expect:");
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, expect);
+	curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
 
 	struct uwsgi_alarm_curl_config *uacc = (struct uwsgi_alarm_curl_config *) ut->data;
 	char *opts = uwsgi_str(uacc->arg);

plugins/alarm_speech/uwsgiplugin.py

@@ -1,6 +1,15 @@
+import os
+
 NAME='alarm_speech'
 
-CFLAGS = []
+uwsgi_os = os.uname()[0]
+
 LDFLAGS = []
-LIBS = ['-framework appkit']
+if uwsgi_os == "Darwin":
+    CFLAGS = []
+    LIBS = ['-framework appkit']
+else:
+    CFLAGS = ['-I /usr/include/GNUstep']
+    LIBS = []
+
 GCC_LIST = ['alarm_speech.m']

plugins/corerouter/corerouter.c

@@ -10,7 +10,7 @@
 
 */
 
-#include "../../uwsgi.h"
+#include <uwsgi.h>
 
 extern struct uwsgi_server uwsgi;
 

plugins/corerouter/cr.h

@@ -23,13 +23,13 @@
         }\
         peer->out_pos += len;
 
-#define cr_write_buf(peer, buf, f) write(peer->fd, buf + buf##_pos, buf->pos - buf##_pos);\
+#define cr_write_buf(peer, ubuf, f) write(peer->fd, ubuf->buf + ubuf##_pos, ubuf->pos - ubuf##_pos);\
         if (len < 0) {\
                 cr_try_again;\
                 uwsgi_cr_error(peer, f);\
                 return -1;\
         }\
-        buf##_pos += len;
+        ubuf##_pos += len;
 
 #define cr_write_complete(peer) peer->out_pos == peer->out->pos
 

plugins/corerouter/cr_map.c

@@ -1,4 +1,4 @@
-#include "../../uwsgi.h"
+#include <uwsgi.h>
 
 #include "cr.h"
 
@@ -9,13 +9,28 @@ int uwsgi_cr_map_use_void(struct uwsgi_corerouter *ucr, struct corerouter_peer *
 }
 
 int uwsgi_cr_map_use_cache(struct uwsgi_corerouter *ucr, struct corerouter_peer *peer) {
+	uint64_t hits = 0;
 	uwsgi_rlock(ucr->cache->lock);
-	peer->instance_address = uwsgi_cache_get2(ucr->cache, peer->key, peer->key_len, &peer->instance_address_len);
+	char *value = uwsgi_cache_get4(ucr->cache, peer->key, peer->key_len, &peer->instance_address_len, &hits);
+	if (!value) goto end;
+	peer->tmp_socket_name = uwsgi_concat2n(value, peer->instance_address_len, "", 0);
+	size_t nodes = uwsgi_str_occurence(peer->tmp_socket_name, peer->instance_address_len, '|');
+	if (nodes > 0) {
+		size_t choosen_node = hits % (nodes+1);
+		size_t choosen_node_len = 0;
+		peer->instance_address = uwsgi_str_split_nget(peer->tmp_socket_name, peer->instance_address_len, '|', choosen_node, &choosen_node_len);
+		if (!peer->instance_address) goto end;
+		peer->instance_address_len = choosen_node_len;
+	}
+	else {
+		peer->instance_address = peer->tmp_socket_name;
+	}
 	char *cs_mod = uwsgi_str_contains(peer->instance_address, peer->instance_address_len, ',');
 	if (cs_mod) {
 		peer->modifier1 = uwsgi_str_num(cs_mod + 1, (peer->instance_address_len - (cs_mod - peer->instance_address)) - 1);
 		peer->instance_address_len = (cs_mod - peer->instance_address);
 	}
+end:
 	uwsgi_rwunlock(ucr->cache->lock);
 	return 0;
 }

plugins/coroae/coroae.c

@@ -161,7 +161,7 @@ request:
 #endif
 
         for(;;) {
-                if (uwsgi.p[wsgi_req->uh->modifier1]->request(wsgi_req)) {
+                if (uwsgi.p[wsgi_req->uh->modifier1]->request(wsgi_req) <= UWSGI_OK) {
                         goto end;
                 }
                 wsgi_req->switches++;
@@ -201,7 +201,18 @@ edge:
         // mark core as used
         uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request = 1;
 
-        wsgi_req->start_of_request = uwsgi_micros();
+	// accept the connection
+        if (wsgi_req_simple_accept(wsgi_req, uwsgi_sock->fd)) {
+                free_req_queue;
+                if (uwsgi_sock->retry && uwsgi_sock->retry[wsgi_req->async_id]) {
+                        goto edge;
+                }
+		// in case of errors (or thundering herd, just rest it)
+                uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request = 0;
+                goto clear;
+        }
+
+	wsgi_req->start_of_request = uwsgi_micros();
         wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
 
         // enter harakiri mode
@@ -209,14 +220,6 @@ edge:
                 set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
         }
 
-	// accept the connection
-        if (wsgi_req_simple_accept(wsgi_req, uwsgi_sock->fd)) {
-                free_req_queue;
-                if (uwsgi_sock->retry && uwsgi_sock->retry[wsgi_req->async_id]) {
-                        goto edge;
-                }
-                goto clear;
-        }
 
 	// here we spawn an async {} block
 	CV *async_xs_call = newXS(NULL, XS_coroae_accept_request, "uwsgi::coroae");

plugins/fiber/fiber.c

@@ -2,7 +2,7 @@
 
 extern struct uwsgi_server uwsgi;
 extern struct uwsgi_rack ur;
-extern struct uwsgi_plugin rack_plugin;
+static struct uwsgi_plugin *rack_plugin;
 
 struct ufib {
 	int enabled;
@@ -53,7 +53,7 @@ static void fiber_schedule_to_req() {
         }
 
 	if (error) {
-		rack_plugin.exception_log(NULL);
+		rack_plugin->exception_log(NULL);
 		rb_gc_unregister_address(&ufiber.fib[id]);
 	}
 
@@ -72,6 +72,11 @@ static void fiber_schedule_to_main(struct wsgi_request *wsgi_req) {
 }
 
 static int fiber_init() {
+	rack_plugin = uwsgi_plugin_get("rack");
+	if (!rack_plugin) {
+		uwsgi_log("[ruby-fiber] rack plugin is not loaded !!!\n");
+		exit(1);
+	}
 	return 0;
 }
 

plugins/gevent/gevent.c

@@ -19,14 +19,40 @@ static void uwsgi_opt_setup_gevent(char *opt, char *value, void *null) {
 static struct uwsgi_option gevent_options[] = {
         {"gevent", required_argument, 0, "a shortcut enabling gevent loop engine with the specified number of async cores and optimal parameters", uwsgi_opt_setup_gevent, NULL, UWSGI_OPT_THREADS},
         {"gevent-monkey-patch", no_argument, 0, "call gevent.monkey.patch_all() automatically on startup", uwsgi_opt_true, &ugevent.monkey, 0},
+        {"gevent-wait-for-hub", no_argument, 0, "wait for gevent hub's death instead of the control greenlet", uwsgi_opt_true, &ugevent.wait_for_hub, 0},
         {0, 0, 0, 0, 0, 0, 0},
 
 };
 
 
+/*
+	Dumb greenlet used for controlling the shutdown (originally uWSGI only wait for the hub)
+*/
+PyObject *py_uwsgi_gevent_ctrl_gl(PyObject *self, PyObject *args) {
+	for(;;) {
+		PyObject *gevent_sleep_args = PyTuple_New(1);
+                PyTuple_SetItem(gevent_sleep_args, 0, PyInt_FromLong(60));
+                PyObject *gswitch = PyEval_CallObject(ugevent.greenlet_switch, gevent_sleep_args);
+		// could be NULL on exception
+		if (!gswitch) {
+			// just for being paranid
+			if (PyErr_Occurred()) {
+				PyErr_Clear();
+				break;
+			}
+		}
+                Py_XDECREF(gswitch);
+                Py_DECREF(gevent_sleep_args);
+	}
+	Py_INCREF(Py_None);
+	return Py_None;
+}
 
 PyObject *py_uwsgi_gevent_graceful(PyObject *self, PyObject *args) {
 
+	int running_cores = 0;
+	int rounds = 0;
+
 	uwsgi_log("Gracefully killing worker %d (pid: %d)...\n", uwsgi.mywid, uwsgi.mypid);
         uwsgi.workers[uwsgi.mywid].manage_next_request = 0;
 
@@ -41,29 +67,34 @@ PyObject *py_uwsgi_gevent_graceful(PyObject *self, PyObject *args) {
 	}
 	uwsgi_log_verbose("main gevent watchers stopped for worker %d (pid: %d)...\n", uwsgi.mywid, uwsgi.mypid);
 
-	int running_cores = 0;
+retry:
+	running_cores = 0;
 	for(i=0;i<uwsgi.async;i++) {
 		if (uwsgi.workers[uwsgi.mywid].cores[i].in_request) {
 			struct wsgi_request *wsgi_req = &uwsgi.workers[uwsgi.mywid].cores[i].req;
-			uwsgi_log_verbose("worker %d (pid: %d) core %d is managing \"%.*s %.*s\" for %.*s\n", uwsgi.mywid, uwsgi.mypid, i, 
-				wsgi_req->method_len, wsgi_req->method, wsgi_req->uri_len, wsgi_req->uri,
-				wsgi_req->remote_addr_len, wsgi_req->remote_addr);
+			if (!rounds) {
+				uwsgi_log_verbose("worker %d (pid: %d) core %d is managing \"%.*s %.*s\" for %.*s\n", uwsgi.mywid, uwsgi.mypid, i, 
+					wsgi_req->method_len, wsgi_req->method, wsgi_req->uri_len, wsgi_req->uri,
+					wsgi_req->remote_addr_len, wsgi_req->remote_addr);
+			}
 			running_cores++;
 		}
 	}
 
 	if (running_cores > 0) {
 		uwsgi_log_verbose("waiting for %d running requests on worker %d (pid: %d)...\n", running_cores, uwsgi.mywid, uwsgi.mypid);
-	} else {
-            // no need to worry about freeing memory
-            PyObject *uwsgi_dict = get_uwsgi_pydict("uwsgi");
-            if (uwsgi_dict) {
-              PyObject *ae = PyDict_GetItemString(uwsgi_dict, "atexit");
-              if (ae) {
-                python_call(ae, PyTuple_New(0), 0, NULL);
-              }
-            }
-        }
+		PyObject *gevent_sleep_args = PyTuple_New(1);
+		PyTuple_SetItem(gevent_sleep_args, 0, PyInt_FromLong(1));
+		PyObject *gswitch = python_call(ugevent.greenlet_switch, gevent_sleep_args, 0, NULL);
+		Py_DECREF(gswitch);
+		Py_DECREF(gevent_sleep_args);
+		rounds++;
+		goto retry;
+	}
+
+	if (!ugevent.wait_for_hub) {
+		PyObject_CallMethod(ugevent.ctrl_gl, "kill", NULL);
+	}
 
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -164,14 +195,6 @@ edge:
 	// mark core as used
 	uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request = 1;
 
-	wsgi_req->start_of_request = uwsgi_micros();
-	wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
-
-	// enter harakiri mode
-        if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
-                set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
-        }
-
 	// accept the connection (since uWSGI 1.5 all of the sockets are non-blocking)
 	if (wsgi_req_simple_accept(wsgi_req, uwsgi_sock->fd)) {
 		free_req_queue;
@@ -183,6 +206,14 @@ edge:
 		goto clear;
 	}
 
+	wsgi_req->start_of_request = uwsgi_micros();
+	wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
+
+	// enter harakiri mode
+        if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+                set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
+        }
+
 	// hack to easily pass wsgi_req pointer to the greenlet
 	PyTuple_SetItem(ugevent.greenlet_args, 1, PyLong_FromLong((long)wsgi_req));
 
@@ -300,6 +331,7 @@ PyMethodDef uwsgi_gevent_signal_def[] = { {"uwsgi_gevent_signal", py_uwsgi_geven
 PyMethodDef uwsgi_gevent_my_signal_def[] = { {"uwsgi_gevent_my_signal", py_uwsgi_gevent_my_signal, METH_VARARGS, ""} };
 PyMethodDef uwsgi_gevent_signal_handler_def[] = { {"uwsgi_gevent_signal_handler", py_uwsgi_gevent_signal_handler, METH_VARARGS, ""} };
 PyMethodDef uwsgi_gevent_unix_signal_handler_def[] = { {"uwsgi_gevent_unix_signal_handler", py_uwsgi_gevent_graceful, METH_VARARGS, ""} };
+PyMethodDef uwsgi_gevent_ctrl_gl_def[] = { {"uwsgi_gevent_ctrl_gl_handler", py_uwsgi_gevent_ctrl_gl, METH_VARARGS, ""} };
 
 static void gil_gevent_get() {
 	pthread_setspecific(up.upt_gil_key, (void *) PyGILState_Ensure());
@@ -450,8 +482,21 @@ static void gevent_loop() {
 
 	python_call(ugevent.signal, ge_signal_tuple, 0, NULL);
 
+	PyObject *wait_for_me = ugevent.hub;
+
+	if (!ugevent.wait_for_hub) {
+		// spawn the control greenlet
+		PyObject *uwsgi_greenlet_ctrl_gl_handler = PyCFunction_New(uwsgi_gevent_ctrl_gl_def, NULL);
+                Py_INCREF(uwsgi_greenlet_ctrl_gl_handler);
+		PyObject *ctrl_gl_args = PyTuple_New(1);
+                PyTuple_SetItem(ctrl_gl_args, 0, uwsgi_greenlet_ctrl_gl_handler);
+        	ugevent.ctrl_gl = python_call(ugevent.spawn, ctrl_gl_args, 0, NULL);
+		Py_INCREF(ugevent.ctrl_gl);
+		wait_for_me = ugevent.ctrl_gl;
+	}
+
 	for(;;) {
-		if (!PyObject_CallMethod(ugevent.hub, "join", NULL)) {
+		if (!PyObject_CallMethod(wait_for_me, "join", NULL)) {
 			PyErr_Print();
 		}
 		else {
@@ -459,6 +504,15 @@ static void gevent_loop() {
 		}
 	}
 
+	// no need to worry about freeing memory
+        PyObject *uwsgi_dict = get_uwsgi_pydict("uwsgi");
+        if (uwsgi_dict) {
+                PyObject *ae = PyDict_GetItemString(uwsgi_dict, "atexit");
+                if (ae) {
+                        python_call(ae, PyTuple_New(0), 0, NULL);
+                }
+        }
+
 	if (uwsgi.workers[uwsgi.mywid].manage_next_request == 0) {
 		uwsgi_log("goodbye to the gevent Hub on worker %d (pid: %d)\n", uwsgi.mywid, uwsgi.mypid);
 		if (ugevent.destroy) {

plugins/gevent/gevent.h

@@ -51,7 +51,9 @@ struct uwsgi_gevent {
         PyObject *my_signal_watcher;
         PyObject *signal_watcher;
         PyObject **watchers;
+	PyObject *ctrl_gl;
 	int destroy;
 	int monkey;
+	int wait_for_hub;
 };
 

plugins/glusterfs/glusterfs.c

@@ -0,0 +1,299 @@
+#include <uwsgi.h>
+#include <api/glfs.h>
+
+#ifdef UWSGI_MATHEVAL
+#error currently the glusterfs plugins is not compatible with uWSGI built with matheval support
+#endif
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	Author: Roberto De Ioris
+
+	--glusterfs-mount mountpoint=/foo,server=192.168.173.13:24007;192.168.173.17:0,volfile=foo.vol;volume=unbit001
+
+*/
+
+struct uwsgi_plugin glusterfs_plugin;
+
+struct uwsgi_glusterfs {
+	int timeout;
+	struct uwsgi_string_list *mountpoints;
+} uglusterfs;
+
+static struct uwsgi_option uwsgi_glusterfs_options[] = {
+	{"glusterfs-mount", required_argument, 0, "virtual mount the specified glusterfs volume in a uri", uwsgi_opt_add_string_list, &uglusterfs.mountpoints, UWSGI_OPT_MIME},
+	{"glusterfs-timeout", required_argument, 0, "timeout for glusterfs async mode", uwsgi_opt_set_int, &uglusterfs.timeout, 0},
+        {0, 0, 0, 0, 0, 0, 0},
+};
+
+
+static int uwsgi_glusterfs_read_sync(struct wsgi_request *wsgi_req, glfs_fd_t *fd, size_t remains) {
+	while(remains > 0) {
+        	char buf[8192];
+                ssize_t rlen = glfs_read (fd, buf, UMIN(remains, 8192), 0);
+                if (rlen <= 0) return -1;
+                if (uwsgi_response_write_body_do(wsgi_req, buf, rlen)) return -1;
+                remains -= rlen;
+	}
+	return 0;
+}
+
+/*
+	async read of a resource
+	the uwsgi_glusterfs_async_io structure is passed between threads
+	the callback simply signal the main core about the availability of data
+*/
+struct uwsgi_glusterfs_async_io {
+	int fd[2];
+	ssize_t rlen;
+};
+
+static void uwsgi_glusterfs_read_async_cb(glfs_fd_t *fd, ssize_t rlen, void *data) {
+	struct uwsgi_glusterfs_async_io *aio = (struct uwsgi_glusterfs_async_io *) data;
+#ifdef UWSGI_DEBUG
+	uwsgi_log("[glusterfs-cb] rlen = %d\n", rlen);
+#endif
+	aio->rlen = rlen;
+	// signal the core
+	if (write(aio->fd[1], "\1", 1) <= 0) {
+		uwsgi_error("uwsgi_glusterfs_read_async_cb()/write()");
+	}
+}
+
+static int uwsgi_glusterfs_read_async(struct wsgi_request *wsgi_req, glfs_fd_t *fd, size_t remains) {
+	char buf[8192];
+	struct uwsgi_glusterfs_async_io aio;
+	int ret = -1;
+	if (pipe(aio.fd)) {
+		uwsgi_error("uwsgi_glusterfs_read_async()/pipe()");
+		return -1;
+	}
+	aio.rlen = -1;
+	while(remains > 0) {
+		// trigger an async read
+		if (glfs_read_async(fd, buf, 8192, 0, uwsgi_glusterfs_read_async_cb, &aio)) goto end;
+		// wait for the callback to be executed
+		if (uwsgi.wait_read_hook(aio.fd[0], uglusterfs.timeout) <= 0) goto end;
+		if (aio.rlen <= 0) goto end;	
+		if (uwsgi_response_write_body_do(wsgi_req, buf, aio.rlen)) goto end;
+		remains -= aio.rlen;
+	}
+	ret = 0;
+end:
+	close(aio.fd[0]);
+	close(aio.fd[1]);
+	return ret;	
+}
+
+
+static int uwsgi_glusterfs_try(struct uwsgi_app *ua, char *node) {
+	int ret = -1;
+	char *colon = strchr(node, ':');
+	// unix socket
+	if (!colon) {
+		if (glfs_set_volfile_server((glfs_t *)ua->interpreter, "unix", node, 0)) {
+			uwsgi_error("[glusterfs] glfs_set_volfile_server()");
+			return -1;
+		}
+		goto connect;
+	}
+
+	*colon = 0;
+	if (glfs_set_volfile_server((glfs_t *)ua->interpreter, "tcp", node, atoi(colon+1))) {
+		uwsgi_error("[glusterfs] glfs_set_volfile_server()");
+                return -1;
+	}
+connect:
+	ret = glfs_init((glfs_t *)ua->interpreter);
+        if (ret) { uwsgi_error("[glusterfs] glfs_init()"); }
+	else {
+		if (colon) *colon = ':';
+		uwsgi_log("[glusterfs] worker %d connected to %s\n", uwsgi.mywid, node);
+	}
+        return ret;
+}
+
+static void uwsgi_glusterfs_connect_do(struct uwsgi_app *ua) {
+	char *servers = uwsgi_str(ua->callable);
+	char *p = strtok(servers, ";");
+	while(p) {
+		uwsgi_log("[glusterfs] try connect to %s for mountpoint %.*s on worker %d ...\n", p, ua->mountpoint_len, ua->mountpoint, uwsgi.mywid);
+		if (uwsgi_glusterfs_try(ua, p)) {
+			goto end;
+		}
+		p = strtok(NULL, ";");
+	}
+end:
+	free(servers);
+}
+
+static void uwsgi_glusterfs_connect() {
+	int i;
+	// search for all of the glusterfs apps and connect to the server-based ones
+	for (i = 0; i < uwsgi_apps_cnt; i++) {
+		if (uwsgi_apps[i].modifier1 != glusterfs_plugin.modifier1) continue;
+		if (!uwsgi_apps[i].callable) {
+			if (glfs_init((glfs_t *)uwsgi_apps[i].interpreter)) {
+				uwsgi_error("[glusterfs] glfs_init()");
+				exit(1);
+			}
+			uwsgi_log("[glusterfs] worker %d connected using volfile\n", uwsgi.mywid);
+			continue;
+		}
+		uwsgi_glusterfs_connect_do(&uwsgi_apps[i]);
+	}
+
+}
+
+static void uwsgi_glusterfs_add_mountpoint(char *arg, size_t arg_len) {
+	char *ugfs_mountpoint = NULL;
+	char *ugfs_server = NULL;
+	char *ugfs_volfile = NULL;
+	char *ugfs_volume = NULL;
+	if (uwsgi_kvlist_parse(arg, arg_len, ',', '=',
+                        "mountpoint", &ugfs_mountpoint,
+                        "server", &ugfs_server,
+                        "servers", &ugfs_server,
+                        "volfile", &ugfs_volfile,
+                        "volume", &ugfs_volume,
+                        NULL)) {
+                        	uwsgi_log("unable to parse glusterfs mountpoint definition\n");
+                        	exit(1);
+                }
+
+	if (!ugfs_mountpoint || (!ugfs_server && !ugfs_volfile) || !ugfs_volume) {
+		uwsgi_log("[glusterfs] mount requires a mountpoint, a volume and at least one server or volfile\n");
+		exit(1);
+	}
+
+	int id = uwsgi_apps_cnt;
+	time_t now = uwsgi_now();
+	uwsgi_log("[glusterfs] mounting %s ...\n", ugfs_mountpoint);
+	// this should fail only if memory is not available
+	glfs_t *volume = glfs_new(ugfs_volume);
+	if (!volume) {
+		uwsgi_error("unable to initialize glusterfs mountpoint: glfs_new()");
+		exit(1);
+	}
+
+	if (ugfs_volfile) {
+		if (glfs_set_volfile(volume, ugfs_volfile)) {
+			uwsgi_error("unable to set glusterfs volfile: glfs_set_volfile\n");
+			exit(1);
+		}
+	}
+	/*
+		here we pass ugfs_server as the callable field.
+		After fork() if this field is defined we will start trying to connect to each one of the configuratio nodes
+		This is required to have fallback management
+	*/
+        struct uwsgi_app *ua = uwsgi_add_app(id, glusterfs_plugin.modifier1, ugfs_mountpoint, strlen(ugfs_mountpoint), volume, ugfs_server);
+	if (!ua) {
+		uwsgi_log("[glusterfs] unable to mount %s\n", ugfs_mountpoint);
+		exit(1);
+	}
+
+	ua->started_at = now;
+        ua->startup_time = uwsgi_now() - now;
+	uwsgi_log("GlusterFS app/mountpoint %d (%s) loaded in %d seconds at %p\n", id, ugfs_mountpoint, (int) ua->startup_time, volume);
+}
+
+// we translate the string list to an app representation
+// this happens before fork() if not in lazy/lazy-apps mode
+static void uwsgi_glusterfs_setup() {
+
+	if (!uglusterfs.timeout) {
+		uglusterfs.timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
+	}
+
+	struct uwsgi_string_list *usl = uglusterfs.mountpoints;
+	while(usl) {
+		uwsgi_glusterfs_add_mountpoint(usl->value, usl->len);
+		usl = usl->next;
+	}
+}
+
+static int uwsgi_glusterfs_request(struct wsgi_request *wsgi_req) {
+	char filename[PATH_MAX+1];
+	/* Standard GlusterFS request */
+        if (!wsgi_req->uh->pktsize) {
+                uwsgi_log( "Empty GlusterFS request. skip.\n");
+                return -1;
+        }
+
+        if (uwsgi_parse_vars(wsgi_req)) {
+                return -1;
+        }
+
+	// blocks empty paths
+	if (wsgi_req->path_info_len == 0 || wsgi_req->path_info_len > PATH_MAX) {
+                uwsgi_403(wsgi_req);
+                return UWSGI_OK;
+	}
+
+        wsgi_req->app_id = uwsgi_get_app_id(wsgi_req, wsgi_req->appid, wsgi_req->appid_len, glusterfs_plugin.modifier1);
+	if (wsgi_req->app_id == -1 && !uwsgi.no_default_app && uwsgi.default_app > -1) {
+        	if (uwsgi_apps[uwsgi.default_app].modifier1 == glusterfs_plugin.modifier1) {
+                	wsgi_req->app_id = uwsgi.default_app;
+                }
+        }
+        if (wsgi_req->app_id == -1) {
+                uwsgi_404(wsgi_req);
+                return UWSGI_OK;
+        }
+
+        struct uwsgi_app *ua = &uwsgi_apps[wsgi_req->app_id];
+
+	memcpy(filename, wsgi_req->path_info, wsgi_req->path_info_len);
+	filename[wsgi_req->path_info_len] = 0;
+
+	glfs_fd_t *fd = glfs_open((glfs_t *) ua->interpreter, filename, O_RDONLY);
+	if (!fd) {
+                uwsgi_404(wsgi_req);
+                return UWSGI_OK;
+	}
+	
+
+	struct stat st;
+	if (glfs_fstat(fd, &st)) {
+		uwsgi_403(wsgi_req);
+                return UWSGI_OK;
+	}	
+
+	if (uwsgi_response_prepare_headers(wsgi_req, "200 OK", 6)) goto end;
+	size_t mime_type_len = 0;
+        char *mime_type = uwsgi_get_mime_type(wsgi_req->path_info, wsgi_req->path_info_len, &mime_type_len);
+        if (mime_type) {
+        	if (uwsgi_response_add_content_type(wsgi_req, mime_type, mime_type_len)) goto end;
+        }
+
+        if (uwsgi_response_add_last_modified(wsgi_req, (uint64_t) st.st_mtime)) goto end;
+	if (uwsgi_response_add_content_length(wsgi_req, st.st_size)) goto end;
+
+	// skip body on HEAD
+	if (uwsgi_strncmp(wsgi_req->method, wsgi_req->method_len, "HEAD", 4)) {
+		size_t remains = st.st_size;
+		if (uwsgi.async > 1) {
+			if (uwsgi_glusterfs_read_async(wsgi_req, fd, remains)) goto end;
+		}
+		else {
+			if (uwsgi_glusterfs_read_sync(wsgi_req, fd, remains)) goto end;
+		}
+	}
+
+end:
+	glfs_close(fd);
+	return UWSGI_OK;
+}
+
+struct uwsgi_plugin glusterfs_plugin = {
+	.name = "glusterfs",
+	.modifier1 = 27,
+	.options = uwsgi_glusterfs_options,
+	.post_fork = uwsgi_glusterfs_setup,
+	.fixup = uwsgi_glusterfs_connect,
+	.request = uwsgi_glusterfs_request,
+	.after_request = log_request,
+};

plugins/glusterfs/uwsgiplugin.py

@@ -0,0 +1,7 @@
+import os
+NAME='glusterfs'
+
+CFLAGS = os.popen('pkg-config --cflags glusterfs-api').read().rstrip().split()
+LDFLAGS = []
+LIBS = os.popen('pkg-config --libs glusterfs-api').read().rstrip().split() 
+GCC_LIST = ['glusterfs']

plugins/http/http.c

@@ -10,6 +10,7 @@ struct uwsgi_http uhttp;
 
 struct uwsgi_option http_options[] = {
 	{"http", required_argument, 0, "add an http router/server on the specified address", uwsgi_opt_corerouter, &uhttp, 0},
+	{"httprouter", required_argument, 0, "add an http router/server on the specified address", uwsgi_opt_corerouter, &uhttp, 0},
 #ifdef UWSGI_SSL
 	{"https", required_argument, 0, "add an https router/server on the specified address with specified certificate and key", uwsgi_opt_https, &uhttp, 0},
 	{"https2", required_argument, 0, "add an https/spdy router/server using keyval options", uwsgi_opt_https2, &uhttp, 0},
@@ -207,8 +208,19 @@ int http_headers_parse(struct corerouter_peer *peer) {
 	while (ptr < watermark) {
 		if (*ptr == '?' && !query_string) {
 			// PATH_INFO must be url-decoded !!!
-			hr->path_info_len = ptr - base;
-			hr->path_info = uwsgi_malloc(hr->path_info_len);
+			if (!hr->path_info) {
+				hr->path_info_len = ptr - base;
+				hr->path_info = uwsgi_malloc(hr->path_info_len);
+			}
+			else {
+				size_t new_path_info = ptr - base;
+				if (new_path_info > hr->path_info_len) {
+					char *tmp_buf = realloc(hr->path_info, new_path_info);
+					if (!tmp_buf) return -1;
+					hr->path_info = tmp_buf;
+				}
+				hr->path_info_len = new_path_info;
+			}
 			http_url_decode(base, &hr->path_info_len, hr->path_info);
 			if (uwsgi_buffer_append_keyval(out, "PATH_INFO", 9, hr->path_info, hr->path_info_len)) return -1;
 			query_string = ptr + 1;
@@ -219,8 +231,19 @@ int http_headers_parse(struct corerouter_peer *peer) {
 			if (uwsgi_buffer_append_keyval(out, "REQUEST_URI", 11, base, ptr - base)) return -1;
 			if (!query_string) {
 				// PATH_INFO must be url-decoded !!!
-				hr->path_info_len = ptr - base;
-				hr->path_info = uwsgi_malloc(hr->path_info_len);
+				if (!hr->path_info) {
+                                	hr->path_info_len = ptr - base;
+                                	hr->path_info = uwsgi_malloc(hr->path_info_len);
+                        	}
+                        	else {
+                                	size_t new_path_info = ptr - base;
+                                	if (new_path_info > hr->path_info_len) {
+                                        	char *tmp_buf = realloc(hr->path_info, new_path_info);
+                                        	if (!tmp_buf) return -1;
+                                        	hr->path_info = tmp_buf;
+                                	}
+                                	hr->path_info_len = new_path_info;
+                        	}
 				http_url_decode(base, &hr->path_info_len, hr->path_info);
 				if (uwsgi_buffer_append_keyval(out, "PATH_INFO", 9, hr->path_info, hr->path_info_len)) return -1;
 				if (uwsgi_buffer_append_keyval(out, "QUERY_STRING", 12, "", 0)) return -1;
@@ -430,6 +453,9 @@ ssize_t hr_instance_connected(struct corerouter_peer* peer) {
 
 	cr_peer_connected(peer, "hr_instance_connected()");
 
+	// we are connected, we cannot retry anymore
+        peer->can_retry = 0;
+
 	// prepare for write
 	peer->out_pos = 0;
 
@@ -566,8 +592,10 @@ ssize_t hr_instance_read(struct corerouter_peer *peer) {
 		}
 #endif
 		else if (hr->force_chunked) {
+			peer->in->limit = 0;
 			if (uwsgi_buffer_insert_chunked(peer->in, 0, len)) return -1;
 			if (uwsgi_buffer_append(peer->in, "\r\n", 2)) return -1;
+			peer->in->len = UMIN(peer->in->len, UMAX16);
 		}
 	}
 
@@ -705,7 +733,7 @@ ssize_t http_parse(struct corerouter_peer *main_peer) {
 			if (hr->websockets > 2 && hr->websocket_key_len > 0) {
 				hr->raw_body = 1;
 			}
-
+			new_peer->can_retry = 1;
                 	cr_connect(new_peer, hr_instance_connected);
 			break;
 		}
@@ -775,7 +803,31 @@ ssize_t hr_recv_stud4(struct corerouter_peer * main_peer) {
 
 }
 
+// retry connection to the backend
+static int hr_retry(struct corerouter_peer *peer) {
+
+        struct uwsgi_corerouter *ucr = peer->session->corerouter;
+
+        if (peer->instance_address_len > 0) goto retry;
+
+        if (ucr->mapper(ucr, peer)) {
+                return -1;
+        }
+
+        if (peer->instance_address_len == 0) {
+                return -1;
+        }
+
+retry:
+        // start async connect (again)
+        cr_connect(peer, hr_instance_connected);
+        return 0;
+}
+
+
 int http_alloc_session(struct uwsgi_corerouter *ucr, struct uwsgi_gateway_socket *ugs, struct corerouter_session *cs, struct sockaddr *sa, socklen_t s_len) {
+	// set the retry hook
+        cs->retry = hr_retry;
 	struct http_session *hr = (struct http_session *) cs;
 	// set the modifier1
 	cs->main_peer->modifier1 = uhttp.modifier1;

plugins/http/spdy3.c

@@ -568,6 +568,8 @@ static ssize_t spdy_inflate_http_headers(struct http_session *hr) {
         new_peer->out->buf[1] = (uint8_t) (pktsize & 0xff);
         new_peer->out->buf[2] = (uint8_t) ((pktsize >> 8) & 0xff);
 
+	new_peer->can_retry = 1;
+
 	cr_connect(new_peer, hr_instance_connected);
 
 	return 1;

plugins/jvm/jvm.h

@@ -28,6 +28,7 @@ struct uwsgi_jvm {
 	jclass list_class;
 	jclass set_class;
 	jclass iterator_class;
+	jclass bool_class;
 
 	jclass runtime_exception;
 	jclass io_exception;
@@ -101,6 +102,7 @@ int uwsgi_jvm_call_bool(jobject, jmethodID, ...);
 int uwsgi_jvm_consume_input_stream(struct wsgi_request *, size_t, jobject);
 jobject uwsgi_jvm_num(long);
 jobject uwsgi_jvm_request_body_input_stream(void);
+jobject uwsgi_jvm_bool(long);
 
 size_t uwsgi_jvm_array_len(jobject);
 jobject uwsgi_jvm_array_get(jobject, long);

plugins/jvm/jvm_plugin.c

@@ -896,6 +896,19 @@ jobject uwsgi_jvm_num(long num) {
 	return o;
 }
 
+jobject uwsgi_jvm_bool(long b) {
+        static jmethodID mid = 0;
+        if (!mid) {
+                mid = uwsgi_jvm_get_method_id(ujvm.int_class, "<init>", "(I)V");
+                if (!mid) return NULL;
+        }
+        jobject o = (*ujvm_env)->NewObject(ujvm_env, ujvm.bool_class, mid, b);
+        if (uwsgi_jvm_exception()) {
+                return NULL;
+        }
+        return o;
+}
+
 jobject uwsgi_jvm_str(char *str, size_t len) {
 	jobject new_str;
 	if (len > 0) {
@@ -1063,6 +1076,9 @@ static void uwsgi_jvm_create(void) {
 	ujvm.int_class = uwsgi_jvm_class("java/lang/Integer");
 	if (!ujvm.int_class) exit(1);
 
+	ujvm.bool_class = uwsgi_jvm_class("java/lang/Boolean");
+	if (!ujvm.bool_class) exit(1);
+
 	ujvm.long_class = uwsgi_jvm_class("java/lang/Long");
 	if (!ujvm.long_class) exit(1);
 
@@ -1116,7 +1132,7 @@ static void uwsgi_jvm_create(void) {
 			jobject j_opt_value = uwsgi_jvm_hashmap_get(opt_hm, (jobject) j_opt_key);
 			if (uwsgi_jvm_object_is_instance(j_opt_value, ujvm.list_class)) {
 				if (uwsgi.exported_opts[j]->value == NULL) {
-                                        uwsgi_jvm_list_add(j_opt_value, (jobject) 1);
+                                        uwsgi_jvm_list_add(j_opt_value, uwsgi_jvm_bool(JNI_TRUE));
                                 }
                                 else {
                                         uwsgi_jvm_list_add(j_opt_value, uwsgi_jvm_str(uwsgi.exported_opts[j]->value, 0));
@@ -1126,7 +1142,7 @@ static void uwsgi_jvm_create(void) {
 				jobject ll = uwsgi_jvm_list();
 				uwsgi_jvm_list_add(ll, j_opt_value);
 				if (uwsgi.exported_opts[j]->value == NULL) {
-					uwsgi_jvm_list_add(ll, (jobject) 1);
+					uwsgi_jvm_list_add(ll, uwsgi_jvm_bool(JNI_TRUE));
 				}
 				else {
 					uwsgi_jvm_list_add(ll, uwsgi_jvm_str(uwsgi.exported_opts[j]->value, 0));
@@ -1136,7 +1152,7 @@ static void uwsgi_jvm_create(void) {
 		}
 		else {
 			if (uwsgi.exported_opts[j]->value == NULL) {
-				uwsgi_jvm_hashmap_put(opt_hm, j_opt_key, (jobject) 1);
+				uwsgi_jvm_hashmap_put(opt_hm, j_opt_key, uwsgi_jvm_bool(JNI_TRUE));
 			}
 			else {
 				uwsgi_jvm_hashmap_put(opt_hm, j_opt_key, uwsgi_jvm_str(uwsgi.exported_opts[j]->value, 0));

plugins/lua/lua_plugin.c

@@ -4,6 +4,11 @@
 #include <lualib.h>
 #include <lauxlib.h>
 
+#if LUA_VERSION_NUM < 502
+# define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l))
+# define lua_rawlen lua_objlen
+#endif
+
 extern struct uwsgi_server uwsgi;
 
 struct uwsgi_lua {
@@ -347,7 +352,7 @@ static int uwsgi_api_unlock(lua_State *L) {
 	return 0;
 }
 
-static const luaL_reg uwsgi_api[] = {
+static const luaL_Reg uwsgi_api[] = {
   {"log", uwsgi_api_log},
   {"connection_fd", uwsgi_api_req_fd},
 
@@ -411,7 +416,7 @@ static void uwsgi_lua_app() {
 		for(i=0;i<uwsgi.cores;i++) {
 			ulua.L[i] = luaL_newstate();
 			luaL_openlibs(ulua.L[i]);
-			luaL_register(ulua.L[i], "uwsgi", uwsgi_api);
+			luaL_newlib(ulua.L[i], uwsgi_api);
 
 			lua_pushstring(ulua.L[i], UWSGI_VERSION);
         		lua_setfield(ulua.L[i], -2, "version");
@@ -711,7 +716,7 @@ static uint16_t uwsgi_lua_rpc(void * func, uint8_t argc, char **argv, uint16_t a
 static void uwsgi_lua_configurator_array(lua_State *L) { 
 
 	int i;
-	int n = luaL_getn(L, -3);
+	int n = lua_rawlen(L, -3);
 
 	for(i=1;i<=n;i++) {
 		lua_rawgeti(L, 1, i);

plugins/lua/uwsgiplugin.py

@@ -1,22 +1,33 @@
 import os,sys
 
-try:
-        LUALIB = os.environ['UWSGICONFIG_LUALIB']
-except:
-        LUALIB = 'lua5.1'
+LUAINC = os.environ.get('UWSGICONFIG_LUAINC')
+LUALIB = os.environ.get('UWSGICONFIG_LUALIB')
+LUALIBPATH = os.environ.get('UWSGICONFIG_LUALIBPATH')
+LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua5.1')
 
-try:
-        LUAINC = os.environ['UWSGICONFIG_LUAINC']
-except:
-        LUAINC = '/usr/include/lua5.1'
+# we LUAINC/LUALIB/LUALIBPATH override the LUAPC for backwards compat
+if LUAINC:
+	CFLAGS = ['-I%s' % LUAINC]
+else:
+	try:
+		CFLAGS = os.popen('pkg-config --cflags %s' % LUAPC).read().rstrip().split()
+	except:
+		CFLAGS = ['-I/usr/include/lua5.1']
 
-try:
-        LUALIBPATH = os.environ['UWSGICONFIG_LUALIBPATH']
-except:
-        LUALIBPATH = '/usr/lib/lua5.1'
+if LUALIB:
+	LIBS = ['-l%s' % LUALIB]
+else:
+	try:
+		LIBS = os.popen('pkg-config --libs %s' % LUAPC).read().rstrip().split() 
+	except:
+		LIBS = ['-llua5.1']
+
+if LUALIBPATH:
+	LDFLAGS = ['-L%s' % LUALIBPATH]
+else:
+	LDFLAGS = []
 
 NAME='lua'
-CFLAGS = ['-I%s' % LUAINC]
-LDFLAGS = ['-L%s' % LUALIBPATH]
 GCC_LIST = ['lua_plugin']
-LIBS = ['-l%s' % LUALIB]
+
+

plugins/mono/mono_plugin.c

@@ -77,7 +77,7 @@ struct uwsgi_mono {
 struct uwsgi_option uwsgi_mono_options[] = {
 
         {"mono-app", required_argument, 0, "load a Mono asp.net app from the specified directory", uwsgi_opt_add_string_list, &umono.app, 0},
-        {"mono-gc-freq", required_argument, 0, "run the Mono GC every <n> requests (default, run after every request)", uwsgi_opt_set_64bit, &umono.gc_freq, 0},
+        {"mono-gc-freq", required_argument, 0, "run the Mono GC every <n> requests (default: run after every request)", uwsgi_opt_set_64bit, &umono.gc_freq, 0},
         {"mono-key", required_argument, 0, "select the ApplicationHost based on the specified CGI var", uwsgi_opt_add_string_list, &umono.key, 0},
         {"mono-version", required_argument, 0, "set the Mono jit version", uwsgi_opt_set_str, &umono.version, 0},
         {"mono-config", required_argument, 0, "set the Mono config file", uwsgi_opt_set_str, &umono.config, 0},

plugins/msgpack/msgpack.c

@@ -0,0 +1,361 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	msgpack utilities
+
+*/
+
+enum {
+	MSGPACK_NIL = 0,
+	MSGPACK_TRUE,
+	MSGPACK_FALSE,
+	MSGPACK_INT,
+	MSGPACK_FLOAT,
+	MSGPACK_STR,
+	MSGPACK_BIN,
+	MSGPACK_ARRAY,
+	MSGPACK_MAP,
+	MSGPACK_EXT,
+	MSGPACK_MAGIC,
+};
+
+struct uwsgi_msgpack_item {
+	uint8_t type;
+	char *str;
+	uint32_t str_len;
+	int64_t num;
+	double fnum;
+	int (*func)(char *);
+	struct uwsgi_msgpack_item *next;
+};
+
+struct uwsgi_msgpack_item *uwsgi_msgpack_item_add(struct uwsgi_msgpack_item **list, uint8_t type) {
+	struct uwsgi_msgpack_item *old_umi = NULL, *umi = *list;
+	while(umi) {
+		old_umi = umi;
+		umi = umi->next;
+	}
+
+	umi = uwsgi_calloc(sizeof(struct uwsgi_msgpack_item)); 
+	umi->type = type;
+	if (old_umi) {
+		old_umi->next = umi;
+	}
+	else {
+		*list = umi;
+	}
+	return umi;
+}
+
+int uwsgi_buffer_msgpack_map(struct uwsgi_buffer *ub, uint32_t len) {
+	if (len <= 15) {
+		return uwsgi_buffer_byte(ub, 0x80 + len);
+	}
+	else if (len <= 0xffff) {
+		if (uwsgi_buffer_byte(ub, 0xDE)) return -1;
+		return uwsgi_buffer_u16be(ub, (uint16_t) len);
+	}
+	
+	if (uwsgi_buffer_byte(ub, 0xDF)) return -1;
+	return uwsgi_buffer_u32be(ub, len);
+}
+
+int uwsgi_buffer_msgpack_array(struct uwsgi_buffer *ub, uint32_t len) {
+        if (len <= 15) {
+                return uwsgi_buffer_byte(ub, 0x90 + len);
+        }
+        else if (len <= 0xffff) {
+                if (uwsgi_buffer_byte(ub, 0xDC)) return -1;
+                return uwsgi_buffer_u16be(ub, (uint16_t) len);
+        }
+
+        if (uwsgi_buffer_byte(ub, 0xDD)) return -1;
+        return uwsgi_buffer_u32be(ub, len);
+}
+
+int uwsgi_buffer_msgpack_str(struct uwsgi_buffer *ub, char *str, uint32_t len) {
+        if (len <= 31) {
+                if (uwsgi_buffer_byte(ub, 0xA0 + len)) return -1;
+        }
+	// this is annoying, D9 does not work for older SPEC :(
+/*
+        else if (len <= 0xff) {
+                if (uwsgi_buffer_byte(ub, 0xD9)) return -1;
+                if (uwsgi_buffer_byte(ub, (uint8_t) len)) return -1;
+        }
+*/
+	else if (len <= 0xffff) {
+                if (uwsgi_buffer_byte(ub, 0xDA)) return -1;
+                if (uwsgi_buffer_u16be(ub, (uint16_t) len)) return -1;
+	}
+	else {
+                if (uwsgi_buffer_byte(ub, 0xDB)) return -1;
+                if (uwsgi_buffer_u32be(ub, len)) return -1;
+	}
+
+        return uwsgi_buffer_append(ub, str, len);
+}
+
+int uwsgi_buffer_msgpack_bin(struct uwsgi_buffer *ub, char *str, uint32_t len) {
+        if (len <= 0xff) {
+                if (uwsgi_buffer_byte(ub, 0xC4)) return -1;
+                if (uwsgi_buffer_byte(ub, (uint8_t) len)) return -1;
+        }
+        else if (len <= 0xffff) {
+                if (uwsgi_buffer_byte(ub, 0xC5)) return -1;
+		if (uwsgi_buffer_u16be(ub, (uint16_t) len)) return -1;
+        }
+        else {
+                if (uwsgi_buffer_byte(ub, 0xC6)) return -1;
+		if (uwsgi_buffer_u32be(ub, len)) return -1;
+        }
+
+        return uwsgi_buffer_append(ub, str, len);
+}
+
+
+int uwsgi_buffer_msgpack_int(struct uwsgi_buffer *ub, int64_t num) {
+	if (num > 0 && num <= 127) {
+		return uwsgi_buffer_byte(ub, (uint8_t) num);
+	}
+	else if (num < 0 && num >= 31) {
+		return uwsgi_buffer_byte(ub, 224 | (int8_t) num);
+	}
+	else if (num <= 127 && num >= -127) {
+		if (uwsgi_buffer_byte(ub, 0xD0)) return -1;
+		return uwsgi_buffer_byte(ub, (int8_t) num);
+	}
+	else if (num <= 32767 && num >= -32767) {
+		if (uwsgi_buffer_byte(ub, 0xD1)) return -1;
+		return uwsgi_buffer_u16be(ub, (uint16_t) num);
+	}
+	else if (num <= 2147483647LL && num >= -2147483648LL) {
+		if (uwsgi_buffer_byte(ub, 0xD2)) return -1;
+		return uwsgi_buffer_u32be(ub, (uint32_t) num);
+	}
+	if (uwsgi_buffer_byte(ub, 0xD3)) return -1;
+	return uwsgi_buffer_u64be(ub, (uint64_t)num);
+}
+
+int uwsgi_buffer_msgpack_float(struct uwsgi_buffer *ub, double num) {
+	if (num >= -126.0 && num <= 127.0) {
+        	if (uwsgi_buffer_byte(ub, 0xCA)) return -1;
+        	return uwsgi_buffer_f32be(ub, (float) num);
+	}
+	if (uwsgi_buffer_byte(ub, 0xCB)) return -1;
+        return uwsgi_buffer_f64be(ub, num);
+}
+
+int uwsgi_buffer_msgpack_nil(struct uwsgi_buffer *ub) {
+	return uwsgi_buffer_byte(ub, 0xC0);
+}
+
+int uwsgi_buffer_msgpack_true(struct uwsgi_buffer *ub) {
+	return uwsgi_buffer_byte(ub, 0xC3);
+}
+
+int uwsgi_buffer_msgpack_false(struct uwsgi_buffer *ub) {
+	return uwsgi_buffer_byte(ub, 0xC2);
+}
+
+static char *uwsgi_msgpack_log_encoder(struct uwsgi_log_encoder *ule, char *msg, size_t len, size_t *rlen) {
+	char *buf = NULL;
+	if (!ule->configured) {
+		char *p = strtok(ule->args, "|");
+		while(p) {
+			char *colon = strchr(p, ':');
+			if (colon) *colon = 0;	
+			// find the type of item
+			if (!strcmp(p, "map")) {
+				struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAP);
+				if (colon) {
+					new_umi->num = strtoull(colon+1, NULL, 10);
+				}
+			}
+			else if (!strcmp(p, "array")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_ARRAY);
+                                if (colon) {
+                                        new_umi->num = strtoull(colon+1, NULL, 10);
+                                }
+                        }
+			else if (!strcmp(p, "nil")) {
+				uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_NIL);
+			}
+			else if (!strcmp(p, "true")) {
+				uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_TRUE);
+			}
+			else if (!strcmp(p, "false")) {
+				uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_FALSE);
+			}
+			else if (!strcmp(p, "int")) {
+				struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_INT);
+				if (colon) {
+                                        new_umi->num = strtoll(colon+1, NULL, 10);
+                                }	
+			}
+			else if (!strcmp(p, "float")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_FLOAT);
+                                if (colon) {
+                                        new_umi->fnum = strtod(colon+1, NULL);
+                                }
+                        }
+			else if (!strcmp(p, "str")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_STR);
+                                if (colon) {
+                                        new_umi->str = colon+1;
+					new_umi->str_len = strlen(colon+1);
+				}
+				else {
+					new_umi->str = "";
+				}
+                        }
+			else if (!strcmp(p, "bin")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_BIN);
+                                if (colon) {
+                                        new_umi->str = colon+1;
+                                        new_umi->str_len = strlen(colon+1);
+                                }
+				else {
+					new_umi->str = "";
+				}
+                        }
+			else if (!strcmp(p, "msg")) {
+				uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+			}
+			else if (!strcmp(p, "msgbin")) {
+				struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+				new_umi->num = 1;
+			}
+
+			else if (!strcmp(p, "msgnl")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+                                new_umi->num = 2;
+                        }
+                        else if (!strcmp(p, "msgbinnl")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+                                new_umi->num = 3;
+                        }
+			else if (!strcmp(p, "unix")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+                                new_umi->num = 4;
+                        }
+			else if (!strcmp(p, "micros")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+                                new_umi->num = 5;
+                        }
+			else if (!strcmp(p, "strftime")) {
+                                struct uwsgi_msgpack_item *new_umi = uwsgi_msgpack_item_add((struct uwsgi_msgpack_item**)&ule->data, MSGPACK_MAGIC);
+                                new_umi->num = 6;
+				if (colon) {
+                                        new_umi->str = colon+1;
+                                        new_umi->str_len = strlen(colon+1);
+                                }
+                                else {
+                                        new_umi->str = "";
+                                }
+                        }
+		
+			if (colon) *colon = ':';
+			p = strtok(NULL, "|");
+		}
+		ule->configured = 1;
+	}
+
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(len + strlen(ule->args));
+	struct uwsgi_msgpack_item *umi = (struct uwsgi_msgpack_item*) ule->data;
+	uint32_t tmp_len = 0;
+	while(umi) {
+		switch(umi->type) {
+			case(MSGPACK_NIL):
+				if (uwsgi_buffer_msgpack_nil(ub)) goto end;
+				break;
+			case(MSGPACK_TRUE):
+				if (uwsgi_buffer_msgpack_true(ub)) goto end;
+				break;
+			case(MSGPACK_FALSE):
+				if (uwsgi_buffer_msgpack_false(ub)) goto end;
+				break;
+			case(MSGPACK_STR):
+				if (uwsgi_buffer_msgpack_str(ub, umi->str, umi->str_len)) goto end;
+				break;
+			case(MSGPACK_BIN):
+				if (uwsgi_buffer_msgpack_bin(ub, umi->str, umi->str_len)) goto end;
+				break;
+			case(MSGPACK_MAP):
+				if (uwsgi_buffer_msgpack_map(ub, umi->num)) goto end;
+				break;
+			case(MSGPACK_ARRAY):
+				if (uwsgi_buffer_msgpack_array(ub, umi->num)) goto end;
+				break;
+			case(MSGPACK_INT):
+				if (uwsgi_buffer_msgpack_int(ub, umi->num)) goto end;
+				break;
+			case(MSGPACK_FLOAT):
+				if (uwsgi_buffer_msgpack_float(ub, umi->fnum)) goto end;
+				break;
+			case(MSGPACK_MAGIC):
+				// msg
+				tmp_len = len;
+				if (umi->num == 0) {
+					if (msg[len-1] == '\n') tmp_len--;
+					if (uwsgi_buffer_msgpack_str(ub, msg, tmp_len)) goto end;
+				}
+				// msgbin
+				else if (umi->num == 1) {
+					if (msg[len-1] == '\n') tmp_len--;
+					if (uwsgi_buffer_msgpack_bin(ub, msg, tmp_len)) goto end;
+				}
+				// msgnl
+				if (umi->num == 2) {
+                                        if (uwsgi_buffer_msgpack_str(ub, msg, tmp_len)) goto end;
+                                }
+                                // msgbinnl
+                                else if (umi->num == 3) {
+                                        if (uwsgi_buffer_msgpack_bin(ub, msg, tmp_len)) goto end;
+                                }
+				// unix
+                                else if (umi->num == 4) {
+                                        if (uwsgi_buffer_msgpack_int(ub, (int64_t)uwsgi_now())) goto end;
+                                }
+				// micros
+                                else if (umi->num == 5) {
+                                        if (uwsgi_buffer_msgpack_int(ub, (int64_t)uwsgi_micros())) goto end;
+                                }
+				// strftime
+                                else if (umi->num == 6) {
+					char sftime[64];
+					time_t now = uwsgi_now();
+                        		int rlen = strftime(sftime, 64, umi->str, localtime(&now));
+					if (rlen > 0) {
+                                        	if (uwsgi_buffer_msgpack_str(ub, sftime, rlen)) goto end;
+					}
+					else {
+                                        	if (uwsgi_buffer_msgpack_str(ub, "", 0)) goto end;
+					}
+                                }
+				break;
+			default:
+				break;
+		}
+		umi = umi->next;
+	}
+
+	buf = ub->buf;
+	*rlen = ub->pos;
+	ub->buf = NULL;
+end:
+	uwsgi_buffer_destroy(ub);
+	return buf;
+}
+
+static void uwsgi_msgpack_register() {
+	uwsgi_register_log_encoder("msgpack", uwsgi_msgpack_log_encoder);
+}
+
+struct uwsgi_plugin msgpack_plugin = {
+	.name = "msgpack",
+	.on_load = uwsgi_msgpack_register,
+};

plugins/msgpack/uwsgiplugin.py

@@ -0,0 +1,5 @@
+NAME='msgpack'
+CFLAGS=[]
+LDFLAGS=[]
+LIBS=[]
+GCC_LIST = ['msgpack']

plugins/objc_gc/objc_gc.m

@@ -0,0 +1,5 @@
+#include <uwsgi.h>
+
+struct uwsgi_plugin objc_gc_plugin = {
+	.name = "objc_gc",
+};

plugins/objc_gc/uwsgiplugin.py

@@ -0,0 +1,5 @@
+NAME="objc_gc"
+CFLAGS=["-fobjc-gc"]
+LDFLAGS=[]
+LIBS=[]
+GCC_LIST=['objc_gc.m']

plugins/php/php_plugin.c

@@ -96,7 +96,7 @@ static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers)
 	}
 	else {
 		char *sl = SG(sapi_headers).http_status_line;
-		uwsgi_response_prepare_headers(wsgi_req, sl + 8 , strlen(sl) - 8);
+		uwsgi_response_prepare_headers(wsgi_req, sl + 9 , strlen(sl + 9));
 	}
 	
 	h = zend_llist_get_first_ex(&sapi_headers->headers, &pos);

plugins/psgi/psgi.h

@@ -1,5 +1,5 @@
 #undef __USE_GNU
-#include "../../uwsgi.h"
+#include <uwsgi.h>
 
 #ifdef __APPLE__
 #define HAS_BOOL 1
@@ -50,6 +50,9 @@ struct uwsgi_perl {
 	SV *atexit;
 
 	int loaded;
+
+	struct uwsgi_string_list *exec;
+	struct uwsgi_string_list *exec_post_fork;
 };
 
 void init_perl_embedded_module(void);
@@ -66,3 +69,4 @@ int init_psgi_app(struct wsgi_request *, char *, uint16_t, PerlInterpreter **);
 PerlInterpreter *uwsgi_perl_new_interpreter(void);
 int uwsgi_perl_mule(char *);
 void uwsgi_perl_run_hook(SV *);
+void uwsgi_perl_exec(char *);

plugins/psgi/psgi_loader.c

@@ -483,6 +483,16 @@ void uwsgi_psgi_app() {
 		//load app in the main interpreter list
 		init_psgi_app(NULL, uperl.psgi, strlen(uperl.psgi), uperl.main);
         }
+	// create a perl environment (if needed)
+	else if (uperl.exec) {
+		PERL_SET_CONTEXT(uperl.main[0]);
+                perl_parse(uperl.main[0], xs_init, 2, uperl.embedding, NULL);
+	}
+
+	struct uwsgi_string_list *usl;
+        uwsgi_foreach(usl, uperl.exec) {
+                uwsgi_perl_exec(usl->value);
+        }
 
 }
 
@@ -502,3 +512,10 @@ int uwsgi_perl_mule(char *opt) {
 
 }
 
+
+void uwsgi_perl_exec(char *filename) {
+	size_t size = 0;
+        char *buf = uwsgi_open_and_read(filename, &size, 1, NULL);
+        perl_eval_pv(buf, 0);
+	free(buf);
+}

plugins/psgi/psgi_plugin.c

@@ -21,6 +21,8 @@ struct uwsgi_option uwsgi_perl_options[] = {
 #endif
         {"perl-args", required_argument, 0, "add items (space separated) to @ARGV", uwsgi_opt_set_str, &uperl.argv_items, 0},
         {"perl-arg", required_argument, 0, "add an item to @ARGV", uwsgi_opt_add_string_list, &uperl.argv_item, 0},
+        {"perl-exec", required_argument, 0, "exec the specified perl file before fork()", uwsgi_opt_add_string_list, &uperl.exec, 0},
+        {"perl-exec-post-fork", required_argument, 0, "exec the specified perl file after fork()", uwsgi_opt_add_string_list, &uperl.exec_post_fork, 0},
         {0, 0, 0, 0, 0, 0, 0},
 
 };
@@ -588,6 +590,11 @@ void uwsgi_perl_post_fork() {
 		SvREADONLY_on(GvSV(tmpgv));
 	}
 
+	struct uwsgi_string_list *usl;
+	uwsgi_foreach(usl, uperl.exec_post_fork) {
+		uwsgi_perl_exec(usl->value);
+	}
+
 	if (uperl.postfork) {
 		uwsgi_perl_run_hook(uperl.postfork);
 	}

plugins/psgi/uwsgi_plmodule.c

@@ -81,6 +81,16 @@ XS(XS_signal) {
 	XSRETURN_UNDEF;
 }
 
+XS(XS_set_user_harakiri) {
+        dXSARGS;
+
+        psgi_check_args(1);
+
+	set_user_harakiri( SvIV(ST(0)) );
+
+        XSRETURN_UNDEF;
+}
+
 XS(XS_reload) {
     dXSARGS;
 
@@ -549,5 +559,7 @@ void init_perl_embedded_module() {
 
 	psgi_xs(add_timer);
 	psgi_xs(add_rb_timer);
+
+	psgi_xs(set_user_harakiri);
 }
 

plugins/pty/pty.c

@@ -0,0 +1,316 @@
+#include <uwsgi.h>
+#ifdef __linux__
+#include <pty.h>
+#elif defined(__APPLE__) || defined(__OpenBSD__)
+#include <util.h>
+#elif defined(__FreeBSD__)
+#include <libutil.h>
+#endif
+#ifndef __FreeBSD__
+#include <utmp.h>
+#endif
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_pty_client {
+	int fd;
+	struct uwsgi_pty_client *prev;
+	struct uwsgi_pty_client *next;
+};
+
+static struct uwsgi_pty {
+	char *addr;
+	char *remote;
+	int queue;
+	int server_fd;
+	int master_fd;
+	int slave_fd;
+	int log;
+	int original_log;
+	int input;
+	int original_input;
+	int no_isig;
+	char *command;
+	pid_t command_pid;
+	struct uwsgi_pty_client *head;
+	struct uwsgi_pty_client *tail;
+} upty;
+
+static struct uwsgi_pty_client *uwsgi_pty_client_new(int fd) {
+	struct uwsgi_pty_client *upc = uwsgi_calloc(sizeof(struct uwsgi_pty_client));
+	upc->fd = fd;
+	if (upty.tail) {
+		upc->prev = upty.tail;
+		upty.tail->next = upc;
+	}
+	upty.tail = upc;
+	if (!upty.head) upty.head = upc;
+	return upc;
+}
+
+static void uwsgi_pty_client_remove(struct uwsgi_pty_client *upc) {
+	struct uwsgi_pty_client *prev = upc->prev;
+	struct uwsgi_pty_client *next = upc->next;
+
+	if (prev) {
+		prev->next = next;
+	}
+
+	if (next) {
+		next->prev = prev;
+	}
+
+	if (upc == upty.head) {
+		upty.head = next;
+	}
+
+	if (upc == upty.tail) {
+		upty.tail = prev;
+	}
+
+	close(upc->fd);
+	free(upc);
+}
+
+static struct uwsgi_option uwsgi_pty_options[] = {
+	{"pty-socket", required_argument, 0, "bind the pty server on the specified address", uwsgi_opt_set_str, &upty.addr, 0},
+	{"pty-log", no_argument, 0, "send stdout/stderr to the log engine too", uwsgi_opt_true, &upty.log, 0},
+	{"pty-input", no_argument, 0, "read from original stdin in addition to pty", uwsgi_opt_true, &upty.input, 0},
+	{"pty-connect", required_argument, 0, "connect the current terminal to a pty server", uwsgi_opt_set_str, &upty.remote, 0},
+	{"pty-no-isig", no_argument, 0, "disable ISIG terminal attribute in client mode", uwsgi_opt_true, &upty.no_isig, 0},
+	{"pty-exec", no_argument, 0, "run the specified command soon after the pty thread is spawned", uwsgi_opt_set_str, &upty.command, 0},
+	{0, 0, 0, 0, 0, 0, 0},
+};
+
+void uwsgi_pty_setterm(int fd) {
+	struct termios tio;
+        tcgetattr(fd, &tio);
+
+        tio.c_iflag |= IGNPAR;
+        tio.c_iflag &= ~(ISTRIP | IMAXBEL | BRKINT | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
+#ifdef IUCLC
+        tio.c_iflag &= ~IUCLC;
+#endif
+        tio.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHONL);
+	if (upty.no_isig) {
+		tio.c_lflag &= ~(ISIG);
+	}
+#ifdef IEXTEN
+        tio.c_lflag &= ~IEXTEN;
+#endif
+        tio.c_oflag &= ~OPOST;
+        tio.c_cc[VMIN] = 1;
+        tio.c_cc[VTIME] = 0;
+
+#ifdef B38400
+	cfsetispeed(&tio, B38400);
+	cfsetospeed(&tio, B38400);
+#endif
+
+        tcsetattr(fd, TCSANOW, &tio);
+}
+
+static void *uwsgi_pty_loop(void *arg) {
+
+	/*
+                if slave is ready there is something to send to the clients (and logs)
+
+                if client is ready we have something to write to the master pty
+        */
+
+	// block signals on this thread
+        sigset_t smask;
+        sigfillset(&smask);
+#ifndef UWSGI_DEBUG
+        sigdelset(&smask, SIGSEGV);
+#endif
+        pthread_sigmask(SIG_BLOCK, &smask, NULL);
+
+        for(;;) {
+                char buf[8192];
+                int interesting_fd = -1;
+                int ret = event_queue_wait(upty.queue, -1, &interesting_fd);
+                if (ret == 0) continue;
+                if (ret < 0) continue;
+
+		if (upty.input && interesting_fd == upty.original_input) {
+			ssize_t rlen = read(upty.original_input, buf, 8192);
+                        if (rlen <= 0) continue;
+                        if (write(upty.master_fd, buf, rlen) != rlen) {
+				// what to do ?
+                        }
+			continue;
+		}
+
+                if (interesting_fd == upty.master_fd) {
+                        ssize_t rlen = read(upty.master_fd, buf, 8192);
+                        if (rlen == 0) exit(1);
+                        if (rlen < 0) {
+                                uwsgi_error("uwsgi_pty_loop()/read()");
+                        }
+			if (upty.log && upty.original_log >= 0) {
+                        	if (write(upty.original_log, buf, rlen) != rlen) {
+					// what to do ?
+                        	}
+			}
+			struct uwsgi_pty_client *upc = upty.head;	
+			while(upc) {
+                        	if (write(upc->fd, buf, rlen) != rlen) {
+					struct uwsgi_pty_client *tmp_upc = upc->next;
+					uwsgi_pty_client_remove(upc);	
+					upc = tmp_upc;
+					continue;
+				}
+				upc = upc->next;
+			}
+                        continue;
+                }
+
+                if (interesting_fd == upty.server_fd) {
+                        struct sockaddr_un client_src;
+			memset(&client_src, 0, sizeof(struct sockaddr_un));
+                        socklen_t client_src_len = 0;
+
+                        int client_fd = accept(upty.server_fd, (struct sockaddr *) &client_src, &client_src_len);
+                        if (client_fd < 0) {
+                                uwsgi_error("accept()");
+				continue;
+                        }
+			struct uwsgi_pty_client *upc = uwsgi_pty_client_new(client_fd);
+                        event_queue_add_fd_read(upty.queue, upc->fd);
+                        continue;
+                }
+
+		struct uwsgi_pty_client *upc = upty.head;
+		while(upc) {
+                	if (interesting_fd == upc->fd) {
+                        	ssize_t rlen = read(upc->fd, buf, 8192);
+                        	if (rlen <= 0) {
+					uwsgi_pty_client_remove(upc);
+					break;
+                        	}
+                        	if (write(upty.master_fd, buf, rlen) != rlen) {
+				}
+				break;
+			}
+			upc = upc->next;
+                }
+
+                continue;
+
+        }
+
+}
+
+static void uwsgi_pty_init() {
+
+	if (!upty.addr) return;
+	if (!uwsgi.master_process) return;
+	if (uwsgi.mywid > 1) return;
+
+	char *tcp_port = strrchr(upty.addr, ':');
+        if (tcp_port) {
+        	// disable deferred accept for this socket
+                int current_defer_accept = uwsgi.no_defer_accept;
+                uwsgi.no_defer_accept = 1;
+                upty.server_fd = bind_to_tcp(upty.addr, uwsgi.listen_queue, tcp_port);
+                uwsgi.no_defer_accept = current_defer_accept;
+	}
+        else {
+        	upty.server_fd = bind_to_unix(upty.addr, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
+        }
+
+	if (upty.log) {
+		upty.original_log = dup(1);
+	}
+
+	if (upty.input) {
+		upty.original_input = dup(0);
+	}
+
+	if (openpty(&upty.master_fd, &upty.slave_fd, NULL, NULL, NULL)) {
+		uwsgi_error("uwsgi_pty_init()/openpty()");
+		exit(1);
+	}
+
+
+	uwsgi_log("pty server %s (fd: %d) enabled on %s master: %d slave: %d\n", upty.addr, upty.server_fd, ttyname(upty.slave_fd), upty.master_fd, upty.slave_fd);
+
+	upty.queue = event_queue_init();
+
+	event_queue_add_fd_read(upty.queue, upty.master_fd);
+	event_queue_add_fd_read(upty.queue, upty.server_fd);
+	if (upty.input) {
+		event_queue_add_fd_read(upty.queue, upty.original_input);
+		uwsgi_pty_setterm(upty.original_input);
+	}
+
+	login_tty(upty.slave_fd);
+
+	if (upty.command) {
+		upty.command_pid = uwsgi_run_command(upty.command, NULL, -1);
+	}
+
+	pthread_t t;
+	pthread_create(&t, NULL, uwsgi_pty_loop, NULL);
+
+}
+
+static int uwsgi_pty_client() {
+	if (!upty.remote) return 0;
+
+	uwsgi_log("[pty] connecting to %s ...\n", upty.remote);
+
+	// save current terminal settings
+	if (!tcgetattr(0, &uwsgi.termios)) {
+        	uwsgi.restore_tc = 1;
+        }
+
+	upty.server_fd = uwsgi_connect(upty.remote, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
+	if (upty.server_fd < 0) {
+		uwsgi_error("uwsgi_pty_client()/connect()");
+		exit(1);
+	}
+
+	uwsgi_socket_nb(upty.server_fd);
+	uwsgi_socket_nb(0);
+
+	uwsgi_log("[pty] connected.\n");
+
+	uwsgi_pty_setterm(0);
+
+	upty.queue = event_queue_init();
+	event_queue_add_fd_read(upty.queue, upty.server_fd);
+	event_queue_add_fd_read(upty.queue, 0);
+
+	for(;;) {
+		char buf[8192];
+		int interesting_fd = -1;
+                int ret = event_queue_wait(upty.queue, -1, &interesting_fd);		
+		if (ret <= 0) break;
+		if (interesting_fd == 0) {
+			ssize_t rlen = read(0, buf, 8192);
+			if (rlen <= 0) break;
+			if (write(upty.server_fd, buf, rlen) != rlen) break;
+			continue;
+		}	
+
+		if (interesting_fd == upty.server_fd) {
+			ssize_t rlen = read(upty.server_fd, buf, 8192);
+                        if (rlen <= 0) break;
+                        if (write(0, buf, rlen) != rlen) break;
+                        continue;
+		}
+	}
+
+	exit(0);
+	// never here
+	return 0;
+}
+
+struct uwsgi_plugin pty_plugin = {
+	.name = "pty",
+	.options = uwsgi_pty_options,
+	.init = uwsgi_pty_client,
+	.post_fork = uwsgi_pty_init,
+};

plugins/pty/uwsgiplugin.py

@@ -0,0 +1,12 @@
+NAME='pty'
+
+import os
+uwsgi_os = os.uname()[0]
+
+CFLAGS = []
+LDFLAGS = []
+if uwsgi_os in ('Linux', 'FreeBSD'):
+    LIBS = ['-lutil']
+else:
+    LIBS = []
+GCC_LIST = ['pty']

plugins/pypy/pypy_plugin.c

@@ -25,11 +25,11 @@ struct uwsgi_pypy {
 } upypy;
 
 // the functions exposed by libpypy-c
-char *(*rpython_startup_code)(void);
-int (*pypy_setup_home)(char *, int);
-int (*pypy_execute_source)(char *);
-void (*pypy_thread_attach)(void);
-void (*pypy_init_threads)(void);
+char *(*u_rpython_startup_code)(void);
+int (*u_pypy_setup_home)(char *, int);
+int (*u_pypy_execute_source)(char *);
+void (*u_pypy_thread_attach)(void);
+void (*u_pypy_init_threads)(void);
 
 // the hooks you can override with pypy
 void (*uwsgi_pypy_hook_loader)(char *);
@@ -41,47 +41,6 @@ void (*uwsgi_pypy_post_fork_hook)(void);
 extern struct uwsgi_server uwsgi;
 struct uwsgi_plugin pypy_plugin;
 
-int uwsgi_pypy_helper_masterpid() {
-	if (uwsgi.master_process) {
-		return uwsgi.workers[0].pid;
-	}
-	return 0;
-}
-
-int uwsgi_pypy_helper_worker_id() {
-	return uwsgi.mywid;
-}
-
-int uwsgi_pypy_helper_mule_id() {
-	return uwsgi.muleid;
-}
-
-void uwsgi_pypy_helper_signal(int signum) {
-	uwsgi_signal_send(uwsgi.signal_socket, signum);
-}
-
-struct uwsgi_opt **uwsgi_pypy_helper_opts(int *n) {
-	*n = uwsgi.exported_opts_cnt;
-	return uwsgi.exported_opts;
-}
-
-char *uwsgi_pypy_helper_version() {
-	return UWSGI_VERSION;
-}
-
-int uwsgi_pypy_helper_register_signal(int signum, char *kind, void *handler) {
-	return uwsgi_register_signal(signum, kind, handler, pypy_plugin.modifier1);
-}
-
-int uwsgi_pypy_helper_register_rpc(char *name, int argc, void *func) {
-	return uwsgi_register_rpc(name, &pypy_plugin, argc, func);
-}
-
-struct iovec *uwsgi_pypy_helper_environ(struct wsgi_request *wsgi_req, uint16_t *len) {
-	*len = wsgi_req->var_cnt;
-	return wsgi_req->hvec;
-}
-
 static int uwsgi_pypy_init() {
 
 	size_t rlen = 0;
@@ -93,12 +52,18 @@ static int uwsgi_pypy_init() {
 		exit(1);
 	}
 
-	if (upypy.lib) {
+	if (dlsym(RTLD_DEFAULT, "rpython_startup_code")) {
+		uwsgi_log("PyPy runtime detected, skipping libpypy-c loading\n");
+		goto ready;
+	}
+	else if (upypy.lib) {
 		upypy.handler = dlopen(upypy.lib, RTLD_NOW | RTLD_GLOBAL);
 	}
 	else {
 		if (upypy.home) {
-#ifdef __APPLE__
+#ifdef __CYGWIN__
+                        char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dll");
+#elif defined(__APPLE__)
                         char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dylib");
 #else
                         char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.so");
@@ -110,7 +75,9 @@ static int uwsgi_pypy_init() {
 		}
 		// fallback to standard library search path
 		if (!upypy.handler) {
-#ifdef __APPLE__
+#ifdef __CYGWIN__
+			upypy.handler = dlopen("libpypy-c.dll", RTLD_NOW | RTLD_GLOBAL);
+#elif defined(__APPLE__)
 			upypy.handler = dlopen("libpypy-c.dylib", RTLD_NOW | RTLD_GLOBAL);
 #else
 			upypy.handler = dlopen("libpypy-c.so", RTLD_NOW | RTLD_GLOBAL);
@@ -123,35 +90,24 @@ static int uwsgi_pypy_init() {
 		exit(1);
 	}
 
-	rpython_startup_code = dlsym(upypy.handler, "rpython_startup_code");
-	if (!rpython_startup_code) {
+	u_rpython_startup_code = dlsym(upypy.handler, "rpython_startup_code");
+	if (!u_rpython_startup_code) {
 		uwsgi_log("unable to find rpython_startup_code() symbol\n");
 		exit(1);
 	}
 
-	pypy_setup_home = dlsym(upypy.handler, "pypy_setup_home");
-	if (!pypy_setup_home) {
+	u_pypy_setup_home = dlsym(upypy.handler, "pypy_setup_home");
+	if (!u_pypy_setup_home) {
 		uwsgi_log("unable to find pypy_setup_home() symbol\n");
 		exit(1);
 	}
 
-	pypy_execute_source = dlsym(upypy.handler, "pypy_execute_source");
-	if (!pypy_execute_source) {
-		uwsgi_log("unable to find pypy_execute_source() symbol\n");
-		exit(1);
-	}
-
-	pypy_thread_attach = dlsym(upypy.handler, "pypy_thread_attach");
-        if (!pypy_thread_attach) {
-                uwsgi_log("!!! WARNING your libpypy-c does not export pypy_thread_attach, multithreading will not work !!!\n");
-        }
-
-	pypy_init_threads = dlsym(upypy.handler, "pypy_init_threads");
-        if (!pypy_init_threads) {
+	u_pypy_init_threads = dlsym(upypy.handler, "pypy_init_threads");
+        if (!u_pypy_init_threads) {
                 uwsgi_log("!!! WARNING your libpypy-c does not export pypy_init_threads, multithreading will not work !!!\n");
         }
 	
-	rpython_startup_code();
+	u_rpython_startup_code();
 
 	if (!upypy.home) {
 		upypy.home = getenv("PYPY_HOME");
@@ -161,11 +117,11 @@ static int uwsgi_pypy_init() {
 		}
 	}
 
-	if (pypy_setup_home(upypy.home, 0)) {
+	if (u_pypy_setup_home(upypy.home, 0)) {
 		char *retry = uwsgi_concat2(upypy.home, "/lib_pypy");
 		if (uwsgi_is_dir(retry)) {
 			// this time we use debug
-			if (!pypy_setup_home(retry, 1)) {
+			if (!u_pypy_setup_home(retry, 1)) {
 				free(retry);
 				goto ready;
 			}
@@ -175,12 +131,29 @@ static int uwsgi_pypy_init() {
         }
 
 ready:
+	u_pypy_execute_source = dlsym(upypy.handler, "pypy_execute_source");
+	if (!u_pypy_execute_source) {
+		uwsgi_log("unable to find pypy_execute_source() symbol\n");
+		exit(1);
+	}
+
+	u_pypy_thread_attach = dlsym(upypy.handler, "pypy_thread_attach");
+        if (!u_pypy_thread_attach) {
+                uwsgi_log("!!! WARNING your libpypy-c does not export pypy_thread_attach, multithreading will not work !!!\n");
+        }
+
 	if (upypy.setup) {
 		buffer = uwsgi_open_and_read(upypy.setup, &rlen, 1, NULL);
 	}
 	else {
 		char *start = dlsym(RTLD_DEFAULT, "uwsgi_pypy_setup_start");
+		if (!start) {
+			start = dlsym(RTLD_DEFAULT, "_uwsgi_pypy_setup_start");
+		}
 		char *end = dlsym(RTLD_DEFAULT, "uwsgi_pypy_setup_end");
+		if (!end) {
+			end = dlsym(RTLD_DEFAULT, "_uwsgi_pypy_setup_end");
+		}
 		if (start && end) {
 			buffer = uwsgi_concat2n(start, end-start, "", 0);
 		}
@@ -190,7 +163,7 @@ ready:
 		uwsgi_log("you have to load a pypy setup file with --pypy-setup\n");
 		exit(1);
 	}
-	if (pypy_execute_source(buffer)) {
+	if (u_pypy_execute_source(buffer)) {
 		exit(1);
 	}
 	free(buffer);
@@ -211,7 +184,7 @@ static void uwsgi_pypy_preinit_apps() {
 
 	struct uwsgi_string_list *usl = upypy.eval;
 	while(usl) {
-		if (pypy_execute_source(usl->value)) {
+		if (u_pypy_execute_source(usl->value)) {
 			exit(1);
 		}
 		usl = usl->next;
@@ -221,7 +194,7 @@ static void uwsgi_pypy_preinit_apps() {
 	while(usl) {
 		size_t rlen = 0;
 		char *buffer = uwsgi_open_and_read(usl->value, &rlen, 1, NULL);
-		if (pypy_execute_source(buffer)) {
+		if (u_pypy_execute_source(buffer)) {
 			exit(1);
 		}
 		free(buffer);
@@ -284,14 +257,14 @@ static struct uwsgi_option uwsgi_pypy_options[] = {
 };
 
 static void uwsgi_pypy_enable_threads() {
-	if (pypy_init_threads) {
-		pypy_init_threads();
+	if (u_pypy_init_threads) {
+		u_pypy_init_threads();
 	}
 }
 
 static void uwsgi_pypy_init_thread() {
-	if (pypy_thread_attach) {
-		pypy_thread_attach();
+	if (u_pypy_thread_attach) {
+		u_pypy_thread_attach();
 	}
 }
 
@@ -315,7 +288,7 @@ static uint16_t uwsgi_pypy_rpc(void *func, uint8_t argc, char **argv, uint16_t a
 static void uwsgi_pypy_post_fork() {
 	struct uwsgi_string_list *usl = upypy.eval_post_fork;
         while(usl) {
-                if (pypy_execute_source(usl->value)) {
+                if (u_pypy_execute_source(usl->value)) {
 			exit(1);
 		}
                 usl = usl->next;
@@ -324,7 +297,7 @@ static void uwsgi_pypy_post_fork() {
         while(usl) {
                 size_t rlen = 0;
                 char *buffer = uwsgi_open_and_read(usl->value, &rlen, 1, NULL);
-                if (pypy_execute_source(buffer)) {
+                if (u_pypy_execute_source(buffer)) {
 			exit(1);
 		}
                 free(buffer);
@@ -342,6 +315,20 @@ static void uwsgi_pypy_onload() {
 #endif
 }
 
+static int uwsgi_pypy_mule(char *opt) {
+
+        if (uwsgi_endswith(opt, ".py")) {
+                size_t rlen = 0;
+                char *buffer = uwsgi_open_and_read(opt, &rlen, 1, NULL);
+                u_pypy_execute_source(buffer);
+		free(buffer);
+                return 1;
+        }
+        return 0;
+
+}
+
+
 struct uwsgi_plugin pypy_plugin = {
 	.name = "pypy",
 	.modifier1 = 0,
@@ -357,4 +344,5 @@ struct uwsgi_plugin pypy_plugin = {
 	.enable_threads = uwsgi_pypy_enable_threads,
 	.rpc = uwsgi_pypy_rpc,
 	.post_fork = uwsgi_pypy_post_fork,
+	.mule = uwsgi_pypy_mule,
 };

plugins/pypy/pypy_setup.py

@@ -14,77 +14,258 @@ import cffi
 
 # this is a list holding object we do not want to be freed (like callback and handlers)
 uwsgi_gc = []
+# the main ffi
+ffi = cffi.FFI()
 
-defines = '''
+# the hooks we need to patch
+hooks = '''
 void free(void *);
+ssize_t read(int, void *, size_t);
+ssize_t write(int, const void *, size_t);
+int close(int);
 
 void (*uwsgi_pypy_hook_loader)(char *);
 void (*uwsgi_pypy_hook_file_loader)(char *);
 void (*uwsgi_pypy_hook_pythonpath)(char *);
-void (*uwsgi_pypy_hook_request)(void *, int);
+void (*uwsgi_pypy_hook_request)(struct wsgi_request *);
 void (*uwsgi_pypy_post_fork_hook)(void);
+'''
+
+# here we load CFLAGS and uwsgi.h from the binary
+defines0 = '''
+char *uwsgi_get_cflags();
+char *uwsgi_get_dot_h();
+'''
+ffi.cdef(defines0)
+lib0 = ffi.verify(defines0)
+
+
+# this is ugly, we should find a better approach
+# basically it build a list of #define from binary CFLAGS
+uwsgi_cdef = []
+uwsgi_defines = []
+uwsgi_cflags = ffi.string(lib0.uwsgi_get_cflags()).split()
+for cflag in uwsgi_cflags:
+    if cflag.startswith('-D'):
+        line = cflag[2:]
+        if '=' in line:
+            (key, value) = line.split('=', 1)
+            uwsgi_cdef.append('#define %s ...' % key)
+            uwsgi_defines.append('#define %s %s' % (key, value.replace('\\"','"').replace('""','"')))            
+        else:
+            uwsgi_cdef.append('#define %s ...' % line)
+            uwsgi_defines.append('#define %s 1' % line)            
+uwsgi_dot_h = ffi.string(lib0.uwsgi_get_dot_h())
+
+# uwsgi definitions
+cdefines = '''
+%s
 
 struct iovec {
-    char *iov_base;
-    uint64_t iov_len;
+	void *iov_base;
+	size_t iov_len;
+	...;
+};
+
+struct uwsgi_header {
+	uint8_t modifier1;
+	...;
+};
+
+struct wsgi_request {
+	int fd;
+	int async_id;
+	uint16_t var_cnt;
+	struct iovec *hvec;
+
+	int async_ready_fd;
+	int async_last_ready_fd;
+
+	int suspended;
+
+	struct uwsgi_header *uh;
+	...;
 };
 
 struct uwsgi_opt {
-        char *key;
-        char *value;
-        int configured;
+	char *key;
+	char *value;
+	...;
 };
 
+struct uwsgi_worker {
+	int id;
+	int pid;
+	uint64_t requests;
+	uint64_t delta_requests;
+	uint64_t signals;
+
+	int cheaped;
+	int suspended;
+	int sig;
+	uint8_t signum;
+
+	uint64_t running_time;
+	uint64_t avg_response_time;
+	uint64_t tx;
+	...;
+};
+
+struct uwsgi_plugin {
+	uint8_t modifier1;
+
+	void (*suspend) (struct wsgi_request *);
+        void (*resume) (struct wsgi_request *);
+	...;
+};
+
+struct uwsgi_buffer {
+	char *buf;
+	size_t pos;
+	...;
+};
+
+struct uwsgi_lock_item {
+	...;
+};
+
+struct uwsgi_cache {
+	struct uwsgi_lock_item *lock;
+	...;
+};
+
+struct uwsgi_cache_item {
+	uint64_t keysize;
+	...;
+};
+
+struct uwsgi_server {
+	char hostname[];
+	int mywid;
+	int muleid;
+	int master_process;
+
+	struct uwsgi_opt **exported_opts;
+	int exported_opts_cnt;	
+
+	struct uwsgi_worker *workers;
+
+	int signal_socket;
+	int numproc;
+	int async;
+
+	void (*schedule_to_main) (struct wsgi_request *);
+        void (*schedule_to_req) (void);
+
+	struct wsgi_request *(*current_wsgi_req) (void);
+	
+	struct wsgi_request *wsgi_req;
+
+	struct uwsgi_plugin *p[];
+	...;
+};
+struct uwsgi_server uwsgi;
+
+struct uwsgi_plugin pypy_plugin;
+
+const char *uwsgi_pypy_version;
+
 char *uwsgi_binary_path();
-void uwsgi_set_processname(char *);
-void uwsgi_alarm_trigger(char *, char *, uint64_t);
-int uwsgi_signal_registered(uint8_t);
 
-int uwsgi_response_write_body_do(void *, char *, uint64_t);
-int uwsgi_response_sendfile_do_can_close(void *, int, uint64_t, uint64_t, int);
-int uwsgi_response_prepare_headers(void *, char *, uint16_t);
-int uwsgi_response_add_header(void *, char *, uint16_t, char *, uint16_t);
-char *uwsgi_request_body_read(void *, uint64_t, int64_t *);
-char *uwsgi_request_body_readline(void *, uint64_t, int64_t *);
+int uwsgi_response_prepare_headers(struct wsgi_request *, char *, size_t);
+int uwsgi_response_add_header(struct wsgi_request *, char *, uint16_t, char *, uint16_t);
+int uwsgi_response_write_body_do(struct wsgi_request *, char *, size_t);
+int uwsgi_response_sendfile_do_can_close(struct wsgi_request *, int, size_t, size_t, int);
 
-struct iovec *uwsgi_pypy_helper_environ(void *, uint16_t *);
+char *uwsgi_request_body_read(struct wsgi_request *, ssize_t , ssize_t *);
+char *uwsgi_request_body_readline(struct wsgi_request *, ssize_t, ssize_t *);
 
-char *uwsgi_pypy_helper_version();
-int uwsgi_pypy_helper_register_signal(int, char *, void *);
-int uwsgi_pypy_helper_register_rpc(char *, int, void *);
-void uwsgi_pypy_helper_signal(int);
-struct uwsgi_opt** uwsgi_pypy_helper_opts(int *);
-int uwsgi_pypy_helper_masterpid();
-int uwsgi_pypy_helper_worker_id();
-int uwsgi_pypy_helper_mule_id();
+void uwsgi_buffer_destroy(struct uwsgi_buffer *);
+int uwsgi_is_again();
+
+int uwsgi_register_rpc(char *, struct uwsgi_plugin *, uint8_t, void *);
+int uwsgi_register_signal(uint8_t, char *, void *, uint8_t);
 
-char *uwsgi_cache_magic_get(char *, uint64_t, uint64_t *, uint64_t *, char *);
-int uwsgi_cache_magic_set(char *, uint64_t, char *, uint64_t, uint64_t, uint64_t, char *);
-int uwsgi_cache_magic_del(char *, uint64_t, char *);
-int uwsgi_add_timer(uint8_t, int);
-int uwsgi_add_rb_timer(uint8_t, int, int);
-int uwsgi_add_file_monitor(uint8_t, char *);
 char *uwsgi_do_rpc(char *, char *, uint8_t, char **, uint16_t *, uint16_t *);
-int uwsgi_signal_add_cron(uint8_t, int, int, int, int, int);
+
+void uwsgi_set_processname(char *);
+int uwsgi_signal_send(int, uint8_t);
+uint64_t uwsgi_worker_exceptions(int);
+int uwsgi_worker_is_busy(int);
+
+char *uwsgi_cache_magic_get(char *, uint16_t, uint64_t *, uint64_t *, char *);
+int uwsgi_cache_magic_set(char *, uint16_t, char *, uint64_t, uint64_t, uint64_t, char *);
+int uwsgi_cache_magic_del(char *, uint16_t, char *);
+int uwsgi_cache_magic_exists(char *, uint16_t, char *);
+int uwsgi_cache_magic_clear(char *);
+struct uwsgi_cache *uwsgi_cache_by_name(char *);
+void uwsgi_cache_rlock(struct uwsgi_cache *);
+void uwsgi_cache_rwunlock(struct uwsgi_cache *);
+char *uwsgi_cache_item_key(struct uwsgi_cache_item *);
+struct uwsgi_cache_item *uwsgi_cache_keys(struct uwsgi_cache *, uint64_t *, struct uwsgi_cache_item **);
+
+int uwsgi_add_file_monitor(uint8_t, char *);
+int uwsgi_add_timer(uint8_t, int);
+int uwsgi_signal_add_rb_timer(uint8_t, int, int);
 
 int uwsgi_user_lock(int);
 int uwsgi_user_unlock(int);
 
-'''
+int uwsgi_signal_registered(uint8_t);
 
-ffi = cffi.FFI()
-ffi.cdef(defines)
-lib = ffi.verify(defines)
+int uwsgi_signal_add_cron(uint8_t, int, int, int, int, int);
+void uwsgi_alarm_trigger(char *, char *, size_t);
+
+void async_schedule_to_req_green(void);
+void async_add_timeout(struct wsgi_request *, int);
+int async_add_fd_write(struct wsgi_request *, int, int);
+int async_add_fd_read(struct wsgi_request *, int, int);
+int uwsgi_connect(char *, int, int);
+
+int uwsgi_websocket_handshake(struct wsgi_request *, char *, uint16_t, char *, uint16_t);
+int uwsgi_websocket_send(struct wsgi_request *, char *, size_t);
+struct uwsgi_buffer *uwsgi_websocket_recv(struct wsgi_request *);
+struct uwsgi_buffer *uwsgi_websocket_recv_nb(struct wsgi_request *);
+
+char *uwsgi_chunked_read(struct wsgi_request *, size_t *, int, int);
+
+void uwsgi_disconnect(struct wsgi_request *);
+
+int uwsgi_ready_fd(struct wsgi_request *);
+
+void set_user_harakiri(int);
+
+%s
+
+''' % ('\n'.join(uwsgi_cdef), hooks)
+
+cverify = '''
+%s
+
+const char *uwsgi_pypy_version = UWSGI_VERSION;
+
+%s
+
+extern struct uwsgi_server uwsgi;
+extern struct uwsgi_plugin pypy_plugin;
+%s
+''' % ('\n'.join(uwsgi_defines), uwsgi_dot_h, hooks)
+
+ffi.cdef(cdefines)
+lib = ffi.verify(cverify)
 libc = ffi.dlopen(None)
 
+
+
 """
 this is a global object point the the WSGI callable
 it sucks, i will fix it in the near future...
 """
 wsgi_application = None
 
-
-sys.argv.insert(0, ffi.string(lib.uwsgi_binary_path()))
+# fix argv if needed
+if len(sys.argv) == 0:
+    sys.argv.insert(0, ffi.string(lib.uwsgi_binary_path()))
 
 
 """
@@ -115,7 +296,7 @@ def uwsgi_pypy_file_loader(filename):
     wsgi_application = getattr(mod, c)
 
 """
-.post_fork_hokk
+.post_fork_hook
 """
 @ffi.callback("void()")
 def uwsgi_pypy_post_fork_hook():
@@ -171,7 +352,7 @@ class WSGIinput(object):
         self.wsgi_req = wsgi_req
 
     def read(self, size=0):
-        rlen = ffi.new('int64_t*')
+        rlen = ffi.new('ssize_t*')
         chunk = lib.uwsgi_request_body_read(self.wsgi_req, size, rlen)
         if chunk != ffi.NULL:
             return ffi.string(chunk, rlen[0])
@@ -180,7 +361,7 @@ class WSGIinput(object):
         raise IOError("error waiting for wsgi.input")
 
     def getline(self, hint=0):
-        rlen = ffi.new('int64_t*')
+        rlen = ffi.new('ssize_t*')
         chunk = lib.uwsgi_request_body_readline(self.wsgi_req, hint, rlen)
         if chunk != ffi.NULL:
             return ffi.string(chunk, rlen[0])
@@ -213,8 +394,9 @@ class WSGIinput(object):
 """
 the WSGI request handler
 """
-@ffi.callback("void(void *, int)")
-def uwsgi_pypy_wsgi_handler(wsgi_req, core):
+@ffi.callback("void(struct wsgi_request *)")
+def uwsgi_pypy_wsgi_handler(wsgi_req):
+    import uwsgi
     global wsgi_application
 
     def writer(data):
@@ -229,10 +411,9 @@ def uwsgi_pypy_wsgi_handler(wsgi_req, core):
         return writer
 
     environ = {}
-    nv = ffi.new("uint16_t*")
-    iov = lib.uwsgi_pypy_helper_environ(wsgi_req, nv)
-    for i in range(0, nv[0], 2):
-        environ[ffi.string(iov[i].iov_base, iov[i].iov_len)] = ffi.string(iov[i+1].iov_base, iov[i+1].iov_len)
+    iov = wsgi_req.hvec
+    for i in range(0, wsgi_req.var_cnt, 2):
+        environ[ffi.string(ffi.cast("char*", iov[i].iov_base), iov[i].iov_len)] = ffi.string(ffi.cast("char*", iov[i+1].iov_base), iov[i+1].iov_len)
 
     environ['wsgi.version'] = (1, 0)
     scheme = 'http'
@@ -247,7 +428,8 @@ def uwsgi_pypy_wsgi_handler(wsgi_req, core):
     environ['wsgi.multithread'] = True
     environ['wsgi.multiprocess'] = True
 
-    environ['uwsgi.core'] = core
+    environ['uwsgi.core'] = wsgi_req.async_id
+    environ['uwsgi.node'] = uwsgi.hostname
 
     response = wsgi_application(environ, start_response)
     if type(response) is str:
@@ -281,13 +463,13 @@ Here we define the "uwsgi" virtual module
 
 uwsgi = imp.new_module('uwsgi')
 sys.modules['uwsgi'] = uwsgi
-uwsgi.version = ffi.string(lib.uwsgi_pypy_helper_version())
-
+uwsgi.version = ffi.string(lib.uwsgi_pypy_version)
+uwsgi.hostname = ffi.string(lib.uwsgi.hostname)
 
 def uwsgi_pypy_uwsgi_register_signal(signum, kind, handler):
     cb = ffi.callback('void(int)', handler)
     uwsgi_gc.append(cb)
-    if lib.uwsgi_pypy_helper_register_signal(signum, ffi.new("char[]", kind), cb) < 0:
+    if lib.uwsgi_register_signal(signum, ffi.new("char[]", kind), cb, lib.pypy_plugin.modifier1) < 0:
         raise Exception("unable to register signal %d" % signum)
 uwsgi.register_signal = uwsgi_pypy_uwsgi_register_signal
 
@@ -311,7 +493,7 @@ def uwsgi_pypy_uwsgi_register_rpc(name, func, argc=0):
     rpc_func = uwsgi_pypy_RPC(func)
     cb = ffi.callback("int(int, char*[], int[], char*)", rpc_func)
     uwsgi_gc.append(cb)
-    if lib.uwsgi_pypy_helper_register_rpc(ffi.new("char[]", name), argc, cb) < 0:
+    if lib.uwsgi_register_rpc(ffi.new("char[]", name), ffi.addressof(lib.pypy_plugin), argc, cb) < 0:
         raise Exception("unable to register rpc func %s" % name)
 uwsgi.register_rpc = uwsgi_pypy_uwsgi_register_rpc
 
@@ -350,9 +532,7 @@ def uwsgi_pypy_call(func, *args):
     return uwsgi_pypy_rpc(node, func, *args)
 uwsgi.call = uwsgi_pypy_call
     
-def uwsgi_pypy_uwsgi_signal(signum):
-    lib.uwsgi_pypy_helper_signal(signum)
-uwsgi.signal = uwsgi_pypy_uwsgi_signal
+uwsgi.signal = lambda x: lib.uwsgi_signal_send(lib.uwsgi.signal_socket, x)
 
 
 def uwsgi_pypy_uwsgi_cache_get(key, cache=ffi.NULL):
@@ -380,6 +560,21 @@ def uwsgi_pypy_uwsgi_cache_del(key, cache=ffi.NULL):
         raise Exception('unable to delete item from the cache')
 uwsgi.cache_del = uwsgi_pypy_uwsgi_cache_del
 
+def uwsgi_pypy_uwsgi_cache_keys(cache=ffi.NULL):
+    uc = lib.uwsgi_cache_by_name(cache)
+    if uc == ffi.NULL:
+        raise Exception('no local uWSGI cache available')
+    l = []
+    lib.uwsgi_cache_rlock(uc)
+    pos = ffi.new('uint64_t *')
+    uci = ffi.new('struct uwsgi_cache_item **')
+    while True:
+        uci[0] = lib.uwsgi_cache_keys(uc, pos, uci)
+        if uci[0] == ffi.NULL: break
+        l.append(ffi.string(lib.uwsgi_cache_item_key(uci[0]), uci[0].keysize))
+    lib.uwsgi_cache_rwunlock(uc)
+    return l
+uwsgi.cache_keys = uwsgi_pypy_uwsgi_cache_keys
 
 def uwsgi_pypy_uwsgi_add_timer(signum, secs):
     if lib.uwsgi_add_timer(signum, secs) < 0:
@@ -387,7 +582,7 @@ def uwsgi_pypy_uwsgi_add_timer(signum, secs):
 uwsgi.add_timer = uwsgi_pypy_uwsgi_add_timer
 
 def uwsgi_pypy_uwsgi_add_rb_timer(signum, secs):
-    if lib.uwsgi_add_rb_timer(signum, secs, 0) < 0:
+    if lib.uwsgi_signal_add_rb_timer(signum, secs, 0) < 0:
         raise Exception("unable to register redblack timer")
 uwsgi.add_rb_timer = uwsgi_pypy_uwsgi_add_rb_timer
 
@@ -397,27 +592,25 @@ def uwsgi_pypy_uwsgi_add_file_monitor(signum, filename):
         raise Exception("unable to register file monitor")
 uwsgi.add_file_monitor = uwsgi_pypy_uwsgi_add_file_monitor
 
-def uwsgi_pypy_lock(num):
+def uwsgi_pypy_lock(num=0):
     if lib.uwsgi_user_lock(num) < 0:
         raise Exception("invalid lock")
 uwsgi.lock = uwsgi_pypy_lock
 
-def uwsgi_pypy_unlock(num):
+def uwsgi_pypy_unlock(num=0):
     if lib.uwsgi_user_unlock(num) < 0:
         raise Exception("invalid lock")
 uwsgi.unlock = uwsgi_pypy_unlock
 
 def uwsgi_pypy_masterpid():
-    return lib.uwsgi_pypy_helper_masterpid()
+    if lib.uwsgi.master_process:
+        return lib.uwsgi.workers[0].pid
+    return 0
 uwsgi.masterpid = uwsgi_pypy_masterpid
 
-def uwsgi_pypy_worker_id():
-    return lib.uwsgi_pypy_helper_worker_id()
-uwsgi.worker_id = uwsgi_pypy_worker_id
+uwsgi.worker_id = lambda: lib.uwsgi.mywid
 
-def uwsgi_pypy_mule_id():
-    return lib.uwsgi_pypy_helper_mule_id()
-uwsgi.mule_id = uwsgi_pypy_mule_id
+uwsgi.mule_id = lambda: lib.uwsgi.muleid
 
 def uwsgi_pypy_signal_registered(signum):
     if lib.uwsgi_signal_registered(signum) > 0:
@@ -429,28 +622,24 @@ def uwsgi_pypy_alarm(alarm, msg):
     lib.uwsgi_alarm_trigger(ffi.new('char[]', alarm), ffi.new('char[]', msg), len(msg))
 uwsgi.alarm = uwsgi_pypy_alarm
 
-def uwsgi_pypy_setprocname(name):
-    lib.uwsgi_set_processname(ffi.new('char[]',name))
-uwsgi.setprocname = uwsgi_pypy_setprocname
+uwsgi.setprocname = lambda name: lib.uwsgi_set_processname(ffi.new('char[]', name))
 
 def uwsgi_pypy_add_cron(signum, minute, hour, day, month, week):
     if lib.uwsgi_signal_add_cron(signum, minute, hour, day, month, week) < 0:
         raise Exception("unable to register cron")
-    return True
 uwsgi.add_cron = uwsgi_pypy_add_cron
 
 """
 populate uwsgi.opt
 """
 uwsgi.opt = {}
-n_opts = ffi.new('int*')
-u_opts = lib.uwsgi_pypy_helper_opts(n_opts)
-for i in range(0, n_opts[0]):
-    k = ffi.string(u_opts[i].key)
-    if u_opts[i].value == ffi.NULL:
+for i in range(0, lib.uwsgi.exported_opts_cnt):
+    uo = lib.uwsgi.exported_opts[i]
+    k = ffi.string(uo.key)
+    if uo.value == ffi.NULL:
         v = True
     else:
-        v = ffi.string(u_opts[i].value)
+        v = ffi.string(uo.value)
     if k in uwsgi.opt:
         if type(uwsgi.opt[k]) is list:
             uwsgi.opt[k].append(v)
@@ -459,5 +648,287 @@ for i in range(0, n_opts[0]):
     else:
         uwsgi.opt[k] = v
 
+def uwsgi_pypy_current_wsgi_req():
+    wsgi_req = lib.uwsgi.current_wsgi_req()
+    if wsgi_req == ffi.NULL:
+        raise Exception("unable to get current wsgi_request, check your setup !!!")
+    return wsgi_req
+
+"""
+uwsgi.suspend()
+"""
+def uwsgi_pypy_suspend():
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
+    if lib.uwsgi.schedule_to_main:
+        lib.uwsgi.schedule_to_main(wsgi_req);
+uwsgi.suspend = uwsgi_pypy_suspend
+
+"""
+uwsgi.workers()
+"""
+def uwsgi_pypy_workers():
+    workers = []
+    for i in range(1, lib.uwsgi.numproc+1):
+        worker = {}
+        worker['id'] = lib.uwsgi.workers[i].id
+        worker['pid'] = lib.uwsgi.workers[i].pid
+        worker['requests'] = lib.uwsgi.workers[i].requests
+        worker['delta_requests'] = lib.uwsgi.workers[i].delta_requests
+        worker['signals'] = lib.uwsgi.workers[i].signals
+        worker['exceptions'] = lib.uwsgi_worker_exceptions(i);
+        worker['apps'] = []
+        if lib.uwsgi.workers[i].cheaped:
+            worker['status'] == 'cheap'
+        elif lib.uwsgi.workers[i].suspended and not lib.uwsgi_worker_is_busy(i):
+            worker['status'] == 'pause'
+        else:
+            if lib.uwsgi.workers[i].sig:
+                worker['status'] = 'sig%d' % lib.uwsgi.workers[i].signum
+            elif lib.uwsgi_worker_is_busy(i):
+                worker['status'] = 'busy' 
+            else:
+                worker['status'] = 'idle'
+        worker['running_time'] = lib.uwsgi.workers[i].running_time
+        worker['avg_rt'] = lib.uwsgi.workers[i].avg_response_time
+        worker['tx'] = lib.uwsgi.workers[i].tx
+            
+        workers.append(worker)
+    return workers
+    
+uwsgi.workers = uwsgi_pypy_workers
+
+"""
+uwsgi.async_sleep(timeout)
+"""
+def uwsgi_pypy_async_sleep(timeout):
+    if timeout > 0:
+        wsgi_req = uwsgi_pypy_current_wsgi_req();
+        lib.async_add_timeout(wsgi_req, timeout);
+uwsgi.async_sleep = uwsgi_pypy_async_sleep
+
+"""
+uwsgi.async_connect(addr)
+"""
+def uwsgi_pypy_async_connect(addr):
+    fd = lib.uwsgi_connect(ffi.new('char[]', addr), 0, 1)
+    if fd < 0:
+        raise Exception("unable to connect to %s" % addr)
+    return fd
+uwsgi.async_connect = uwsgi_pypy_async_connect
+
+uwsgi.connection_fd = lambda: uwsgi_pypy_current_wsgi_req().fd
+
+"""
+uwsgi.wait_fd_read(fd, timeout=0)
+"""
+def uwsgi_pypy_wait_fd_read(fd, timeout=0):
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    if lib.async_add_fd_read(wsgi_req, fd, timeout) < 0:
+        raise Exception("unable to add fd %d to the event queue" % fd)
+uwsgi.wait_fd_read = uwsgi_pypy_wait_fd_read
+
+"""
+uwsgi.wait_fd_write(fd, timeout=0)
+"""
+def uwsgi_pypy_wait_fd_write(fd, timeout=0):
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    if lib.async_add_fd_write(wsgi_req, fd, timeout) < 0:
+        raise Exception("unable to add fd %d to the event queue" % fd)
+uwsgi.wait_fd_write = uwsgi_pypy_wait_fd_write
+
+"""
+uwsgi.ready_fd()
+"""
+def uwsgi_pypy_ready_fd():
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    return lib.uwsgi_ready_fd(wsgi_req)
+uwsgi.ready_fd = uwsgi_pypy_ready_fd
+    
+
+"""
+uwsgi.send(fd=None,data)
+"""
+def uwsgi_pypy_send(*args):
+    if len(args) == 0:
+        raise ValueError("uwsgi.send() takes at least 1 argument")
+    elif len(args) == 1:
+        wsgi_req = uwsgi_pypy_current_wsgi_req();
+        fd = wsgi_req.fd
+        data = args[0]
+    else:
+        fd = args[0]
+        data = args[1]
+    rlen = libc.write(fd, data, len(data))
+    if rlen <= 0:
+        raise IOError("unable to send data")
+    return rlen
+uwsgi.send = uwsgi_pypy_send
+
+"""
+uwsgi.recv(fd=None,len)
+"""
+def uwsgi_pypy_recv(*args):
+    if len(args) == 0:
+        raise ValueError("uwsgi.recv() takes at least 1 argument")
+    elif len(args) == 1:
+        wsgi_req = uwsgi_pypy_current_wsgi_req();
+        fd = wsgi_req.fd
+        l = args[0]
+    else:
+        fd = args[0]
+        l = args[1]
+    data = ffi.new('char[%d]' % l)
+    rlen = libc.read(fd, data, l)
+    if rlen <= 0:
+        raise IOError("unable to receive data")
+    return ffi.string(data[0:rlen])
+uwsgi.recv = uwsgi_pypy_recv
+    
+"""
+uwsgi.close(fd)
+"""
+uwsgi.close = lambda fd: lib.close(fd)
+
+"""
+uwsgi.disconnect()
+"""
+uwsgi.disconnect = lambda: lib.uwsgi_disconnect(uwsgi_pypy_current_wsgi_req())
+
+"""
+uwsgi.websocket_recv()
+"""
+def uwsgi_pypy_websocket_recv():
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    ub = lib.uwsgi_websocket_recv(wsgi_req);
+    if ub == ffi.NULL:
+        raise IOError("unable to receive websocket message")
+    ret = ffi.string(ub.buf, ub.pos)
+    lib.uwsgi_buffer_destroy(ub)
+    return ret
+uwsgi.websocket_recv = uwsgi_pypy_websocket_recv
+
+"""
+uwsgi.websocket_recv_nb()
+"""
+def uwsgi_pypy_websocket_recv_nb():
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    ub = lib.uwsgi_websocket_recv_nb(wsgi_req);
+    if ub == ffi.NULL:
+        raise IOError("unable to receive websocket message")
+    ret = ffi.string(ub.buf, ub.pos)
+    lib.uwsgi_buffer_destroy(ub)
+    return ret
+uwsgi.websocket_recv_nb = uwsgi_pypy_websocket_recv_nb
+
+"""
+uwsgi.websocket_handshake(key, origin)
+"""
+def uwsgi_pypy_websocket_handshake(key, origin=''):
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    if lib.uwsgi_websocket_handshake(wsgi_req, ffi.new('char[]', key), len(key), ffi.new('char[]',origin), len(origin)) < 0:
+        raise IOError("unable to complete websocket handshake")
+uwsgi.websocket_handshake = uwsgi_pypy_websocket_handshake
+
+"""
+uwsgi.websocket_send(msg)
+"""
+def uwsgi_pypy_websocket_send(msg):
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    if lib.uwsgi_websocket_send(wsgi_req, ffi.new('char[]', msg), len(msg)) < 0:
+        raise IOError("unable to send websocket message")
+uwsgi.websocket_send = uwsgi_pypy_websocket_send
+
+"""
+uwsgi.chunked_read(timeout=0)
+"""
+def uwsgi_pypy_chunked_read(timeout=0):
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    rlen = ffi.new("size_t*")
+    chunk = lib.uwsgi_chunked_read(wsgi_req, rlen, timeout, 0)
+    if chunk == ffi.NULL:
+        raise IOError("unable to receive chunked part")
+    return ffi.string(chunk, rlen[0])
+uwsgi.chunked_read = uwsgi_pypy_chunked_read
+
+"""
+uwsgi.chunked_read_nb()
+"""
+def uwsgi_pypy_chunked_read_nb():
+    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    rlen = ffi.new("size_t*")
+    chunk = lib.uwsgi_chunked_read(wsgi_req, rlen, 0, 1)
+    if chunk == ffi.NULL:
+        if lib.uwsgi_is_again() > 0:
+            return None
+        raise IOError("unable to receive chunked part")
+    
+    return ffi.string(chunk, rlen[0])
+uwsgi.chunked_read_nb = uwsgi_pypy_chunked_read_nb
+
+"""
+uwsgi.set_user_harakiri(sec)
+"""
+uwsgi.set_user_harakiri = lambda x: lib.set_user_harakiri(x)
+
+
 print "Initialized PyPy with Python", sys.version
 print "PyPy Home:", sys.prefix
+
+
+"""
+Continulets support
+"""
+
+# this is the dictionary of continulets (one per-core)
+uwsgi_pypy_continulets = {}
+
+
+def uwsgi_pypy_continulet_wrapper(cont):
+    lib.async_schedule_to_req_green()
+
+@ffi.callback("void()")
+def uwsgi_pypy_continulet_schedule():
+    id = lib.uwsgi.wsgi_req.async_id
+    modifier1 = lib.uwsgi.wsgi_req.uh.modifier1;
+
+    # generate a new continulet
+    if not lib.uwsgi.wsgi_req.suspended:
+        from _continuation import continulet
+        uwsgi_pypy_continulets[id] = continulet(uwsgi_pypy_continulet_wrapper)
+        lib.uwsgi.wsgi_req.suspended = 1
+
+    # this is called in the main stack
+    if lib.uwsgi.p[modifier1].suspend:
+        lib.uwsgi.p[modifier1].suspend(ffi.NULL)    
+
+    # let's switch
+    uwsgi_pypy_continulets[id].switch()
+
+    # back to the main stack
+    if lib.uwsgi.p[modifier1].resume:
+        lib.uwsgi.p[modifier1].resume(ffi.NULL) 
+
+@ffi.callback("void(struct wsgi_request *)")
+def uwsgi_pypy_continulet_switch(wsgi_req):
+    id = wsgi_req.async_id
+    modifier1 = wsgi_req.uh.modifier1;
+
+    # this is called in the current continulet
+    if lib.uwsgi.p[modifier1].suspend:
+        lib.uwsgi.p[modifier1].suspend(wsgi_req)    
+
+    uwsgi_pypy_continulets[id].switch()
+
+    # back to the continulet
+    if lib.uwsgi.p[modifier1].resume:
+        lib.uwsgi.p[modifier1].resume(wsgi_req) 
+
+    # update current running continulet
+    lib.uwsgi.wsgi_req = wsgi_req
+    
+def uwsgi_pypy_setup_continulets():
+    if lib.uwsgi.async <= 1:
+        raise Exception("pypy continulets require async mode !!!")
+    lib.uwsgi.schedule_to_main = uwsgi_pypy_continulet_switch
+    lib.uwsgi.schedule_to_req = uwsgi_pypy_continulet_schedule
+    print "*** PyPy Continulets engine loaded ***"

plugins/pypy/uwsgiplugin.py

@@ -2,7 +2,7 @@ NAME='pypy'
 LDFLAGS = []
 LIBS = []
 GCC_LIST = ['pypy_plugin']
-BINARY_LIST = [ ('uwsgi_pypy_setup','pypy_setup.py')]
+BINARY_LIST = [ ('_uwsgi_pypy_setup','pypy_setup.py')]
 CFLAGS = []
 try:
     import __pypy__

plugins/python/profiler.c

@@ -13,6 +13,15 @@ int PyFrame_GetLineNumber(PyFrameObject *frame) {
 }
 #endif
 
+#ifdef PYTHREE
+#undef PyString_AsString
+static char *PyString_AsString(PyObject *o) {
+	PyObject *zero = PyUnicode_AsLatin1String(o);
+	if (!zero) return "";
+        return PyBytes_AsString(zero);
+}
+#endif
+
 int uwsgi_python_profiler_call(PyObject *obj, PyFrameObject *frame, int what, PyObject *arg) {
 
 	static uint64_t last_ts = 0;

plugins/python/pyloader.c

@@ -10,6 +10,7 @@
 
 extern struct uwsgi_server uwsgi;
 extern struct uwsgi_python up;
+extern struct uwsgi_plugin python_plugin;
 
 extern char **environ;
 
@@ -94,6 +95,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 	wi = &uwsgi_apps[id];
 
 	memset(wi, 0, sizeof(struct uwsgi_app));
+	wi->modifier1 = python_plugin.modifier1;
 	wi->mountpoint_len = wsgi_req->appid_len < 0xff ? wsgi_req->appid_len : (0xff-1);
 	strncpy(wi->mountpoint, wsgi_req->appid, wi->mountpoint_len);
 
@@ -605,6 +607,52 @@ PyObject *uwsgi_file_loader(void *arg1) {
 
 }
 
+PyObject *uwsgi_pecan_loader(void *arg1) {
+
+	char *pecan = (char *) arg1;
+	PyObject *pecan_module, *pecan_dict, *pecan_deploy;
+	PyObject *pecan_arg, *pecan_app;
+
+	uwsgi_log( "Loading pecan environment: %s\n", pecan);
+
+	pecan_module = PyImport_ImportModule("pecan.deploy");
+	if (!pecan_module) {
+		PyErr_Print();
+		exit(UWSGI_FAILED_APP_CODE);
+	}
+
+	pecan_dict = PyModule_GetDict(pecan_module);
+	if (!pecan_dict) {
+		PyErr_Print();
+		exit(UWSGI_FAILED_APP_CODE);
+	}
+
+	pecan_deploy = PyDict_GetItemString(pecan_dict, "deploy");
+	if (!pecan_deploy) {
+		PyErr_Print();
+		exit(UWSGI_FAILED_APP_CODE);
+	}
+
+	pecan_arg = PyTuple_New(1);
+	if (!pecan_arg) {
+		PyErr_Print();
+		exit(UWSGI_FAILED_APP_CODE);
+	}
+
+	if (PyTuple_SetItem(pecan_arg, 0, UWSGI_PYFROMSTRING(pecan))) {
+		PyErr_Print();
+		exit(UWSGI_FAILED_APP_CODE);
+	}
+
+	pecan_app = PyEval_CallObject(pecan_deploy, pecan_arg);
+	if (!pecan_app) {
+		PyErr_Print();
+		exit(UWSGI_FAILED_APP_CODE);
+	}
+
+	return pecan_app;
+}
+
 PyObject *uwsgi_paste_loader(void *arg1) {
 
 	char *paste = (char *) arg1;
@@ -666,7 +714,6 @@ PyObject *uwsgi_paste_loader(void *arg1) {
 		exit(UWSGI_FAILED_APP_CODE);
 	}
 
-
 	return paste_app;
 }
 

plugins/python/python_plugin.c

@@ -121,6 +121,9 @@ struct uwsgi_option uwsgi_python_options[] = {
 	{"pyargv", required_argument, 0, "manually set sys.argv", uwsgi_opt_set_str, &up.argv, 0},
 	{"optimize", required_argument, 'O', "set python optimization level", uwsgi_opt_set_int, &up.optimize, 0},
 
+
+	{"pecan", required_argument, 0, "load a pecan config file", uwsgi_opt_set_str, &up.pecan, 0},
+
 	{"paste", required_argument, 0, "load a paste.deploy config file", uwsgi_opt_set_str, &up.paste, 0},
 	{"paste-logger", no_argument, 0, "enable paste fileConfig logger", uwsgi_opt_true, &up.paste_logger, 0},
 
@@ -1058,6 +1061,7 @@ void uwsgi_python_init_apps() {
         up.loaders[LOADER_DYN] = uwsgi_dyn_loader;
         up.loaders[LOADER_UWSGI] = uwsgi_uwsgi_loader;
         up.loaders[LOADER_FILE] = uwsgi_file_loader;
+        up.loaders[LOADER_PECAN] = uwsgi_pecan_loader;
         up.loaders[LOADER_PASTE] = uwsgi_paste_loader;
         up.loaders[LOADER_EVAL] = uwsgi_eval_loader;
         up.loaders[LOADER_MOUNT] = uwsgi_mount_loader;
@@ -1123,6 +1127,9 @@ next:
 	if (up.file_config != NULL) {
 		init_uwsgi_app(LOADER_FILE, up.file_config, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
 	}
+	if (up.pecan != NULL) {
+		init_uwsgi_app(LOADER_PECAN, up.pecan, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
+	}
 	if (up.paste != NULL) {
 		init_uwsgi_app(LOADER_PASTE, up.paste, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
 	}
@@ -1732,7 +1739,7 @@ int uwsgi_python_mule_msg(char *message, size_t len) {
 	return 1;
 }
 
-void uwsgi_python_harakiri(int wid) {
+static void uwsgi_python_harakiri(int wid) {
 
 	if (up.tracebacker) {
 
@@ -1762,7 +1769,7 @@ void uwsgi_python_harakiri(int wid) {
 	import logging
 	logging.basicConfig(filename='/tmp/pippo.log')
 */
-ssize_t uwsgi_python_logger(struct uwsgi_logger *ul, char *message, size_t len) {
+static ssize_t uwsgi_python_logger(struct uwsgi_logger *ul, char *message, size_t len) {
 	if (!Py_IsInitialized()) return -1;
 
 	UWSGI_GET_GIL
@@ -1800,7 +1807,7 @@ clear:
 	return -1;
 }
 
-void uwsgi_python_on_load() {
+static void uwsgi_python_on_load() {
 	uwsgi_register_logger("python", uwsgi_python_logger);
 }