1.9.18.1

Still need to loop again when EAGAIN after a read triggered by an event, Fixes #363

LICENSE

@@ -1,3 +1,19 @@
+----------------------------------------------------------------------
+
+LINKING EXCEPTION
+
+ In addition to the permissions in the GNU General Public License,
+ the authors give you unlimited permission to link the compiled
+ version of this library into combinations with other programs,
+ and to distribute those combinations without any restriction
+ coming from the use of this file. (The General Public License
+ restrictions do apply in other respects; for example, they cover
+ modification of the file, and distribution when not linked into
+ a combined executable.)
+
+----------------------------------------------------------------------
+
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

attach.py

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

buildconf/all.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-main_plugin = python,gevent,psgi,lua,php,rack,jvm,jwsgi,ring,mono,transformation_toupper,coroae,v8,cgi,xslt,webdav,ssi,ldap
+main_plugin = python,gevent,psgi,lua,php,rack,jvm,jwsgi,ring,mono,transformation_toupper,coroae,v8,cgi,xslt,webdav,ssi,ldap,gccgo,rados
 inherit = base

buildconf/minimal.ini

@@ -0,0 +1,33 @@
+[uwsgi]
+xml = false
+yaml = false
+json = false
+zeromq = false
+ssl = false
+pcre = false
+routing = false
+matheval = false
+debug = false
+unbit = false
+xml_implementation = none
+yaml_implementation = none
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins = %(main_plugin)s
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

buildconf/plonly.ini

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

buildconf/pyonly.ini

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

buildconf/pypyonly.ini

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

buildconf/rados.ini

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

buildconf/rbonly.ini

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

core/alarm.c

@@ -184,8 +184,8 @@ static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
 
 	// map instances to the log
 	char *list = uwsgi_str(alarms);
