1.9.17.1

core/emperor.c

@@ -1039,7 +1039,7 @@ static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
 
 		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;
 
 		char *colon = NULL;
 

core/init.c

@@ -176,6 +176,7 @@ void uwsgi_init_default() {
 	// clear reforked status
 	uwsgi.master_is_reforked = 0;
 
+	uwsgi.master_fifo_fd = -1;
 	uwsgi_master_fifo_prepare();
 }
 

core/uwsgi.c

@@ -173,6 +173,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"master", no_argument, 'M', "enable master process", uwsgi_opt_true, &uwsgi.master_process, 0},
 	{"honour-stdin", no_argument, 0, "do not remap stdin to /dev/null", uwsgi_opt_true, &uwsgi.honour_stdin, 0},
 	{"emperor", required_argument, 0, "run the Emperor", uwsgi_opt_add_string_list, &uwsgi.emperor, 0},
+	{"emperor-wrapper", required_argument, 0, "set a binary wrapper for vassals", uwsgi_opt_set_str, &uwsgi.emperor_wrapper, 0},
 	{"emperor-nofollow", no_argument, 0, "do not follow symlinks when checking for mtime", uwsgi_opt_true, &uwsgi.emperor_nofollow, 0},
 	{"emperor-procname", required_argument, 0, "set the Emperor process name", uwsgi_opt_set_str, &uwsgi.emperor_procname, 0},
 	{"emperor-freq", required_argument, 0, "set the Emperor scan frequency (default 3 seconds)", uwsgi_opt_set_int, &uwsgi.emperor_freq, 0},
@@ -406,7 +407,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"ini", required_argument, 0, "load config from ini file", uwsgi_opt_load_ini, NULL, UWSGI_OPT_IMMEDIATE},
 #ifdef UWSGI_YAML
 	{"yaml", required_argument, 'y', "load config from yaml file", uwsgi_opt_load_yml, NULL, UWSGI_OPT_IMMEDIATE},
-	{"yal", required_argument, 'y', "load config from yaml file", uwsgi_opt_load_yml, NULL, UWSGI_OPT_IMMEDIATE},
+	{"yml", required_argument, 'y', "load config from yaml file", uwsgi_opt_load_yml, NULL, UWSGI_OPT_IMMEDIATE},
 #endif
 #ifdef UWSGI_JSON
 	{"json", required_argument, 'j', "load config from json file", uwsgi_opt_load_json, NULL, UWSGI_OPT_IMMEDIATE},

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;

uwsgi.h

@@ -1870,6 +1870,7 @@ struct uwsgi_server {
 	int emperor_clone;
 	char *pivot_root;
 #endif
+	char *emperor_wrapper;
 
 #ifdef __FreeBSD__
 	char *jail;

uwsgiconfig.py

@@ -1,6 +1,6 @@
 # uWSGI build system
 
-uwsgi_version = '1.9.17'
+uwsgi_version = '1.9.17.1'
 
 import os
 import re