-	char *p = strtok(list, ",");
-	while (p) {
+	char *p, *ctx = NULL;
+	uwsgi_foreach_token(list, ",", p, ctx) {
 		struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(p);
 		if (!uai) {
 			free(list);
@@ -205,7 +205,6 @@ static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
 		else {
 			ual->alarms = uall;
 		}
-		p = strtok(NULL, ",");
 	}
 	free(list);
 	return 0;

core/buffer.c

@@ -172,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);
@@ -195,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)) {

core/cache.c

@@ -7,7 +7,7 @@ extern struct uwsgi_server uwsgi;
 
 /* how the cache bitmap works:
 
-	a bitmap is a shared mempry area allocated when requested by the user with --cache2
+	a bitmap is a shared memory area allocated when requested by the user with --cache2
 
 	Each block maps to a bit in the bitmap. If the corresponding bit is cleared
 	the block is usable otherwise the block scanner will search for the next one.
@@ -325,7 +325,7 @@ void uwsgi_cache_init(struct uwsgi_cache *uc) {
 			exit(1);
 		}
 		uc->items = (struct uwsgi_cache_item *) mmap(NULL, uc->filesize, PROT_READ | PROT_WRITE, MAP_SHARED, cache_fd, 0);
-		if (!uc->items) {
+		if (uc->items == MAP_FAILED) {
 			uwsgi_error("uwsgi_cache_init()/mmap() [with store]");
 			exit(1);
 		}
@@ -335,7 +335,7 @@ void uwsgi_cache_init(struct uwsgi_cache *uc) {
 	}
 	else {
 		uc->items = (struct uwsgi_cache_item *) mmap(NULL, uc->filesize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-		if (!uc->items) {
+		if (uc->items == MAP_FAILED) {
 			uwsgi_error("uwsgi_cache_init()/mmap()");
 			exit(1);
 		}
@@ -773,7 +773,7 @@ int uwsgi_cache_set2(struct uwsgi_cache *uc, char *key, uint16_t keylen, char *v
 			cache_unmark_blocks(uc, uci->first_block, uci->valsize);
 		}
 		if ( !(flags & UWSGI_CACHE_FLAG_MATH)) {
-			memcpy(uc->data + (uci->first_block * uc->blocksize), val, vallen);
+			memcpy(((char *) uc->data) + (uci->first_block * uc->blocksize), val, vallen);
 		}
 		else {
 			int64_t *num = (int64_t *)(((char *) uc->data) + (uci->first_block * uc->blocksize));
@@ -1191,26 +1191,23 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
 		uc->store = c_store;
 
 		if (c_nodes) {
-			char *p = strtok(c_nodes, ";");
-			while(p) {
+			char *p, *ctx = NULL;
+			uwsgi_foreach_token(c_nodes, ";", p, ctx) {
 				uwsgi_string_new_list(&uc->nodes, p);
-				p = strtok(NULL, ";");
 			}
 		}
 
 		if (c_sync) {
-			char *p = strtok(c_sync, ";");
-                        while(p) {
+			char *p, *ctx = NULL;
+			uwsgi_foreach_token(c_sync, ";", p, ctx) {
                                 uwsgi_string_new_list(&uc->sync_nodes, p);
-                                p = strtok(NULL, ";");
                         }
 		}
 
 		if (c_udp_servers) {
-                        char *p = strtok(c_udp_servers, ";");
-                        while(p) {
+			char *p, *ctx = NULL;
+                        uwsgi_foreach_token(c_udp_servers, ";", p, ctx) {
                                 uwsgi_string_new_list(&uc->udp_servers, p);
-                                p = strtok(NULL, ";");
                         }
                 }
 		

core/config.c

@@ -55,10 +55,9 @@ int uwsgi_logic_opt_if_not_exists(char *key, char *value) {
 
 int uwsgi_logic_opt_for(char *key, char *value) {
 
-        char *p = strtok(uwsgi.logic_opt_data, " ");
-        while (p) {
+        char *p, *ctx = NULL;
+	uwsgi_foreach_token(uwsgi.logic_opt_data, " ", p, ctx) {
                 add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
-                p = strtok(NULL, " ");
         }
 
         return 1;
@@ -294,8 +293,25 @@ int uwsgi_count_options(struct uwsgi_option *uopt) {
         return count;
 }
 
+int uwsgi_opt_exists(char *name) {
+	struct uwsgi_option *op = uwsgi.options;
+	while (op->name) {
+		if (!strcmp(name, op->name)) return 1;
+		op++;
+	}
+	return 0;	
+}
+
+/*
+	avoid loops here !!!
+*/
 struct uwsgi_option *uwsgi_opt_get(char *name) {
-        struct uwsgi_option *op = uwsgi.options;
+        struct uwsgi_option *op;
+	int round = 0;
+retry:
+	round++;
+	if (round > 2) goto end;
+	op = uwsgi.options;
 
         while (op->name) {
                 if (!strcmp(name, op->name)) {
@@ -304,10 +320,26 @@ struct uwsgi_option *uwsgi_opt_get(char *name) {
                 op++;
         }
 
+	if (uwsgi.autoload) {
+		if (uwsgi_try_autoload(name)) goto retry;
+	}
+
+end:
+	if (uwsgi.strict) {
+                uwsgi_log("[strict-mode] unknown config directive: %s\n", name);
+                exit(1);
+        }
+
         return NULL;
 }
 
+
+
 void add_exported_option(char *key, char *value, int configured) {
+	add_exported_option_do(key, value, configured, 0);
+}
+
+void add_exported_option_do(char *key, char *value, int configured, int placeholder_only) {
 
 	struct uwsgi_string_list *blacklist = uwsgi.blacklist;
 	struct uwsgi_string_list *whitelist = uwsgi.whitelist;
@@ -395,6 +427,15 @@ add:
 	uwsgi.exported_opts_cnt++;
 	uwsgi.dirty_config = 1;
 
+	if (placeholder_only) {
+		if (uwsgi_opt_exists(key)) {
+			uwsgi_log("you cannot use %s as a placeholder, it is already available as an option\n");
+			exit(1);
+		}
+		uwsgi.exported_opts[id]->configured = 1;
+		return;
+	}
+
 	struct uwsgi_option *op = uwsgi_opt_get(key);
 	if (op) {
 		// requires master ?
@@ -458,11 +499,6 @@ add:
 			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() {
@@ -478,3 +514,118 @@ void uwsgi_fallback_config() {
         	// never here
 	}
 }
+
+int uwsgi_manage_opt(char *key, char *value) {
+
+        struct uwsgi_option *op = uwsgi_opt_get(key);
+	if (op) {
+        	op->func(key, value, op->data);
+                return 1;
+        }
+        return 0;
+
+}
+
+void uwsgi_configure() {
+
+        int i;
+
+        // and now apply the remaining configs
+restart:
+        for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
+                if (uwsgi.exported_opts[i]->configured)
+                        continue;
+                uwsgi.dirty_config = 0;
+                uwsgi.exported_opts[i]->configured = uwsgi_manage_opt(uwsgi.exported_opts[i]->key, uwsgi.exported_opts[i]->value);
+		// some option could cause a dirty config tree
+                if (uwsgi.dirty_config)
+                        goto restart;
+        }
+
+}
+
+
+void uwsgi_opt_custom(char *key, char *value, void *data ) {
+        struct uwsgi_custom_option *uco = (struct uwsgi_custom_option *)data;
+        size_t i, count = 1;
+        size_t value_len = 0;
+        if (value)
+                value_len = strlen(value);
+        off_t pos = 0;
+        char **opt_argv;
+        char *tmp_val = NULL, *p = NULL;
+
+        // now count the number of args
+        for (i = 0; i < value_len; i++) {
+                if (value[i] == ' ') {
+                        count++;
+                }
+        }
+
+        // allocate a tmp array
+        opt_argv = uwsgi_calloc(sizeof(char *) * count);
+        //make a copy of the value;
+        if (value_len > 0) {
+                tmp_val = uwsgi_str(value);
+                // fill the array of options
+                char *p, *ctx = NULL;
+                uwsgi_foreach_token(tmp_val, " ", p, ctx) {
+                        opt_argv[pos] = p;
+                        pos++;
+                }
+        }
+        else {
+                // no argument specified
+                opt_argv[0] = "";
+        }
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("found custom option %s with %d args\n", key, count);
+#endif
+
+        // now make a copy of the option template
+        char *tmp_opt = uwsgi_str(uco->value);
+        // split it
+        char *ctx = NULL;
+        uwsgi_foreach_token(tmp_opt, ";", p, ctx) {
+                char *equal = strchr(p, '=');
+                if (!equal)
+                        goto clear;
+                *equal = '\0';
+
+                // build the key
+                char *new_key = uwsgi_str(p);
+                for (i = 0; i < count; i++) {
+                        char *old_key = new_key;
+                        char *tmp_num = uwsgi_num2str(i + 1);
+                        char *placeholder = uwsgi_concat2((char *) "$", tmp_num);
+                        free(tmp_num);
+                        new_key = uwsgi_substitute(old_key, placeholder, opt_argv[i]);
+                        if (new_key != old_key)
+                                free(old_key);
+                        free(placeholder);
+                }
+
+                // build the value
+                char *new_value = uwsgi_str(equal + 1);
+                for (i = 0; i < count; i++) {
+                        char *old_value = new_value;
+                        char *tmp_num = uwsgi_num2str(i + 1);
+                        char *placeholder = uwsgi_concat2((char *) "$", tmp_num);
+                        free(tmp_num);
+                        new_value = uwsgi_substitute(old_value, placeholder, opt_argv[i]);
+                        if (new_value != old_value)
+                                free(old_value);
+                        free(placeholder);
+                }
+                // ignore return value here
+                uwsgi_manage_opt(new_key, new_value);
+        }
+
+clear:
+        free(tmp_val);
+        free(tmp_opt);
+        free(opt_argv);
+
+}
+

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;
 	}
@@ -123,6 +139,10 @@ int uwsgi_daemon_check_pid_reload(pid_t diedpid) {
 		}
 #endif
 		if (ud->pid == diedpid && !ud->pidfile) {
+			if (ud->control) {
+				gracefully_kill_them_all(0);
+				return 0;
+			}
 			uwsgi_spawn_daemon(ud);
 			return 1;
 		}
@@ -215,9 +235,11 @@ void uwsgi_detach_daemons() {
 			// try to gracefully stop daemon, kill it if it won't die
 			// if mercy is not set than wait up to 3 seconds
 			time_t timeout = uwsgi_now() + (uwsgi.reload_mercy ? uwsgi.reload_mercy : 3);
+			int waitpid_status;
 			while (!kill(ud->pid, 0)) {
 				kill(-ud->pid, SIGTERM);
 				sleep(1);
+				waitpid(-ud->pid, &waitpid_status, WNOHANG);
 				if (uwsgi_now() >= timeout) {
 					uwsgi_log("[uwsgi-daemons] daemon did not died in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command);
 					kill(-ud->pid, SIGKILL);
@@ -237,7 +259,6 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 	// skip unregistered daemons
 	if (!ud->registered) return;
 
-	int devnull = -1;
 	int throttle = 0;
 
 	if (uwsgi.current_time - ud->last_spawn <= 3) {
@@ -251,6 +272,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;
@@ -282,18 +304,7 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 
 		if (!uwsgi.daemons_honour_stdin) {
 			// /dev/null will became stdin
-			devnull = open("/dev/null", O_RDONLY);
-			if (devnull < 0) {
-				uwsgi_error("/dev/null open()");
-				exit(1);
-			}
-			if (devnull != 0) {
-				if (dup2(devnull, 0) < 0) {
-					uwsgi_error("dup2()");
-					exit(1);
-				}
-				close(devnull);
-			}
+			uwsgi_remap_fd(0, "/dev/null");
 		}
 
 		if (setsid() < 0) {
@@ -395,6 +406,10 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	uwsgi_ud->last_spawn = 0;
 	uwsgi_ud->daemonize = daemonize;
 	uwsgi_ud->pidfile = pidfile;
+	uwsgi_ud->control = 0;
+	if (!strcmp(opt, "attach-control-daemon")) {
+		uwsgi_ud->control = 1;
+	}
 #ifdef UWSGI_SSL
 	uwsgi_ud->legion = legion;
 #endif

core/emperor.c

@@ -339,8 +339,13 @@ void uwsgi_imperial_monitor_glob(struct uwsgi_emperor_scanner *ues) {
 	struct stat st;
 	struct uwsgi_instance *ui_current;
 
+	if (chdir(uwsgi.cwd)) {
+		uwsgi_error("uwsgi_imperial_monitor_glob()/chdir()");
+		exit(1);
+	}
+
 	if (glob(ues->arg, GLOB_MARK | GLOB_NOCHECK, NULL, &g)) {
-		uwsgi_error("glob()");
+		uwsgi_error("uwsgi_imperial_monitor_glob()/glob()");
 		return;
 	}
 
@@ -617,24 +622,38 @@ void emperor_del(struct uwsgi_instance *c_ui) {
 }
 
 void emperor_stop(struct uwsgi_instance *c_ui) {
+	if (c_ui->status == 1) return;
 	// remove uWSGI instance
 
 	if (write(c_ui->pipe[0], "\0", 1) != 1) {
-		uwsgi_error("write()");
+		uwsgi_error("emperor_stop()/write()");
 	}
 
 	c_ui->status = 1;
+	c_ui->cursed_at = uwsgi_now();
 
 	uwsgi_log("[emperor] stop the uwsgi instance %s\n", c_ui->name);
 }
 
+void emperor_curse(struct uwsgi_instance *c_ui) {
+	if (c_ui->status == 1) return;
+        // curse uWSGI instance
+
+        c_ui->status = 1;
+        c_ui->cursed_at = uwsgi_now();
+
+        uwsgi_log("[emperor] curse the uwsgi instance %s (pid: %d)\n", c_ui->name, (int) c_ui->pid);
+
+}
+
+
 void emperor_respawn(struct uwsgi_instance *c_ui, time_t mod) {
 
 	struct uwsgi_header uh;
 
 	// 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)
@@ -817,7 +836,7 @@ 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 defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL) && !defined(__ia64__)
 	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);
@@ -825,7 +844,7 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 	else {
 #endif
 	pid = fork();
-#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL)
+#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL) && !defined(__ia64__)
 	}
 #endif
 	if (pid < 0) {
@@ -862,14 +881,28 @@ 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", n_ui->pid); argv[1] = argv_pid;
-			char argv_uid[17+11]; snprintf(argv_uid, 17 + 11, "UWSGI_VASSAL_UID=%d", n_ui->uid); argv[2] = argv_uid;
-			char argv_gid[17+11]; snprintf(argv_gid, 17 + 11, "UWSGI_VASSAL_GID=%d", n_ui->gid); argv[3] = argv_gid;
+			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]);
@@ -926,6 +959,59 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
 
 static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
 
+
+#ifdef __linux__
+        if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0)) {
+                uwsgi_error("prctl()");
+        }
+#ifdef CLONE_NEWUSER
+	if (uwsgi.emperor_clone & CLONE_NEWUSER) {
+		if (setuid(0)) {
+			uwsgi_error("uwsgi_emperor_spawn_vassal()/setuid(0)");
+			exit(1);
+		}
+	}
+#endif
+
+#ifdef UWSGI_CAP
+        if (uwsgi.emperor_cap && uwsgi.emperor_cap_count > 0) {
+		int i;
+		for(i=0;i<=CAP_LAST_CAP;i++) {
+			
+			int has_cap = prctl(PR_CAPBSET_READ, i, 0, 0, 0);
+			if (has_cap == 1) {
+				if (i == CAP_SETPCAP) continue;
+				int j;int found = 0;
+				for(j=0;j<uwsgi.emperor_cap_count;j++) {
+					if (uwsgi.emperor_cap[j] == (int) i) {
+						found = 1; break;
+					}
+				}
+				if (found) continue;
+				if (prctl(PR_CAPBSET_DROP, i, 0, 0, 0)) {
+					uwsgi_error("uwsgi_emperor_spawn_vassal()/prctl()");
+					uwsgi_log_verbose("unable to drop capability %lu\n", i);
+					exit(1);
+				}
+			}
+		}
+		// just for being paranoid
+#ifdef SECBIT_KEEP_CAPS
+                if (prctl(SECBIT_KEEP_CAPS, 1, 0, 0, 0) < 0) {
+                        uwsgi_error("prctl()");
+                        exit(1);
+                }
+#else
+                if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) {
+                        uwsgi_error("prctl()");
+                        exit(1);
+                }
+#endif
+		uwsgi_log("capabilities applied for vassal %s (pid: %d)\n", n_ui->name, (int) getpid());
+        }
+#endif
+#endif
+
 		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);
 			if (setgid(n_ui->gid)) {
@@ -1011,18 +1097,32 @@ static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
 		}
 
 		int counter = 4;
-		struct uwsgi_string_list *uct = uwsgi.vassals_templates;
-		while (uct) {
-			counter += 2;
-			uct = uct->next;
-		}
+		struct uwsgi_string_list *uct;
+		uwsgi_foreach(uct, uwsgi.vassals_templates_before) counter += 2;
+		uwsgi_foreach(uct, uwsgi.vassals_includes_before) counter += 2;
+		uwsgi_foreach(uct, uwsgi.vassals_templates) counter += 2;
+		uwsgi_foreach(uct, uwsgi.vassals_includes) counter += 2;
 
 		char **vassal_argv = uwsgi_malloc(sizeof(char *) * counter);
 		// set args
-		vassal_argv[0] = uwsgi.binary_path;
+		vassal_argv[0] = uwsgi.emperor_wrapper ? uwsgi.emperor_wrapper: uwsgi.binary_path;
+
+		// reset counter
+		counter = 1;
+
+		uwsgi_foreach(uct, uwsgi.vassals_templates_before) {
+			vassal_argv[counter] = "--inherit";
+			vassal_argv[counter + 1] = uct->value;
+			counter += 2;
+		}
+
+                uwsgi_foreach (uct,  uwsgi.vassals_includes_before) {
+                        vassal_argv[counter] = "--include";
+                        vassal_argv[counter + 1] = uct->value;
+                        counter += 2;
+                }
 
 		char *colon = NULL;
-
 		if (uwsgi.emperor_broodlord) {
 			colon = strchr(n_ui->name, ':');
 			if (colon) {
@@ -1030,55 +1130,60 @@ static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
 			}
 		}
 		// initialize to a default value
-		vassal_argv[1] = "--inherit";
+		vassal_argv[counter] = "--inherit";
 
 		if (!strcmp(n_ui->name + (strlen(n_ui->name) - 4), ".xml"))
-			vassal_argv[1] = "--xml";
+			vassal_argv[counter] = "--xml";
 		if (!strcmp(n_ui->name + (strlen(n_ui->name) - 4), ".ini"))
-			vassal_argv[1] = "--ini";
+			vassal_argv[counter] = "--ini";
 		if (!strcmp(n_ui->name + (strlen(n_ui->name) - 4), ".yml"))
-			vassal_argv[1] = "--yaml";
+			vassal_argv[counter] = "--yaml";
 		if (!strcmp(n_ui->name + (strlen(n_ui->name) - 5), ".yaml"))
-			vassal_argv[1] = "--yaml";
+			vassal_argv[counter] = "--yaml";
 		if (!strcmp(n_ui->name + (strlen(n_ui->name) - 3), ".js"))
-			vassal_argv[1] = "--json";
+			vassal_argv[counter] = "--json";
 		if (!strcmp(n_ui->name + (strlen(n_ui->name) - 5), ".json"))
-			vassal_argv[1] = "--json";
-	
+			vassal_argv[counter] = "--json";
 		struct uwsgi_string_list *usl = uwsgi.emperor_extra_extension;
 		while(usl) {
 			if (uwsgi_endswith(n_ui->name, usl->value)) {
-				vassal_argv[1] = "--config";
+				vassal_argv[counter] = "--config";
 				break;
 			}
 			usl = usl->next;
 		}
+		if (colon) colon[0] = ':';
 
-		if (colon) {
-			colon[0] = ':';
-		}
+		// start config filename...
+		counter++;
 
-
-		vassal_argv[2] = n_ui->name;
+		vassal_argv[counter] = n_ui->name;
 		if (uwsgi.emperor_magic_exec) {
 			if (!access(n_ui->name, R_OK | X_OK)) {
-				vassal_argv[2] = uwsgi_concat2("exec://", n_ui->name);
+				vassal_argv[counter] = uwsgi_concat2("exec://", n_ui->name);
 			}
 
 		}
 
 		if (n_ui->use_config) {
-			vassal_argv[2] = uwsgi_concat2("emperor://", n_ui->name);
+			vassal_argv[counter] = uwsgi_concat2("emperor://", n_ui->name);
 		}
 
-		counter = 3;
-		uct = uwsgi.vassals_templates;
-		while (uct) {
+		// start templates,includes,inherit...
+		counter++;
+
+		uwsgi_foreach(uct, uwsgi.vassals_templates) {
 			vassal_argv[counter] = "--inherit";
 			vassal_argv[counter + 1] = uct->value;
 			counter += 2;
-			uct = uct->next;
 		}
+
+                uwsgi_foreach (uct,  uwsgi.vassals_includes) {
+                        vassal_argv[counter] = "--include";
+                        vassal_argv[counter + 1] = uct->value;
+                        counter += 2;
+                }
+
 		vassal_argv[counter] = NULL;
 
 		// disable stdin OR map it to the "on demand" socket
@@ -1092,18 +1197,7 @@ static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
 			}
 		}
 		else {
-			int stdin_fd = open("/dev/null", O_RDONLY);
-			if (stdin_fd < 0) {
-				uwsgi_error_open("/dev/null");
-				exit(1);
-			}
-			if (stdin_fd != 0) {
-				if (dup2(stdin_fd, 0) < 0) {
-					uwsgi_error("dup2()");
-					exit(1);
-				}
-				close(stdin_fd);
-			}
+			uwsgi_remap_fd(0, "/dev/null");
 		}
 
 		// close all of the unneded fd
@@ -1131,6 +1225,22 @@ static void uwsgi_emperor_spawn_vassal(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);
@@ -1426,7 +1536,8 @@ void emperor_loop() {
 				ssize_t rlen = read(interesting_fd, &byte, 1);
 				if (rlen <= 0) {
 					// SAFE
-					emperor_del(ui_current);
+					event_queue_del_fd(uwsgi.emperor_queue, interesting_fd, event_queue_read());
+					emperor_curse(ui_current);
 				}
 				else {
 					if (byte == 17) {
@@ -1476,10 +1587,14 @@ void emperor_loop() {
 		while (ui_current) {
 			if (ui_current->last_heartbeat > 0) {
 				if ((ui_current->last_heartbeat + uwsgi.emperor_heartbeat) < uwsgi_now()) {
-					uwsgi_log("[emperor] vassal %s sent no heartbeat in last %d seconds, respawning it...\n", ui_current->name, uwsgi.emperor_heartbeat);
+					uwsgi_log("[emperor] vassal %s sent no heartbeat in last %d seconds, brutally respawning it...\n", ui_current->name, uwsgi.emperor_heartbeat);
 					// set last_heartbeat to 0 avoiding races
 					ui_current->last_heartbeat = 0;
-					emperor_respawn(ui_current, uwsgi_now());
+					if (ui_current->pid > 0) {
+						if (kill(ui_current->pid, SIGKILL)) {
+							uwsgi_error("[emperor] kill()");
+						}
+					}
 				}
 			}
 			ui_current = ui_current->ui_next;
@@ -1528,14 +1643,8 @@ void emperor_loop() {
 		ui_current = ui;
 		while (ui_current->ui_next) {
 			ui_current = ui_current->ui_next;
-			if (ui_current->status == 1) {
-				if (ui_current->config)
-					free(ui_current->config);
-				// SAFE
-				emperor_del(ui_current);
-				break;
-			}
-			else if (ui_current->pid == diedpid) {
+			time_t now = uwsgi_now();
+			if (ui_current->pid == diedpid) {
 				if (ui_current->status == 0) {
 					// respawn an accidentally dead instance if its exit code is not UWSGI_EXILE_CODE
 					if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_EXILE_CODE) {
@@ -1558,6 +1667,13 @@ void emperor_loop() {
 					break;
 				}
 			}
+			else if (ui_current->cursed_at > 0 && now - ui_current->cursed_at >= uwsgi.emperor_curse_tolerance) {
+				ui_current->cursed_at = now;
+				if (kill(ui_current->pid, SIGKILL)) {
+					uwsgi_error("[emperor] kill");
+				}
+				break;
+			}
 		}
 
 
@@ -1654,6 +1770,8 @@ void emperor_send_stats(int fd) {
 			goto end0;
 		if (uwsgi_stats_keylong_comma(us, "last_run", (unsigned long long) c_ui->last_run))
 			goto end0;
+		if (uwsgi_stats_keylong_comma(us, "cursed", (unsigned long long) c_ui->cursed_at))
+			goto end0;
 		if (uwsgi_stats_keylong_comma(us, "zerg", (unsigned long long) c_ui->zerg))
 			goto end0;
 
@@ -1797,6 +1915,46 @@ void uwsgi_emperor_start() {
 }
 
 void uwsgi_check_emperor() {
+	char *emperor_fd_pass = getenv("UWSGI_EMPEROR_PROXY");
+	if (emperor_fd_pass) {
+		for(;;) {
+			int proxy_fd = uwsgi_connect(emperor_fd_pass, 30, 0);
+			if (proxy_fd < 0) {
+				uwsgi_error("uwsgi_check_emperor()/uwsgi_connect()");
+				sleep(1);
+				continue;
+			}
+			int count = 2;
+			int *fds = uwsgi_attach_fd(proxy_fd, &count, "uwsgi-emperor", 13);
+			if (fds && count > 0) {
+				char *env_emperor_fd = uwsgi_num2str(fds[0]);
+				if (setenv("UWSGI_EMPEROR_FD", env_emperor_fd, 1)) {
+					uwsgi_error("uwsgi_check_emperor()/setenv(UWSGI_EMPEROR_FD)");
+					free(env_emperor_fd);
+					int i; for(i=0;i<count;i++) close(fds[i]);
+					goto next;	
+				}
+				free(env_emperor_fd);
+				if (count > 1) {
+					char *env_emperor_fd_config = uwsgi_num2str(fds[1]);
+					if (setenv("UWSGI_EMPEROR_FD_CONFIG", env_emperor_fd_config, 1)) {
+						uwsgi_error("uwsgi_check_emperor()/setenv(UWSGI_EMPEROR_FD_CONFIG)");
+						free(env_emperor_fd_config);
+						int i; for(i=0;i<count;i++) close(fds[i]);
+						goto next;	
+					}
+					free(env_emperor_fd_config);
+				}
+				break;
+			}
+next:
+			if (fds) free(fds);
+			close(proxy_fd);
+			sleep(1);
+		}
+		unsetenv("UWSGI_EMPEROR_PROXY");
+	}
+
 	char *emperor_env = getenv("UWSGI_EMPEROR_FD");
 	if (emperor_env) {
 		uwsgi.has_emperor = 1;
@@ -1852,3 +2010,89 @@ void uwsgi_emperor_simple_do(struct uwsgi_emperor_scanner *ues, char *name, char
 		emperor_add(ues, name, ts, new_config, new_config_len, uid, gid, socket_name);
 	}
 }
+
+void uwsgi_master_manage_emperor() {
+        char byte;
+        ssize_t rlen = read(uwsgi.emperor_fd, &byte, 1);
+        if (rlen > 0) {
+                uwsgi_log_verbose("received message %d from emperor\n", byte);
+                // remove me
+                if (byte == 0) {
+                        close(uwsgi.emperor_fd);
+                        if (!uwsgi.status.brutally_reloading)
+                                kill_them_all(0);
+                }
+                // reload me
+                else if (byte == 1) {
+                        // un-lazy the stack to trigger a real reload
+                        uwsgi.lazy = 0;
+                        uwsgi_block_signal(SIGHUP);
+                        grace_them_all(0);
+                        uwsgi_unblock_signal(SIGHUP);
+                }
+        }
+        else {
+                uwsgi_log("lost connection with my emperor !!!\n");
+                close(uwsgi.emperor_fd);
+                if (!uwsgi.status.brutally_reloading)
+                        kill_them_all(0);
+                sleep(2);
+                exit(1);
+        }
+
+}
+
+void uwsgi_master_manage_emperor_proxy() {
+
+	struct sockaddr_un epsun;
+        socklen_t epsun_len = sizeof(struct sockaddr_un);
+
+        int ep_client = accept(uwsgi.emperor_fd_proxy, (struct sockaddr *) &epsun, &epsun_len);
+        if (ep_client < 0) {
+                uwsgi_error("uwsgi_master_manage_emperor_proxy()/accept()");
+                return;
+        }
+
+	int num_fds = 1;
+	if (uwsgi.emperor_fd_config > -1) num_fds++;
+
+        struct msghdr ep_msg;
+        void *ep_msg_control = uwsgi_malloc(CMSG_SPACE(sizeof(int) * num_fds));
+        struct iovec ep_iov[2];
+        struct cmsghdr *cmsg;
+
+        ep_iov[0].iov_base = "uwsgi-emperor";
+        ep_iov[0].iov_len = 13;
+        ep_iov[1].iov_base = &num_fds;
+        ep_iov[1].iov_len = sizeof(int);
+
+        ep_msg.msg_name = NULL;
+        ep_msg.msg_namelen = 0;
+
+        ep_msg.msg_iov = ep_iov;
+        ep_msg.msg_iovlen = 2;
+
+        ep_msg.msg_flags = 0;
+        ep_msg.msg_control = ep_msg_control;
+        ep_msg.msg_controllen = CMSG_SPACE(sizeof(int) * num_fds);
+
+        cmsg = CMSG_FIRSTHDR(&ep_msg);
+        cmsg->cmsg_len = CMSG_LEN(sizeof(int) * num_fds);
+        cmsg->cmsg_level = SOL_SOCKET;
+        cmsg->cmsg_type = SCM_RIGHTS;
+
+        unsigned char *ep_fd_ptr = CMSG_DATA(cmsg);
+
+        memcpy(ep_fd_ptr, &uwsgi.emperor_fd, sizeof(int));
+	if (num_fds > 1) {
+        	memcpy(ep_fd_ptr + sizeof(int), &uwsgi.emperor_fd_config, sizeof(int));
+	}
+
+        if (sendmsg(ep_client, &ep_msg, 0) < 0) {
+                uwsgi_error("uwsgi_master_manage_emperor_proxy()/sendmsg()");
+        }
+
+        free(ep_msg_control);
+
+        close(ep_client);
+}

core/fifo.c

@@ -0,0 +1,122 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	the --master-fifo option create a unix named pipe (fifo) you can use to send management
+	commands to the master:
+
+	echo r > myfifo
+
+*/
+
+// this var can be accessed by plugins and hooks
+void (*uwsgi_fifo_table[256])(int);
+
+static char *uwsgi_fifo_by_slot() {
+	int count = 0;
+	struct uwsgi_string_list *usl;
+	uwsgi_foreach(usl, uwsgi.master_fifo) {
+		if (count == uwsgi.master_fifo_slot) return usl->value;
+		count++;
+	}
+	return uwsgi.master_fifo->value;
+}
+
+static void uwsgi_fifo_set_slot_zero() { uwsgi.master_fifo_slot = 0; }
+static void uwsgi_fifo_set_slot_one() { uwsgi.master_fifo_slot = 1; }
+static void uwsgi_fifo_set_slot_two() { uwsgi.master_fifo_slot = 2; }
+static void uwsgi_fifo_set_slot_three() { uwsgi.master_fifo_slot = 3; }
+static void uwsgi_fifo_set_slot_four() { uwsgi.master_fifo_slot = 4; }
+static void uwsgi_fifo_set_slot_five() { uwsgi.master_fifo_slot = 5; }
+static void uwsgi_fifo_set_slot_six() { uwsgi.master_fifo_slot = 6; }
+static void uwsgi_fifo_set_slot_seven() { uwsgi.master_fifo_slot = 7; }
+static void uwsgi_fifo_set_slot_eight() { uwsgi.master_fifo_slot = 8; }
+static void uwsgi_fifo_set_slot_nine() { uwsgi.master_fifo_slot = 9; }
+
+/*
+
+this is called as soon as possibile allowing plugins (or hooks) to override it
+
+*/
+void uwsgi_master_fifo_prepare() {
+	int i;
+	for(i=0;i<256;i++) {
+		uwsgi_fifo_table[i] = NULL;
+	}
+
+	uwsgi_fifo_table['0'] = uwsgi_fifo_set_slot_zero;
+	uwsgi_fifo_table['1'] = uwsgi_fifo_set_slot_one;
+	uwsgi_fifo_table['2'] = uwsgi_fifo_set_slot_two;
+	uwsgi_fifo_table['3'] = uwsgi_fifo_set_slot_three;
+	uwsgi_fifo_table['4'] = uwsgi_fifo_set_slot_four;
+	uwsgi_fifo_table['5'] = uwsgi_fifo_set_slot_five;
+	uwsgi_fifo_table['6'] = uwsgi_fifo_set_slot_six;
+	uwsgi_fifo_table['7'] = uwsgi_fifo_set_slot_seven;
+	uwsgi_fifo_table['8'] = uwsgi_fifo_set_slot_eight;
+	uwsgi_fifo_table['9'] = uwsgi_fifo_set_slot_nine;
+
+	uwsgi_fifo_table['-'] = uwsgi_cheaper_decrease;
+	uwsgi_fifo_table['+'] = uwsgi_cheaper_increase;
+	uwsgi_fifo_table['c'] = uwsgi_chain_reload;
+	uwsgi_fifo_table['C'] = uwsgi_go_cheap;
+	uwsgi_fifo_table['f'] = uwsgi_refork_master;
+	uwsgi_fifo_table['l'] = uwsgi_log_reopen;
+	uwsgi_fifo_table['L'] = uwsgi_log_rotate;
+	uwsgi_fifo_table['p'] = suspend_resume_them_all;
+	uwsgi_fifo_table['P'] = uwsgi_update_pidfiles;
+	uwsgi_fifo_table['q'] = gracefully_kill_them_all;
+	uwsgi_fifo_table['Q'] = kill_them_all;
+	uwsgi_fifo_table['r'] = grace_them_all;
+	uwsgi_fifo_table['R'] = reap_them_all;
+	uwsgi_fifo_table['s'] = stats;
+	uwsgi_fifo_table['w'] = uwsgi_reload_workers;
+	uwsgi_fifo_table['W'] = uwsgi_brutally_reload_workers;
+
+}
+
+int uwsgi_master_fifo() {
+
+	char *path = uwsgi_fifo_by_slot();
+
+	unlink(path);
+
+	if (mkfifo(path, S_IRUSR|S_IWUSR)) {
+		uwsgi_error("uwsgi_master_fifo()/mkfifo()");
+		exit(1);
+	}
+
+	int fd = open(path, O_RDONLY|O_NONBLOCK);
+	if (fd < 0) {
+		uwsgi_error("uwsgi_master_fifo()/open()");
+		exit(1);
+	}
+
+	uwsgi_socket_nb(fd);
+
+	return fd;
+}
+
+int uwsgi_master_fifo_manage(int fd) {
+	char cmd;
+	ssize_t rlen = read(fd, &cmd, 1);
+	if (rlen < 0) {
+		if (uwsgi_is_again()) return 0;
+		uwsgi_error("uwsgi_master_fifo_manage()/read()");
+		exit(1);
+	}
+	// fifo destroyed, recreate it
+	else if (rlen == 0) {
+		close(fd);
+		uwsgi.master_fifo_fd = uwsgi_master_fifo();
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.master_fifo_fd);
+		return 0;
+	}
+
+	if (uwsgi_fifo_table[(int) cmd]) {
+		uwsgi_fifo_table[(int) cmd](0);
+	}
+	
+	return 0;
+}

core/gateway.c

@@ -70,6 +70,7 @@ void gateway_respawn(int id) {
 
 	if (gw_pid == 0) {
 		uwsgi_fixup_fds(0, 0, ug);
+		uwsgi_close_all_sockets();
 		if (uwsgi.master_as_root)
 			uwsgi_as_root();
 #ifdef __linux__

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

@@ -75,10 +75,12 @@ void uwsgi_init_default() {
 	uwsgi.original_log_fd = -1;
 
 	uwsgi.emperor_fd_config = -1;
+	uwsgi.emperor_fd_proxy = -1;
 	// default emperor scan frequency
 	uwsgi.emperor_freq = 3;
 	uwsgi.emperor_throttle = 1000;
 	uwsgi.emperor_heartbeat = 30;
+	uwsgi.emperor_curse_tolerance = 30;
 	// max 3 minutes throttling
 	uwsgi.emperor_max_throttle = 1000 * 180;
 	uwsgi.emperor_pid = -1;
@@ -172,6 +174,12 @@ void uwsgi_init_default() {
 	
 	// 1 MB default limit
 	uwsgi.chunked_input_limit = 1024*1024;
+
+	// clear reforked status
+	uwsgi.master_is_reforked = 0;
+
+	uwsgi.master_fifo_fd = -1;
+	uwsgi_master_fifo_prepare();
 }
 
 void uwsgi_setup_reload() {
@@ -216,21 +224,19 @@ void uwsgi_autoload_plugins_by_name(char *argv_zero) {
 		p = original_proc_name;
 	p = strstr(p, "uwsgi_");
 	if (p != NULL) {
-		plugins_requested = strtok(uwsgi_str(p + 6), "_");
-		while (plugins_requested) {
+		char *ctx = NULL;
+		uwsgi_foreach_token(uwsgi_str(p + 6), "_", plugins_requested, ctx) {
 			uwsgi_log("[uwsgi] implicit plugin requested %s\n", plugins_requested);
 			uwsgi_load_plugin(-1, plugins_requested, NULL);
-			plugins_requested = strtok(NULL, "_");
 		}
 	}
 
 	plugins_requested = getenv("UWSGI_PLUGINS");
 	if (plugins_requested) {
 		plugins_requested = uwsgi_concat2(plugins_requested, "");
-		char *p = strtok(plugins_requested, ",");
-		while (p != NULL) {
+		char *p, *ctx = NULL;
+		uwsgi_foreach_token(plugins_requested, ",", p, ctx) {
 			uwsgi_load_plugin(-1, p, NULL);
-			p = strtok(NULL, ",");
 		}
 	}
 
@@ -357,6 +363,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
 
@@ -451,6 +458,19 @@ 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_hard && 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) {

core/io.c

@@ -116,48 +116,31 @@ end:
 
 }
 
-/*
-	extremely complex function for reading resources (files, url...)
-	need a lot of refactoring...
-*/
-char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_table[]) {
+static char *uwsgi_scheme_fd(char *url, size_t *size, int add_zero) {
+	int fd = atoi(url);
+	return uwsgi_read_fd(fd, size, add_zero);
+}
 
-	int fd;
-	struct stat sb;
-	char *buffer = NULL;
+static char *uwsgi_scheme_exec(char *url, size_t *size, int add_zero) {
+	int cpipe[2];
+	if (pipe(cpipe)) {
+		uwsgi_error("pipe()");
+		exit(1);
+	}
+	uwsgi_run_command(url, NULL, cpipe[1]);
+	char *buffer = uwsgi_read_fd(cpipe[0], size, add_zero);
+	close(cpipe[0]);
+	close(cpipe[1]);
+	return buffer;
+}
+
+static char *uwsgi_scheme_http(char *url, size_t *size, int add_zero) {
 	char byte;
-	ssize_t len;
-	char *uri, *colon;
-	char *domain;
-	char *ip;
-	int body = 0;
-	char *magic_buf;
+        int body = 0;
+	char *buffer = NULL;
 
-	// stdin ?
-	if (!strcmp(url, "-")) {
-		buffer = uwsgi_read_fd(0, size, add_zero);
-	}
-	// fd ?
-	else if (!strncmp("fd://", url, 5)) {
-		fd = atoi(url + 5);
-		buffer = uwsgi_read_fd(fd, size, add_zero);
-	}
-	// exec ?
-	else if (!strncmp("exec://", url, 5)) {
-		int cpipe[2];
-		if (pipe(cpipe)) {
-			uwsgi_error("pipe()");
-			exit(1);
-		}
-		uwsgi_run_command(url + 7, NULL, cpipe[1]);
-		buffer = uwsgi_read_fd(cpipe[0], size, add_zero);
-		close(cpipe[0]);
-		close(cpipe[1]);
-	}
-	// http url ?
-	else if (!strncmp("http://", url, 7)) {
-		domain = url + 7;
-		uri = strchr(domain, '/');
+		char *domain = url;
+		char *uri = strchr(domain, '/');
 		if (!uri) {
 			uwsgi_log("invalid http url\n");
 			exit(1);
@@ -165,14 +148,14 @@ char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_tab
 		uri[0] = 0;
 		uwsgi_log("domain: %s\n", domain);
 
-		colon = uwsgi_get_last_char(domain, ':');
+		char *colon = uwsgi_get_last_char(domain, ':');
 
 		if (colon) {
 			colon[0] = 0;
 		}
 
 
-		ip = uwsgi_resolve_ip(domain);
+		char *ip = uwsgi_resolve_ip(domain);
 		if (!ip) {
 			uwsgi_log("unable to resolve address %s\n", domain);
 			exit(1);
@@ -186,9 +169,10 @@ char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_tab
 			ip = uwsgi_concat2(ip, ":80");
 		}
 
-		fd = uwsgi_connect(ip, 0, 0);
+		int fd = uwsgi_connect(ip, 0, 0);
 
 		if (fd < 0) {
+			uwsgi_error("uwsgi_scheme_http()/connect()");
 			exit(1);
 		}
 
@@ -196,18 +180,18 @@ char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_tab
 
 		uri[0] = '/';
 
-		len = write(fd, "GET ", 4);
-		len = write(fd, uri, strlen(uri));
-		len = write(fd, " HTTP/1.0\r\n", 11);
-		len = write(fd, "Host: ", 6);
+		if (write(fd, "GET ", 4) != 4) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
+		if (write(fd, uri, strlen(uri)) != (ssize_t) strlen(uri)) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
+		if (write(fd, " HTTP/1.0\r\n", 11) != 11) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
+		if (write(fd, "Host: ", 6) != 6) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
 
 		uri[0] = 0;
-		len = write(fd, domain, strlen(domain));
+		if (write(fd, domain, strlen(domain)) != (ssize_t) strlen(domain)) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
 		uri[0] = '/';
 
-		len = write(fd, "\r\nUser-Agent: uWSGI on ", 23);
-		len = write(fd, uwsgi.hostname, uwsgi.hostname_len);
-		len = write(fd, "\r\n\r\n", 4);
+		if (write(fd, "\r\nUser-Agent: uWSGI on ", 23) != 23) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
+		if (write(fd, uwsgi.hostname, uwsgi.hostname_len) != uwsgi.hostname_len) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
+		if (write(fd, "\r\n\r\n", 4) != 4) { uwsgi_error("uwsgi_scheme_http()/write()"); exit(1);}
 
 		int http_status_code_ptr = 0;
 
@@ -264,57 +248,231 @@ char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_tab
 			buffer[*size - 1] = 0;
 		}
 
+	return buffer;
+}
+
+
+static char *uwsgi_scheme_emperor(char *url, size_t *size, int add_zero) {
+
+	if (uwsgi.emperor_fd_config < 0) {
+		uwsgi_log("this is not a vassal instance\n");
+		exit(1);
 	}
-	else if (!strncmp("emperor://", url, 10)) {
-		if (uwsgi.emperor_fd_config < 0) {
-			uwsgi_log("this is not a vassal instance\n");
+	ssize_t rlen;
+	struct uwsgi_header uh;
+	size_t remains = 4;
+	char *ptr = (char *) &uh;
+	while(remains) {
+		int ret = uwsgi_waitfd(uwsgi.emperor_fd_config, 5);
+		if (ret <= 0) {
+			uwsgi_log("[uwsgi-vassal] error waiting for config header %s !!!\n", url);
 			exit(1);
 		}
-		ssize_t rlen;
-		*size = 0;
-		struct uwsgi_header uh;
-		size_t remains = 4;
-		char *ptr = (char *) &uh;
-		while(remains) {
-			int ret = uwsgi_waitfd(uwsgi.emperor_fd_config, 5);
-			if (ret <= 0) {
-				uwsgi_log("[uwsgi-vassal] error waiting for config header %s !!!\n", url);
-				exit(1);
-			}
-			rlen = read(uwsgi.emperor_fd_config, ptr, remains);
-			if (rlen <= 0) {
-				uwsgi_log("[uwsgi-vassal] error reading config header from !!!\n", url);
-				exit(1);
-			}
-			ptr+=rlen;
-			remains-=rlen;
+		rlen = read(uwsgi.emperor_fd_config, ptr, remains);
+		if (rlen <= 0) {
+			uwsgi_log("[uwsgi-vassal] error reading config header from !!!\n", url);
+			exit(1);
 		}
+		ptr+=rlen;
+		remains-=rlen;
+	}
 
-		remains = uh.pktsize;
-		if (!remains) {
-			uwsgi_log("[uwsgi-vassal] invalid config from %s\n", url);
+	remains = uh.pktsize;
+	if (!remains) {
+		uwsgi_log("[uwsgi-vassal] invalid config from %s\n", url);
+		exit(1);
+	}
+
+	char *buffer = uwsgi_calloc(remains + add_zero);
+	ptr = buffer;
+	while (remains) {
+		int ret = uwsgi_waitfd(uwsgi.emperor_fd_config, 5);
+                if (ret <= 0) {
+                	uwsgi_log("[uwsgi-vassal] error waiting for config %s !!!\n", url);
+                        exit(1);
+                }
+		rlen = read(uwsgi.emperor_fd_config, ptr, remains);
+		if (rlen <= 0) {
+                	uwsgi_log("[uwsgi-vassal] error reading config from !!!\n", url);
+                        exit(1);
+                }
+                ptr+=rlen;
+                remains-=rlen;
+	}
+
+	*size = uh.pktsize + add_zero;
+	return buffer;
+}
+
+static char *uwsgi_scheme_data(char *url, size_t *size, int add_zero) {
+	char *buffer = NULL;
+	int fd = open(uwsgi.binary_path, O_RDONLY);
+	if (fd < 0) {
+		uwsgi_error_open(uwsgi.binary_path);
+		exit(1);
+	}
+	int slot = atoi(url);
+	if (slot < 0) {
+		uwsgi_log("invalid binary data slot requested\n");
+		exit(1);
+	}
+	uwsgi_log("requesting binary data slot %d\n", slot);
+	off_t fo = lseek(fd, 0, SEEK_END);
+	if (fo < 0) {
+		uwsgi_error("lseek()");
+		uwsgi_log("invalid binary data slot requested\n");
+		exit(1);
+	}
+	int i = 0;
+	uint64_t datasize = 0;
+	for (i = 0; i <= slot; i++) {
+		fo = lseek(fd, -8, SEEK_CUR);
+		if (fo < 0) {
+			uwsgi_error("lseek()");
+			uwsgi_log("invalid binary data slot requested\n");
+			exit(1);
+		}
+		ssize_t len = read(fd, &datasize, 8);
+		if (len != 8) {
+			uwsgi_error("read()");
+			uwsgi_log("invalid binary data slot requested\n");
+			exit(1);
+		}
+		if (datasize == 0) {
+			uwsgi_log("0 size binary data !!!\n");
+			exit(1);
+		}
+		fo = lseek(fd, -(datasize + 8), SEEK_CUR);
+		if (fo < 0) {
+			uwsgi_error("lseek()");
+			uwsgi_log("invalid binary data slot requested\n");
 			exit(1);
 		}
 
-		buffer = uwsgi_calloc(remains + add_zero);
-		ptr = buffer;
-		while (remains) {
-			int ret = uwsgi_waitfd(uwsgi.emperor_fd_config, 5);
-                        if (ret <= 0) {
-                                uwsgi_log("[uwsgi-vassal] error waiting for config %s !!!\n", url);
-                                exit(1);
-                        }
-			rlen = read(uwsgi.emperor_fd_config, ptr, remains);
-			if (rlen <= 0) {
-                                uwsgi_log("[uwsgi-vassal] error reading config from !!!\n", url);
-                                exit(1);
-                        }
-                        ptr+=rlen;
-                        remains-=rlen;
+		if (i == slot) {
+			*size = datasize;
+			if (add_zero) {
+				*size += 1;
+			}
+			buffer = uwsgi_malloc(*size);
+			memset(buffer, 0, *size);
+			len = read(fd, buffer, datasize);
+			if (len != (ssize_t) datasize) {
+				uwsgi_error("read()");
+				uwsgi_log("invalid binary data slot requested\n");
+				exit(1);
+			}
 		}
-
-		*size = uh.pktsize + add_zero;
 	}
+
+	return buffer;
+}
+
+static char *uwsgi_scheme_call(char *url, size_t *size, int add_zero) {
+        char *(*func)(void) = dlsym(RTLD_DEFAULT, url);
+	if (!func) {
+		uwsgi_log("unable to find symbol %s\n", url);
+                exit(1);
+	}
+
+	char *s = func();
+	if (!s) {
+		uwsgi_log("called symbol %s did not return a string\n", url);
+                exit(1);
+	}
+        *size = strlen(s);
+        if (add_zero) {
+                *size += 1;
+        }
+        char *buffer = uwsgi_malloc(*size);
+        memset(buffer, 0, *size);
+        memcpy(buffer, s, strlen(s));
+
+        return buffer;
+}
+
+
+static char *uwsgi_scheme_sym(char *url, size_t *size, int add_zero) {
+	void *sym_start_ptr = NULL, *sym_end_ptr = NULL;
+	char **raw_symbol = dlsym(RTLD_DEFAULT, url);
+	if (raw_symbol) {
+		sym_start_ptr = *raw_symbol;
+		sym_end_ptr = sym_start_ptr + strlen(sym_start_ptr);
+		goto found;
+	}
+	char *symbol = uwsgi_concat3("_binary_", url, "_start");
+	sym_start_ptr = dlsym(RTLD_DEFAULT, symbol);
+	if (!sym_start_ptr) {
+		uwsgi_log("unable to find symbol %s\n", symbol);
+		exit(1);
+	}
+	free(symbol);
+	symbol = uwsgi_concat3("_binary_", url, "_end");
+	sym_end_ptr = dlsym(RTLD_DEFAULT, symbol);
+	if (!sym_end_ptr) {
+		uwsgi_log("unable to find symbol %s\n", symbol);
+		exit(1);
+	}
+	free(symbol);
+
+found:
+
+	*size = sym_end_ptr - sym_start_ptr;
+	if (add_zero) {
+		*size += 1;
+	}
+	char *buffer = uwsgi_malloc(*size);
+	memset(buffer, 0, *size);
+	memcpy(buffer, sym_start_ptr, sym_end_ptr - sym_start_ptr);
+
+	return buffer;
+}
+
+static char *uwsgi_scheme_section(char *url, size_t *size, int add_zero) {
+#ifdef UWSGI_ELF
+	size_t s_len = 0;
+	char *buffer = uwsgi_elf_section(uwsgi.binary_path, url, &s_len);
+	if (!buffer) {
+		uwsgi_log("unable to find section %s in %s\n", url + 10, uwsgi.binary_path);
+		exit(1);
+	}
+	*size = s_len;
+	if (add_zero)
+		*size += 1;
+	return buffer;
+#else
+	uwsgi_log("section:// scheme not supported on this platform\n");
+	exit(1);
+#endif
+}
+
+struct uwsgi_string_list *uwsgi_register_scheme(char *name, char * (*func)(char *, size_t *, int)) {
+	struct uwsgi_string_list *usl = NULL;
+	uwsgi_foreach(usl, uwsgi.schemes) {
+		if (!strcmp(usl->value, name)) goto found;
+	}
+
+	usl = uwsgi_string_new_list(&uwsgi.schemes, name); 	
+
+found:
+	usl->custom_ptr = func;
+	return usl;
+}
+
+char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_table[]) {
+
+        struct stat sb;
+        char *buffer = NULL;
+        ssize_t len;
+        char *magic_buf;
+	int fd;
+
+	*size = 0;
+
+        // stdin ?
+        if (!strcmp(url, "-")) {
+                buffer = uwsgi_read_fd(0, size, add_zero);
+        }
 #ifdef UWSGI_EMBED_CONFIG
 	else if (url[0] == 0) {
 		*size = &UWSGI_EMBED_CONFIG_END - &UWSGI_EMBED_CONFIG;
@@ -326,106 +484,19 @@ char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_tab
 		memcpy(buffer, &UWSGI_EMBED_CONFIG, &UWSGI_EMBED_CONFIG_END - &UWSGI_EMBED_CONFIG);
 	}
 #endif
-	else if (!strncmp("data://", url, 7)) {
-		fd = open(uwsgi.binary_path, O_RDONLY);
-		if (fd < 0) {
-			uwsgi_error_open(uwsgi.binary_path);
-			exit(1);
-		}
-		int slot = atoi(url + 7);
-		if (slot < 0) {
-			uwsgi_log("invalid binary data slot requested\n");
-			exit(1);
-		}
-		uwsgi_log("requesting binary data slot %d\n", slot);
-		off_t fo = lseek(fd, 0, SEEK_END);
-		if (fo < 0) {
-			uwsgi_error("lseek()");
-			uwsgi_log("invalid binary data slot requested\n");
-			exit(1);
-		}
-		int i = 0;
-		uint64_t datasize = 0;
-		for (i = 0; i <= slot; i++) {
-			fo = lseek(fd, -9, SEEK_CUR);
-			if (fo < 0) {
-				uwsgi_error("lseek()");
-				uwsgi_log("invalid binary data slot requested\n");
-				exit(1);
-			}
-			ssize_t len = read(fd, &datasize, 8);
-			if (len != 8) {
-				uwsgi_error("read()");
-				uwsgi_log("invalid binary data slot requested\n");
-				exit(1);
-			}
-			if (datasize == 0) {
-				uwsgi_log("0 size binary data !!!\n");
-				exit(1);
-			}
-			fo = lseek(fd, -(datasize + 9), SEEK_CUR);
-			if (fo < 0) {
-				uwsgi_error("lseek()");
-				uwsgi_log("invalid binary data slot requested\n");
-				exit(1);
-			}
 
-			if (i == slot) {
-				*size = datasize;
-				if (add_zero) {
-					*size += 1;
-				}
-				buffer = uwsgi_malloc(*size);
-				memset(buffer, 0, *size);
-				len = read(fd, buffer, datasize);
-				if (len != (ssize_t) datasize) {
-					uwsgi_error("read()");
-					uwsgi_log("invalid binary data slot requested\n");
-					exit(1);
-				}
-			}
-		}
-	}
-	else if (!strncmp("sym://", url, 6)) {
-		char *symbol = uwsgi_concat3("_binary_", url + 6, "_start");
-		void *sym_start_ptr = dlsym(RTLD_DEFAULT, symbol);
-		if (!sym_start_ptr) {
-			uwsgi_log("unable to find symbol %s\n", symbol);
-			exit(1);
-		}
-		free(symbol);
-		symbol = uwsgi_concat3("_binary_", url + 6, "_end");
-		void *sym_end_ptr = dlsym(RTLD_DEFAULT, symbol);
-		if (!sym_end_ptr) {
-			uwsgi_log("unable to find symbol %s\n", symbol);
-			exit(1);
-		}
-		free(symbol);
+	struct uwsgi_string_list *usl = uwsgi_check_scheme(url);
+	if (!usl) goto fallback;
 
-		*size = sym_end_ptr - sym_start_ptr;
-		if (add_zero) {
-			*size += 1;
-		}
-		buffer = uwsgi_malloc(*size);
-		memset(buffer, 0, *size);
-		memcpy(buffer, sym_start_ptr, sym_end_ptr - sym_start_ptr);
-
-	}
-#ifdef UWSGI_ELF
-	else if (!strncmp("section://", url, 10)) {
-		size_t s_len = 0;
-		buffer = uwsgi_elf_section(uwsgi.binary_path, url + 10, &s_len);
-		if (!buffer) {
-			uwsgi_log("unable to find section %s in %s\n", url + 10, uwsgi.binary_path);
-			exit(1);
-		}
-		*size = s_len;
-		if (add_zero)
-			*size += 1;
-	}
-#endif
+	char *(*func)(char *, size_t *, int) = (char *(*)(char *, size_t *, int)) usl->custom_ptr;
+	buffer = func(url + usl->len + 3, size, add_zero);
+	if (buffer) goto end;
+	// never here !!!
+	uwsgi_log("unable to parse config file %s\n", url);
+	exit(1);
+	
 	// fallback to file
-	else {
+fallback:
 		fd = open(url, O_RDONLY);
 		if (fd < 0) {
 			uwsgi_error_open(url);
@@ -457,7 +528,6 @@ char *uwsgi_open_and_read(char *url, size_t *size, int add_zero, char *magic_tab
 
 		if (add_zero)
 			buffer[sb.st_size] = 0;
-	}
 
 end:
 
@@ -1097,3 +1167,44 @@ int uwsgi_ready_fd(struct wsgi_request *wsgi_req) {
 	if (wsgi_req->async_ready_fd) return wsgi_req->async_last_ready_fd;
 	return -1;
 }
+
+void uwsgi_setup_schemes() {
+	uwsgi_register_scheme("emperor", uwsgi_scheme_emperor);	
+	uwsgi_register_scheme("http", uwsgi_scheme_http);	
+	uwsgi_register_scheme("data", uwsgi_scheme_data);	
+	uwsgi_register_scheme("sym", uwsgi_scheme_sym);	
+	uwsgi_register_scheme("section", uwsgi_scheme_section);	
+	uwsgi_register_scheme("fd", uwsgi_scheme_fd);	
+	uwsgi_register_scheme("exec", uwsgi_scheme_exec);	
+	uwsgi_register_scheme("call", uwsgi_scheme_call);	
+}
+
+struct uwsgi_string_list *uwsgi_check_scheme(char *file) {
+	struct uwsgi_string_list *usl;
+	uwsgi_foreach(usl, uwsgi.schemes) {
+		char *url = uwsgi_concat2(usl->value, "://");
+		int ret = uwsgi_startswith(file, url, strlen(url));
+		free(url);
+		if (!ret) return usl;
+	}
+	return NULL;
+}
+
+void uwsgi_remap_fd(int fd, char *filename) {
+
+	int fdin = open(filename, O_RDWR);
+        if (fdin < 0) {
+                uwsgi_error_open(filename);
+                exit(1);
+        }
+
+        /* stdin */
+        if (fdin != fd) {
+                if (dup2(fdin, fd) < 0) {
+                        uwsgi_error("uwsgi_remap_fd()/dup2()");
+                        exit(1);
+                }
+                close(fdin);
+        }
+}
+

core/json.c

@@ -106,6 +106,8 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
 		config_iter = json_object_iter_next(config, config_iter);
 	}
 
+	if (colon) colon[0] = ':';
+
 }
 
 #endif

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;
 	}

core/logging.c

@@ -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) {
@@ -440,7 +488,6 @@ void uwsgi_logvar_add(struct wsgi_request *wsgi_req, char *key, uint8_t keylen,
 
 void uwsgi_check_logrotate(void) {
 
-	char message[1024];
 	int need_rotation = 0;
 	int need_reopen = 0;
 
@@ -464,70 +511,81 @@ void uwsgi_check_logrotate(void) {
 	}
 
 	if (need_rotation) {
-
-		char *rot_name = uwsgi.log_backupname;
-		int need_free = 0;
-		if (rot_name == NULL) {
-			char *ts_str = uwsgi_num2str((int) uwsgi_now());
-			rot_name = uwsgi_concat3(uwsgi.logfile, ".", ts_str);
-			free(ts_str);
-			need_free = 1;
-		}
-		int ret = snprintf(message, 1024, "[%d] logsize: %llu, triggering rotation to %s...\n", (int) uwsgi_now(), (unsigned long long) uwsgi.shared->logsize, rot_name);
-		if (ret > 0) {
-			if (write(uwsgi.original_log_fd, message, ret) != ret) {
-				// very probably this will never be printed
-				uwsgi_error("write()");
-			}
-		}
-		if (rename(uwsgi.logfile, rot_name) == 0) {
-			// reopen logfile dup'it and eventually gracefully reload workers;
-			int fd = open(uwsgi.logfile, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
-			if (fd < 0) {
-				uwsgi_error_open(uwsgi.logfile);
-				grace_them_all(0);
-			}
-			else {
-				if (dup2(fd, uwsgi.original_log_fd) < 0) {
-					uwsgi_error("dup2()");
-					grace_them_all(0);
-				}
-				close(fd);
-			}
-		}
-		else {
-			uwsgi_error("unable to rotate log: rename()");
-		}
-		if (need_free)
-			free(rot_name);
+		uwsgi_log_rotate();
 	}
 	else if (need_reopen) {
-		int ret = snprintf(message, 1024, "[%d] logsize: %llu, triggering log-reopen...\n", (int) uwsgi_now(), (unsigned long long) uwsgi.shared->logsize);
-		if (ret > 0) {
-			if (write(uwsgi.original_log_fd, message, ret) != ret) {
-				// very probably this will never be printed
-				uwsgi_error("write()");
-			}
-		}
-
-		// reopen logfile;
-		close(uwsgi.original_log_fd);
-		uwsgi.original_log_fd = open(uwsgi.logfile, O_RDWR | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP);
-		if (uwsgi.original_log_fd < 0) {
-			uwsgi_error_open(uwsgi.logfile);
-			grace_them_all(0);
-		}
-		ret = snprintf(message, 1024, "[%d] %s reopened.\n", (int) uwsgi_now(), uwsgi.logfile);
-		if (ret > 0) {
-			if (write(uwsgi.original_log_fd, message, ret) != ret) {
-				// very probably this will never be printed
-				uwsgi_error("write()");
-			}
-		}
-		uwsgi.shared->logsize = lseek(uwsgi.original_log_fd, 0, SEEK_CUR);
+		uwsgi_log_reopen();
 	}
 }
 
+void uwsgi_log_rotate() {
+	char message[1024];
+	if (!uwsgi.logfile) return;
+	char *rot_name = uwsgi.log_backupname;
+                int need_free = 0;
+                if (rot_name == NULL) {
+                        char *ts_str = uwsgi_num2str((int) uwsgi_now());
+                        rot_name = uwsgi_concat3(uwsgi.logfile, ".", ts_str);
+                        free(ts_str);
+                        need_free = 1;
+                }
+                int ret = snprintf(message, 1024, "[%d] logsize: %llu, triggering rotation to %s...\n", (int) uwsgi_now(), (unsigned long long) uwsgi.shared->logsize, rot_name);
+                if (ret > 0) {
+                        if (write(uwsgi.original_log_fd, message, ret) != ret) {
+                                // very probably this will never be printed
+                                uwsgi_error("write()");
+                        }
+                }
+                if (rename(uwsgi.logfile, rot_name) == 0) {
+                        // reopen logfile dup'it and eventually gracefully reload workers;
+                        int fd = open(uwsgi.logfile, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
+                        if (fd < 0) {
+                                uwsgi_error_open(uwsgi.logfile);
+                                grace_them_all(0);
+                        }
+                        else {
+                                if (dup2(fd, uwsgi.original_log_fd) < 0) {
+                                        uwsgi_error("dup2()");
+                                        grace_them_all(0);
+                                }
+                                close(fd);
+                        }
+                }
+                else {
+                        uwsgi_error("unable to rotate log: rename()");
+                }
+                if (need_free)
+                        free(rot_name);
+}
+
+void uwsgi_log_reopen() {
+	char message[1024];
+	if (!uwsgi.logfile) return;
+	int ret = snprintf(message, 1024, "[%d] logsize: %llu, triggering log-reopen...\n", (int) uwsgi_now(), (unsigned long long) uwsgi.shared->logsize);
+        if (ret > 0) {
+                        if (write(uwsgi.original_log_fd, message, ret) != ret) {
+                                // very probably this will never be printed
+                                uwsgi_error("write()");
+                        }
+                }
+
+                // reopen logfile;
+                close(uwsgi.original_log_fd);
+                uwsgi.original_log_fd = open(uwsgi.logfile, O_RDWR | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP);
+                if (uwsgi.original_log_fd < 0) {
+                        uwsgi_error_open(uwsgi.logfile);
+                        grace_them_all(0);
+                }
+                ret = snprintf(message, 1024, "[%d] %s reopened.\n", (int) uwsgi_now(), uwsgi.logfile);
+                if (ret > 0) {
+                        if (write(uwsgi.original_log_fd, message, ret) != ret) {
+                                // very probably this will never be printed
+                                uwsgi_error("write()");
+                        }
+                }
+                uwsgi.shared->logsize = lseek(uwsgi.original_log_fd, 0, SEEK_CUR);
+}
+
 
 void log_request(struct wsgi_request *wsgi_req) {
 
@@ -1346,6 +1404,45 @@ 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;
+		if (ule->use_for) {
+			if (ul && ul->id) {
+				if (strcmp(ule->use_for, ul->id)) {
+					goto next;
+				}
+			}
+			else {
+				goto next;
+			}
+		}
+		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;
+next:
+		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);
@@ -1379,7 +1476,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;
                                 }
                         }
@@ -1397,14 +1494,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;
         }
@@ -1423,7 +1520,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;
                                 }
                         }
@@ -1441,14 +1538,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;
         }
@@ -1511,3 +1608,374 @@ 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;
+		char *use_for = strchr(usl->value, ':');
+		if (use_for) *use_for = 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);
+		}
+		struct uwsgi_log_encoder *ule2 = uwsgi_malloc(sizeof(struct uwsgi_log_encoder));
+		memcpy(ule2, ule, sizeof(struct uwsgi_log_encoder)); 
+		if (use_for) {
+			ule2->use_for = uwsgi_str(use_for+1);
+			*use_for = ':';
+		}
+		// we use a copy
+		if (space) {
+			*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;
+		char *use_for = strchr(usl->value, ':');
+		if (use_for) *use_for = 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);
+                }
+		struct uwsgi_log_encoder *ule2 = uwsgi_malloc(sizeof(struct uwsgi_log_encoder));
+                memcpy(ule2, ule, sizeof(struct uwsgi_log_encoder));
+                if (use_for) {
+			ule2->use_for = uwsgi_str(use_for+1);
+                        *use_for = ':';
+                }
+                // we use a copy
+                if (space) {
+                        *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

@@ -77,38 +77,6 @@ void uwsgi_master_manage_udp(int udp_fd) {
 	}
 }
 
-void uwsgi_master_manage_emperor() {
-	char byte;
-	ssize_t rlen = read(uwsgi.emperor_fd, &byte, 1);
-	if (rlen > 0) {
-		uwsgi_log_verbose("received message %d from emperor\n", byte);
-		// remove me
-		if (byte == 0) {
-			close(uwsgi.emperor_fd);
-			if (!uwsgi.status.brutally_reloading)
-				kill_them_all(0);
-		}
-		// reload me
-		else if (byte == 1) {
-			// un-lazy the stack to trigger a real reload
-			uwsgi.lazy = 0;
-			uwsgi_block_signal(SIGHUP);
-			grace_them_all(0);
-			uwsgi_unblock_signal(SIGHUP);
-		}
-	}
-	else {
-		uwsgi_log("lost connection with my emperor !!!\n");
-		close(uwsgi.emperor_fd);
-		if (!uwsgi.status.brutally_reloading)
-			kill_them_all(0);
-		sleep(2);
-		exit(1);
-	}
-
-}
-
-
 void uwsgi_master_restore_snapshot() {
 	int i, waitpid_status;
 	uwsgi_log("[snapshot] restoring workers...\n");
@@ -222,8 +190,8 @@ int uwsgi_get_tcp_info(int fd) {
 #elif defined(__FreeBSD__)
 		if (!uwsgi.shared->ti.__tcpi_sacked) {
 #endif
-                        return 0;
-                }
+			return 0;
+		}
 
 #if defined(__linux__)
 		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.tcpi_unacked;
@@ -242,12 +210,12 @@ int uwsgi_get_tcp_info(int fd) {
 					uwsgi_error("write()");
 				}
 				else {
-					uwsgi_log("asking emperor for reinforcements (backlog: %llu)...\n", (unsigned long long ) uwsgi.shared->load);
+					uwsgi_log("asking emperor for reinforcements (backlog: %llu)...\n", (unsigned long long) uwsgi.shared->load);
 				}
 			}
 		}
 		if (uwsgi.shared->load >= uwsgi.shared->max_load) {
-			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%llu/%llu) ***\n", fd, (unsigned long long ) uwsgi.shared->load, (unsigned long long ) uwsgi.shared->max_load);
+			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%llu/%llu) ***\n", fd, (unsigned long long) uwsgi.shared->load, (unsigned long long) uwsgi.shared->max_load);
 			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
 		}
 
@@ -306,7 +274,6 @@ int master_loop(char **argv, char **environ) {
 	struct uwsgi_rb_timer *min_timeout;
 	struct uwsgi_rbtree *rb_timers = uwsgi_init_rb_timer();
 
-
 	if (uwsgi.procname_master) {
 		uwsgi_set_processname(uwsgi.procname_master);
 	}
@@ -346,6 +313,11 @@ int master_loop(char **argv, char **environ) {
 #endif
 	event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->worker_signal_pipe[0]);
 
+	if (uwsgi.master_fifo) {
+		uwsgi.master_fifo_fd = uwsgi_master_fifo();
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.master_fifo_fd);
+	}
+
 	if (uwsgi.spoolers) {
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->spooler_signal_pipe[0]);
 	}
@@ -383,7 +355,18 @@ int master_loop(char **argv, char **environ) {
 	uwsgi.wsgi_req->buffer = uwsgi.workers[0].cores[0].buffer;
 
 	if (uwsgi.has_emperor) {
-		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd);
+		if (uwsgi.emperor_proxy) {
+			uwsgi.emperor_fd_proxy = bind_to_unix(uwsgi.emperor_proxy, uwsgi.listen_queue, 0, 0);
+			if (uwsgi.emperor_fd_proxy < 0) exit(1);
+			if (chmod(uwsgi.emperor_proxy, S_IRUSR|S_IWUSR)) {
+				uwsgi_error("[emperor-proxy] chmod()");
+				exit(1);
+			}
+			event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd_proxy);
+		}
+		else {
+			event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd);
+		}
 	}
 
 	if (uwsgi.zerg_server) {
@@ -477,7 +460,7 @@ int master_loop(char **argv, char **environ) {
 	uwsgi_check_touches(uwsgi.touch_gracefully_stop);
 	// update exec touches
 	struct uwsgi_string_list *usl = uwsgi.touch_exec;
-	while(usl) {
+	while (usl) {
 		char *space = strchr(usl->value, ' ');
 		if (space) {
 			*space = 0;
@@ -489,16 +472,16 @@ int master_loop(char **argv, char **environ) {
 	uwsgi_check_touches(uwsgi.touch_exec);
 	// update signal touches
 	usl = uwsgi.touch_signal;
-        while(usl) {
-                char *space = strchr(usl->value, ' ');
-                if (space) {
-                        *space = 0;
-                        usl->len = strlen(usl->value);
-                        usl->custom_ptr = space + 1;
-                }
-                usl = usl->next;
-        }
-        uwsgi_check_touches(uwsgi.touch_signal);
+	while (usl) {
+		char *space = strchr(usl->value, ' ');
+		if (space) {
+			*space = 0;
+			usl->len = strlen(usl->value);
+			usl->custom_ptr = space + 1;
+		}
+		usl = usl->next;
+	}
+	uwsgi_check_touches(uwsgi.touch_signal);
 
 	// fsmon
 	uwsgi_fsmon_setup();
@@ -731,6 +714,7 @@ int master_loop(char **argv, char **environ) {
 			uwsgi_master_check_mules_deadline();
 			uwsgi_master_check_spoolers_deadline();
 			uwsgi_master_check_crons_deadline();
+			uwsgi_master_check_mountpoints();
 
 #ifdef __linux__
 #ifdef MADV_MERGEABLE
@@ -741,7 +725,7 @@ int master_loop(char **argv, char **environ) {
 #endif
 
 			// resubscribe every 10 cycles by default
-			if (( (uwsgi.subscriptions || uwsgi.subscriptions2) && ((uwsgi.master_cycles % uwsgi.subscribe_freq) == 0 || uwsgi.master_cycles == 1)) && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
+			if (((uwsgi.subscriptions || uwsgi.subscriptions2) && ((uwsgi.master_cycles % uwsgi.subscribe_freq) == 0 || uwsgi.master_cycles == 1)) && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
 				uwsgi_subscribe_all(0, 0);
 			}
 
@@ -765,40 +749,34 @@ int master_loop(char **argv, char **environ) {
 				}
 				touched = uwsgi_check_touches(uwsgi.touch_workers_reload);
 				if (touched) {
-                                        uwsgi_log_verbose("*** %s has been touched... workers reload !!! ***\n", touched);
-					uwsgi_block_signal(SIGHUP);
-					for(i=1;i<=uwsgi.numproc;i++) {
-						if (uwsgi.workers[i].pid > 0) {
-							uwsgi_curse(i, SIGHUP);
-						}
-					}
-					uwsgi_unblock_signal(SIGHUP);
-                                        continue;
-                                }
+					uwsgi_log_verbose("*** %s has been touched... workers reload !!! ***\n", touched);
+					uwsgi_reload_workers();
+					continue;
+				}
 				touched = uwsgi_check_touches(uwsgi.touch_chain_reload);
 				if (touched) {
 					if (uwsgi.status.chain_reloading == 0) {
-                                        	uwsgi_log_verbose("*** %s has been touched... chain reload !!! ***\n", touched);
+						uwsgi_log_verbose("*** %s has been touched... chain reload !!! ***\n", touched);
 						uwsgi.status.chain_reloading = 1;
 					}
 					else {
-                                        	uwsgi_log_verbose("*** %s has been touched... but chain reload is already running ***\n", touched);
+						uwsgi_log_verbose("*** %s has been touched... but chain reload is already running ***\n", touched);
 					}
 				}
 
 				// be sure to run it as the last touch check
 				touched = uwsgi_check_touches(uwsgi.touch_exec);
 				if (touched) {
-					if (uwsgi_run_command( touched , NULL, -1) >= 0) {
+					if (uwsgi_run_command(touched, NULL, -1) >= 0) {
 						uwsgi_log_verbose("[uwsgi-touch-exec] running %s\n", touched);
 					}
 				}
 				touched = uwsgi_check_touches(uwsgi.touch_signal);
-                                if (touched) {
+				if (touched) {
 					uint8_t signum = atoi(touched);
 					uwsgi_route_signal(signum);
-                                        uwsgi_log_verbose("[uwsgi-touch-signal] raising %u\n", signum);
-                                }
+					uwsgi_log_verbose("[uwsgi-touch-signal] raising %u\n", signum);
+				}
 			}
 
 			continue;
@@ -815,12 +793,18 @@ int master_loop(char **argv, char **environ) {
 		// reload gateways and daemons only on normal workflow (+outworld status)
 		if (!uwsgi_instance_is_reloading && !uwsgi_instance_is_dying) {
 
-			if (uwsgi_master_check_emperor_death(diedpid)) continue;
-			if (uwsgi_master_check_spoolers_death(diedpid)) continue;
-			if (uwsgi_master_check_mules_death(diedpid)) continue;
-			if (uwsgi_master_check_gateways_death(diedpid)) continue;
-			if (uwsgi_master_check_daemons_death(diedpid)) continue;
-			if (uwsgi_master_check_cron_death(diedpid)) continue;
+			if (uwsgi_master_check_emperor_death(diedpid))
+				continue;
+			if (uwsgi_master_check_spoolers_death(diedpid))
+				continue;
+			if (uwsgi_master_check_mules_death(diedpid))
+				continue;
+			if (uwsgi_master_check_gateways_death(diedpid))
+				continue;
+			if (uwsgi_master_check_daemons_death(diedpid))
+				continue;
+			if (uwsgi_master_check_cron_death(diedpid))
+				continue;
 		}
 
 
@@ -885,8 +869,9 @@ next:
 		// ok, if we are reloading or dying, just continue the master loop
 		// as soon as all of the workers have pid == 0, the action (exit, or reload) is triggered
 		if (uwsgi_instance_is_reloading || uwsgi_instance_is_dying) {
-			if (!uwsgi.workers[thewid].cursed_at) uwsgi.workers[thewid].cursed_at = uwsgi_now();
-			uwsgi_log("worker %d buried after %d seconds\n", thewid, (int) (uwsgi_now()-uwsgi.workers[thewid].cursed_at));
+			if (!uwsgi.workers[thewid].cursed_at)
+				uwsgi.workers[thewid].cursed_at = uwsgi_now();
+			uwsgi_log("worker %d buried after %d seconds\n", thewid, (int) (uwsgi_now() - uwsgi.workers[thewid].cursed_at));
 			uwsgi.workers[thewid].cursed_at = 0;
 			continue;
 		}
@@ -905,6 +890,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));
@@ -959,3 +949,34 @@ next:
 
 	// never here
 }
+
+void uwsgi_reload_workers() {
+	int i;
+	uwsgi_block_signal(SIGHUP);
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid > 0) {
+			uwsgi_curse(i, SIGHUP);
+		}
+	}
+	uwsgi_unblock_signal(SIGHUP);
+}
+
+void uwsgi_chain_reload() {
+	if (!uwsgi.status.chain_reloading) {
+		uwsgi_log_verbose("chain reload starting...\n");
+		uwsgi.status.chain_reloading = 1;
+	}
+	else {
+		uwsgi_log_verbose("chain reload already running...\n");
+	}
+}
+
+void uwsgi_brutally_reload_workers() {
+	int i;
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid > 0) {
+			uwsgi_log_verbose("killing worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
+			uwsgi_curse(i, SIGINT);
+		}
+	}
+}

core/master_checks.c

@@ -35,11 +35,17 @@ int uwsgi_master_check_reload(char **argv) {
 // check for chain reload
 void uwsgi_master_check_chain() {
 	if (!uwsgi.status.chain_reloading) return;
-	if (uwsgi.status.chain_reloading > uwsgi.numproc) {
+	int i;
+	int needed_procs = 0;
+	for(i=1;i<=uwsgi.numproc;i++) {
+                if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0) {
+			needed_procs++;
+                }
+        }
+	if (uwsgi.status.chain_reloading > needed_procs) {
 		uwsgi.status.chain_reloading = 0;
                 uwsgi_log_verbose("chain reloading complete\n");
 	}
-	int i;
 	uwsgi_block_signal(SIGHUP);
 	for(i=1;i<=uwsgi.numproc;i++) {
 		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].cursed_at == 0 && i == uwsgi.status.chain_reloading) {
@@ -112,6 +118,9 @@ void uwsgi_master_check_idle() {
 				if (errno != ECHILD)
 					uwsgi_error("uwsgi_master_check_idle()/waitpid()");
 			}
+			else {
+				uwsgi.workers[i].pid = 0;
+			}
 		}
 		uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
 		uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
@@ -316,3 +325,14 @@ void uwsgi_master_check_crons_deadline() {
 	}
 }
 
+void uwsgi_master_check_mountpoints() {
+	struct uwsgi_string_list *usl;
+	uwsgi_foreach(usl, uwsgi.mountpoints_check) {
+		if (uwsgi_check_mountpoint(usl->value)) {
+			uwsgi_log_verbose("mountpoint %s failed, triggering detonation...\n", usl->value);
+			uwsgi_nuclear_blast();
+			//never here
+			exit(1);
+		}
+	}
+}

core/master_events.c

@@ -18,6 +18,10 @@ int uwsgi_master_manage_events(int interesting_fd) {
 		}
 	}
 
+	if (uwsgi.master_fifo_fd > -1 && interesting_fd == uwsgi.master_fifo_fd) {
+		return uwsgi_master_fifo_manage(uwsgi.master_fifo_fd);
+	}
+
 	// stats server ?
 	if (uwsgi.stats && uwsgi.stats_fd > -1) {
 		if (interesting_fd == uwsgi.stats_fd) {
@@ -36,6 +40,11 @@ int uwsgi_master_manage_events(int interesting_fd) {
 
 	// emperor event ?
 	if (uwsgi.has_emperor) {
+		if (uwsgi.emperor_fd_proxy > -1 && interesting_fd == uwsgi.emperor_fd_proxy) {
+			uwsgi_master_manage_emperor_proxy();	
+			return 0;
+		}
+
 		if (interesting_fd == uwsgi.emperor_fd) {
 			uwsgi_master_manage_emperor();
 			return 0;

core/master_utils.c

@@ -115,7 +115,49 @@ 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;
+		}
+	}
+
+	// then check for fifo
+	if (uwsgi.cheaper_fifo_delta != 0) {
+		if (!ignore_algo) {
+			needed_workers = uwsgi.cheaper_fifo_delta;
+			ignore_algo = 1;
+		}
+		uwsgi.cheaper_fifo_delta = 0;
+	}
+
+	// if cheaper limits wants to change worker count, then skip cheaper algo
+	if (!needed_workers) needed_workers = uwsgi.cheaper_algo(!ignore_algo);
+	// safe check to verify if cheaper algo obeyed ignore_algo value
+	if (ignore_algo && needed_workers > 0) {
+		uwsgi_log("BUG! cheaper algo returned %d but it cannot spawn any worker at this time!\n", needed_workers);
+		needed_workers = 0;
+	}
 
 	if (needed_workers > 0) {
 		for (i = 1; i <= uwsgi.numproc; i++) {
@@ -152,6 +194,11 @@ int uwsgi_calc_cheaper(void) {
 	return 1;
 }
 
+// fake algo to allow control with the fifo
+int uwsgi_cheaper_algo_manual(int can_spawn) {
+	return 0;
+}
+
 /*
 
         -- Cheaper, spare algorithm, adapted from old-fashioned spare system --
@@ -187,7 +234,7 @@ int uwsgi_calc_cheaper(void) {
 */
 
 
-int uwsgi_cheaper_algo_spare(void) {
+int uwsgi_cheaper_algo_spare(int can_spawn) {
 
 	int i;
 	static uint64_t overload_count = 0;
@@ -211,7 +258,7 @@ int uwsgi_cheaper_algo_spare(void) {
 healthy:
 
 	// are we overloaded ?
-	if (overload_count > uwsgi.cheaper_overload) {
+	if (can_spawn && overload_count > uwsgi.cheaper_overload) {
 
 #ifdef UWSGI_DEBUG
 		uwsgi_log("overloaded !!!\n");
@@ -279,7 +326,7 @@ healthy:
 
 */
 
-int uwsgi_cheaper_algo_backlog(void) {
+int uwsgi_cheaper_algo_backlog(int can_spawn) {
 
 	int i;
 #ifdef __linux__
@@ -288,7 +335,7 @@ int uwsgi_cheaper_algo_backlog(void) {
 	int backlog = 0;
 #endif
 
-	if (backlog > (int) uwsgi.cheaper_overload) {
+	if (can_spawn && backlog > (int) uwsgi.cheaper_overload) {
 		// activate the first available worker (taking step into account)
 		int decheaped = 0;
 		// search for cheaped workers
@@ -326,23 +373,30 @@ void uwsgi_reload(char **argv) {
 	int i;
 	int waitpid_status;
 
-	// call a series of waitpid to ensure all processes (gateways, mules and daemons) are dead
-	for (i = 0; i < (ushared->gateways_cnt + uwsgi.daemons_cnt + uwsgi.mules_cnt); i++) {
-		waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
+	if (!uwsgi.master_is_reforked) {
+
+		// call a series of waitpid to ensure all processes (gateways, mules and daemons) are dead
+		for (i = 0; i < (ushared->gateways_cnt + uwsgi.daemons_cnt + uwsgi.mules_cnt); i++) {
+			waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
+		}
+
+		// call master cleanup hooks
+		uwsgi_master_cleanup_hooks();
+
+		// call atexit user exec
+		uwsgi_exec_atexit();
+
+		if (uwsgi.exit_on_reload) {
+			uwsgi_log("uWSGI: GAME OVER (insert coin)\n");
+			exit(0);
+		}
+
+		uwsgi_log("binary reloading uWSGI...\n");
+	}
+	else {
+		uwsgi_log("fork()'ing uWSGI...\n");
 	}
 
-	// call master cleanup hooks
-	uwsgi_master_cleanup_hooks();
-
-	// call atexit user exec
-	uwsgi_exec_atexit();
-
-	if (uwsgi.exit_on_reload) {
-		uwsgi_log("uWSGI: GAME OVER (insert coin)\n");
-		exit(0);
-	}
-
-	uwsgi_log("binary reloading uWSGI...\n");
 	uwsgi_log("chdir() to %s\n", uwsgi.cwd);
 	if (chdir(uwsgi.cwd)) {
 		uwsgi_error("chdir()");
@@ -529,6 +583,7 @@ void uwsgi_fixup_fds(int wid, int muleid, struct uwsgi_gateway *ug) {
 			}
 		}
 
+		if (uwsgi.master_fifo_fd > -1) close(uwsgi.master_fifo_fd);
 	}
 
 
@@ -1296,7 +1351,7 @@ end:
 	return NULL;
 }
 
-void uwsgi_register_cheaper_algo(char *name, int (*func) (void)) {
+void uwsgi_register_cheaper_algo(char *name, int (*func) (int)) {
 
 	struct uwsgi_cheaper_algo *uca = uwsgi.cheaper_algos;
 
@@ -1485,3 +1540,53 @@ void uwsgi_add_reload_fds() {
 	add_reload_fds(uwsgi.reload_on_fd, "graceful");
 	add_reload_fds(uwsgi.brutal_reload_on_fd, "brutal");
 }
+
+void uwsgi_refork_master() {
+	pid_t pid = fork();
+	if (pid < 0) {
+		uwsgi_error("uwsgi_refork_master()/fork()");
+		return;
+	}
+
+	if (pid > 0) {
+		uwsgi_log_verbose("new master copy spawned with pid %d\n", (int) pid);
+		return;
+	}
+
+	// detach from the old master
+	setsid();
+
+	uwsgi.master_is_reforked = 1;
+	uwsgi_reload(uwsgi.argv);
+	// never here
+	exit(1);
+}
+
+void uwsgi_cheaper_increase() {
+	uwsgi.cheaper_fifo_delta++;
+}
+
+void uwsgi_cheaper_decrease() {
+        uwsgi.cheaper_fifo_delta--;
+}
+
+void uwsgi_go_cheap() {
+	int i;
+	int waitpid_status;
+	if (uwsgi.status.is_cheap) return;
+	uwsgi_log_verbose("going cheap...\n");
+	uwsgi.status.is_cheap = 1;
+                for (i = 1; i <= uwsgi.numproc; i++) {
+                        uwsgi.workers[i].cheaped = 1;
+                        if (uwsgi.workers[i].pid == 0)
+                                continue;
+			uwsgi_log("killing worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
+                        kill(uwsgi.workers[i].pid, SIGKILL);
+                        if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+                                if (errno != ECHILD)
+                                        uwsgi_error("uwsgi_go_cheap()/waitpid()");
+                        }
+                }
+                uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
+                uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
+}

core/mount.c

@@ -0,0 +1,254 @@
+#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
+#include <sys/statfs.h>
+#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) {
+#if defined(__FreeBSD__) || defined(__GNU_kFreeBSD__)
+	struct iovec iov[6];
+#endif
+	unsigned long mountflags = 0;
+	if (!flags) goto parsed;
+	char *mflags = uwsgi_str(flags);
+	char *p, *ctx = NULL;
+	uwsgi_foreach_token(mflags, ",", p, ctx) {
+		unsigned long flag = (unsigned long) uwsgi_mount_flag(p);
+		if (!flag) {
+			uwsgi_log("unknown mount flag \"%s\"\n", p);
+			exit(1);
+		}
+		mountflags |= flag;
+	}
+	free(mflags);
+parsed:
+#ifdef __linux__
+	return mount(what, where, fs, mountflags, NULL);
+#elif defined(__FreeBSD__) || defined(__GNU_kFreeBSD__)
+	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, *ctx = NULL;
+	uwsgi_foreach_token(mflags, ",", p, ctx) {
+                unsigned long flag = (unsigned long) uwsgi_mount_flag(p);
+                if (!flag) {
+                        uwsgi_log("unknown umount flag \"%s\"\n", p);
+                        exit(1);
+                }
+                mountflags |= flag;
+        }
+        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__) || defined(__GNU_kFreeBSD__)
+	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;
+}
+
+int uwsgi_check_mountpoint(char *mountpoint) {
+#ifdef __linux__
+	struct statfs sfs;
+	int ret = statfs(mountpoint, &sfs);
+	if (ret) {
+		uwsgi_error("uwsgi_check_mountpoint()/statfs()");
+		return -1;
+	}
+	return 0;
+#else
+	uwsgi_log("this platform does not support mountpoints check !!!\n");
+	return -1;
+#endif
+}

core/mule.c

@@ -453,8 +453,8 @@ void uwsgi_setup_mules_and_farms() {
 			create_signal_pipe(uwsgi.farms[i].signal_pipe);
 			create_msg_pipe(uwsgi.farms[i].queue_pipe, uwsgi.mule_msg_size);
 
-			char *p = strtok(mules_list, ",");
-			while (p != NULL) {
+			char *p, *ctx = NULL;
+			uwsgi_foreach_token(mules_list, ",", p, ctx) {
 				struct uwsgi_mule *um = get_mule_by_id(atoi(p));
 				if (!um) {
 					uwsgi_log("invalid mule id: %s\n", p);
@@ -462,8 +462,6 @@ void uwsgi_setup_mules_and_farms() {
 				}
 
 				uwsgi_mule_farm_new(&uwsgi.farms[i].mules, um);
-
-				p = strtok(NULL, ",");
 			}
 			uwsgi_log("created farm %d name: %s mules:%s\n", i + 1, uwsgi.farms[i].name, strchr(farm_name->value, ':') + 1);
 

core/offload.c

@@ -323,7 +323,7 @@ static int u_offload_sendfile_do(struct uwsgi_thread *ut, struct uwsgi_offload_r
 		if (event_queue_add_fd_write(ut->queue, uor->fd2)) return -1;
 		return 0;
 	}
-#if defined(__linux__) || defined(__sun__)
+#if defined(__linux__) || defined(__sun__) || defined(__GNU_kFreeBSD__)
 	ssize_t len = sendfile(uor->fd2, uor->fd, &uor->pos, 128 * 1024);
 	if (len > 0) {
         	uor->written += len;

core/plugins.c

@@ -14,7 +14,9 @@ static void uwsgi_plugin_parse_section(char *filename) {
 			if (equal) {
 				*equal = 0;
 				if (!strcmp(p, "requires")) {
-					uwsgi_load_plugin(-1, equal + 1, NULL);
+					if (!plugin_already_loaded(equal+1)) {	
+						uwsgi_load_plugin(-1, equal + 1, NULL);
+					}
 				}
 			}
 			p = strtok_r(NULL, "\n", &ctx);

core/queue.c

@@ -57,7 +57,7 @@ void uwsgi_init_queue() {
 		uwsgi.queue_header->pos = 0;
 		uwsgi.queue_header->pull_pos = 0;
 	}
-	if (!uwsgi.queue) {
+	if (uwsgi.queue == MAP_FAILED) {
 		uwsgi_error("mmap()");
 		exit(1);
 	}

core/reader.c

@@ -389,6 +389,8 @@ wait:
 				remains -= len;
                         	*rlen += len;
                         	continue;
+			}else if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) {
+				goto wait;
 			}
 			*rlen = -1;
 			if (len == 0) {

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;
 		}
@@ -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
@@ -1630,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);
@@ -1750,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");
@@ -1784,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) {
@@ -1800,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,6 +4,11 @@ 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;
@@ -15,15 +20,14 @@ ssize_t uwsgi_sendfile_do(int sockfd, int filefd, size_t pos, size_t len) {
 	int sf_ret = sendfile(filefd, sockfd, pos, &sf_len, NULL, 0);
 	if (sf_ret == 0 || (sf_ret == -1 && errno == EAGAIN)) return sf_len;
 	return -1;
-#elif defined(__linux__) || defined(__sun__)
+#elif defined(__linux__) || defined(__sun__) || defined(__GNU_kFreeBSD__)
 	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
 
 }
 

core/socket.c

@@ -187,6 +187,14 @@ int bind_to_unix(char *socket_name, int listen_queue, int chmod_socket, int abst
 		return -1;
 	}
 
+#ifdef __linux__
+        long somaxconn = uwsgi_num_from_file("/proc/sys/net/core/somaxconn", 1);
+        if (somaxconn > 0 && uwsgi.listen_queue > somaxconn) {
+                uwsgi_log("Listen queue size is greater than the system max net.core.somaxconn (%li).\n", somaxconn);
+                uwsgi_nuclear_blast();
+                return -1;
+        }
+#endif
 
 	if (listen(serverfd, listen_queue) != 0) {
 		uwsgi_error("listen()");
@@ -1645,8 +1653,8 @@ void uwsgi_map_sockets() {
 			}
 			if ((int) uwsgi_str_num(usl->value, colon - usl->value) == uwsgi_get_socket_num(uwsgi_sock)) {
 				enabled = 0;
-				char *p = strtok(colon + 1, ",");
-				while (p != NULL) {
+				char *p, *ctx = NULL;
+				uwsgi_foreach_token(colon + 1, ",", p, ctx) {
 					int w = atoi(p);
 					if (w < 1 || w > uwsgi.numproc) {
 						uwsgi_log("invalid worker num: %d\n", w);
@@ -1657,7 +1665,6 @@ void uwsgi_map_sockets() {
 						uwsgi_log("mapped socket %d (%s) to worker %d\n", uwsgi_get_socket_num(uwsgi_sock), uwsgi_sock->name, uwsgi.mywid);
 						break;
 					}
-					p = strtok(NULL, ",");
 				}
 			}
 
@@ -1666,18 +1673,7 @@ void uwsgi_map_sockets() {
 
 		if (!enabled) {
 			close(uwsgi_sock->fd);
-			int fd = open("/dev/null", O_RDONLY);
-			if (fd < 0) {
-				uwsgi_error_open("/dev/null");
-				exit(1);
-			}
-			if (fd != uwsgi_sock->fd) {
-				if (dup2(fd, uwsgi_sock->fd) < 0) {
-					uwsgi_error("dup2()");
-					exit(1);
-				}
-				close(fd);
-			}
+			uwsgi_remap_fd(uwsgi_sock->fd, "/dev/null");
 			uwsgi_sock->disabled = 1;
 		}
 
@@ -1707,6 +1703,10 @@ void uwsgi_bind_sockets() {
 	while (uwsgi_sock) {
 		if (!uwsgi_sock->bound && !uwsgi_socket_is_already_bound(uwsgi_sock->name)) {
 			char *tcp_port = strrchr(uwsgi_sock->name, ':');
+			int current_defer_accept = uwsgi.no_defer_accept;
+                        if (uwsgi_sock->no_defer) {
+                                uwsgi.no_defer_accept = 1;
+                        }
 			if (tcp_port == NULL) {
 				uwsgi_sock->fd = bind_to_unix(uwsgi_sock->name, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
 				uwsgi_sock->family = AF_UNIX;
@@ -1740,6 +1740,7 @@ void uwsgi_bind_sockets() {
 				uwsgi_log("unable to create server socket on: %s\n", uwsgi_sock->name);
 				exit(1);
 			}
+			uwsgi.no_defer_accept = current_defer_accept;
 		}
 		uwsgi_sock->bound = 1;
 		uwsgi_sock = uwsgi_sock->next;
@@ -1785,7 +1786,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) {
@@ -1803,6 +1805,8 @@ void uwsgi_bind_sockets() {
 
 	}
 
+stdin_done:
+
 	// check for auto_port socket
 	uwsgi_sock = uwsgi.sockets;
 	while (uwsgi_sock) {
@@ -1867,7 +1871,20 @@ setup_proto:
 			if (uwsgi.offload_threads > 0)
 				uwsgi_sock->can_offload = 1;
 		}
-
+		else if (requested_protocol && !strcmp("raw", requested_protocol)) {
+			uwsgi_sock->proto = uwsgi_proto_raw_parser;
+                        uwsgi_sock->proto_accept = uwsgi_proto_base_accept;
+                        uwsgi_sock->proto_prepare_headers = uwsgi_proto_base_prepare_headers;
+                        uwsgi_sock->proto_add_header = uwsgi_proto_base_add_header;
+                        uwsgi_sock->proto_fix_headers = uwsgi_proto_base_fix_headers;
+                        uwsgi_sock->proto_read_body = uwsgi_proto_base_read_body;
+                        uwsgi_sock->proto_write = uwsgi_proto_base_write;
+                        uwsgi_sock->proto_write_headers = uwsgi_proto_base_write;
+                        uwsgi_sock->proto_sendfile = uwsgi_proto_base_sendfile;
+                        uwsgi_sock->proto_close = uwsgi_proto_base_close;
+                        if (uwsgi.offload_threads > 0)
+                                uwsgi_sock->can_offload = 1;
+		}
 		else if (requested_protocol && (!strcmp("fastcgi", requested_protocol) || !strcmp("fcgi", requested_protocol))) {
 			uwsgi_sock->proto = uwsgi_proto_fastcgi_parser;
 			uwsgi_sock->proto_accept = uwsgi_proto_base_accept;
@@ -1955,3 +1972,22 @@ 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/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

@@ -379,3 +379,107 @@ char *uwsgi_cheap_string(char *buf, int len) {
         return buf - 1;
 }
 
+/*
+	status 0: append mode
+	status 1: single quote found
+	status 2: double quote found
+	status 3: backslash found (on 0)
+	status 4: backslash found (on 1)
+	status 5: backslash found (on 2)
+	
+*/
+char ** uwsgi_split_quoted(char *what, size_t what_len, char *sep, size_t *rlen) {
+	size_t i;
+	int status = 0;
+	char *base = uwsgi_concat2n(what, what_len, "", 0);
+	char *item = NULL;
+	char *ptr = NULL;
+	*rlen = 0;
+	char **ret = (char **) uwsgi_malloc(sizeof(char *) * (what_len+1));
+
+	for(i=0;i<what_len;i++) {
+		if (!item) {
+			item = uwsgi_malloc((what_len - i)+1);
+			ptr = item;
+		}
+
+		if (status == 0) {
+			if (base[i] == '\\') {
+				status = 3;
+			}	
+			else if (base[i] == '"') {
+				status = 2;
+			}
+			else if (base[i] == '\'') {
+				status = 1;
+			}
+			else if (strchr(sep, base[i])) {
+				*ptr++= 0;
+				ret[(*rlen)] = item; (*rlen)++;
+				item = NULL;
+			}
+			else {
+				*ptr++= base[i];
+			}
+			continue;
+		}
+
+		// backslash
+		if (status == 3) {
+			*ptr++= base[i];
+			status = 0;
+			continue;
+		}
+
+		// single quote
+		if (status == 1) {
+			if (base[i] == '\\') {
+				status = 4;
+			}
+			else if (base[i] == '\'') {
+				status = 0;
+			}
+			else {
+				*ptr++= base[i];
+			}
+			continue;
+		}
+
+		// double quote
+		if (status == 2) {
+			if (base[i] == '\\') {
+                                status = 5;
+                        }
+                        else if (base[i] == '"') {
+                        	status = 0;
+                        }
+                        else {
+                                *ptr++= base[i];
+                        }
+			continue;
+		}
+
+		// backslash single quote
+                if (status == 4) {
+                        *ptr++= base[i];
+                        status = 1;
+			continue;
+                }
+
+		// backslash double quote
+                if (status == 5) {
+                        *ptr++= base[i];
+                        status = 2;
+			continue;
+                }
+	}
+
+	if (item) {
+		*ptr++= 0;
+		ret[(*rlen)] = item; (*rlen)++;
+	}
+
+	free(base);
+
+	return ret;
+}

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

@@ -151,6 +151,8 @@ void uwsgi_xml_config(char *filename, struct wsgi_request *wsgi_req, char *magic
 	}
 	/* We can safely free resources */
 
+	if (colon) colon[0] = ':';
+
 	xmlFreeDoc(doc);
 	xmlCleanupParser();
 
@@ -267,6 +269,7 @@ void uwsgi_xml_config(char *filename, struct wsgi_request *wsgi_req, char *magic
 
 	} while (!done);
 
+	if (colon) colon[0] = ':';
 
 	// we can safely free, as we have a copy of datas
 	XML_ParserFree(parser);

core/yaml.c

@@ -280,6 +280,7 @@ next:
 	}
 #endif
 
+	if (colon) colon[0] = ':';
 
 }
 

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

@@ -123,12 +123,13 @@ int uwsgi_gzip_fix(z_stream *z, uint32_t crc32, struct uwsgi_buffer *ub, size_t
         if (!gzipped0) goto end;
 	if (uwsgi_buffer_append(ub, gzipped0, dlen0)) goto end;
 	free(gzipped0);
-	if (uwsgi_buffer_u32le(ub, crc32)) goto end;
-        if (uwsgi_buffer_u32le(ub, len)) goto end;
+	if (uwsgi_buffer_u32le(ub, crc32)) goto end2;
+        if (uwsgi_buffer_u32le(ub, len)) goto end2;
 	deflateEnd(z);
 	return 0;
 end:
 	if (gzipped0) free(gzipped0);
+end2:
 	deflateEnd(z);
 	return -1;
 }

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);
@@ -84,7 +90,8 @@ void linux_namespace_start(void *argv) {
 
 		uwsgi_foreach(usl, uwsgi.call_post_jail) {
                         if (uwsgi_call_symbol(usl->value)) {
-                                uwsgi_log("unaable to call function \"%s\"\n", usl->value);
+                                uwsgi_log("unable to call function \"%s\"\n", usl->value);
+				exit(1);
                         }
                 }
 
@@ -173,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;

plugins/carbon/carbon.c

@@ -71,8 +71,8 @@ static void carbon_post_init() {
 		u_server->healthy = 1;
 		u_server->errors = 0;
 
-		char *p = strtok(usl->value, ":");
-		while (p) {
+		char *p, *ctx = NULL;
+		uwsgi_foreach_token(usl->value, ":", p, ctx) {
 			if (!u_server->hostname) {
 				u_server->hostname = uwsgi_str(p);
 			}
@@ -81,7 +81,6 @@ static void carbon_post_init() {
 			}
 			else
 				break;
-			p = strtok(NULL, ":");
 		}
 		if (!u_server->hostname || !u_server->port) {
 			uwsgi_log("[carbon] invalid carbon server address (%s)\n", usl->value);

plugins/cgi/cgi_plugin.c

@@ -828,8 +828,8 @@ clear2:
 			// set the start position of args in argv
 			i = 1;
 			if (helper) i = 2;
-			char *p = strtok(qs, "+");
-			while(p) {
+			char *p, *ctx = NULL;
+			uwsgi_foreach_token(qs, "+", p, ctx) {
 				// create a copy for the url_decoded string
 				char *arg_copy = uwsgi_str(p);
 				uint16_t arg_copy_len = strlen(p);
@@ -838,7 +838,6 @@ clear2:
 				argv[i] = uwsgi_malloc( (arg_copy_len * 2) +1);
 				escape_shell_arg(arg_copy, arg_copy_len, argv[i]);	
 				i++;
-				p = strtok(NULL, "+");
 			}
 			free(qs);
 		}

plugins/cheaper_backlog2/cheaper_backlog2.c

@@ -13,7 +13,7 @@
 
 extern struct uwsgi_server uwsgi;
 
-int cheaper_backlog2_algo(void) {
+int cheaper_backlog2_algo(int can_spawn) {
 
         int i;
 #ifdef __linux__
@@ -22,7 +22,9 @@ int cheaper_backlog2_algo(void) {
         int backlog = 0;
 #endif
 
-        if (backlog > (int)uwsgi.cheaper_overload) {
+        // if can_spawn == 0 we cannot spawn any new worker
+        // this is set to 1 if --cheaper-rss-limit-* options are used and running workers are exceeding resources limit
+        if (can_spawn && backlog > (int)uwsgi.cheaper_overload) {
                 // activate the first available worker (taking step into account)
                 int decheaped = 0;
                 // search for cheaped workers

plugins/cheaper_busyness/cheaper_busyness.c

@@ -142,7 +142,7 @@ int spawn_emergency_worker(int backlog) {
 #endif
 
 
-int cheaper_busyness_algo(void) {
+int cheaper_busyness_algo(int can_spawn) {
 
 	int i;
 	// we use microseconds
@@ -243,11 +243,12 @@ int cheaper_busyness_algo(void) {
 			uwsgi_cheaper_busyness_global.tolerance_counter = 0;
 
 			int decheaped = 0;
-			for (i = 1; i <= uwsgi.numproc; i++) {
-				
-				if (uwsgi.workers[i].cheaped == 1 && uwsgi.workers[i].pid == 0) {
-					decheaped++;
-					if (decheaped >= uwsgi.cheaper_step) break;
+			if (can_spawn) {
+				for (i = 1; i <= uwsgi.numproc; i++) {
+					if (uwsgi.workers[i].cheaped == 1 && uwsgi.workers[i].pid == 0) {
+						decheaped++;
+						if (decheaped >= uwsgi.cheaper_step) break;
+					}
 				}
 			}
 
@@ -271,15 +272,15 @@ int cheaper_busyness_algo(void) {
 				uwsgi_log("[busyness] %llus average busyness is at %llu%%, will spawn %d new worker(s)\n",
 					uwsgi.cheaper_overload, avg_busyness, decheaped);
 			} else {
-				uwsgi_log("[busyness] %llus average busyness is at %llu%% but we already started maximum number of workers (%d)\n",
-					uwsgi.cheaper_overload, avg_busyness, uwsgi.numproc);
+				uwsgi_log("[busyness] %llus average busyness is at %llu%% but we already started maximum number of workers available with current limits (%d)\n",
+					uwsgi.cheaper_overload, avg_busyness, active_workers);
 			}
 
 			// return the maximum number of workers to spawn
 			return decheaped;
 
 #ifdef __linux__
-		} else if (backlog > uwsgi_cheaper_busyness_global.backlog_alert && active_workers < uwsgi.numproc) {
+		} else if (can_spawn && backlog > uwsgi_cheaper_busyness_global.backlog_alert && active_workers < uwsgi.numproc) {
 			return spawn_emergency_worker(backlog);
 #endif
 
@@ -347,14 +348,14 @@ int cheaper_busyness_algo(void) {
 	}
 
 #ifdef __linux__
-	else if (backlog > uwsgi_cheaper_busyness_global.backlog_alert && active_workers < uwsgi.numproc) {
+	else if (can_spawn && backlog > uwsgi_cheaper_busyness_global.backlog_alert && active_workers < uwsgi.numproc) {
 		// we check for backlog overload every cycle
 		return spawn_emergency_worker(backlog);
 	}
 	else if (backlog > 0) {
 		if (uwsgi_cheaper_busyness_global.backlog_is_nonzero) {
 			// backlog was > 0 last time, check timestamp and spawn workers if needed
-			if ((now - uwsgi_cheaper_busyness_global.backlog_nonzero_since)/1000000 >= uwsgi_cheaper_busyness_global.backlog_nonzero_alert) {
+			if (can_spawn && (now - uwsgi_cheaper_busyness_global.backlog_nonzero_since)/1000000 >= uwsgi_cheaper_busyness_global.backlog_nonzero_alert) {
 				uwsgi_log("[busyness] backlog was non-zero for %llu second(s), spawning new worker(s)\n", (now - uwsgi_cheaper_busyness_global.backlog_nonzero_since)/1000000);
 				uwsgi_cheaper_busyness_global.backlog_nonzero_since = now;
 				return spawn_emergency_worker(backlog);
@@ -391,4 +392,3 @@ struct uwsgi_plugin cheaper_busyness_plugin = {
 	.options = uwsgi_cheaper_busyness_options,
 	
 };
-

plugins/forkptyrouter/forkptyrouter.c

@@ -0,0 +1,296 @@
+/*
+
+   uWSGI forkpty-router
+
+   can use the uwsgi protocol, modifier2 means:
+
+	0 -> stdin
+	1-99 -> UNIX signal
+	100 -> window rows (pktsize is the window size)
+	101 -> window cols (pktsize is the window size)
+
+*/
+
+#include <uwsgi.h>
+#include "../corerouter/cr.h"
+
+extern struct uwsgi_server uwsgi;
+
+#if defined(__linux__) || defined(__GNU_kFreeBSD__)
+#include <pty.h>
+#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#include <util.h>
+#elif defined(__FreeBSD__)
+#include <libutil.h>
+#endif
+#ifndef __FreeBSD__
+#include <utmp.h>
+#endif
+
+
+static struct uwsgi_forkptyrouter {
+	struct uwsgi_corerouter cr;
+	char *cmd;
+	uint16_t win_rows;
+	uint16_t win_cols;
+} ufpty;
+
+extern struct uwsgi_server uwsgi;
+
+struct forkptyrouter_session {
+	struct corerouter_session session;
+	// use the uwsgi protocol ?
+	int uwsgi;
+	size_t restore_size;
+	struct winsize w;
+	pid_t pid;
+};
+
+static void uwsgi_opt_forkpty_urouter(char *opt, char *value, void *cr) {
+        struct uwsgi_corerouter *ucr = (struct uwsgi_corerouter *) cr;
+        struct uwsgi_gateway_socket *ugs = uwsgi_new_gateway_socket(value, ucr->name);
+        ugs->no_defer = 1;
+	ugs->mode = 1;
+        ucr->has_sockets++;
+}
+
+
+static struct uwsgi_option forkptyrouter_options[] = {
+	{"forkptyrouter", required_argument, 0, "run the forkptyrouter on the specified address", uwsgi_opt_undeferred_corerouter, &ufpty, 0},
+	{"forkpty-router", required_argument, 0, "run the forkptyrouter on the specified address", uwsgi_opt_undeferred_corerouter, &ufpty, 0},
+
+	{"forkptyurouter", required_argument, 0, "run the forkptyrouter on the specified address", uwsgi_opt_forkpty_urouter, &ufpty, 0},
+	{"forkpty-urouter", required_argument, 0, "run the forkptyrouter on the specified address", uwsgi_opt_forkpty_urouter, &ufpty, 0},
+
+	{"forkptyrouter-command", required_argument, 0, "run the specified command on every connection (default: /bin/sh)", uwsgi_opt_set_str, &ufpty.cmd, 0},
+	{"forkpty-router-command", required_argument, 0, "run the specified command on every connection (default: /bin/sh)", uwsgi_opt_set_str, &ufpty.cmd, 0},
+	{"forkptyrouter-cmd", required_argument, 0, "run the specified command on every connection (default: /bin/sh)", uwsgi_opt_set_str, &ufpty.cmd, 0},
+	{"forkpty-router-cmd", required_argument, 0, "run the specified command on every connection (default: /bin/sh)", uwsgi_opt_set_str, &ufpty.cmd, 0},
+
+	{"forkptyrouter-rows", required_argument, 0, "set forkptyrouter default pty window rows", uwsgi_opt_set_16bit, &ufpty.win_rows, 0},
+	{"forkptyrouter-cols", required_argument, 0, "set forkptyrouter default pty window cols", uwsgi_opt_set_16bit, &ufpty.win_cols, 0},
+
+	{"forkptyrouter-processes", required_argument, 0, "prefork the specified number of forkptyrouter processes", uwsgi_opt_set_int, &ufpty.cr.processes, 0},
+	{"forkptyrouter-workers", required_argument, 0, "prefork the specified number of forkptyrouter processes", uwsgi_opt_set_int, &ufpty.cr.processes, 0},
+	{"forkptyrouter-zerg", required_argument, 0, "attach the forkptyrouter to a zerg server", uwsgi_opt_corerouter_zerg, &ufpty, 0},
+
+	{"forkptyrouter-fallback", required_argument, 0, "fallback to the specified node in case of error", uwsgi_opt_add_string_list, &ufpty.cr.fallback, 0},
+
+	{"forkptyrouter-events", required_argument, 0, "set the maximum number of concufptyent events", uwsgi_opt_set_int, &ufpty.cr.nevents, 0},
+	{"forkptyrouter-cheap", no_argument, 0, "run the forkptyrouter in cheap mode", uwsgi_opt_true, &ufpty.cr.cheap, 0},
+
+	{"forkptyrouter-timeout", required_argument, 0, "set forkptyrouter timeout", uwsgi_opt_set_int, &ufpty.cr.socket_timeout, 0},
+
+	{"forkptyrouter-stats", required_argument, 0, "run the forkptyrouter stats server", uwsgi_opt_set_str, &ufpty.cr.stats_server, 0},
+	{"forkptyrouter-stats-server", required_argument, 0, "run the forkptyrouter stats server", uwsgi_opt_set_str, &ufpty.cr.stats_server, 0},
+	{"forkptyrouter-ss", required_argument, 0, "run the forkptyrouter stats server", uwsgi_opt_set_str, &ufpty.cr.stats_server, 0},
+	{"forkptyrouter-harakiri", required_argument, 0, "enable forkptyrouter harakiri", uwsgi_opt_set_int, &ufpty.cr.harakiri, 0},
+
+	{0, 0, 0, 0, 0, 0, 0},
+};
+
+// write to backend
+static ssize_t fpty_instance_write(struct corerouter_peer *peer) {
+	struct forkptyrouter_session *fpty_session = (struct forkptyrouter_session *) peer->session;
+	ssize_t len = cr_write(peer, "fpty_instance_write()");
+	// end on empty write
+	if (!len) return 0;
+
+	// the chunk has been sent, start (again) reading from client and instances
+	if (cr_write_complete(peer)) {
+		// reset the buffer
+		if (fpty_session->uwsgi) {
+			if (uwsgi_buffer_decapitate(peer->out, peer->out->pos)) return -1;
+			peer->out->pos = fpty_session->restore_size;
+		}
+		else {
+			peer->out->pos = 0;
+		}
+		cr_reset_hooks(peer);
+	}
+
+	return len;
+}
+
+// write to client
+static ssize_t fpty_write(struct corerouter_peer *main_peer) {
+	ssize_t len = cr_write(main_peer, "fpty_write()");
+	// end on empty write
+	if (!len) return 0;
+
+	// ok this response chunk is sent, let's start reading again
+	if (cr_write_complete(main_peer)) {
+		// reset the buffer
+		main_peer->out->pos = 0;
+                cr_reset_hooks(main_peer);
+        } 
+
+	return len;
+}
+
+static ssize_t fpty_parse_uwsgi(struct corerouter_peer *peer) {
+	
+	struct forkptyrouter_session *fpty_session = (struct forkptyrouter_session *) peer->session;
+	for(;;) {
+	if (peer->in->pos < 4) return 0;
+	struct uwsgi_header *uh = (struct uwsgi_header *) peer->in->buf;
+	uint16_t pktsize = uh->pktsize;
+	switch(uh->modifier2) {
+		case 0:
+			// stdin
+			if ((size_t) (pktsize+4) > peer->in->pos) return 0;
+			if (uwsgi_buffer_decapitate(peer->in, 4)) return -1;
+			return pktsize;		
+		case 100:	
+			if (uwsgi_buffer_decapitate(peer->in, 4)) return -1;
+			fpty_session->w.ws_row = pktsize;
+			ioctl(peer->session->peers->fd, TIOCSWINSZ, &fpty_session->w);
+			// rows
+			break;
+		case 101:
+			if (uwsgi_buffer_decapitate(peer->in, 4)) return -1;
+			fpty_session->w.ws_col = pktsize;
+			ioctl(peer->session->peers->fd, TIOCSWINSZ, &fpty_session->w);
+			// cols
+			break;
+		default:
+			if (uwsgi_buffer_decapitate(peer->in, 4)) return -1;
+			// send signal
+			kill(fpty_session->pid, uh->modifier2);
+			break;
+	}
+	}
+
+	return 0;
+}
+
+// read from backend
+static ssize_t fpty_instance_read(struct corerouter_peer *peer) {
+	ssize_t len = cr_read(peer, "fpty_instance_read()");
+	if (!len) return 0;
+
+	// set the input buffer as the main output one
+	peer->session->main_peer->out = peer->in;
+	peer->session->main_peer->out_pos = 0;
+
+	cr_write_to_main(peer, fpty_write);
+	return len;
+}
+
+// read from client
+static ssize_t fpty_read(struct corerouter_peer *main_peer) {
+        struct forkptyrouter_session *fpty_session = (struct forkptyrouter_session *) main_peer->session;
+	ssize_t len = cr_read(main_peer, "fpty_read()");
+	if (!len) return 0;
+
+	if (fpty_session->uwsgi) {
+		ssize_t rlen = fpty_parse_uwsgi(main_peer);
+		if (rlen < 0) return -1;
+		if (rlen == 0) return 1;
+
+		fpty_session->restore_size = main_peer->in->pos - rlen;	
+		main_peer->session->peers->out = main_peer->in;
+		main_peer->session->peers->out->pos = rlen;
+	}
+	else {
+		main_peer->session->peers->out = main_peer->in;
+	}
+	main_peer->session->peers->out_pos = 0;
+
+	cr_write_to_backend(main_peer->session->peers, fpty_instance_write);
+	return len;
+}
+
+static void fpty_session_close(struct corerouter_session *cs) {
+        struct forkptyrouter_session *fpty_session = (struct forkptyrouter_session *) cs;
+	if (fpty_session->pid > 0) {
+		int waitpid_status = 0;
+		if (waitpid(fpty_session->pid, &waitpid_status, WNOHANG) < 0) {
+			uwsgi_error("fpty_session_close()/waitpid()");
+		}
+	}
+}
+
+
+// allocate a new session
+static int forkptyrouter_alloc_session(struct uwsgi_corerouter *ucr, struct uwsgi_gateway_socket *ugs, struct corerouter_session *cs, struct sockaddr *sa, socklen_t s_len) {
+
+	// set default read hook
+	cs->main_peer->last_hook_read = fpty_read;
+
+	// wait4() on close
+	cs->close = fpty_session_close;
+
+	struct forkptyrouter_session *fpty_session = (struct forkptyrouter_session *) cs;
+	if (ugs->mode == 1) {
+		fpty_session->uwsgi = 1;
+	}
+
+	// default terminal size
+	fpty_session->w.ws_row = ufpty.win_rows ? ufpty.win_rows : 24;
+	fpty_session->w.ws_col = ufpty.win_cols ? ufpty.win_cols : 80;
+
+	// add a new peer
+	struct corerouter_peer *peer = uwsgi_cr_peer_add(cs);
+
+	// on new connection generate a new pty
+	fpty_session->pid = forkpty(&peer->fd, NULL, NULL, &fpty_session->w);
+	if (fpty_session->pid < 0) {
+		uwsgi_error("forkpty()");
+		return -1;
+	}
+	else if (fpty_session->pid == 0) {
+		if (ufpty.cmd) {
+			char *space = strchr(ufpty.cmd, ' ');
+			if (space) {
+				char *argv[4];
+				argv[0] = uwsgi_binsh();
+				argv[1] = "-c";	
+				argv[2] = ufpty.cmd;	
+				argv[3] = NULL;	
+				execv(argv[0], argv);
+			}
+			else {
+				char *argv[2];
+				argv[0] = ufpty.cmd;
+				argv[1] = NULL;	
+				execv(argv[0], argv);
+			}
+		}
+		else {
+			char *argv[2];
+			argv[0] = "/bin/sh";
+			argv[1] = NULL;	
+			execv(argv[0], argv);
+		}
+		// never here;
+		uwsgi_error("forkptyrouter_alloc_session()/execv()");
+		exit(1);
+	}
+
+	ucr->cr_table[peer->fd] = peer;
+	cr_reset_hooks_and_read(peer, fpty_instance_read);
+	return 0;
+}
+
+static int forkptyrouter_init() {
+
+	ufpty.cr.session_size = sizeof(struct forkptyrouter_session);
+	ufpty.cr.alloc_session = forkptyrouter_alloc_session;
+	uwsgi_corerouter_init((struct uwsgi_corerouter *) &ufpty);
+
+	return 0;
+}
+
+static void forkptyrouter_setup() {
+	ufpty.cr.name = uwsgi_str("uWSGI forkptyrouter");
+	ufpty.cr.short_name = uwsgi_str("forkptyrouter");
+}
+
+struct uwsgi_plugin forkptyrouter_plugin = {
+
+	.name = "forkptyrouter",
+	.options = forkptyrouter_options,
+	.init = forkptyrouter_init,
+	.on_load = forkptyrouter_setup
+};

plugins/forkptyrouter/uwsgiplugin.py

@@ -0,0 +1,8 @@
+NAME='forkptyrouter'
+CFLAGS = []
+LDFLAGS = []
+LIBS = []
+
+REQUIRES = ['corerouter']
+
+GCC_LIST = ['forkptyrouter']

plugins/gccgo/gccgo_plugin.c

@@ -123,10 +123,9 @@ static void uwsgi_gccgo_initialize() {
 	int argc = 0;
 	if (ugccgo.args) {
         	char *argv_list = uwsgi_str(ugccgo.args);
-                char *p = strtok(argv_list, " ");
-                while(p) {
+                char *p, *ctx = NULL;
+		uwsgi_foreach_token(argv_list, " ", p, ctx) {
 			argc++;
-                        p = strtok(NULL, " ");
                 }
 		free(argv_list);
         }
@@ -134,12 +133,11 @@ static void uwsgi_gccgo_initialize() {
 	if (argc > 0) {
 		char **argv = uwsgi_calloc(sizeof(char *) * (argc + 1));
 		char *argv_list = uwsgi_str(ugccgo.args);
-		char *p = strtok(argv_list, " ");
+		char *p, *ctx = NULL;
 		int n = 0;
-                while(p) {
+		uwsgi_foreach_token(argv_list, " ", p, ctx) {
 			argv[n] = p;
 			n++;
-                        p = strtok(NULL, " ");
                 }
         	runtime_args(argc, argv);
 	}

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;
@@ -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

@@ -117,13 +117,12 @@ connect:
 
 static void uwsgi_glusterfs_connect_do(struct uwsgi_app *ua) {
 	char *servers = uwsgi_str(ua->callable);
-	char *p = strtok(servers, ";");
-	while(p) {
+	char *p, *ctx = NULL;
+	uwsgi_foreach_token(servers, ";", p, ctx) {
 		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);

plugins/jvm/uwsgiplugin.py

@@ -7,12 +7,14 @@ JVM_INCPATH = None
 JVM_LIBPATH = None
 
 operating_system = os.uname()[0].lower()
-arch = os.uname()[4]
+arch = os.uname()[4].lower()
 
 if arch in ('i686', 'x86', 'x86_32'):
     arch = 'i386'
 elif arch in ('x86_64',):
     arch = 'amd64'
+elif arch.startswith('arm'):
+    arch = 'arm'
 
 # try to detect the JVM
 if operating_system == 'darwin':

plugins/ldap/ldap.c

@@ -181,10 +181,9 @@ static void uwsgi_opt_ldap_dump_ldif(char *opt, char *foo, void *bar) {
 		entry = &ule[i];
 
 		char *list2 = uwsgi_concat2(entry->names + 1, "");
-		char *p = strtok(list2, " ");
-		while (p != NULL) {
+		char *p, *ctx = NULL;
+		uwsgi_foreach_token(list2, " ", p, ctx) {
 			uwsgi_log("%.*s $ ", strlen(p) - 2, p + 1);
-			p = strtok(NULL, " ");
 		}
 
 		free(list2);
@@ -228,10 +227,9 @@ static void uwsgi_opt_ldap_dump(char *opt, char *foo, void *bar) {
 		entry = &ule[i];
 
 		char *list2 = uwsgi_concat2(entry->names + 1, "");
-		char *p = strtok(list2, " ");
-		while (p != NULL) {
+		char *p, *ctx = NULL;
+		uwsgi_foreach_token(list2, " ", p, ctx) {
 			uwsgi_log("%.*s $ ", strlen(p) - 2, p + 1);
-			p = strtok(NULL, " ");
 		}
 
 		free(list2);

plugins/libffi/libffi.c

@@ -0,0 +1,71 @@
+#include <uwsgi.h>
+#include <ffi.h>
+
+ffi_type *uwsgi_libffi_get_type(char *what, size_t *skip) {
+	if (!uwsgi_startswith(what, "int:", 4)) { *skip = 4; return &ffi_type_sint32;}
+	if (!uwsgi_startswith(what, "sint:", 5)) { *skip = 5; return &ffi_type_sint32;}
+	if (!uwsgi_startswith(what, "uint:", 5)) { *skip = 5;return &ffi_type_uint32;}
+	return &ffi_type_pointer;
+}
+
+void *uwsgi_libffi_get_value(char *what, ffi_type *t) {
+	if (t == &ffi_type_sint32) {
+		int32_t *num = uwsgi_malloc(sizeof(int32_t));
+		*num = atoi(what);
+		return num;
+	}
+	return NULL;
+}
+
+static int uwsgi_libffi_hook(char *arg) {
+	size_t argc = 0;
+	size_t i;
+	char **argv = uwsgi_split_quoted(arg, strlen(arg), " \t", &argc);
+	if (!argc) goto end;
+	
+	void *func = dlsym(RTLD_DEFAULT, argv[0]);
+	if (!func) goto destroy;
+
+	ffi_cif cif;
+	ffi_type **args_type = (ffi_type **) uwsgi_malloc(sizeof(ffi_type) * (argc-1));
+	void **values = uwsgi_malloc(sizeof(void*) * (argc-1));
+	for(i=1;i<argc;i++) {
+		size_t skip = 0;
+		args_type[i-1] = uwsgi_libffi_get_type(argv[i], &skip);
+		void *v = uwsgi_libffi_get_value(argv[i] + skip, args_type[i-1]);
+		values[i-1] = v ? v : &argv[i];
+		uwsgi_log("%d = %s %p\n", i, argv[i], values[i-1]);
+	}
+
+	if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, argc-1, &ffi_type_sint64, args_type) == FFI_OK) {
+		int64_t rc = 0;
+		uwsgi_log("ready to call\n");
+		ffi_call(&cif, func, &rc, values); 
+	}
+
+	uwsgi_log("ready to call2\n");
+	for(i=0;i<(argc-1);i++) {
+		char **ptr = (char **) values[i];
+		if (*ptr != argv[i+1]) {
+			free(values[i]);
+		}
+	}
+	free(args_type);
+	free(values);
+destroy:
+	for(i=0;i<argc;i++) {
+		free(argv[i]);
+	}
+end:
+	free(argv);
+	return -1;
+}
+
+static void uwsgi_libffi_setup() {
+	uwsgi_register_hook("ffi", uwsgi_libffi_hook);
+}
+
+struct uwsgi_plugin libffi_plugin = {
+	.name = "libffi",
+	.on_load = uwsgi_libffi_setup,
+};

plugins/libffi/uwsgiplugin.py

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

plugins/libtcc/libtcc.c

@@ -0,0 +1,53 @@
+#include <uwsgi.h>
+#include <libtcc.h>
+
+uint64_t uwsgi_libtcc_counter = 0;
+
+static int uwsgi_libtcc_hook(char *arg) {
+	char *func_base = "uwsgi_libtcc_func";
+	size_t func_len = strlen(func_base) + sizeof(UMAX64_STR);
+	char *func_name = uwsgi_malloc(func_len);
+	if (snprintf(func_name, func_len, "%s%llu", func_base, uwsgi_libtcc_counter) < (int) strlen(func_base)) {
+		free(func_name);
+		return -1;
+	}
+	uwsgi_libtcc_counter++;
+	size_t source_len = 64 + func_len + strlen(arg);
+	char *source = uwsgi_malloc(source_len); 
+	if (snprintf(source, source_len, "void %s() { %s ;}", func_name, arg) < (int) ( strlen(func_base) + strlen(arg))) {
+		free(func_name);
+		free(source);
+		return -1;
+	}
+
+	TCCState *s = tcc_new();
+
+	if (tcc_compile_string(s, source)) goto error;
+	if (tcc_relocate(s, TCC_RELOCATE_AUTO)) goto error;
+
+	void (*func)() = tcc_get_symbol(s, func_name);
+	if (!func) goto error;
+	free(func_name);
+	free(source);
+
+	// call the function
+	func();
+
+	tcc_delete(s);
+	return 0;
+
+error:
+	free(func_name);
+	free(source);
+	tcc_delete(s);
+	return -1;
+}
+
+static void uwsgi_libtcc_setup() {
+	uwsgi_register_hook("tcc", uwsgi_libtcc_hook);
+}
+
+struct uwsgi_plugin libtcc_plugin = {
+	.name = "libtcc",
+	.on_load = uwsgi_libtcc_setup,
+};

plugins/libtcc/uwsgiplugin.py

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

plugins/logfile/logfile.c

@@ -1,6 +1,6 @@
-#include "../../uwsgi.h"
+#include <uwsgi.h>
 
-ssize_t uwsgi_file_logger(struct uwsgi_logger *ul, char *message, size_t len) {
+static ssize_t uwsgi_file_logger(struct uwsgi_logger *ul, char *message, size_t len) {
 
 	if (!ul->configured) {
 		if (ul->arg) {
@@ -18,8 +18,24 @@ ssize_t uwsgi_file_logger(struct uwsgi_logger *ul, char *message, size_t len) {
 
 }
 
+static ssize_t uwsgi_fd_logger(struct uwsgi_logger *ul, char *message, size_t len) {
+
+        if (!ul->configured) {
+		ul->fd = -1;
+                if (ul->arg) ul->fd = atoi(ul->arg);
+                ul->configured = 1;
+        }
+
+        if (ul->fd >= 0) {
+                return write(ul->fd, message, len);
+        }
+        return 0;
+
+}
+
 void uwsgi_file_logger_register() {
 	uwsgi_register_logger("file", uwsgi_file_logger);
+	uwsgi_register_logger("fd", uwsgi_fd_logger);
 }
 
 struct uwsgi_plugin logfile_plugin = {

plugins/logpipe/logpipe.c

@@ -0,0 +1,60 @@
+#include <uwsgi.h>
+
+/*
+
+	The pipe logger
+
+	Author: INADA Naoki
+
+	every log line is sent to the stdin of an external process	
+
+	Example:
+
+		req-logger = pipe:/usr/local/bin/mylogger
+
+*/
+
+static ssize_t uwsgi_pipe_logger(struct uwsgi_logger *ul, char *message, size_t len) {
+	if (!ul->configured) {
+		if (ul->arg) {
+			int pipefd[2];
+			// retry later...
+			if (pipe(pipefd) < 0) return -1;
+			pid_t pid = fork();
+			if (pid < 0) return -1;
+			if (pid > 0) {
+				close(pipefd[0]);
+				ul->fd = pipefd[1];
+			}
+			else {
+				// child
+				setsid();
+				close(pipefd[1]);
+				dup2(pipefd[0], STDIN_FILENO);
+				close(pipefd[0]);
+				uwsgi_exec_command_with_args(ul->arg);
+				exit(1);	// if here something seriously failed
+			}
+		}
+
+		ul->configured = 1;
+	}
+
+	int err = write(ul->fd, message, len);
+	// on failed writes, re-configure the logger
+	if (err <= 0) {
+		close(ul->fd);
+		ul->configured = 0;
+		return err;
+	}
+	return 0;
+}
+
+static void uwsgi_pipe_logger_register() {
+	uwsgi_register_logger("pipe", uwsgi_pipe_logger);
+}
+
+struct uwsgi_plugin logpipe_plugin = {
+	.name = "logpipe",
+	.on_load = uwsgi_pipe_logger_register,
+};

plugins/logpipe/uwsgiplugin.py

@@ -0,0 +1,6 @@
+NAME='logpipe'
+
+CFLAGS = []
+LDFLAGS = []
+LIBS = []
+GCC_LIST = ['logpipe']

plugins/mono/mono_plugin.c

@@ -84,6 +84,7 @@ struct uwsgi_option uwsgi_mono_options[] = {
         {"mono-assembly", required_argument, 0, "load the specified main assembly (default: uwsgi.dll)", uwsgi_opt_set_str, &umono.assembly_name, 0},
         {"mono-exec", required_argument, 0, "exec the specified assembly just before app loading", uwsgi_opt_add_string_list, &umono.exec, 0},
         {"mono-index", required_argument, 0, "add an asp.net index file", uwsgi_opt_add_string_list, &umono.index, 0},
+	{0, 0, 0, 0, 0, 0, 0},
 };
 
 static MonoString *uwsgi_mono_method_GetFilePath(MonoObject *this) {

plugins/msgpack/msgpack.c

@@ -0,0 +1,360 @@
+#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, *ctx = NULL;
+		uwsgi_foreach_token(ule->args, "|", p, ctx) {
+			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 = ':';
+		}
+		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/php/uwsgiplugin.py

@@ -5,25 +5,24 @@ NAME='php'
 ld_run_path = None
 PHPPATH = 'php-config'
 
-try:
-    phpdir = os.environ['UWSGICONFIG_PHPDIR']
+phpdir = os.environ.get('UWSGICONFIG_PHPDIR')
+if phpdir:
     ld_run_path = "%s/lib" % phpdir
     PHPPATH = "%s/bin/php-config" % phpdir
-except:
-    pass
 
-try:
-    PHPPATH = os.environ['UWSGICONFIG_PHPPATH']
-except:
-    pass
+PHPPATH = os.environ.get('UWSGICONFIG_PHPPATH', PHPPATH)
 
 CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare']
-
 LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
+
 if ld_run_path:
     LDFLAGS.append('-L%s' % ld_run_path)
     os.environ['LD_RUN_PATH'] = ld_run_path
 
 LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
 
+phplibdir = os.environ.get('UWSGICONFIG_PHPLIBDIR')
+if phplibdir:
+    LIBS.append('-Wl,-rpath=%s' % phplibdir)
+
 GCC_LIST = ['php_plugin']

plugins/psgi/psgi.h

@@ -53,6 +53,11 @@ struct uwsgi_perl {
 
 	struct uwsgi_string_list *exec;
 	struct uwsgi_string_list *exec_post_fork;
+
+	int auto_reload;
+	time_t last_auto_reload;
+	struct uwsgi_string_list *auto_reload_ignore;
+	HV *auto_reload_hash;
 };
 
 void init_perl_embedded_module(void);
@@ -70,3 +75,5 @@ PerlInterpreter *uwsgi_perl_new_interpreter(void);
 int uwsgi_perl_mule(char *);
 void uwsgi_perl_run_hook(SV *);
 void uwsgi_perl_exec(char *);
+
+void uwsgi_perl_check_auto_reload(void);

plugins/psgi/psgi_loader.c

@@ -260,7 +260,6 @@ static void uwsgi_perl_free_stashes(void) {
 
 int init_psgi_app(struct wsgi_request *wsgi_req, char *app, uint16_t app_len, PerlInterpreter **interpreters) {
 
-	struct stat st;
 	int i;
 	SV **callables;
 
@@ -268,31 +267,14 @@ int init_psgi_app(struct wsgi_request *wsgi_req, char *app, uint16_t app_len, Pe
 
 	char *app_name = uwsgi_concat2n(app, app_len, "", 0);
 
-	// prepare for $0
-	uperl.embedding[1] = app_name;
-		
-	int fd = open(app_name, O_RDONLY);
-	if (fd < 0) {
-		uwsgi_error_open(app_name);
-		goto clear2;
-	}
+	size_t size;
+	char *buf = uwsgi_open_and_read(app_name, &size, 1, NULL);
 
-	if (fstat(fd, &st)) {
-		uwsgi_error("fstat()");
-		close(fd);
-		goto clear2;
+	if (uwsgi_file_exists(app_name)) {
+		// prepare for $0 (if the file is local)
+		uperl.embedding[1] = app_name;
 	}
 
-	char *buf = uwsgi_calloc(st.st_size+1);
-	if (read(fd, buf, st.st_size) != st.st_size) {
-		uwsgi_error("read()");
-		close(fd);
-		free(buf);
-		goto clear2;
-	}
-
-	close(fd);
-
 	// the first (default) app, should always be loaded in the main interpreter
 	if (interpreters == NULL) {
 		if (uwsgi_apps_cnt) {
@@ -309,10 +291,7 @@ int init_psgi_app(struct wsgi_request *wsgi_req, char *app, uint16_t app_len, Pe
 		}		
 	}
 
-	if (!interpreters) {
-		goto clear2;
-	}
-
+	if (!interpreters) goto clear2;
 
 	callables = uwsgi_calloc(sizeof(SV *) * uwsgi.threads);
 	uperl.tmp_streaming_stash = uwsgi_calloc(sizeof(HV *) * uwsgi.threads);
@@ -383,10 +362,9 @@ int init_psgi_app(struct wsgi_request *wsgi_req, char *app, uint16_t app_len, Pe
 			AV *uperl_argv = GvAV(PL_argvgv);
 			if (uperl.argv_items) {
 				char *argv_list = uwsgi_str(uperl.argv_items);
-				char *p = strtok(argv_list, " ");
-				while(p) {
+				char *p, *ctx = NULL;
+				uwsgi_foreach_token(argv_list, " ", p, ctx) {
 					av_push(uperl_argv, newSVpv(p, 0));
-					p = strtok(NULL, " ");
 				}
 			}
 			struct uwsgi_string_list *usl = uperl.argv_item;

plugins/psgi/psgi_plugin.c

@@ -23,10 +23,60 @@ struct uwsgi_option uwsgi_perl_options[] = {
         {"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},
+        {"perl-auto-reload", required_argument, 0, "enable perl auto-reloader with the specified frequency", uwsgi_opt_set_int, &uperl.auto_reload, UWSGI_OPT_MASTER},
+        {"perl-auto-reload-ignore", required_argument, 0, "ignore the specified files when auto-reload is enabled", uwsgi_opt_add_string_list, &uperl.auto_reload_ignore, UWSGI_OPT_MASTER},
         {0, 0, 0, 0, 0, 0, 0},
 
 };
 
+int uwsgi_perl_check_mtime(time_t now, HV *list, SV *key) {
+	// insert item with the current time
+	if (!hv_exists_ent(list, key, 0)) {
+		// useless if...
+		if (hv_store_ent(list, key, newSViv(now), 0)) return 0;
+	}
+	else {
+		// compare mtime
+		struct stat st;
+		if (stat(SvPV_nolen(key), &st)) return 0;
+		HE *mtime = hv_fetch_ent(list, key, 0, 0);
+		if (!mtime) return 0;
+		if (st.st_mtime > SvIV(HeVAL(mtime))) {
+			uwsgi_log_verbose("[perl-auto-reloader] %s has been modified !!!\n", SvPV_nolen(key));
+			kill(uwsgi.workers[0].pid, SIGHUP);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+void uwsgi_perl_check_auto_reload() {
+	time_t now = uwsgi_now();
+	HE *he;
+	if (!uperl.auto_reload_hash) {
+		uperl.auto_reload_hash = newHV();
+		// useless return value
+		if (!SvREFCNT_inc(uperl.auto_reload_hash)) return;
+	}
+	GV *gv_inc = gv_fetchpv("INC", TRUE, SVt_PV);
+	if (!gv_inc) return;
+	HV *inc = GvHV(gv_inc);
+	hv_iterinit(inc);
+	while((he = hv_iternext(inc))) {
+		SV *filename = hv_iterval(inc, he);
+		struct uwsgi_string_list *usl;
+		int found = 0;
+		uwsgi_foreach(usl, uperl.auto_reload_ignore) {
+			if (!strcmp(usl->value, SvPV_nolen(filename))) {
+				found = 1; break;
+			}
+		}	
+		if (found) continue;
+		if (uwsgi_perl_check_mtime(now, uperl.auto_reload_hash, filename)) return;
+	}
+}
+
 SV *uwsgi_perl_obj_new(char *class, size_t class_len) {
 
 	SV *newobj;
@@ -563,6 +613,14 @@ void uwsgi_perl_after_request(struct wsgi_request *wsgi_req) {
 	// clear the env
 	SvREFCNT_dec(wsgi_req->async_environ);
 
+	// now we can check for changed files
+        if (uperl.auto_reload) {
+                time_t now = uwsgi_now();
+                if (now - uperl.last_auto_reload > uperl.auto_reload) {
+                        uwsgi_perl_check_auto_reload();
+                }
+        }
+
 }
 
 int uwsgi_perl_magic(char *mountpoint, char *lazy) {

plugins/psgi/psgi_response.c

@@ -78,8 +78,14 @@ int psgi_response(struct wsgi_request *wsgi_req, AV *response) {
         // generate headers
         for(i=0; i<=av_len(headers); i++) {
                 hitem = av_fetch(headers,i,0);
+		if (!*hitem) {
+			uwsgi_log("invalid PSGI headers\n"); return UWSGI_OK;
+		}
                 chitem = SvPV(*hitem, hlen);
                 hitem = av_fetch(headers,i+1,0);
+		if (!*hitem) {
+			uwsgi_log("invalid PSGI headers\n"); return UWSGI_OK;
+		}
                 chitem2 = SvPV(*hitem, hlen2);
 		if (uwsgi_response_add_header(wsgi_req, chitem, hlen, chitem2, hlen2)) return UWSGI_OK;
 		i++;

plugins/pty/pty.c

@@ -1,7 +1,7 @@
 #include <uwsgi.h>
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU_kFreeBSD__)
 #include <pty.h>
-#elif defined(__APPLE__) || defined(__OpenBSD__)
+#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #include <util.h>
 #elif defined(__FreeBSD__)
 #include <libutil.h>
@@ -21,6 +21,7 @@ struct uwsgi_pty_client {
 static struct uwsgi_pty {
 	char *addr;
 	char *remote;
+	char *uremote;
 	int queue;
 	int server_fd;
 	int master_fd;
@@ -76,9 +77,10 @@ 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-connect", required_argument, 0, "connect the current terminal to a pty server", uwsgi_opt_set_str, &upty.remote, UWSGI_OPT_NO_INITIAL},
+	{"pty-uconnect", required_argument, 0, "connect the current terminal to a pty server (using uwsgi protocol)", uwsgi_opt_set_str, &upty.uremote, UWSGI_OPT_NO_INITIAL},
 	{"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},
+	{"pty-exec", required_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},
 };
 
@@ -118,6 +120,14 @@ static void *uwsgi_pty_loop(void *arg) {
                 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;
@@ -248,29 +258,59 @@ static void uwsgi_pty_init() {
 
 }
 
-static int uwsgi_pty_client() {
-	if (!upty.remote) return 0;
+static void uwsgi_pty_winch() {
+	// 2 uwsgi packets
+	char uwsgi_pkt[8];
+#ifdef TIOCGWINSZ
+	struct winsize w;
+	ioctl(0, TIOCGWINSZ, &w);
+	uwsgi_pkt[0] = 0;
+	uwsgi_pkt[1] = (uint8_t) (w.ws_row & 0xff);
+        uwsgi_pkt[2] = (uint8_t) ((w.ws_row >> 8) & 0xff);
+	uwsgi_pkt[3] = 100;
+	uwsgi_pkt[4] = 0;
+	uwsgi_pkt[5] = (uint8_t) (w.ws_col & 0xff);
+        uwsgi_pkt[6] = (uint8_t) ((w.ws_col >> 8) & 0xff);
+	uwsgi_pkt[7] = 101;
+#endif
+	if (write(upty.server_fd, uwsgi_pkt, 8) != 8) {
+		uwsgi_error("uwsgi_pty_winch()/write()");
+		exit(1);
+	}
+}
 
-	uwsgi_log("[pty] connecting to %s ...\n", upty.remote);
+static int uwsgi_pty_client() {
+	if (!upty.remote && !upty.uremote) return 0;
+
+	char *remote = upty.uremote ? upty.uremote : upty.remote;
+
+	uwsgi_log("[pty] connecting to %s ...\n", 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);
+	upty.server_fd = uwsgi_connect(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_socket_nb(upty.server_fd);
+	//uwsgi_socket_nb(0);
 
 	uwsgi_log("[pty] connected.\n");
 
+
 	uwsgi_pty_setterm(0);
 
+	if (upty.uremote) {
+		signal(SIGWINCH, uwsgi_pty_winch);
+		// send current terminal size
+		uwsgi_pty_winch();
+	}
+
 	upty.queue = event_queue_init();
 	event_queue_add_fd_read(upty.queue, upty.server_fd);
 	event_queue_add_fd_read(upty.queue, 0);
@@ -279,10 +319,21 @@ static int uwsgi_pty_client() {
 		char buf[8192];
 		int interesting_fd = -1;
                 int ret = event_queue_wait(upty.queue, -1, &interesting_fd);		
-		if (ret <= 0) break;
+		if (ret == 0) break;
+		if (ret < 0) {
+			if (errno == EINTR) continue;
+			break;
+		}
 		if (interesting_fd == 0) {
 			ssize_t rlen = read(0, buf, 8192);
 			if (rlen <= 0) break;
+			if (upty.uremote) {
+				struct uwsgi_header uh;
+				uh.modifier1 = 0;
+				uh.pktsize = rlen;
+				uh.modifier2 = 0;
+				if (write(upty.server_fd, &uh, 4) != 4) break;
+			}
 			if (write(upty.server_fd, buf, rlen) != rlen) break;
 			continue;
 		}	

plugins/python/python_plugin.c

@@ -156,8 +156,14 @@ struct uwsgi_option uwsgi_python_options[] = {
 	{"wsgi-env-behavior", required_argument, 0, "set the strategy for allocating/deallocating the WSGI env", uwsgi_opt_set_str, &up.wsgi_env_behaviour, 0},
 	{"start_response-nodelay", no_argument, 0, "send WSGI http headers as soon as possible (PEP violation)", uwsgi_opt_true, &up.start_response_nodelay, 0},
 
+	{"wsgi-strict", no_argument, 0, "try to be fully PEP compliant disabling optimizations", uwsgi_opt_true, &up.wsgi_strict, 0},
+	{"wsgi-accept-buffer", no_argument, 0, "accept CPython buffer-compliant objects as WSGI response in addition to string/bytes", uwsgi_opt_true, &up.wsgi_accept_buffer, 0},
+	{"wsgi-accept-buffers", no_argument, 0, "accept CPython buffer-compliant objects as WSGI response in addition to string/bytes", uwsgi_opt_true, &up.wsgi_accept_buffer, 0},
+
 	{"python-version", no_argument, 0, "report python version", uwsgi_opt_pyver, NULL, UWSGI_OPT_IMMEDIATE},
 
+	{"python-raw", required_argument, 0, "load a python file for managing raw requests", uwsgi_opt_set_str, &up.raw, 0},
+
 	{0, 0, 0, 0, 0, 0, 0},
 };
 
@@ -308,6 +314,10 @@ realstuff:
 	// this time we use this higher level function
 	// as this code can be executed in a signal handler
 
+#ifdef __GNU_kFreeBSD__
+	return;
+#endif
+
 	if (!Py_IsInitialized()) {
 		return;
 	}
@@ -1068,7 +1078,6 @@ void uwsgi_python_init_apps() {
         up.loaders[LOADER_CALLABLE] = uwsgi_callable_loader;
         up.loaders[LOADER_STRING_CALLABLE] = uwsgi_string_callable_loader;
 
-
 	struct uwsgi_string_list *upli = up.import_list;
 	while(upli) {
 		if (strchr(upli->value, '/') || uwsgi_endswith(upli->value, ".py")) {
@@ -1119,6 +1128,12 @@ next:
 		uppa = uppa->next;
         }
 
+	if (up.raw) {
+		up.raw_callable = uwsgi_file_loader(up.raw);
+		if (up.raw_callable) {
+			Py_INCREF(up.raw_callable);
+		}
+	}
 
 	if (up.wsgi_config != NULL) {
 		init_uwsgi_app(LOADER_UWSGI, up.wsgi_config, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
@@ -1354,8 +1369,10 @@ void *uwsgi_python_autoreloader_thread(void *foobar) {
 		UWSGI_RELEASE_GIL;
 		sleep(up.auto_reload);
 		UWSGI_GET_GIL;
-		// do not start monitoring til the first app is loaded (required for lazy mode)
-		if (uwsgi_apps_cnt == 0) continue;
+		if (uwsgi.lazy || uwsgi.lazy_apps) {
+			// do not start monitoring til the first app is loaded (required for lazy mode)
+			if (uwsgi_apps_cnt == 0) continue;
+		}
 #ifdef UWSGI_PYTHON_OLD
                 int pos = 0;
 #else

plugins/python/pyutils.c

@@ -320,8 +320,9 @@ void init_pyargv() {
 		char *tmp_ptr = uwsgi_str(up.argv);
 #ifdef __sun__
                 // FIX THIS !!!
-                ap = strtok(tmp_ptr, " ");
-                while ((ap = strtok(NULL, " ")) != NULL) {
+		char *ctx = NULL;
+                ap = strtok_r(tmp_ptr, " ", &ctx);
+                while ((ap = strtok_r(NULL, " ", &ctx)) != NULL) {
 #else
                 while ((ap = strsep(&tmp_ptr, " \t")) != NULL) {
 #endif
@@ -352,8 +353,9 @@ void init_pyargv() {
 
 #ifdef __sun__
 		// FIX THIS !!!
-		ap = strtok(py_argv_copy, " ");
-		while ((ap = strtok(NULL, " ")) != NULL) {
+		char *ctx = NULL;
+		ap = strtok_r(py_argv_copy, " ", &ctx);
+		while ((ap = strtok_r(NULL, " ", &ctx)) != NULL) {
 #else
 		while ((ap = strsep(&py_argv_copy, " \t")) != NULL) {
 #endif

plugins/python/raw.c

@@ -0,0 +1,90 @@
+#include "uwsgi_python.h"
+
+extern struct uwsgi_server uwsgi;
+extern struct uwsgi_python up;
+
+static int manage_raw_response(struct wsgi_request *wsgi_req) {
+	int ret = 0;
+	if (!wsgi_req->async_force_again) {
+		ret = uwsgi_python_send_body(wsgi_req, (PyObject *) wsgi_req->async_result);
+		if (ret == 0) {
+			if (PyInt_Check((PyObject *) wsgi_req->async_result) || PyObject_HasAttrString((PyObject *) wsgi_req->async_result, "fileno")) {
+				// is it a file ?
+				int fd = PyObject_AsFileDescriptor((PyObject *) wsgi_req->async_result);
+				if (fd >= 0) {
+					wsgi_req->sendfile_fd = fd;
+					uwsgi_response_sendfile_do(wsgi_req, fd, 0, 0);
+					wsgi_req->sendfile_fd = -1;
+					return UWSGI_OK;
+				}
+			}
+		}
+	}
+	if (ret == 0) {
+		if (!wsgi_req->async_placeholder) {
+			wsgi_req->async_placeholder = PyObject_GetIter((PyObject *) wsgi_req->async_result);
+			if (!wsgi_req->async_placeholder)
+				return UWSGI_OK;
+		}
+
+		PyObject *pychunk = PyIter_Next((PyObject *) wsgi_req->async_placeholder);
+		if (!pychunk)
+			return UWSGI_OK;
+		ret = uwsgi_python_send_body(wsgi_req, pychunk);
+		if (ret == 0) {
+			if (PyInt_Check(pychunk) || PyObject_HasAttrString(pychunk, "fileno")) {
+				// is it a file ?
+				int fd = PyObject_AsFileDescriptor(pychunk);
+				if (fd >= 0) {
+					wsgi_req->sendfile_fd = fd;
+					uwsgi_response_sendfile_do(wsgi_req, fd, 0, 0);
+					wsgi_req->sendfile_fd = -1;
+				}
+			}
+		}
+		Py_DECREF(pychunk);
+		return UWSGI_AGAIN;
+	}
+	return UWSGI_OK;
+}
+
+int uwsgi_request_python_raw(struct wsgi_request *wsgi_req) {
+	if (!up.raw_callable)
+		return UWSGI_OK;
+
+	// back from async
+	if (wsgi_req->async_force_again) {
+		UWSGI_GET_GIL int ret = manage_raw_response(wsgi_req);
+		if (ret == UWSGI_AGAIN) {
+			wsgi_req->async_force_again = 1;
+			UWSGI_RELEASE_GIL return UWSGI_AGAIN;
+		}
+		goto end;
+	}
+
+	UWSGI_GET_GIL PyObject * args = PyTuple_New(1);
+	PyTuple_SetItem(args, 0, PyInt_FromLong(wsgi_req->fd));
+	wsgi_req->async_result = PyEval_CallObject(up.raw_callable, args);
+	Py_DECREF(args);
+	if (wsgi_req->async_result) {
+		for (;;) {
+			int ret = manage_raw_response(wsgi_req);
+			if (ret == UWSGI_AGAIN) {
+				wsgi_req->async_force_again = 1;
+				if (uwsgi.async > 1) {
+					UWSGI_RELEASE_GIL return UWSGI_AGAIN;
+				}
+				continue;
+			}
+			break;
+		}
+	}
+end:
+	if (PyErr_Occurred())
+		PyErr_Print();
+	if (wsgi_req->async_result) {
+		Py_DECREF((PyObject *) wsgi_req->async_result);
+	}
+	UWSGI_RELEASE_GIL;
+	return UWSGI_OK;
+}

plugins/python/uwsgi_pymodule.c

@@ -394,6 +394,7 @@ PyObject *py_uwsgi_register_rpc(PyObject * self, PyObject * args) {
 		return NULL;
 	}
 
+	Py_INCREF(func);
 
 	if (uwsgi_register_rpc(name, &python_plugin, argc, func)) {
 		return PyErr_Format(PyExc_ValueError, "unable to register rpc function");
@@ -498,6 +499,8 @@ PyObject *py_uwsgi_register_signal(PyObject * self, PyObject * args) {
 		return NULL;
 	}
 
+	Py_INCREF(handler);
+
 	if (uwsgi_register_signal(uwsgi_signal, signal_kind, handler, 0)) {
 		return PyErr_Format(PyExc_ValueError, "unable to register signal");
 	}

plugins/python/uwsgi_python.h

@@ -1,4 +1,4 @@
-#include "../../uwsgi.h"
+#include <uwsgi.h>
 #include <Python.h>
 
 #include <frameobject.h>
@@ -180,6 +180,11 @@ struct uwsgi_python {
 	int start_response_nodelay;
 
 	char *programname;
+	int wsgi_strict;
+	int wsgi_accept_buffer;
+
+	char *raw;
+	PyObject *raw_callable;
 };
 
 
@@ -276,6 +281,10 @@ struct uwsgi_buffer *uwsgi_python_exception_repr(struct wsgi_request *);
 struct uwsgi_buffer *uwsgi_python_backtrace(struct wsgi_request *);
 void uwsgi_python_exception_log(struct wsgi_request *);
 
+int uwsgi_python_send_body(struct wsgi_request *, PyObject *);
+
+int uwsgi_request_python_raw(struct wsgi_request *);
+
 #define py_current_wsgi_req() current_wsgi_req();\
 			if (!wsgi_req) {\
 				return PyErr_Format(PyExc_SystemError, "you can call uwsgi api function only from the main callable");\

plugins/python/uwsgiplugin.py

@@ -11,7 +11,7 @@ def get_python_version():
     return version
 
 NAME='python'
-GCC_LIST = ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter', 'tracebacker']
+GCC_LIST = ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter', 'tracebacker', 'raw']
 
 CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ] 
 LDFLAGS = []
@@ -32,9 +32,17 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
         # try 3.x style config dir
         if not os.path.exists(libdir):
             libdir = '%s/lib/python%s/config-%s' % (sys.prefix, version, get_python_version())
-        libpath = '%s/%s' % (libdir, sysconfig.get_config_var('LDLIBRARY'))
-        if not os.path.exists(libpath): 
+
+        # get cpu type
+        uname = os.uname()
+        if uname[4].startswith('arm'):
             libpath = '%s/%s' % (libdir, sysconfig.get_config_var('LIBRARY'))
+            if not os.path.exists(libpath): 
+                libpath = '%s/%s' % (libdir, sysconfig.get_config_var('LDLIBRARY'))
+        else:
+            libpath = '%s/%s' % (libdir, sysconfig.get_config_var('LDLIBRARY'))
+            if not os.path.exists(libpath): 
+                libpath = '%s/%s' % (libdir, sysconfig.get_config_var('LIBRARY'))
         if not os.path.exists(libpath): 
             libpath = '%s/libpython%s.a' % (libdir, version)
         LIBS.append(libpath)

plugins/python/wsgi_handlers.c

@@ -292,6 +292,8 @@ PyObject *py_eventfd_write(PyObject * self, PyObject * args) {
 
 int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 
+	if (wsgi_req->is_raw) return uwsgi_request_python_raw(wsgi_req);
+
 	struct uwsgi_app *wi;
 
 	if (wsgi_req->async_force_again) {

plugins/python/wsgi_subhandler.c

@@ -5,6 +5,68 @@ extern struct uwsgi_python up;
 extern struct uwsgi_plugin python_plugin;
 extern PyTypeObject uwsgi_InputType;
 
+/*
+
+	Albeit PEP 333/3333 is clear about what kind of return object we must
+	expect from a WSGI callable, we CAN use the buffer api to optimize for lower-level
+	returns type: bytes, bytearray, array.array
+
+	to enable this optimization add --wsgi-accept-buffer
+
+	NOTE: this is a violation of the standards !!! use only if you know the implications !!!
+
+*/
+
+int uwsgi_python_send_body(struct wsgi_request *wsgi_req, PyObject *chunk) {
+	if (!up.wsgi_accept_buffer && !wsgi_req->is_raw) goto strict;
+#if defined(PYTHREE) || defined(Py_TPFLAGS_HAVE_NEWBUFFER)
+	Py_buffer pbuf;
+	int has_buffer = 0;
+#endif
+	char *content = NULL;
+	size_t content_len = 0;
+#if defined(PYTHREE) || defined(Py_TPFLAGS_HAVE_NEWBUFFER)
+	if (PyObject_CheckBuffer(chunk)) {
+		if (!PyObject_GetBuffer(chunk, &pbuf, PyBUF_SIMPLE)) {
+			content = (char *) pbuf.buf;
+			content_len = (size_t) pbuf.len;
+			has_buffer = 1;
+			goto found;
+		}
+	}
+#else
+	if (PyObject_CheckReadBuffer(chunk)) {
+		if (!PyObject_AsCharBuffer(chunk, (const char **) &content, (Py_ssize_t *) &content_len)) {
+			PyErr_Clear();
+			goto found;
+		}
+	}
+#endif
+
+strict:
+	// fallback
+	if (PyString_Check(chunk)) {
+               	content = PyString_AsString(chunk);
+               	content_len = PyString_Size(chunk);
+	}
+
+found:
+	if (content) {
+                UWSGI_RELEASE_GIL
+                uwsgi_response_write_body_do(wsgi_req, content, content_len);
+                UWSGI_GET_GIL
+#if defined(PYTHREE) || defined(Py_TPFLAGS_HAVE_NEWBUFFER)
+		if (has_buffer) PyBuffer_Release(&pbuf);
+#endif
+                uwsgi_py_check_write_errors {
+                       	uwsgi_py_write_exception(wsgi_req);
+			return -1;
+                }
+		return 1;
+	}
+	return 0;
+} 
+
 /*
 this is a hack for supporting non-file object passed to wsgi.file_wrapper
 */
@@ -169,19 +231,11 @@ int uwsgi_response_subhandler_wsgi(struct wsgi_request *wsgi_req) {
 	PyObject *pychunk;
 
 	// return or yield ?
-	if (PyString_Check((PyObject *)wsgi_req->async_result)) {
-		char *content = PyString_AsString((PyObject *)wsgi_req->async_result);
-		size_t content_len = PyString_Size((PyObject *)wsgi_req->async_result);
-		UWSGI_RELEASE_GIL
-		uwsgi_response_write_body_do(wsgi_req, content, content_len);
-		UWSGI_GET_GIL
-		uwsgi_py_check_write_errors {
-			uwsgi_py_write_exception(wsgi_req);
-		}
-		goto clear;
+	// in strict mode we do not optimize apps directly returning strings (or bytes)
+	if (!up.wsgi_strict) {
+		if (uwsgi_python_send_body(wsgi_req, (PyObject *)wsgi_req->async_result)) goto clear;
 	}
 
-
 	if (wsgi_req->sendfile_obj == wsgi_req->async_result) {
 		if (wsgi_req->sendfile_fd >= 0) {
 			UWSGI_RELEASE_GIL
@@ -222,19 +276,13 @@ exception:
 
 
 
-	if (PyString_Check(pychunk)) {
-		char *content = PyString_AsString(pychunk);
-		size_t content_len = PyString_Size(pychunk);
-		UWSGI_RELEASE_GIL
-		uwsgi_response_write_body_do(wsgi_req, content, content_len);
-		UWSGI_GET_GIL
-		uwsgi_py_check_write_errors {
-			uwsgi_py_write_exception(wsgi_req);
+	int ret = uwsgi_python_send_body(wsgi_req, pychunk);
+	if (ret != 0) {
+		if (ret < 0) {
 			Py_DECREF(pychunk);
 			goto clear;
 		}
 	}
-
 	else if (wsgi_req->sendfile_obj == pychunk) {
 		if (wsgi_req->sendfile_fd >= 0) {
 			UWSGI_RELEASE_GIL

plugins/rack/rack_plugin.c

@@ -416,6 +416,18 @@ void uwsgi_ruby_gem_set_apply(char *gemset) {
 
 void uwsgi_ruby_gemset(char *gemset) {
 
+	struct uwsgi_string_list *rvm_paths = ur.rvm_path;
+	while(rvm_paths) {
+		char *filename = uwsgi_concat3(rvm_paths->value, "/environments/", gemset);
+                if (uwsgi_file_exists(filename)) {
+			uwsgi_ruby_gem_set_apply(filename);
+                        free(filename);
+                        return;
+                }
+                free(filename);
+		rvm_paths = rvm_paths->next;
+	}
+
 	char *home = getenv("HOME");
 
 	if (home) {
@@ -436,18 +448,6 @@ void uwsgi_ruby_gemset(char *gemset) {
         }
         free(filename);
 
-	struct uwsgi_string_list *rvm_paths = ur.rvm_path;
-	while(rvm_paths) {
-		char *filename = uwsgi_concat3(rvm_paths->value, "/environments/", gemset);
-                if (uwsgi_file_exists(filename)) {
-			uwsgi_ruby_gem_set_apply(filename);
-                        free(filename);
-                        return;
-                }
-                free(filename);
-		rvm_paths = rvm_paths->next;
-	}
-
 	uwsgi_log("ERROR: unable to load gemset %s !!!\n", gemset);
 	exit(1);
 	
@@ -818,6 +818,18 @@ int uwsgi_rack_request(struct wsgi_request *wsgi_req) {
 	uwsgi_apps[wsgi_req->app_id].requests++;
 
         env = rb_hash_new();
+	// the following vars have to always been defined (we skip REQUEST_METHOD and PATH_INFO as they should always be available)
+	rb_hash_aset(env, rb_str_new2("SCRIPT_NAME"), rb_str_new2(""));
+	rb_hash_aset(env, rb_str_new2("QUERY_STRING"), rb_str_new2(""));
+	rb_hash_aset(env, rb_str_new2("SERVER_NAME"), rb_str_new2(uwsgi.hostname));
+	// SERVER_PORT
+        char *server_port = strchr(wsgi_req->socket->name, ':');
+        if (server_port) {
+		rb_hash_aset(env, rb_str_new2("SERVER_PORT"), rb_str_new(server_port+1, strlen(server_port+1)));
+        }
+        else {
+		rb_hash_aset(env, rb_str_new2("SERVER_PORT"), rb_str_new2("80"));
+        }
 
         // fill ruby hash
         for(i=0;i<wsgi_req->var_cnt;i++) {

plugins/rados/rados.c

@@ -0,0 +1,258 @@
+#include <uwsgi.h>
+#include <rados/librados.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	Author: Javier Guerra
+
+	based on the uWSGI GlusterFS plugin by Roberto De Ioris
+
+	--rados-mount mountpoint=/foo,pool=unbit001,config=/etc/ceph.conf
+
+*/
+
+struct uwsgi_plugin rados_plugin;
+
+struct uwsgi_rados {
+	int timeout;
+	struct uwsgi_string_list *mountpoints;
+} urados;
+
+static struct uwsgi_option uwsgi_rados_options[] = {
+	{"rados-mount", required_argument, 0, "virtual mount the specified rados volume in a uri", uwsgi_opt_add_string_list, &urados.mountpoints, UWSGI_OPT_MIME},
+	{"rados-timeout", required_argument, 0, "timeout for async operations", uwsgi_opt_set_int, &urados.timeout, 0},
+	{0, 0, 0, 0, 0, 0, 0},
+};
+
+static int uwsgi_rados_read_sync(struct wsgi_request *wsgi_req, rados_ioctx_t *ctx, const char *key, size_t remains) {
+	uint64_t off = 0;
+	while(remains > 0) {
+		char buf[8192];
+		int rlen = rados_read(ctx, key, buf, UMIN(remains, 8192), off);
+		if (rlen <= 0) return -1;
+		if (uwsgi_response_write_body_do(wsgi_req, buf, rlen)) return -1;
+		remains -= rlen;
+		off += rlen;
+	}
+	return 0;
+}
+
+/*
+	async read of a resource
+	the uwsgi_rados_async_io structure is passed between threads
+	the callback simply signal the main core about the availability of data
+*/
+struct uwsgi_rados_async_io {
+	int fd[2];
+	ssize_t rlen;
+};
+
+static void uwsgi_rados_read_async_cb(rados_completion_t comp, void *data) {
+	struct uwsgi_rados_async_io *aio = (struct uwsgi_rados_async_io *) data;
+#ifdef UWSGI_DEBUG
+	uwsgi_log("[rados-cb] rlen = %d\n", rlen);
+#endif
+	aio->rlen = rados_aio_get_return_value(comp);
+	// signal the core
+	if (write(aio->fd[1], "\1", 1) <= 0) {
+		uwsgi_error("uwsgi_rados_read_async_cb()/write()");
+	}
+}
+
+
+static int uwsgi_rados_read_async(struct wsgi_request *wsgi_req, rados_ioctx_t *ctx, const char *key, size_t remains) {
+	uint64_t off = 0;
+	char buf[8192];
+	struct uwsgi_rados_async_io aio;
+	int ret = -1;
+	if (pipe(aio.fd)) {
+		uwsgi_error("uwsgi_rados_read_async()/pipe()");
+		return -1;
+	}
+	aio.rlen = -1;
+	rados_completion_t comp;
+	if (rados_aio_create_completion(&aio, uwsgi_rados_read_async_cb, NULL, &comp) < 0) goto end;
+	
+	while(remains > 0) {
+		// trigger an async read
+		if (rados_aio_read(ctx, key, comp, buf, 8192, off) < 0) goto end;
+		// wait for the callback to be executed
+		if (uwsgi.wait_read_hook(aio.fd[0], urados.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:
+	rados_aio_release(&comp);
+	close(aio.fd[0]);
+	close(aio.fd[1]);
+	return ret;	
+}
+
+
+static void uwsgi_rados_add_mountpoint(char *arg, size_t arg_len) {
+	char *rad_mountpoint = NULL;
+	char *rad_config = NULL;
+	char *rad_poolname = NULL;
+	if (uwsgi_kvlist_parse(arg, arg_len, ',', '=',
+			"mountpoint", &rad_mountpoint,
+			"config", &rad_config,
+			"pool", &rad_poolname,
+			NULL)) {
+				uwsgi_log("unable to parse rados mountpoint definition\n");
+				exit(1);
+		}
+
+	if (!rad_mountpoint|| !rad_poolname) {
+		uwsgi_log("[rados] mount requires a mountpoint, and a pool name.\n");
+		exit(1);
+	}
+	time_t now = uwsgi_now();
+	uwsgi_log("[rados] mounting %s ...\n", rad_mountpoint);
+	
+	rados_t cluster;
+	if (rados_create(&cluster, NULL) < 0) {
+		uwsgi_error("Can't create Ceph cluster handle");
+		exit(1);
+	}
+	if (rad_config)
+		uwsgi_log("Using Ceph conf:%s\n", rad_config);
+	else
+		uwsgi_log("Using default Ceph conf.\n");
+	if (rados_conf_read_file(cluster, rad_config) < 0) {
+		uwsgi_error("Can't configure Ceph cluster handle");
+		exit(1);
+	}
+	if (rados_connect(cluster) < 0) {
+		uwsgi_error("Can't connect with Ceph cluster");
+		exit(1);
+	}
+	
+	rados_ioctx_t ctx;
+	uwsgi_log("Ceph pool: %s\n", rad_poolname);
+	if (rados_ioctx_create(cluster, rad_poolname, &ctx) < 0) {
+		uwsgi_error("Can't open rados pool")
+		rados_shutdown(cluster);
+		exit(1);
+	}
+	
+	int id = uwsgi_apps_cnt;
+	struct uwsgi_app *ua = uwsgi_add_app(id, rados_plugin.modifier1, rad_mountpoint, strlen(rad_mountpoint), NULL, NULL);
+	if (!ua) {
+		uwsgi_log("[rados] unable to mount %s\n", rad_mountpoint);
+		rados_shutdown(cluster);
+		exit(1);
+	}
+
+	ua->responder0 = cluster;
+	ua->responder1 = ctx;
+	ua->started_at = now;
+	ua->startup_time = uwsgi_now() - now;
+	uwsgi_log("Rados app/mountpoint %d (%s) loaded in %d seconds at %p\n", id, rad_mountpoint, (int) ua->startup_time, ctx);
+}
+
+// we translate the string list to an app representation
+// this happens before fork() if not in lazy/lazy-apps mode
+static void uwsgi_rados_setup() {
+	if (!urados.timeout) {
+		urados.timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
+	}
+	
+	struct uwsgi_string_list *usl = urados.mountpoints;
+	while(usl) {
+		uwsgi_rados_add_mountpoint(usl->value, usl->len);
+		usl = usl->next;
+	}
+}
+
+static int uwsgi_rados_request(struct wsgi_request *wsgi_req) {
+	char filename[PATH_MAX+1];
+	if (!wsgi_req->uh->pktsize) {
+		uwsgi_log( "Empty 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, rados_plugin.modifier1);
+	if (wsgi_req->app_id == -1 && !uwsgi.no_default_app && uwsgi.default_app > -1) {
+		if (uwsgi_apps[uwsgi.default_app].modifier1 == rados_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];
+
+	if (wsgi_req->path_info_len > ua->mountpoint_len &&
+		memcmp(wsgi_req->path_info, ua->mountpoint, ua->mountpoint_len) == 0) 
+	{
+		memcpy(filename, wsgi_req->path_info+ua->mountpoint_len, wsgi_req->path_info_len-ua->mountpoint_len);
+	} else {
+		memcpy(filename, wsgi_req->path_info, wsgi_req->path_info_len);
+	}
+	filename[wsgi_req->path_info_len] = 0;
+	
+	struct {
+		uint64_t size;
+		time_t mtime;
+	} st;
+	rados_ioctx_t ctx = ua->responder1;
+	
+	int r = rados_stat(ctx, filename, &st.size, &st.mtime);
+	if (r < 0) {
+		if (r == -ENOENT)
+			uwsgi_404(wsgi_req);
+		else
+			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.mtime)) goto end;
+	if (uwsgi_response_add_content_length(wsgi_req, st.size)) goto end;
+
+	// skip body on HEAD
+	if (uwsgi_strncmp(wsgi_req->method, wsgi_req->method_len, "HEAD", 4)) {
+		size_t remains = st.size;
+		if (uwsgi.async > 1) {
+			if (uwsgi_rados_read_async(wsgi_req, ctx, filename, remains)) goto end;
+		}
+		else {
+			if (uwsgi_rados_read_sync(wsgi_req, ctx, filename, remains)) goto end;
+		}
+	}
+
+end:
+	return UWSGI_OK;
+}
+
+struct uwsgi_plugin rados_plugin = {
+	.name = "rados",
+	.modifier1 = 28,
+	.options = uwsgi_rados_options,
+	.post_fork = uwsgi_rados_setup,
+	.request = uwsgi_rados_request,
+	.after_request = log_request,
+};

plugins/rados/uwsgiplugin.py

@@ -0,0 +1,7 @@
+import os
+NAME='rados'
+
+CFLAGS = []
+LDFLAGS = []
+LIBS = ['-lrados']
+GCC_LIST = ['rados']

plugins/redislog/redislog_plugin.c

@@ -1,4 +1,4 @@
-#include "../../uwsgi.h"
+#include <uwsgi.h>
 
 extern struct uwsgi_server uwsgi;
 

plugins/router_http/router_http.c

@@ -18,8 +18,10 @@ static int uwsgi_routing_func_http(struct wsgi_request *wsgi_req, struct uwsgi_r
 	struct uwsgi_buffer *ub_url = NULL;
 	if (ur->data3_len) {
 		ub_url = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data3, ur->data3_len);
-		uwsgi_buffer_destroy(ub_addr);
-        	if (!ub_url) return UWSGI_ROUTE_BREAK;
+        	if (!ub_url) {
+			uwsgi_buffer_destroy(ub_addr);
+			return UWSGI_ROUTE_BREAK;
+		}
 	}
 
 
@@ -82,7 +84,7 @@ static int uwsgi_router_http(struct uwsgi_route *ur, char *args) {
 	ur->func = uwsgi_routing_func_http;
 	ur->data = (void *) args;
 	ur->data_len = strlen(args);
-	
+
 	char *comma = strchr(ur->data, ',');
 	if (comma) {
 		*comma = 0;

plugins/rpc/rpc_plugin.c

@@ -158,18 +158,19 @@ static int uwsgi_rpc_request(struct wsgi_request *wsgi_req) {
 		}
 
 		argc = 0;
-		argv[0] = strtok(args, "/");
+		char *ctx = NULL;
+		argv[0] = strtok_r(args, "/", &ctx);
 		if (!argv[0]) {
 			free(args);
 			uwsgi_500(wsgi_req);
 			return UWSGI_OK;
 		}
-		char *p = strtok(NULL, "/");
+		char *p = strtok_r(NULL, "/", &ctx);
 		while(p) {
 			argc++;
 			argv[argc] = p;
 			argvs[argc] = strlen(p);
-			p = strtok(NULL, "/");
+			p = strtok_r(NULL, "/", &ctx);
 		}
 		
 		wsgi_req->uh->pktsize = uwsgi_rpc(argv[0], argc, argv+1, argvs+1, response_buf);
@@ -558,8 +559,8 @@ static int uwsgi_router_rpc_base(struct uwsgi_route *ur, char *args) {
 	ur->custom = 0;
 	ur->data2 = uwsgi_calloc(sizeof(char *) * UMAX8);
 	ur->data3 = uwsgi_calloc(sizeof(uint16_t) * UMAX8);
-	char *p = strtok(args, " ");
-	while(p) {
+	char *p, *ctx = NULL;
+	uwsgi_foreach_token(args, " ", p, ctx) {
 		if (!ur->data) {
 			ur->data = p;
 		}
@@ -576,7 +577,6 @@ static int uwsgi_router_rpc_base(struct uwsgi_route *ur, char *args) {
 			argvs[ur->custom] = strlen(p);
 			ur->custom++;	
 		}
-		p = strtok(NULL, " ");
 	}
 
 	if (!ur->data) {

plugins/rsyslog/rsyslog_plugin.c

@@ -39,10 +39,17 @@ ssize_t uwsgi_rsyslog_logger(struct uwsgi_logger *ul, char *message, size_t len)
 
 		uwsgi_socket_nb(ul->fd);
 
+		ul->count = 29;
+
                 char *comma = strchr(ul->arg, ',');
 		if (comma) {
 			ul->data = comma+1;
                 	*comma = 0;
+			char *prisev = strchr(ul->data, ',');
+			if (prisev) {
+				*prisev = 0;
+				ul->count = atoi(prisev+1);
+			}
 		}
 		else {
 			ul->data = uwsgi_concat2(uwsgi.hostname," uwsgi");
@@ -83,7 +90,7 @@ ssize_t uwsgi_rsyslog_logger(struct uwsgi_logger *ul, char *message, size_t len)
 	for (pos=0 ; pos < (int) len ;) {
 		if (pos > 0 && !u_rsyslog.split_msg) return pos;
 		msg_len = ( ((int)len)-pos > u_rsyslog.msg_size ? u_rsyslog.msg_size : ((int)len)-pos);
-		rlen = snprintf(ul->buf, u_rsyslog.packet_size, "<29>%.*s %s: %.*s", 15, ctime_storage+4, (char *) ul->data, msg_len, &message[pos]);
+		rlen = snprintf(ul->buf, u_rsyslog.packet_size, "<%d>%.*s %s: %.*s", ul->count, 15, ctime_storage+4, (char *) ul->data, msg_len, &message[pos]);
 		if (rlen > 0 && rlen <= u_rsyslog.packet_size) {
 			ret = sendto(ul->fd, ul->buf, rlen, 0, (const struct sockaddr *) &ul->addr, ul->addr_len);
 			if (ret <= 0) return ret;