backports from 1.9.19

.gitignore

@@ -4,21 +4,10 @@
 *.jar
 *~
 *.so
-*.gox
-*.a
-*.dll
-*.key
-*.orig
-*.rej
 
 /uwsgi
 /uwsgibuild.*
-/core/config_py.c
 
 /t/ring/target
 
 core/dot_h.c
-
-+# coverity
-+/cov-int/
-+uwsgi.tar.xz

CONTRIBUTORS

@@ -1,7 +1,7 @@
 - this is a incomplete list of all the contributors of the project -
 
 Roberto De Ioris, Unbit, <roberto@unbit.it>
-Riccardo Magliocchetti
+Riccardo Magliocchetti, Unbit, <riccardo@unbit.it>
 Yann Malet, Lincoln Loop
 Simon Litchfield
 Masahiro Honma, <hiratara@cpan.org>
@@ -25,8 +25,3 @@ Mingli Yuan
 Natanael Copa
 Roberto Leandrini
 Ryan Petrello
-Danila Shtan <danila@shtan.ru>
-Ævar Arnfjörð Bjarmason
-Yu Zhao (getcwd)
-Mathieu Dupuy
-Adriano Di Luzio (adriano@unbit.it)

Makefile

@@ -1,16 +1,8 @@
-PYTHON := python
-
 all:
-	$(PYTHON) uwsgiconfig.py --build $(PROFILE)
+	python uwsgiconfig.py --build
 
 clean:
-	$(PYTHON) uwsgiconfig.py --clean
+	python uwsgiconfig.py --clean
 
 check:
-	$(PYTHON) uwsgiconfig.py --check
-
-plugin.%:
-	$(PYTHON) uwsgiconfig.py --plugin plugins/$* $(PROFILE)
-
-%:
-	$(PYTHON) uwsgiconfig.py --build $@
+	python uwsgiconfig.py --check

README

@@ -1,5 +1,3 @@
-The uWSGI project
+surprise i am empty !
 
-For official documentation check: https://uwsgi-docs.readthedocs.org/en/latest/
-
-For commercial support check: http://unbit.com/
+Look in the online documentation on https://uwsgi-docs.readthedocs.org/en/latest/

apache2/mod_proxy_uwsgi.c

@@ -2,7 +2,7 @@
         
 *** mod_proxy_uwsgi ***
 
-Copyright 2009-2014 Unbit S.a.s. <info@unbit.it>
+Copyright 2009-2013 Unbit S.a.s. <info@unbit.it>
      
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -67,20 +67,15 @@ static int uwsgi_canon(request_rec *r, char *url)
     }
     url += sizeof(UWSGI_SCHEME); /* Keep slashes */
 
-    // is it a unix socket ?
-    if (strlen(url) == 2) {
-	*sport = 0;
-    }
-    else {
-        err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);
-        if (err) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+    err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);
+    if (err) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "error parsing URL %s: %s", url, err);
-            return HTTP_BAD_REQUEST;
-        }
-	apr_snprintf(sport, sizeof(sport), ":%u", port);
+        return HTTP_BAD_REQUEST;
     }
 
+    apr_snprintf(sport, sizeof(sport), ":%u", port);
+
     if (ap_strchr(host, ':')) { /* if literal IPv6 address */
         host = apr_pstrcat(r->pool, "[", host, "]", NULL);
     }
@@ -258,43 +253,6 @@ static request_rec *ap_proxy_make_fake_req(conn_rec *c, request_rec *r)
 
     return rp;
 }
-
-static apr_status_t ap_proxy_buckets_lifetime_transform(request_rec *r,
-        apr_bucket_brigade *from, apr_bucket_brigade *to)
-{
-    apr_bucket *e;
-    apr_bucket *new;
-    const char *data;
-    apr_size_t bytes;
-    apr_status_t rv = APR_SUCCESS;
-
-    apr_brigade_cleanup(to);
-    for (e = APR_BRIGADE_FIRST(from);
-         e != APR_BRIGADE_SENTINEL(from);
-         e = APR_BUCKET_NEXT(e)) {
-        if (!APR_BUCKET_IS_METADATA(e)) {
-            apr_bucket_read(e, &data, &bytes, APR_BLOCK_READ);
-            new = apr_bucket_transient_create(data, bytes, r->connection->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(to, new);
-        }
-        else if (APR_BUCKET_IS_FLUSH(e)) {
-            new = apr_bucket_flush_create(r->connection->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(to, new);
-        }
-        else if (APR_BUCKET_IS_EOS(e)) {
-            new = apr_bucket_eos_create(r->connection->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(to, new);
-        }
-        else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00964)
-                          "Unhandled bucket type of type %s in"
-                          " proxy_buckets_lifetime_transform", e->type->name);
-            apr_bucket_delete(e);
-            rv = APR_EGENERAL;
-        }
-    }
-    return rv;
-}
 #endif
 
 
@@ -305,7 +263,6 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 	const char *buf;
 	char *value, *end;
 	int len;
-	int backend_broke = 1;
 	apr_status_t rc;
 	conn_rec *c = r->connection;
 	apr_off_t readbytes;
@@ -317,7 +274,6 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 	rp->proxyreq = PROXYREQ_RESPONSE;
 
 	apr_bucket_brigade *bb = apr_brigade_create(r->pool, c->bucket_alloc);
-	apr_bucket_brigade *pass_bb = apr_brigade_create(r->pool, c->bucket_alloc);
 
 	len = ap_getline(buffer, sizeof(buffer), rp, 1);
 
@@ -365,13 +321,12 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
                 ap_set_content_type(r, apr_pstrdup(r->pool, buf));
             }
 	
-	int finish = 0;
-	while(!finish) {
+	for(;;) {
 		rv = ap_get_brigade(rp->input_filters, bb,
                                         AP_MODE_READBYTES, mode,
                                         conf->io_buffer_size);
 		if (APR_STATUS_IS_EAGAIN(rv)
-                        || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) ) {
+                        || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb))) {
 			e = apr_bucket_flush_create(c->bucket_alloc);
 			APR_BRIGADE_INSERT_TAIL(bb, e);
 			if (ap_pass_brigade(r->output_filters, bb) || c->aborted) {
@@ -387,46 +342,21 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 		else if (rv != APR_SUCCESS) {
 			ap_proxy_backend_broke(r, bb);
 			ap_pass_brigade(r->output_filters, bb);
-			backend_broke = 1;
-			break;
 		}
 
 		mode = APR_NONBLOCK_READ;
 		apr_brigade_length(bb, 0, &readbytes);
 		backend->worker->s->read += readbytes;
-
-		if (APR_BRIGADE_EMPTY(bb)) {
-                        apr_brigade_cleanup(bb);
-                        break;
-                }
-
-		ap_proxy_buckets_lifetime_transform(r, bb, pass_bb);
-
-		// found the last brigade?
-		if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) finish = 1;
-
-		// do not pass chunk if it is zero_sized
-		apr_brigade_length(pass_bb, 0, &readbytes);
-
-		if ((readbytes > 0 && ap_pass_brigade(r->output_filters, pass_bb) != APR_SUCCESS) || c->aborted) {
-			finish = 1;
-		}
-
+		ap_pass_brigade(r->output_filters, bb);
 		apr_brigade_cleanup(bb);
-		apr_brigade_cleanup(pass_bb);
 	}
-
 	e = apr_bucket_eos_create(c->bucket_alloc);
 	APR_BRIGADE_INSERT_TAIL(bb, e);
         ap_pass_brigade(r->output_filters, bb);
 
 	apr_brigade_cleanup(bb);
 
-	if (c->aborted || backend_broke) {
-        	return DONE;
-        }
-
-	return OK;
+    return OK;
 }
 
 static int uwsgi_handler(request_rec *r, proxy_worker *worker,

apache2/mod_uwsgi.c

@@ -2,7 +2,7 @@
         
 *** uWSGI/mod_uwsgi ***
 
-Copyright 2009-2014 Unbit S.a.s. <info@unbit.it>
+Copyright 2009-2013 Unbit S.a.s. <info@unbit.it>
      
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

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,gccgo,rados,pypy,zabbix,curl_cron,tornado,tuntap,pty,mongrel2,alarm_curl,router_radius,airbrake
+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/asyncio.ini

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

buildconf/base.ini

@@ -2,18 +2,22 @@
 xml = auto
 yaml = true
 json = auto
+zeromq = auto
 ssl = auto
 pcre = auto
 routing = auto
+matheval = auto
 debug = false
 unbit = false
+xml_implementation = libxml2
+yaml_implementation = auto
 malloc_implementation = libc
 extras =
 plugins =
 bin_name = uwsgi
 append_version =
 plugin_dir = .
-embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter, router_static, sslrouter, spooler, cheaper_busyness, symcall, transformation_tofile, transformation_gzip, transformation_chunked, transformation_offload, router_memcached, router_redis, router_hash, router_expires, router_metrics, transformation_template, stats_pusher_socket
+embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter, router_static, sslrouter, spooler, cheaper_busyness, symcall, transformation_tofile, transformation_gzip, transformation_chunked, transformation_offload, router_memcached, router_redis, router_hash, router_expires
 as_shared_library = false
 
 locking = auto

buildconf/coverity.ini

@@ -1,3 +1,4 @@
 [uwsgi]
-main_plugin = psgi,rack,lua,python,gevent,php,cgi,glusterfs,pty,xslt,msgpack,geoip,v8,pam,ldap,mono,jvm,ring,jwsgi,servlet,rados,coroae,pypy,gccgo
+# pypy,jvm,ring,jwsgi
+main_plugin = erlang,psgi,rack,lua,python,gevent,php,cgi,mono,pyerl,go
 inherit = base

buildconf/default.ini

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

buildconf/gccgo.ini

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

buildconf/glusterfs.ini

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

buildconf/go.ini

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

buildconf/minimal.ini

@@ -2,11 +2,15 @@
 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 =

buildconf/ppa.ini

@@ -1,12 +1,15 @@
 [uwsgi]
-xml = libxml2
-yaml = libyaml
+xml = true
+yaml = true
 json = true
+zeromq = true
 ssl = true
 pcre = true
 routing = true
 debug = false
 unbit = false
+xml_implementation = libxml2
+yaml_implementation = libyaml
 malloc_implementation = libc
 extras =
 plugins =

buildconf/unbit.ini

@@ -1,12 +1,15 @@
 [uwsgi]
-xml = expat
-yaml = embedded
+xml = true
+yaml = true
 json = false
+zeromq = false
 ssl = true
 pcre = true
 routing = true
 debug = false
 unbit = true
+xml_implementation = expat
+yaml_implementation = auto
 malloc_implementation = libc
 extras =
 plugins =

buildconf/uwsgi.it.ini

@@ -1,29 +0,0 @@
-[uwsgi]
-xml = expat
-yaml = embedded
-json = true
-ssl = true
-pcre = true
-routing = true
-debug = false
-unbit = false
-malloc_implementation = libc
-extras =
-plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = /opt/unbit/uwsgi/plugins
-embedded_plugins =
-as_shared_library = false
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-blacklist =
-whitelist =
-
-embed_files =
-
-embed_config =

core/alarm.c

@@ -18,18 +18,18 @@ void uwsgi_alarm_init_log(struct uwsgi_alarm_instance *uai) {
 void uwsgi_alarm_func_log(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
 	if (msg[len-1] != '\n') {
 		if (uai->arg && strlen(uai->arg) > 0) {
-			uwsgi_log_verbose("ALARM: %s %.*s\n", uai->arg, len, msg);
+			uwsgi_log_alarm("] %s %.*s\n", uai->arg, len, msg);
 		}
 		else {
-			uwsgi_log_verbose("ALARM: %.*s\n", len, msg);
+			uwsgi_log_alarm("] %.*s\n", len, msg);
 		}
 	}
 	else {
 		if (uai->arg && strlen(uai->arg) > 0) {
-			uwsgi_log_verbose("ALARM: %s %.*s", uai->arg, len, msg);
+			uwsgi_log_alarm("] %s %.*s", uai->arg, len, msg);
 		}
 		else {
-			uwsgi_log_verbose("ALARM: %.*s", len, msg);
+			uwsgi_log_alarm("] %.*s", len, msg);
 		}
 	}
 }
@@ -363,19 +363,6 @@ void uwsgi_alarm_thread_start() {
 	}
 }
 
-void uwsgi_alarm_trigger_uai(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
-	struct iovec iov[2];
-	iov[0].iov_base = &uai;
-	iov[0].iov_len = sizeof(long);
-	iov[1].iov_base = msg;
-	iov[1].iov_len = len;
-
-	// now send the message to the alarm thread
-	if (writev(uwsgi.alarm_thread->pipe[0], iov, 2) != (ssize_t) (len+sizeof(long))) {
-		uwsgi_error("[uwsgi-alarm-error] uwsgi_alarm_trigger()/writev()");
-	}
-}
-
 #ifdef UWSGI_PCRE
 // check if a log should raise an alarm
 void uwsgi_alarm_log_check(char *msg, size_t len) {
@@ -385,14 +372,7 @@ void uwsgi_alarm_log_check(char *msg, size_t len) {
 	while (ual) {
 		if (uwsgi_regexp_match(ual->pattern, ual->pattern_extra, msg, len) >= 0) {
 			if (!ual->negate) {
-				struct uwsgi_alarm_ll *uall = ual->alarms;
-				while (uall) {
-					if (uwsgi.alarm_cheap)
-						uwsgi_alarm_trigger_uai(uall->alarm, msg, len);
-					else
-						uwsgi_alarm_run(uall->alarm, msg, len);
-					uall = uall->next;
-				}
+				uwsgi_alarm_log_run(ual, msg, len);
 			}
 			else {
 				break;
@@ -417,6 +397,18 @@ void uwsgi_alarm_run(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
 	uai->last_msg_size = len;
 }
 
+#ifdef UWSGI_PCRE
+// call the alarms mapped to a log line
+void uwsgi_alarm_log_run(struct uwsgi_alarm_log *ual, char *msg, size_t len) {
+	struct uwsgi_alarm_ll *uall = ual->alarms;
+	while (uall) {
+		uwsgi_alarm_run(uall->alarm, msg, len);
+		uall = uall->next;
+	}
+}
+#endif
+
+
 // this is the api function workers,mules and whatever you want can call from code
 void uwsgi_alarm_trigger(char *alarm_instance_name, char *msg, size_t len) {
 	if (!uwsgi.alarm_thread) return;
@@ -424,7 +416,16 @@ void uwsgi_alarm_trigger(char *alarm_instance_name, char *msg, size_t len) {
 	struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(alarm_instance_name);
 	if (!uai) return;
 
-	uwsgi_alarm_trigger_uai(uai, msg, len);
+	struct iovec iov[2];
+	iov[0].iov_base = &uai;
+	iov[0].iov_len = sizeof(long);
+	iov[1].iov_base = msg;
+	iov[1].iov_len = len;
+
+	// now send the message to the alarm thread
+	if (writev(uwsgi.alarm_thread->pipe[0], iov, 2) != (ssize_t) (len+sizeof(long))) {
+		uwsgi_error("[uwsgi-alarm-error] uwsgi_alarm_trigger()/writev()");
+	}
 }
 
 struct uwsgi_alarm_fd *uwsgi_add_alarm_fd(int fd, char *alarm, size_t buf_len, char *msg, size_t msg_len) {

core/async.c

@@ -4,18 +4,18 @@ extern struct uwsgi_server uwsgi;
 
 /*
 
-	This is a general-purpose async loop engine (it expects a coroutine-based approach)
+	This is a general purpose async loop engine (it expects a coroutine based approach)
 
 	You can see it as an hub holding the following structures:
 
-	1) the runqueue, cores ready to be run are appended to this list
+	1) the runqueue, cores ready to be run are appended in this list
 
 	2) the fd list, this is a list of monitored file descriptors, a core can wait for all the file descriptors it needs
 
-	3) the timeout value, if set, the current core will timeout after the specified number of seconds (unless an event cancels it)
+	3) the timeout value, if set the current core will timeout aftert he specified number of seconds (unless an event cancel it)
 
 
-	IMPORTANT: this is not a callback-based engine !!!
+	IMPORTANT: this is not a callback based engine !!!
 
 */
 
@@ -28,6 +28,7 @@ void uwsgi_async_queue_is_full(time_t now) {
 }
 
 void uwsgi_async_init() {
+	int i;
 
 	uwsgi.async_queue = event_queue_init();
 
@@ -39,9 +40,16 @@ void uwsgi_async_init() {
 
 	uwsgi.rb_async_timeouts = uwsgi_init_rb_timer();
 
-	// optimization, this array maps file descriptor to requests
-        uwsgi.async_waiting_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd);
-        uwsgi.async_proto_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd);
+	// a stack of unused cores
+	uwsgi.async_queue_unused = uwsgi_malloc(sizeof(struct wsgi_request *) * uwsgi.async);
+
+	// fill it with default values
+	for (i = 0; i < uwsgi.async; i++) {
+		uwsgi.async_queue_unused[i] = &uwsgi.workers[uwsgi.mywid].cores[i].req;
+	}
+
+	// the first available core is the last one
+	uwsgi.async_queue_unused_ptr = uwsgi.async - 1;
 
 }
 
@@ -151,7 +159,7 @@ static void async_expire_timeouts(uint64_t now) {
 			wsgi_req = (struct wsgi_request *) urbt->data;
 			// timeout expired
 			wsgi_req->async_timed_out = 1;
-			// reset the request
+			// reset teh request
 			async_reset_request(wsgi_req);
 			// push it in the runqueue
 			runqueue_push(wsgi_req);
@@ -165,11 +173,6 @@ static void async_expire_timeouts(uint64_t now) {
 
 int async_add_fd_read(struct wsgi_request *wsgi_req, int fd, int timeout) {
 
-	if (uwsgi.async < 2 || !uwsgi.async_waiting_fd_table){ 
-		uwsgi_log_verbose("ASYNC call without async mode !!!\n");
-		return -1;
-	}
-
 	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
 
 	if (fd < 0)
@@ -221,47 +224,8 @@ static int async_wait_fd_read(int fd, int timeout) {
 	return 1;
 }
 
-static int async_wait_fd_read2(int fd0, int fd1, int timeout, int *fd) {
-
-        struct wsgi_request *wsgi_req = current_wsgi_req();
-
-        wsgi_req->async_ready_fd = 0;
-
-        if (async_add_fd_read(wsgi_req, fd0, timeout)) {
-                return -1;
-        }
-
-        if (async_add_fd_read(wsgi_req, fd1, timeout)) {
-		// reset already registered fd
-		async_reset_request(wsgi_req);
-                return -1;
-        }
-
-        if (uwsgi.schedule_to_main) {
-                uwsgi.schedule_to_main(wsgi_req);
-        }
-
-        if (wsgi_req->async_timed_out) {
-                wsgi_req->async_timed_out = 0;
-                return 0;
-        }
-
-	if (wsgi_req->async_ready_fd) {
-		*fd = wsgi_req->async_last_ready_fd;
-		return 1;
-	}
-
-        return -1;
-}
-
-
 void async_add_timeout(struct wsgi_request *wsgi_req, int timeout) {
 
-	if (uwsgi.async < 2 || !uwsgi.rb_async_timeouts) {
-		uwsgi_log_verbose("ASYNC call without async mode !!!\n");
-		return;
-	}
-
 	wsgi_req->async_ready_fd = 0;
 
 	if (timeout > 0 && wsgi_req->async_timeout == NULL) {
@@ -272,11 +236,6 @@ void async_add_timeout(struct wsgi_request *wsgi_req, int timeout) {
 
 int async_add_fd_write(struct wsgi_request *wsgi_req, int fd, int timeout) {
 
-	if (uwsgi.async < 2 || !uwsgi.async_waiting_fd_table) {
-		uwsgi_log_verbose("ASYNC call without async mode !!!\n");
-		return -1;
-	}
-
 	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
 
 	if (fd < 0)
@@ -336,8 +295,9 @@ void async_schedule_to_req(void) {
 	// a trick to avoid calling routes again
 	uwsgi.wsgi_req->is_routing = 1;
 #endif
-	uwsgi.wsgi_req->async_status = uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req);
-        if (uwsgi.wsgi_req->async_status <= UWSGI_OK) goto end;
+        if (uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req) <= UWSGI_OK) {
+		goto end;
+	}
 
 	if (uwsgi.schedule_to_main) {
         	uwsgi.schedule_to_main(uwsgi.wsgi_req);
@@ -348,61 +308,29 @@ end:
 	async_reset_request(uwsgi.wsgi_req);
 	uwsgi_close_request(uwsgi.wsgi_req);
 	uwsgi.wsgi_req->async_status = UWSGI_OK;	
-	uwsgi.async_queue_unused_ptr++;
-        uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
 }
 
 void async_schedule_to_req_green(void) {
-	struct wsgi_request *wsgi_req = uwsgi.wsgi_req;
 #ifdef UWSGI_ROUTING
-        if (uwsgi_apply_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
+        if (uwsgi_apply_routes(uwsgi.wsgi_req) == UWSGI_ROUTE_BREAK) {
                 goto end;
         }
 #endif
         for(;;) {
-		wsgi_req->async_status = uwsgi.p[wsgi_req->uh->modifier1]->request(wsgi_req);
-                if (wsgi_req->async_status <= UWSGI_OK) {
+                if (uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req) <= UWSGI_OK) {
                         break;
                 }
-                wsgi_req->switches++;
-		if (uwsgi.schedule_fix) {
-			uwsgi.schedule_fix(wsgi_req);
-		}
+                uwsgi.wsgi_req->switches++;
                 // switch after each yield
-		if (uwsgi.schedule_to_main)
-			uwsgi.schedule_to_main(wsgi_req);
+                uwsgi.schedule_to_main(uwsgi.wsgi_req);
         }
 
 #ifdef UWSGI_ROUTING
 end:
 #endif
-	// re-set the global state
-	uwsgi.wsgi_req = wsgi_req;
-        async_reset_request(wsgi_req);
-        uwsgi_close_request(wsgi_req);
-	// re-set the global state (routing could have changed it)
-	uwsgi.wsgi_req = wsgi_req;
-        wsgi_req->async_status = UWSGI_OK;
-	uwsgi.async_queue_unused_ptr++;
-        uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = wsgi_req;
-	
-}
-
-static int uwsgi_async_wait_milliseconds_hook(int timeout) {
-	struct wsgi_request *wsgi_req = current_wsgi_req();
-	timeout = timeout / 1000;
-	if (!timeout) timeout = 1;
-	async_add_timeout(wsgi_req, timeout);
-	wsgi_req->async_force_again = 1;
-	if (uwsgi.schedule_to_main) {
-                uwsgi.schedule_to_main(wsgi_req);
-        }
-        if (wsgi_req->async_timed_out) {
-                wsgi_req->async_timed_out = 0;
-                return 0;
-        }
-
-	return -1;
+        async_reset_request(uwsgi.wsgi_req);
+        uwsgi_close_request(uwsgi.wsgi_req);
+        uwsgi.wsgi_req->async_status = UWSGI_OK;
 }
 
 void async_loop() {
@@ -425,14 +353,10 @@ void async_loop() {
 	void *events = event_queue_alloc(64);
 	struct uwsgi_socket *uwsgi_sock;
 
-	uwsgi_async_init();
-
 	uwsgi.async_runqueue = NULL;
 
 	uwsgi.wait_write_hook = async_wait_fd_write;
         uwsgi.wait_read_hook = async_wait_fd_read;
-        uwsgi.wait_read2_hook = async_wait_fd_read2;
-	uwsgi.wait_milliseconds_hook = uwsgi_async_wait_milliseconds_hook;
 
 	if (uwsgi.signal_socket > -1) {
 		event_queue_add_fd_read(uwsgi.async_queue, uwsgi.signal_socket);
@@ -541,8 +465,7 @@ void async_loop() {
 						// remove fd from event poll and fd proto table 
 						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
 						event_queue_del_fd(uwsgi.async_queue, interesting_fd, event_queue_read());
-						// put request in the runqueue (set it as UWSGI_OK to signal the first run)
-						uwsgi.wsgi_req->async_status = UWSGI_OK;
+						// put request in the runqueue
 						runqueue_push(uwsgi.wsgi_req);
 						continue;
 					}
@@ -552,7 +475,7 @@ void async_loop() {
 						continue;
 					}
 					// re-add timer
-					async_add_timeout(uwsgi.wsgi_req, uwsgi.socket_timeout);
+					async_add_timeout(uwsgi.wsgi_req, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 					continue;
 				}
 
@@ -588,11 +511,19 @@ void async_loop() {
 			uwsgi.wsgi_req->switches++;
 
 			// request ended ?
-			if (uwsgi.wsgi_req->async_status <= UWSGI_OK ||
-				uwsgi.wsgi_req->waiting_fds || uwsgi.wsgi_req->async_timeout) {
+			if (uwsgi.wsgi_req->async_status <= UWSGI_OK) {
 				// remove from the runqueue
 				runqueue_remove(current_request);
+				// push wsgi_request in the unused stack
+				uwsgi.async_queue_unused_ptr++;
+				uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+
 			}
+			else if (uwsgi.wsgi_req->waiting_fds || uwsgi.wsgi_req->async_timeout) {
+				// remove this request from the runqueue
+				runqueue_remove(current_request);
+			}
+
 			current_request = next_request;
 		}
 

core/buffer.c

@@ -64,7 +64,7 @@ int uwsgi_buffer_insert_chunked(struct uwsgi_buffer *ub, size_t pos, size_t len)
 	// 0xFFFFFFFFFFFFFFFF\r\n\0
 	char chunked[19];
 	int ret = snprintf(chunked, 19, "%X\r\n", (unsigned int) len);
-        if (ret <= 0 || ret >= 19) {
+        if (ret <= 0 || ret > 19) {
                 return -1;
         }
 	return uwsgi_buffer_insert(ub, pos, chunked, ret);
@@ -74,7 +74,7 @@ int uwsgi_buffer_append_chunked(struct uwsgi_buffer *ub, size_t len) {
         // 0xFFFFFFFFFFFFFFFF\r\n\0
         char chunked[19];
         int ret = snprintf(chunked, 19, "%X\r\n", (unsigned int) len);
-        if (ret <= 0 || ret >= 19) {
+        if (ret <= 0 || ret > 19) {
                 return -1;
         }
         return uwsgi_buffer_append(ub, chunked, ret);
@@ -128,16 +128,7 @@ int uwsgi_buffer_append_json(struct uwsgi_buffer *ub, char *buf, size_t len) {
 	// need to escape \ and "
 	size_t i;
 	for(i=0;i<len;i++) {
-		if (buf[i] == '\t') {
-			if (uwsgi_buffer_append(ub, "\\t", 2)) return -1;
-		}
-		else if (buf[i] == '\n') {
-			if (uwsgi_buffer_append(ub, "\\n", 2)) return -1;
-		}
-		else if (buf[i] == '\r') {
-			if (uwsgi_buffer_append(ub, "\\r", 2)) return -1;
-		}
-		else if (buf[i] == '"') {
+		if (buf[i] == '"') {
 			if (uwsgi_buffer_append(ub, "\\\"", 2)) return -1;
 		}
 		else if (buf[i] == '\\') {
@@ -213,19 +204,6 @@ int uwsgi_buffer_u64be(struct uwsgi_buffer *ub, uint64_t num) {
         return uwsgi_buffer_append(ub, (char *) buf, 8);
 }
 
-int uwsgi_buffer_u64le(struct uwsgi_buffer *ub, uint64_t num) {
-	uint8_t buf[8];
-        buf[0] = (uint8_t) (num & 0xff);
-        buf[1] = (uint8_t) ((num >> 8) & 0xff);
-        buf[2] = (uint8_t) ((num >> 16) & 0xff);
-        buf[3] = (uint8_t) ((num >> 24) & 0xff);
-	buf[4] = (uint8_t) ((num >> 32) & 0xff);
-        buf[5] = (uint8_t) ((num >> 40) & 0xff);
-        buf[6] = (uint8_t) ((num >> 48) & 0xff);
-        buf[7] = (uint8_t) ((num >> 56) & 0xff);
-        return uwsgi_buffer_append(ub, (char *) buf, 8);
-}
-
 
 int uwsgi_buffer_f64be(struct uwsgi_buffer *ub, double num) {
         uint8_t buf[8];
@@ -254,7 +232,7 @@ int uwsgi_buffer_append_ipv4(struct uwsgi_buffer *ub, void *addr) {
 int uwsgi_buffer_num64(struct uwsgi_buffer *ub, int64_t num) {
 	char buf[sizeof(UMAX64_STR)+1];
 	int ret = snprintf(buf, sizeof(UMAX64_STR)+1, "%lld", (long long) num);
-	if (ret <= 0 || ret >= (int) (sizeof(UMAX64_STR)+1)) {
+	if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
 		return -1;
 	}
 	return uwsgi_buffer_append(ub, buf, ret);
@@ -277,7 +255,7 @@ int uwsgi_buffer_append_keyval32(struct uwsgi_buffer *ub, char *key, uint32_t ke
 int uwsgi_buffer_append_keynum(struct uwsgi_buffer *ub, char *key, uint16_t keylen, int64_t num) {
 	char buf[sizeof(UMAX64_STR)+1];
         int ret = snprintf(buf, (sizeof(UMAX64_STR)+1), "%lld", (long long) num);
-        if (ret <= 0 || ret >= (int) (sizeof(UMAX64_STR)+1)) {
+        if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
                 return -1;
         }
 	if (uwsgi_buffer_u16le(ub, keylen)) return -1;
@@ -289,7 +267,7 @@ int uwsgi_buffer_append_keynum(struct uwsgi_buffer *ub, char *key, uint16_t keyl
 int uwsgi_buffer_append_valnum(struct uwsgi_buffer *ub, int64_t num) {
         char buf[sizeof(UMAX64_STR)+1];
         int ret = snprintf(buf, (sizeof(UMAX64_STR)+1), "%lld", (long long) num);
-        if (ret <= 0 || ret >= (int) (sizeof(UMAX64_STR)+1)) {
+        if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
                 return -1;
         }
         if (uwsgi_buffer_u16le(ub, ret)) return -1;
@@ -349,7 +327,7 @@ int uwsgi_buffer_send(struct uwsgi_buffer *ub, int fd) {
 	char *ptr = ub->buf;
 
 	while (remains > 0) {
-		int ret = uwsgi_waitfd_write(fd, uwsgi.socket_timeout);
+		int ret = uwsgi_waitfd_write(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		if (ret > 0) {
 			ssize_t len = write(fd, ptr, remains);
 			if (len > 0) {

core/cache.c

@@ -24,49 +24,6 @@ extern struct uwsgi_server uwsgi;
 
 */
 
-static void cache_full(struct uwsgi_cache *uc) {
-	uint64_t i;
-	int force_clear = 0;
-
-	if (!uc->ignore_full) {
-        	if (uc->purge_lru)
-                	uwsgi_log("LRU item will be purged from cache \"%s\"\n", uc->name);
-                else
-                	uwsgi_log("*** DANGER cache \"%s\" is FULL !!! ***\n", uc->name);
-	}
-
-        uc->full++;
-
-        if (uc->purge_lru && uc->lru_head)
-        	uwsgi_cache_del2(uc, NULL, 0, uc->lru_head, UWSGI_CACHE_FLAG_LOCAL);
-
-	// we do not need locking here !
-	if (uc->sweep_on_full) {
-		uint64_t removed = 0;
-		uint64_t now = (uint64_t) uwsgi_now();
-		if (uc->next_scan <= now) {
-			uc->next_scan = now + uc->sweep_on_full;
-                	for (i = 1; i < uc->max_items; i++) {
-				struct uwsgi_cache_item *uci = cache_item(i);
-				if (uci->expires > 0 && uci->expires <= now) {
-                			if (!uwsgi_cache_del2(uc, NULL, 0, i, 0)) {
-						removed++;
-					}
-				}
-			}
-			if (removed == 0) {
-				force_clear = 1;
-			}
-                }
-	}
-
-	if (uc->clear_on_full || force_clear) {
-                for (i = 1; i < uc->max_items; i++) {
-                	uwsgi_cache_del2(uc, NULL, 0, i, 0);
-                }
-	}
-}
-
 static uint64_t uwsgi_cache_find_free_blocks(struct uwsgi_cache *uc, uint64_t need) {
 	// how many blocks we need ?
 	uint64_t needed_blocks = need/uc->blocksize;
@@ -75,7 +32,7 @@ static uint64_t uwsgi_cache_find_free_blocks(struct uwsgi_cache *uc, uint64_t ne
 	// which is the first free bit?
 	uint64_t bitmap_byte = 0;
 	uint8_t bitmap_bit = 0;
-	
+
 	if (uc->blocks_bitmap_pos > 0) {
 		bitmap_byte = uc->blocks_bitmap_pos/8;
 		bitmap_bit = uc->blocks_bitmap_pos % 8;
@@ -88,8 +45,6 @@ static uint64_t uwsgi_cache_find_free_blocks(struct uwsgi_cache *uc, uint64_t ne
 	uint64_t j;
 	uint64_t found = 0;
 	uint64_t need_to_scan = uc->blocks_bitmap_size;
-	// we make an addition round for the corner case of a single byte map not starting from 0
-	if (bitmap_bit > 0) need_to_scan++;
 	j = bitmap_byte;
 	//uwsgi_log("start scanning %llu bytes starting from %llu need: %llu\n", (unsigned long long) need_to_scan, (unsigned long long) bitmap_byte, (unsigned long long) needed_blocks);
 	while(need_to_scan) {
@@ -118,9 +73,7 @@ static uint64_t uwsgi_cache_find_free_blocks(struct uwsgi_cache *uc, uint64_t ne
                                 }
                                 found++;
                                 if (found == needed_blocks) {
-#ifdef UWSGI_DEBUG
-                                        printf("found %llu consecutive bit starting from byte %llu\n", (unsigned long long) found, (unsigned long long) base);
-#endif
+                                        //printf("found %llu consecutive bit starting from byte %llu\n", found, base);
 					return ((base*8) + base_bit);
                                 }
                         }
@@ -129,14 +82,12 @@ static uint64_t uwsgi_cache_find_free_blocks(struct uwsgi_cache *uc, uint64_t ne
                 }
 		j++;
 		need_to_scan--;
-		// check for overlap (that is not supported)
-		if (j >= uc->blocks_bitmap_size) {
+		// check for overlap
+		if (j >= need_to_scan) {
 			j = 0;
 			found = 0;
 			base = 0xffffffffffffffffLLU;
 			base_bit = 0;
-			// we use bitmap_bit only at the first round
-			bitmap_bit = 0;
 		}
 	}
 
@@ -151,27 +102,19 @@ static uint64_t cache_mark_blocks(struct uwsgi_cache *uc, uint64_t index, uint64
 
 	uint64_t first_byte = index/8;
 	uint8_t first_byte_bit = index % 8;
-	// offset starts with 0, so actual last bit is index + needed_blocks - 1
-	uint64_t last_byte = (index + needed_blocks - 1) / 8;
-	uint8_t last_byte_bit = (index + needed_blocks - 1) % 8;
-	
-	uint64_t needed_bytes = (last_byte - first_byte) + 1;
+	uint64_t last_byte = (index+needed_blocks)/8;
+	uint8_t last_byte_bit = (index+needed_blocks) % 8;
 
 	//uwsgi_log("%llu %u %llu %u\n", first_byte, first_byte_bit, last_byte, last_byte_bit);
 
 	uint8_t mask = 0xff >> first_byte_bit;
-	
-	if (needed_bytes == 1) {
-		// kinda hacky, but it does the job
-		mask >>= (7 - last_byte_bit);
-		mask <<= (7 - last_byte_bit);
-	}
-	
 	uc->blocks_bitmap[first_byte] |= mask;
 
+	uint64_t needed_bytes = (last_byte - first_byte)+1;
+
 	if (needed_bytes > 1) {
-		mask = 0xff << (7 - last_byte_bit);
-		uc->blocks_bitmap[last_byte] |= mask;
+		mask = 0xff << (8 - last_byte_bit);
+		uc->blocks_bitmap[last_byte-1] |= mask;
 	}
 
 	if (needed_bytes > 2) {
@@ -187,28 +130,19 @@ static void cache_unmark_blocks(struct uwsgi_cache *uc, uint64_t index, uint64_t
 
         uint64_t first_byte = index/8;
         uint8_t first_byte_bit = index % 8;
-        // offset starts with 0, so actual last bit is index + needed_blocks - 1
-        uint64_t last_byte = (index + needed_blocks - 1)/8;
-        uint8_t last_byte_bit = (index + needed_blocks - 1) % 8;
+        uint64_t last_byte = (index+needed_blocks)/8;
+        uint8_t last_byte_bit = (index+needed_blocks) % 8;
 
-	uint64_t needed_bytes = (last_byte - first_byte) + 1;
+	// here we use XOR (0+0 = 0 | 1+0 = 1 | 0+1 = 1| 1+1 = 0|
 
-	uint8_t mask = 0xff >> first_byte_bit;
+        uint8_t mask = 0xff >> first_byte_bit;
+        uc->blocks_bitmap[first_byte] ^= mask;
 
-	if (needed_bytes == 1) {
-                // kinda hacky, but it does the job
-                mask >>= (7 - last_byte_bit);
-                mask <<= (7 - last_byte_bit);
-        }
-	
-        // here we use AND (0+0 = 0 | 1+0 = 0 | 0+1 = 0| 1+1 = 1)
-    	// 0 in mask means "unmark", 1 in mask means "do not change" 
-    	// so we need to invert the mask 
-        uc->blocks_bitmap[first_byte] &= ~mask;
+        uint64_t needed_bytes = (last_byte - first_byte)+1;
 
         if (needed_bytes > 1) {
-                mask = 0xff << (7 - last_byte_bit);
-                uc->blocks_bitmap[last_byte] &= ~mask;
+                mask = 0xff << (8 - last_byte_bit);
+                uc->blocks_bitmap[last_byte-1] ^= mask;
         }
 
         if (needed_bytes > 2) {
@@ -349,24 +283,16 @@ next2:
 void uwsgi_cache_init(struct uwsgi_cache *uc) {
 
 	uc->hashtable = uwsgi_calloc_shared(sizeof(uint64_t) * uc->hashsize);
-	uc->unused_blocks_stack = uwsgi_calloc_shared(sizeof(uint64_t) * uc->max_items);
+	uc->unused_blocks_stack = uwsgi_calloc_shared(sizeof(uint64_t) * uc->blocks);
+	// the first cache item is always zero
+	uc->first_available_block = 1;
 	uc->unused_blocks_stack_ptr = 0;
 	uc->filesize = ( (sizeof(struct uwsgi_cache_item)+uc->keysize) * uc->max_items) + (uc->blocksize * uc->blocks);
 
-	uint64_t i;
-	for (i = 1; i < uc->max_items; i++) {
-        	uc->unused_blocks_stack_ptr++;
-                uc->unused_blocks_stack[uc->unused_blocks_stack_ptr] = i;
-        }
-
 	if (uc->use_blocks_bitmap) {
 		uc->blocks_bitmap_size = uc->blocks/8;
-                uint8_t m = uc->blocks % 8;
-		if (m > 0) uc->blocks_bitmap_size++;
+		if (uc->blocks % 8 > 0) uc->blocks_bitmap_size++;
 		uc->blocks_bitmap = uwsgi_calloc_shared(uc->blocks_bitmap_size);
-		if (m > 0) {
-			uc->blocks_bitmap[uc->blocks_bitmap_size-1] = 0xff >> m;
-		}
 	}
 
 	//uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
@@ -374,14 +300,6 @@ void uwsgi_cache_init(struct uwsgi_cache *uc) {
 		int cache_fd;
 		struct stat cst;
 
-        if (uc->store_delete && !stat(uc->store, &cst) && ((size_t) cst.st_size != uc->filesize || !S_ISREG(cst.st_mode))) {
-            uwsgi_log("Removing invalid cache store file: %s\n", uc->store);
-            if (unlink(uc->store) != 0) {
-                uwsgi_log("Cannot remove invalid cache store file: %s\n", uc->store);
-                exit(1);
-            }
-        }
-
 		if (stat(uc->store, &cst)) {
 			uwsgi_log("creating a new cache store file: %s\n", uc->store);
 			cache_fd = open(uc->store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
@@ -443,7 +361,7 @@ void uwsgi_cache_init(struct uwsgi_cache *uc) {
 			uc->name,
 			(unsigned long long) uc->filesize / (1024 * 1024),
 			(unsigned long long) sizeof(struct uwsgi_cache_item)+uc->keysize,
-			(unsigned long long) ((sizeof(struct uwsgi_cache_item)+uc->keysize) * uc->max_items), (unsigned long long) (uc->blocksize * uc->blocks),
+			(unsigned long long) ((sizeof(struct uwsgi_cache_item)+uc->keysize) * uc->max_items), (unsigned long long) (uc->blocksize * uc->max_items),
 			(unsigned long long) uc->blocks_bitmap_size);
 
 	uwsgi_cache_setup_nodes(uc);
@@ -463,17 +381,6 @@ void uwsgi_cache_init(struct uwsgi_cache *uc) {
 
 }
 
-static uint64_t check_lazy(struct uwsgi_cache *uc, struct uwsgi_cache_item *uci, uint64_t slot) {
-	if (!uci->expires || !uc->lazy_expire) return slot;
-	uint64_t now = (uint64_t) uwsgi_now();
-	// expired ?
-	if (uci->expires <= now) {
-		uwsgi_cache_del2(uc, NULL, 0, slot, UWSGI_CACHE_FLAG_LOCAL);
-		return 0;
-	}
-	return slot;
-}
-
 static uint64_t uwsgi_cache_get_index(struct uwsgi_cache *uc, char *key, uint16_t keylen) {
 
 	uint32_t hash = uc->hash->func(key, keylen);
@@ -499,7 +406,7 @@ static uint64_t uwsgi_cache_get_index(struct uwsgi_cache *uc, char *key, uint16_
 	if (memcmp(uci->key, key, keylen))
 		goto cycle;
 
-	return check_lazy(uc, uci, slot);
+	return slot;
 
 cycle:
 	while (uci->next) {
@@ -522,9 +429,8 @@ cycle:
 			continue;
 		if (uci->keysize != keylen)
 			continue;
-		if (!memcmp(uci->key, key, keylen)) {
-			return check_lazy(uc, uci, slot);
-		}
+		if (!memcmp(uci->key, key, keylen))
+			return slot;
 	}
 
 	return 0;
@@ -535,38 +441,6 @@ uint32_t uwsgi_cache_exists2(struct uwsgi_cache *uc, char *key, uint16_t keylen)
 	return uwsgi_cache_get_index(uc, key, keylen);
 }
 
-static void lru_remove_item(struct uwsgi_cache *uc, uint64_t index)
-{
-	struct uwsgi_cache_item *prev, *next, *curr = cache_item(index);
-
-	if (curr->lru_next) {
-		next = cache_item(curr->lru_next);
-		next->lru_prev = curr->lru_prev;
-	} else
-		uc->lru_tail = curr->lru_prev;
-
-	if (curr->lru_prev) {
-		prev = cache_item(curr->lru_prev);
-		prev->lru_next = curr->lru_next;
-	} else
-		uc->lru_head = curr->lru_next;
-}
-
-static void lru_add_item(struct uwsgi_cache *uc, uint64_t index)
-{
-	struct uwsgi_cache_item *prev, *curr = cache_item(index);
-
-	if (uc->lru_tail) {
-		prev = cache_item(uc->lru_tail);
-		prev->lru_next = index;
-	} else
-		uc->lru_head = index;
-
-	curr->lru_next = 0;
-	curr->lru_prev = uc->lru_tail;
-	uc->lru_tail = index;
-}
-
 char *uwsgi_cache_get2(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint64_t * valsize) {
 
 	uint64_t index = uwsgi_cache_get_index(uc, key, keylen);
@@ -576,10 +450,6 @@ char *uwsgi_cache_get2(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint6
 		if (uci->flags & UWSGI_CACHE_FLAG_UNGETTABLE)
 			return NULL;
 		*valsize = uci->valsize;
-		if (uc->purge_lru) {
-			lru_remove_item(uc, index);
-			lru_add_item(uc, index);
-		}
 		uci->hits++;
 		uc->hits++;
 		return uc->data + (uci->first_block * uc->blocksize);
@@ -619,10 +489,6 @@ char *uwsgi_cache_get3(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint6
                 *valsize = uci->valsize;
 		if (expires)
 			*expires = uci->expires;
-		if (uc->purge_lru) {
-			lru_remove_item(uc, index);
-			lru_add_item(uc, index);
-		}
                 uci->hits++;
                 uc->hits++;
                 return uc->data + (uci->first_block * uc->blocksize);
@@ -657,56 +523,50 @@ char *uwsgi_cache_get4(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint6
 
 int uwsgi_cache_del2(struct uwsgi_cache *uc, char *key, uint16_t keylen, uint64_t index, uint16_t flags) {
 
-
 	struct uwsgi_cache_item *uci;
 	int ret = -1;
 
-	if (!index) index = uwsgi_cache_get_index(uc, key, keylen);
+	if (!index)
+		index = uwsgi_cache_get_index(uc, key, keylen);
 
 	if (index) {
 		uci = cache_item(index);
-		if (uci->keysize > 0) {
-			// unmark blocks
-			if (uc->blocks_bitmap) cache_unmark_blocks(uc, uci->first_block, uci->valsize);
-			// put back the block in unused stack
-			uc->unused_blocks_stack_ptr++;
-			uc->unused_blocks_stack[uc->unused_blocks_stack_ptr] = index;
-
-			// unlink prev and next (if any)
-			if (uci->prev) {
-                        	struct uwsgi_cache_item *ucii = cache_item(uci->prev);
-                        	ucii->next = uci->next;
-                	}
-                	else {
-                        	// set next as the new entry point (could be 0)
-                        	uc->hashtable[uci->hash % uc->hashsize] = uci->next;
-                	}
-
-                	if (uci->next) {
-                        	struct uwsgi_cache_item *ucii = cache_item(uci->next);
-                        	ucii->prev = uci->prev;
-                	}
-
-                	if (!uci->prev && !uci->next) {
-                        	// reset hashtable entry
-                        	uc->hashtable[uci->hash % uc->hashsize] = 0;
-                	}
-
-			if (uc->purge_lru)
-				lru_remove_item(uc, index);
-
-			uc->n_items--;
-		}
-
-		ret = 0;
-
 		uci->keysize = 0;
 		uci->valsize = 0;
+		uc->unused_blocks_stack_ptr++;
+		uc->unused_blocks_stack[uc->unused_blocks_stack_ptr] = index;
+		// unmark blocks
+		if (uc->blocks_bitmap) {
+			cache_unmark_blocks(uc, uci->first_block, uci->valsize);
+		}
+		ret = 0;
+		// relink collisioned entry
+		if (uci->prev) {
+			struct uwsgi_cache_item *ucii = cache_item(uci->prev);
+			ucii->next = uci->next;
+		}
+		else {
+			// set next as the new entry point (could be 0)
+			uc->hashtable[uci->hash % uc->hashsize] = uci->next;
+		}
+
+		if (uci->next) {
+			struct uwsgi_cache_item *ucii = cache_item(uci->next);
+			ucii->prev = uci->prev;
+		}
+
+		if (!uci->prev && !uci->next) {
+			// reset hashtable entry
+			//uwsgi_log("!!! resetted hashtable entry !!!\n");
+			uc->hashtable[uci->hash % uc->hashsize] = 0;
+		}
 		uci->hash = 0;
 		uci->prev = 0;
 		uci->next = 0;
 		uci->expires = 0;
 
+		uc->n_items--;
+
 		if (uc->use_last_modified) {
 			uc->last_modified_at = uwsgi_now();
 		}
@@ -724,10 +584,7 @@ void uwsgi_cache_fix(struct uwsgi_cache *uc) {
 	uint64_t i;
 	unsigned long long restored = 0;
 
-	// reset unused blocks
-	uc->unused_blocks_stack_ptr = 0;
-
-	for (i = 1; i < uc->max_items; i++) {
+	for (i = 0; i < uc->max_items; i++) {
 		// valid record ?
 		struct uwsgi_cache_item *uci = cache_item(i);
 		if (uci->keysize) {
@@ -739,6 +596,7 @@ void uwsgi_cache_fix(struct uwsgi_cache *uc) {
 		}
 		else {
 			// put this record in unused stack
+			uc->first_available_block = i;
 			uc->unused_blocks_stack_ptr++;
 			uc->unused_blocks_stack[uc->unused_blocks_stack_ptr] = i;
 		}
@@ -755,6 +613,7 @@ int uwsgi_cache_set2(struct uwsgi_cache *uc, char *key, uint16_t keylen, char *v
 	struct uwsgi_cache_item *uci, *ucii;
 
 	// used to reset key allocation in bitmap mode
+	uint8_t rollback_mode = 0;
 
 	int ret = -1;
 	time_t now = 0;
@@ -772,14 +631,24 @@ int uwsgi_cache_set2(struct uwsgi_cache *uc, char *key, uint16_t keylen, char *v
 	//uwsgi_log("putting cache data in key %.*s %d\n", keylen, key, vallen);
 	index = uwsgi_cache_get_index(uc, key, keylen);
 	if (!index) {
-		if (!uc->unused_blocks_stack_ptr) {
-			cache_full(uc);
-			if (!uc->unused_blocks_stack_ptr)
-				goto end;
+		if (uc->first_available_block >= uc->max_items && !uc->unused_blocks_stack_ptr) {
+			uwsgi_log("*** DANGER cache \"%s\" is FULL !!! ***\n", uc->name);
+			uc->full++;
+			goto end;
+		}
+		if (uc->unused_blocks_stack_ptr) {
+			//uwsgi_log("!!! REUSING CACHE SLOT !!! (faci: %llu)\n", (unsigned long long) uwsgi.shared->cache_first_available_block);
+			index = uc->unused_blocks_stack[uc->unused_blocks_stack_ptr];
+			uc->unused_blocks_stack_ptr--;
+		}
+		else {
+			rollback_mode = 1;
+			index = uc->first_available_block;
+			if (uc->first_available_block < uc->max_items) {
+				rollback_mode = 2;
+				uc->first_available_block++;
+			}
 		}
-
-		index = uc->unused_blocks_stack[uc->unused_blocks_stack_ptr];
-		uc->unused_blocks_stack_ptr--;
 
 		uci = cache_item(index);
 		if (!uc->blocks_bitmap) {
@@ -787,28 +656,31 @@ int uwsgi_cache_set2(struct uwsgi_cache *uc, char *key, uint16_t keylen, char *v
 		}
 		else {
 			uci->first_block = uwsgi_cache_find_free_blocks(uc, vallen);
+			//uwsgi_log("first block = %llu\n", uci->first_block);
 			if (uci->first_block == 0xffffffffffffffffLLU) {
-				uc->unused_blocks_stack_ptr++;
-				cache_full(uc);
+				uwsgi_log("*** DANGER cache \"%s\" is FULL !!! ***\n", uc->name);
+                                uc->full++;
+				if (rollback_mode == 0) {
+					uc->unused_blocks_stack_ptr++;
+				}
+				else if (rollback_mode == 2) {
+					uc->first_available_block--;
+				}
                                 goto end;
 			}
 			// mark used blocks;
 			uint64_t needed_blocks = cache_mark_blocks(uc, uci->first_block, vallen);
 			// optimize the scan
-			if (uci->first_block + needed_blocks >= uc->blocks) {
+			if (uc->blocks_bitmap_pos + (needed_blocks+1) > uc->blocks) {
                         	uc->blocks_bitmap_pos = 0;
                         }
                         else {
-                        	uc->blocks_bitmap_pos = uci->first_block + needed_blocks;
+                        	uc->blocks_bitmap_pos = uci->first_block + needed_blocks + 1;
                         }
 		}
-		if (uc->purge_lru)
-			lru_add_item(uc, index);
-		else if (expires && !(flags & UWSGI_CACHE_FLAG_ABSEXPIRE)) {
+		if (expires && !(flags & UWSGI_CACHE_FLAG_ABSEXPIRE)) {
 			now = uwsgi_now();
 			expires += now;
-			if (!uc->next_scan || uc->next_scan > expires)
-				uc->next_scan = expires;
 		}
 		uci->expires = expires;
 		uci->hash = uc->hash->func(key, keylen);
@@ -873,16 +745,9 @@ int uwsgi_cache_set2(struct uwsgi_cache *uc, char *key, uint16_t keylen, char *v
 	}
 	else if (flags & UWSGI_CACHE_FLAG_UPDATE) {
 		uci = cache_item(index);
-		if (!(flags & UWSGI_CACHE_FLAG_FIXEXPIRE)) {
-			if (uc->purge_lru) {
-				lru_remove_item(uc, index);
-				lru_add_item(uc, index);
-			} else if (expires && !(flags & UWSGI_CACHE_FLAG_ABSEXPIRE)) {
-				now = uwsgi_now();
-				expires += now;
-				if (!uc->next_scan || uc->next_scan > expires)
-					uc->next_scan = expires;
-			}
+		if (expires && !(flags & UWSGI_CACHE_FLAG_ABSEXPIRE) && !(flags & UWSGI_CACHE_FLAG_FIXEXPIRE)) {
+			now = uwsgi_now();
+			expires += now;
 			uci->expires = expires;
 		}
 		if (uc->blocks_bitmap) {
@@ -890,21 +755,22 @@ int uwsgi_cache_set2(struct uwsgi_cache *uc, char *key, uint16_t keylen, char *v
 			uint64_t old_first_block = uci->first_block;
 			uci->first_block = uwsgi_cache_find_free_blocks(uc, vallen);
                         if (uci->first_block == 0xffffffffffffffffLLU) {
+                                uwsgi_log("*** DANGER cache \"%s\" is FULL !!! ***\n", uc->name);
+                                uc->full++;
 				uci->first_block = old_first_block;
-				cache_full(uc);
                                 goto end;
                         }
                         // mark used blocks;
                         uint64_t needed_blocks = cache_mark_blocks(uc, uci->first_block, vallen);
-                        // optimize the scan
-                        if (uci->first_block + needed_blocks >= uc->blocks) {
+                        // optimize teh scan
+                        if (uc->blocks_bitmap_pos + (needed_blocks+1) > uc->blocks) {
                                 uc->blocks_bitmap_pos = 0;
                         }
                         else {
-                                uc->blocks_bitmap_pos = uci->first_block + needed_blocks;
+                                uc->blocks_bitmap_pos = uci->first_block + needed_blocks + 1;
                         }
 			// unmark the old blocks
-			cache_unmark_blocks(uc, old_first_block, uci->valsize);
+			cache_unmark_blocks(uc, uci->first_block, uci->valsize);
 		}
 		if ( !(flags & UWSGI_CACHE_FLAG_MATH)) {
 			memcpy(((char *) uc->data) + (uci->first_block * uc->blocksize), val, vallen);
@@ -1099,66 +965,39 @@ void *cache_udp_server_loop(void *ucache) {
         return NULL;
 }
 
-static uint64_t cache_sweeper_free_items(struct uwsgi_cache *uc) {
-	uint64_t i;
-	uint64_t freed_items = 0;
-
-	if (uc->no_expire || uc->purge_lru || uc->lazy_expire)
-		return 0;
-
-	uwsgi_rlock(uc->lock);
-	if (!uc->next_scan || uc->next_scan > (uint64_t)uwsgi.current_time) {
-		uwsgi_rwunlock(uc->lock);
-		return 0;
-	}
-	uwsgi_rwunlock(uc->lock);
-
-	// skip the first slot
-	for (i = 1; i < uc->max_items; i++) {
-		struct uwsgi_cache_item *uci = cache_item(i);
-
-		uwsgi_wlock(uc->lock);
-		// we reset next scan time first, then we find the least
-		// expiration time from those that are NOT expired yet.
-		if (i == 1)
-			uc->next_scan = 0;
-
-		if (uci->expires) {
-			if (uci->expires <= (uint64_t)uwsgi.current_time) {
-				uwsgi_cache_del2(uc, NULL, 0, i, UWSGI_CACHE_FLAG_LOCAL);
-				freed_items++;
-			} else if (!uc->next_scan || uc->next_scan > uci->expires) {
-				uc->next_scan = uci->expires;
-			}
-		}
-		uwsgi_rwunlock(uc->lock);
-	}
-
-	return freed_items;
-}
-
 static void *cache_sweeper_loop(void *ucache) {
 
+        uint64_t i;
         // block all signals
         sigset_t smask;
         sigfillset(&smask);
         pthread_sigmask(SIG_BLOCK, &smask, NULL);
 
+	struct uwsgi_cache *uc = (struct uwsgi_cache *) ucache;
+
         if (!uwsgi.cache_expire_freq)
                 uwsgi.cache_expire_freq = 3;
 
         // remove expired cache items TODO use rb_tree timeouts
         for (;;) {
-		struct uwsgi_cache *uc;
-
-		for (uc = (struct uwsgi_cache *)ucache; uc; uc = uc->next) {
-			uint64_t freed_items = cache_sweeper_free_items(uc);
-			if (uwsgi.cache_report_freed_items && freed_items)
-				uwsgi_log("freed %llu items for cache \"%s\"\n", (unsigned long long)freed_items, uc->name);
-		}
-
 		sleep(uwsgi.cache_expire_freq);
-        }
+                uint64_t freed_items = 0;
+                // skip the first slot
+                for (i = 1; i < uc->max_items; i++) {
+                        uwsgi_wlock(uc->lock);
+			struct uwsgi_cache_item *uci = cache_item(i);
+                        if (uci->expires) {
+                                if (uci->expires < (uint64_t) uwsgi.current_time) {
+                                        uwsgi_cache_del2(uc, NULL, 0, i, UWSGI_CACHE_FLAG_LOCAL);
+                                        freed_items++;
+                                }
+                        }
+                        uwsgi_rwunlock(uc->lock);
+                }
+                if (uwsgi.cache_report_freed_items && freed_items > 0) {
+                        uwsgi_log("freed %llu items for cache \"%s\"\n", (unsigned long long) freed_items, uc->name);
+                }
+        };
 
         return NULL;
 }
@@ -1178,28 +1017,19 @@ void uwsgi_cache_sync_all() {
 
 void uwsgi_cache_start_sweepers() {
 	struct uwsgi_cache *uc = uwsgi.caches;
-
-	if (uwsgi.cache_no_expire)
-		return;
-
-	int need_to_run = 0;
 	while(uc) {
-		if (!uc->no_expire && !uc->purge_lru && !uc->lazy_expire) {
-			need_to_run = 1;
-			break;
+		pthread_t cache_sweeper;
+		if (!uwsgi.cache_no_expire && !uc->no_expire) {
+                	if (pthread_create(&cache_sweeper, NULL, cache_sweeper_loop, (void *) uc)) {
+                        	uwsgi_error("pthread_create()");
+                        	uwsgi_log("unable to run the sweeper for cache \"%s\" !!!\n", uc->name);
+			}
+                	else {
+                        	uwsgi_log("sweeper thread enabled for cache \"%s\"\n", uc->name);
+                	}
 		}
 		uc = uc->next;
         }
-
-	if (!need_to_run) return;
-
-	pthread_t cache_sweeper;
-        if (pthread_create(&cache_sweeper, NULL, cache_sweeper_loop, uwsgi.caches)) {
-        	uwsgi_error("uwsgi_cache_start_sweepers()/pthread_create()");
-                uwsgi_log("unable to run the cache sweeper!!!\n");
-		return;
-	}
-        uwsgi_log("cache sweeper thread enabled\n");
 }
 
 void uwsgi_cache_start_sync_servers() {
@@ -1267,19 +1097,12 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
 		char *c_keysize = NULL;
 		char *c_store = NULL;
 		char *c_store_sync = NULL;
-		char *c_store_delete = NULL;
 		char *c_nodes = NULL;
 		char *c_sync = NULL;
 		char *c_udp_servers = NULL;
 		char *c_bitmap = NULL;
 		char *c_use_last_modified = NULL;
 		char *c_math_initial = NULL;
-		char *c_ignore_full = NULL;
-		char *c_purge_lru = NULL;
-		char *c_lazy_expire = NULL;
-		char *c_sweep_on_full = NULL;
-		char *c_clear_on_full = NULL;
-		char *c_no_expire = NULL;
 
 		if (uwsgi_kvlist_parse(arg, strlen(arg), ',', '=',
                         "name", &c_name,
@@ -1296,8 +1119,6 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
                         "store", &c_store,
                         "store_sync", &c_store_sync,
                         "storesync", &c_store_sync,
-                        "store_delete", &c_store_delete,
-                        "storedelete", &c_store_delete,
                         "node", &c_nodes,
                         "nodes", &c_nodes,
                         "sync", &c_sync,
@@ -1309,14 +1130,6 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
                         "bitmap", &c_bitmap,
                         "lastmod", &c_use_last_modified,
                         "math_initial", &c_math_initial,
-                        "ignore_full", &c_ignore_full,
-			"purge_lru", &c_purge_lru,
-			"lru", &c_purge_lru,
-			"lazy_expire", &c_lazy_expire,
-			"lazy", &c_lazy_expire,
-			"sweep_on_full", &c_sweep_on_full,
-			"clear_on_full", &c_clear_on_full,
-			"no_expire", &c_no_expire,
                 	NULL)) {
 			uwsgi_log("unable to parse cache definition\n");
 			exit(1);
@@ -1364,19 +1177,9 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
 			uc->max_item_size = uc->blocksize * uc->blocks;
 		}
 		if (c_use_last_modified) uc->use_last_modified = 1;
-		if (c_ignore_full) uc->ignore_full = 1;
-
-		if (c_store_delete) uc->store_delete = 1;
 
 		if (c_math_initial) uc->math_initial = strtol(c_math_initial, NULL, 10);
 
-		if (c_lazy_expire) uc->lazy_expire = 1;
-		if (c_sweep_on_full) {
-			uc->sweep_on_full = uwsgi_n64(c_sweep_on_full);
-		}
-		if (c_clear_on_full) uc->clear_on_full = 1;
-		if (c_no_expire) uc->no_expire = 1;
-
 		uc->store_sync = uwsgi.cache_store_sync;
 		if (c_store_sync) { uc->store_sync = uwsgi_n64(c_store_sync); }
 
@@ -1408,8 +1211,6 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
                         }
                 }
 		
-		if (c_purge_lru)
-			uc->purge_lru = 1;
 	}
 
 	uwsgi_cache_init(uc);
@@ -1631,7 +1432,7 @@ static int cache_magic_send_and_manage(int fd, struct uwsgi_buffer *ub, char *st
 	// ok now wait for the response, using the same buffer of the request
 	// NOTE: after using a uwsgi_buffer in that way we basically destroy (even if we can safely free it)
 	size_t rlen = ub->pos;
-	if (uwsgi_read_with_realloc(fd, &ub->buf, &rlen, timeout, NULL, NULL)) return -1;
+	if (uwsgi_read_with_realloc(fd, &ub->buf, &rlen, timeout)) return -1;
 	// try to fix the buffer to maintain size info
 	ub->pos = rlen;
 
@@ -1665,10 +1466,7 @@ char *uwsgi_cache_magic_get(char *key, uint16_t keylen, uint64_t *vallen, uint64
 
 	// we have a local cache !!!
 	if (uc) {
-		if (uc->purge_lru)
-			uwsgi_wlock(uc->lock);
-		else
-			uwsgi_rlock(uc->lock);
+		uwsgi_rlock(uc->lock);
 		char *value = uwsgi_cache_get3(uc, key, keylen, vallen, expires);
 		if (!value) {
 			uwsgi_rwunlock(uc->lock);
@@ -1685,7 +1483,7 @@ char *uwsgi_cache_magic_get(char *key, uint16_t keylen, uint64_t *vallen, uint64
 		int fd = uwsgi_connect(cache_server, 0, 1);
 		if (fd < 0) return NULL;
 
-		int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
+		int ret = uwsgi.wait_write_hook(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		if (ret <= 0) {
 			close(fd);
 			return NULL;
@@ -1697,7 +1495,7 @@ char *uwsgi_cache_magic_get(char *key, uint16_t keylen, uint64_t *vallen, uint64
 			return NULL;
 		}
 
-		if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.socket_timeout, &ucmc)) {
+		if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &ucmc)) {
 			close(fd);
                         uwsgi_buffer_destroy(ub);
                         return NULL;
@@ -1728,7 +1526,7 @@ char *uwsgi_cache_magic_get(char *key, uint16_t keylen, uint64_t *vallen, uint64
 		}
 
 		// read the raw value from the socket
-		if (uwsgi_read_whole_true_nb(fd, ub->buf, ucmc.size, uwsgi.socket_timeout)) {
+		if (uwsgi_read_whole_true_nb(fd, ub->buf, ucmc.size, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 			close(fd);
 			uwsgi_buffer_destroy(ub);
 			return NULL;
@@ -1787,7 +1585,7 @@ int uwsgi_cache_magic_exists(char *key, uint16_t keylen, char *cache) {
                 int fd = uwsgi_connect(cache_server, 0, 1);
                 if (fd < 0) return 0;
 
-                int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
+                int ret = uwsgi.wait_write_hook(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 if (ret <= 0) {
                         close(fd);
 			return 0;
@@ -1799,7 +1597,7 @@ int uwsgi_cache_magic_exists(char *key, uint16_t keylen, char *cache) {
 			return 0;
                 }
 
-                if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.socket_timeout, &ucmc)) {
+                if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &ucmc)) {
                         close(fd);
                         uwsgi_buffer_destroy(ub);
 			return 0;
@@ -1854,7 +1652,7 @@ int uwsgi_cache_magic_set(char *key, uint16_t keylen, char *value, uint64_t vall
 		int fd = uwsgi_connect(cache_server, 0, 1);
                 if (fd < 0) return -1;
 
-                int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
+                int ret = uwsgi.wait_write_hook(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 if (ret <= 0) {
                         close(fd);
                         return -1;
@@ -1872,7 +1670,7 @@ int uwsgi_cache_magic_set(char *key, uint16_t keylen, char *value, uint64_t vall
                         return -1;
                 }
 
-                if (cache_magic_send_and_manage(fd, ub, value, vallen, uwsgi.socket_timeout, &ucmc)) {
+                if (cache_magic_send_and_manage(fd, ub, value, vallen, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &ucmc)) {
                         close(fd);
                         uwsgi_buffer_destroy(ub);
                         return -1;
@@ -1932,7 +1730,7 @@ int uwsgi_cache_magic_del(char *key, uint16_t keylen, char *cache) {
                 int fd = uwsgi_connect(cache_server, 0, 1);
                 if (fd < 0) return -1;
 
-                int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
+                int ret = uwsgi.wait_write_hook(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 if (ret <= 0) {
                         close(fd);
                         return -1;
@@ -1944,7 +1742,7 @@ int uwsgi_cache_magic_del(char *key, uint16_t keylen, char *cache) {
                         return -1;
                 }
 
-                if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.socket_timeout, &ucmc)) {
+                if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &ucmc)) {
                         close(fd);
                         uwsgi_buffer_destroy(ub);
                         return -1;
@@ -1990,7 +1788,7 @@ int uwsgi_cache_magic_clear(char *cache) {
         if (uc) {
 		uint64_t i;
                 uwsgi_wlock(uc->lock);
-		for (i = 1; i < uc->max_items; i++) {
+		for (i = 1; i < uwsgi.caches->max_items; i++) {
                 	if (uwsgi_cache_del2(uc, NULL, 0, i, 0)) {
                         	uwsgi_rwunlock(uc->lock);
                         	return -1;
@@ -2005,7 +1803,7 @@ int uwsgi_cache_magic_clear(char *cache) {
                 int fd = uwsgi_connect(cache_server, 0, 1);
                 if (fd < 0) return -1;
 
-                int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
+                int ret = uwsgi.wait_write_hook(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 if (ret <= 0) {
                         close(fd);
                         return -1;
@@ -2017,7 +1815,7 @@ int uwsgi_cache_magic_clear(char *cache) {
                         return -1;
                 }
 
-                if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.socket_timeout, &ucmc)) {
+                if (cache_magic_send_and_manage(fd, ub, NULL, 0, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &ucmc)) {
                         close(fd);
                         uwsgi_buffer_destroy(ub);
                         return -1;
@@ -2061,7 +1859,7 @@ void uwsgi_cache_sync_from_nodes(struct uwsgi_cache *uc) {
 			goto next;
 		}
 
-		if (uwsgi_write_nb(fd, ub->buf, ub->pos, uwsgi.socket_timeout)) {
+		if (uwsgi_write_nb(fd, ub->buf, ub->pos, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 			uwsgi_buffer_destroy(ub);
 			uwsgi_log("[cache-sync] unable to write to the cache server\n");
 			close(fd);
@@ -2069,7 +1867,7 @@ void uwsgi_cache_sync_from_nodes(struct uwsgi_cache *uc) {
 		}
 
 		size_t rlen = ub->pos;
-		if (uwsgi_read_with_realloc(fd, &ub->buf, &rlen, uwsgi.socket_timeout, NULL, NULL)) {
+		if (uwsgi_read_with_realloc(fd, &ub->buf, &rlen, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 			uwsgi_buffer_destroy(ub);
 			uwsgi_log("[cache-sync] unable to read from the cache server\n");
 			close(fd);
@@ -2078,7 +1876,7 @@ void uwsgi_cache_sync_from_nodes(struct uwsgi_cache *uc) {
 
 		uwsgi_hooked_parse(ub->buf, rlen, cache_sync_hook, uc);
 
-		if (uwsgi_read_nb(fd, (char *) uc->items, uc->filesize, uwsgi.socket_timeout)) {
+		if (uwsgi_read_nb(fd, (char *) uc->items, uc->filesize, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 			uwsgi_buffer_destroy(ub);
 			close(fd);
                         uwsgi_log("[cache-sync] unable to read from the cache server\n");

core/chunked.c

@@ -20,7 +20,7 @@ extern struct uwsgi_server uwsgi;
 static ssize_t uwsgi_chunked_input_recv(struct wsgi_request *wsgi_req, int timeout, int nb) {
 
 	if (timeout == 0) timeout = uwsgi.chunked_input_timeout;
-	if (timeout == 0) timeout = uwsgi.socket_timeout;
+	if (timeout == 0) timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
 
 	int ret = -1;
 

core/clock.c

@@ -2,11 +2,6 @@
 
 extern struct uwsgi_server uwsgi;
 
-int uwsgi_simple_wait_milliseconds_hook(int timeout) {
-        return poll(NULL, 0, timeout);
-}
-
-
 // in the future we will need to use the best clock source for each os/system
 time_t uwsgi_now() {
 	return uwsgi.clock->seconds();

core/config.c

@@ -81,22 +81,6 @@ int uwsgi_logic_opt_for_glob(char *key, char *value) {
         return 1;
 }
 
-int uwsgi_logic_opt_for_readline(char *key, char *value) {
-
-	char line[1024];
-
-        FILE *fh = fopen(uwsgi.logic_opt_data, "r");
-        if (fh) {
-                while (fgets(line, 1024, fh)) {
-			add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi_chomp(uwsgi_str(line))), 0);
-                }
-                fclose(fh);
-                return 1;
-        }
-        uwsgi_error_open(uwsgi.logic_opt_data);
-	return 0;
-}
-
 int uwsgi_logic_opt_for_times(char *key, char *value) {
 
         int num = atoi(uwsgi.logic_opt_data);
@@ -294,26 +278,6 @@ int uwsgi_logic_opt_if_not_plugin(char *key, char *value) {
         return 0;
 }
 
-int uwsgi_logic_opt_if_hostname(char *key, char *value) {
-
-        if (!strcmp(uwsgi.hostname, uwsgi.logic_opt_data)) {
-                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
-                return 1;
-        }
-
-        return 0;
-}
-
-int uwsgi_logic_opt_if_not_hostname(char *key, char *value) {
-
-        if (strcmp(uwsgi.hostname, uwsgi.logic_opt_data)) {
-                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
-                return 1;
-        }
-
-        return 0;
-}
-
 int uwsgi_count_options(struct uwsgi_option *uopt) {
 
         struct uwsgi_option *aopt;
@@ -420,8 +384,7 @@ void add_exported_option_do(char *key, char *value, int configured, int placehol
 	if (uwsgi.logic_opt_running)
 		goto add;
 
-	if (!strcmp(key, "end") || !strcmp(key, "endfor") || !strcmp(key, "endif")
-		|| !strcmp(key, "end-if") || !strcmp(key, "end-for")) {
+	if (!strcmp(key, "end") || !strcmp(key, "endfor") || !strcmp(key, "endif")) {
 		if (uwsgi.logic_opt_data) {
 			free(uwsgi.logic_opt_data);
 		}
@@ -530,10 +493,6 @@ add:
 		if (op->flags & UWSGI_OPT_MIME) {
 			uwsgi.build_mime_dict = 1;
 		}
-		// enable metrics ?
-		if (op->flags & UWSGI_OPT_METRICS) {
-                        uwsgi.has_metrics = 1;
-                }
 		// immediate ?
 		if (op->flags & UWSGI_OPT_IMMEDIATE) {
 			op->func(key, value, op->data);
@@ -670,185 +629,3 @@ clear:
 
 }
 
-char *uwsgi_get_exported_opt(char *key) {
-
-        int i;
-
-        for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
-                if (!strcmp(uwsgi.exported_opts[i]->key, key)) {
-                        return uwsgi.exported_opts[i]->value;
-                }
-        }
-
-        return NULL;
-}
-
-char *uwsgi_get_optname_by_index(int index) {
-
-        struct uwsgi_option *op = uwsgi.options;
-
-        while (op->name) {
-                if (op->shortcut == index) {
-                        return op->name;
-                }
-                op++;
-        }
-
-        return NULL;
-}
-
-/*
-
-	this works as a pipeline
-
-	processes = 2
-	cpu_cores = 8
-	foobar = %(processes cpu_cores + 2)
-
-	translate as:
-
-		step1 = proceses cpu_cores = 2 8 = 28 (string concatenation)
-
-		step1 + = step1_apply_func_plus (func token)
-
-		step1_apply_func_plus 2 = 28 + 2 = 30 (math)
-
-*/
-
-char *uwsgi_manage_placeholder(char *key) {
-	enum {
-		concat = 0,
-		sum,
-		sub,
-		mul,
-		div,
-	} state;
-
-	state = concat;
-	char *current_value = NULL;
-
-	char *space = strchr(key, ' ');
-	if (!space) {
-		return uwsgi_get_exported_opt(key);
-	}
-	// let's start the heavy metal here
-	char *tmp_value = uwsgi_str(key);
-	char *p, *ctx = NULL;
-        uwsgi_foreach_token(tmp_value, " ", p, ctx) {
-		char *value = NULL;
-		if (is_a_number(p)) {
-			value = uwsgi_str(p);
-		}
-		else if (!strcmp(p, "+")) {
-			state = sum;
-			continue;
-		}
-		else if (!strcmp(p, "-")) {
-			state = sub;
-			continue;
-		}
-		else if (!strcmp(p, "*")) {
-			state = mul;
-			continue;
-		}
-		else if (!strcmp(p, "/")) {
-			state = div;
-			continue;
-		}
-		else if (!strcmp(p, "++")) {
-			if (current_value) {
-				int64_t tmp_num = strtoll(current_value, NULL, 10);
-				free(current_value);
-				current_value = uwsgi_64bit2str(tmp_num+1);
-			}
-			state = concat;
-			continue;
-		}
-		else if (!strcmp(p, "--")) {
-			if (current_value) {
-				int64_t tmp_num = strtoll(current_value, NULL, 10);
-				free(current_value);
-				current_value = uwsgi_64bit2str(tmp_num-1);
-			}
-			state = concat;
-			continue;
-		}
-		// find the option
-		else {
-			char *ov = uwsgi_get_exported_opt(p);
-			if (!ov) ov = "";
-			value = uwsgi_str(ov);
-		}
-
-		int64_t arg1n = 0, arg2n = 0;
-		char *arg1 = "", *arg2 = "";	
-
-		switch(state) {
-			case concat:
-				if (current_value) arg1 = current_value;
-				if (value) arg2 = value;
-				char *ret = uwsgi_concat2(arg1, arg2);
-				if (current_value) free(current_value);
-				current_value = ret;	
-				break;
-			case sum:
-				if (current_value) arg1n = strtoll(current_value, NULL, 10);
-				if (value) arg2n = strtoll(value, NULL, 10);
-				if (current_value) free(current_value);
-				current_value = uwsgi_64bit2str(arg1n + arg2n);
-				break;
-			case sub:
-				if (current_value) arg1n = strtoll(current_value, NULL, 10);
-				if (value) arg2n = strtoll(value, NULL, 10);
-				if (current_value) free(current_value);
-				current_value = uwsgi_64bit2str(arg1n - arg2n);
-				break;
-			case mul:
-				if (current_value) arg1n = strtoll(current_value, NULL, 10);
-				if (value) arg2n = strtoll(value, NULL, 10);
-				if (current_value) free(current_value);
-				current_value = uwsgi_64bit2str(arg1n * arg2n);
-				break;
-			case div:
-				if (current_value) arg1n = strtoll(current_value, NULL, 10);
-				if (value) arg2n = strtoll(value, NULL, 10);
-				if (current_value) free(current_value);
-				// avoid division by zero
-				if (arg2n == 0) {
-					current_value = uwsgi_64bit2str(0);
-				}
-				else {
-					current_value = uwsgi_64bit2str(arg1n / arg2n);
-				}
-				break;
-			default:
-				break;
-		}
-
-		// over engineering
-		if (value)
-			free(value);
-
-		// reset state to concat
-		state = concat;
-	}
-	free(tmp_value);
-
-	return current_value;
-}
-
-void uwsgi_opt_resolve(char *opt, char *value, void *foo) {
-        char *equal = strchr(value, '=');
-        if (!equal) {
-                uwsgi_log("invalid resolve syntax, must be placeholder=domain\n");
-                exit(1);
-        }
-        char *ip = uwsgi_resolve_ip(equal+1);
-        if (!ip) {
-		uwsgi_log("unable to resolve name %s\n", equal+1);
-                uwsgi_error("uwsgi_resolve_ip()");
-                exit(1);
-        }
-        char *new_opt = uwsgi_concat2n(value, (equal-value)+1, ip, strlen(ip));
-        uwsgi_opt_set_placeholder(opt, new_opt, (void *) 1);
-}

core/daemons.c

@@ -6,7 +6,7 @@ extern struct uwsgi_server uwsgi;
 
 	External uwsgi daemons
 
-	There are 3 kinds of daemons (read: external applications) that can be managed
+	There are 3 kind of daemons (read: external applications) that can be managed
 	by uWSGI.
 
 	1) dumb daemons (attached with --attach-daemon)
@@ -14,12 +14,12 @@ extern struct uwsgi_server uwsgi;
 		and the process is respawned
 	2) smart daemons with daemonization
 		you specify a pidfile and a command
-		- on startup - if the pidfile does not exist or contains a non-available pid (checked with kill(pid, 0))
-		  the daemon is respawned
-		- on master check - if the pidfile does not exist or if it points to a non-existent pid
-		  the daemon is respawned
+		- on startup - if the pidfile does not exists or contains a not-available pid (checked with kill(pid, 0))
+		the daemon is respawned
+		- on master ckeck - if the pidfile does not exist or if it point to a non-existent pid
+                the daemon is respawned
 	3) smart daemons without daemonization
-		same as 2, but the daemonization and pidfile creation are managed by uWSGI
+		same as 2, but the daemonization and pidfile creation is managed by uWSGI
 
 	status:
 
@@ -55,7 +55,7 @@ void uwsgi_daemons_smart_check() {
 				if (ud->pid > 0) {
 					if (!kill(ud->pid, 0)) {
 						uwsgi_log("[uwsgi_daemons] stopping legion \"%s\" daemon: %s (pid: %d)\n", ud->legion, ud->command, ud->pid);
-						kill(-(ud->pid), ud->stop_signal);
+						kill(-ud->pid, SIGTERM);
 					}
 					else {
 						// pid already died
@@ -232,22 +232,17 @@ void uwsgi_detach_daemons() {
 		if (ud->pid > 0 && !ud->pidfile) {
 #endif
 			uwsgi_log("[uwsgi-daemons] stopping daemon (pid: %d): %s\n", (int) ud->pid, ud->command);
-			// try to stop daemon gracefully, kill it if it won't die
-			// if mercy is not set then wait up to 3 seconds
+			// 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)) {
-				if (uwsgi_instance_is_reloading && ud->reload_signal > 0) {
-					kill(-(ud->pid), ud->reload_signal);
-				}
-				else {
-					kill(-(ud->pid), ud->stop_signal);
-				}
+				kill(-ud->pid, SIGTERM);
 				sleep(1);
-				waitpid(ud->pid, &waitpid_status, WNOHANG);
+				waitpid(-ud->pid, &waitpid_status, WNOHANG);
 				if (uwsgi_now() >= timeout) {
-					uwsgi_log("[uwsgi-daemons] daemon did not die in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command);
-					kill(-(ud->pid), SIGKILL);
+					uwsgi_log("[uwsgi-daemons] daemon did not died in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command);
+					kill(-ud->pid, SIGKILL);
 					break;
 				}
 			}
@@ -258,19 +253,16 @@ void uwsgi_detach_daemons() {
 	}
 }
 
-static int daemon_spawn(void *);
 
 void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 
 	// skip unregistered daemons
 	if (!ud->registered) return;
 
-	ud->throttle = 0;
+	int throttle = 0;
 
 	if (uwsgi.current_time - ud->last_spawn <= 3) {
-		ud->throttle = ud->respawns - (uwsgi.current_time - ud->last_spawn);
-		// if ud->respawns == 0 then we can end up with throttle < 0
-		if (ud->throttle <= 0) ud->throttle = 1;
+		throttle = ud->respawns - (uwsgi.current_time - ud->last_spawn);
 	}
 
 	pid_t pid = uwsgi_fork("uWSGI external daemon");
@@ -297,74 +289,9 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 		uwsgi_close_all_sockets();
 		uwsgi_close_all_fds();
 
-		if (ud->chdir) {
-			if (chdir(ud->chdir)) {
-				uwsgi_error("uwsgi_spawn_daemon()/chdir()");
-				exit(1);
-			}
-		}
-
-#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL) && defined(CLONE_NEWPID)
-		if (ud->ns_pid) {
-			// we need to create a new session
-			if (setsid() < 0) {
-				uwsgi_error("uwsgi_spawn_daemon()/setsid()");
-				exit(1);
-			}
-			// avoid the need to set stop_signal in attach-daemon2
-			signal(SIGTERM, end_me);
-
-			char stack[PTHREAD_STACK_MIN];
-                	pid_t pid = clone((int (*)(void *))daemon_spawn, stack + PTHREAD_STACK_MIN, SIGCHLD | CLONE_NEWPID, (void *) ud);
-                        if (pid > 0) {
-
-#ifdef PR_SET_PDEATHSIG
-				if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0)) {
-                                	uwsgi_error("uwsgi_spawn_daemon()/prctl()");
-                        	}
-#endif
-                                // block all signals except SIGTERM
-                                sigset_t smask;
-                                sigfillset(&smask);
-				sigdelset(&smask, SIGTERM);
-                                sigprocmask(SIG_BLOCK, &smask, NULL);
-                                int status;
-                                if (waitpid(pid, &status, 0) < 0) {
-                                        uwsgi_error("uwsgi_spawn_daemon()/waitpid()");
-                                }
-                                _exit(0);
-                        }
-			uwsgi_error("uwsgi_spawn_daemon()/clone()");
-                        exit(1);
-		}
-#endif
-		daemon_spawn((void *) ud);
-
-	}
-}
-
-
-static int daemon_spawn(void *arg) {
-
-	struct uwsgi_daemon *ud = (struct uwsgi_daemon *) arg;
-
-		if (ud->gid) {
-			if (setgid(ud->gid)) {
-				uwsgi_error("uwsgi_spawn_daemon()/setgid()");
-				exit(1);
-			}
-		}
-
-		if (ud->uid) {
-			if (setuid(ud->uid)) {
-				uwsgi_error("uwsgi_spawn_daemon()/setuid()");
-				exit(1);
-			}
-		}
-
 		if (ud->daemonize) {
 			/* refork... */
-			pid_t pid = fork();
+			pid = fork();
 			if (pid < 0) {
 				uwsgi_error("fork()");
 				exit(1);
@@ -375,7 +302,7 @@ static int daemon_spawn(void *arg) {
 			uwsgi_write_pidfile(ud->pidfile);
 		}
 
-		if (!uwsgi.daemons_honour_stdin && !ud->honour_stdin) {
+		if (!uwsgi.daemons_honour_stdin) {
 			// /dev/null will became stdin
 			uwsgi_remap_fd(0, "/dev/null");
 		}
@@ -386,7 +313,7 @@ static int daemon_spawn(void *arg) {
 		}
 
 		if (!ud->pidfile) {
-#ifdef PR_SET_PDEATHSIG
+#ifdef __linux__
 			if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0)) {
 				uwsgi_error("prctl()");
 			}
@@ -394,17 +321,20 @@ static int daemon_spawn(void *arg) {
 		}
 
 
-		if (ud->throttle) {
-			uwsgi_log("[uwsgi-daemons] throttling \"%s\" for %d seconds\n", ud->command, ud->throttle);
-			sleep((unsigned int) ud->throttle);
+		if (throttle) {
+			uwsgi_log("[uwsgi-daemons] throttling \"%s\" for %d seconds\n", ud->command, throttle);
+			sleep(throttle);
 		}
 
-		uwsgi_log("[uwsgi-daemons] %sspawning \"%s\" (uid: %d gid: %d)\n", ud->respawns > 0 ? "re" : "", ud->command, (int) getuid(), (int) getgid());
+		uwsgi_log("[uwsgi-daemons] %sspawning \"%s\"\n", ud->respawns > 0 ? "re" : "", ud->command);
 		uwsgi_exec_command_with_args(ud->command);
 		uwsgi_log("[uwsgi-daemons] unable to spawn \"%s\"\n", ud->command);
 
 		// never here;
 		exit(1);
+	}
+
+	return;
 }
 
 
@@ -415,8 +345,6 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	int daemonize = 0;
 	int freq = 10;
 	char *space = NULL;
-	int stop_signal = SIGTERM;
-	int reload_signal = 0;
 
 	char *command = uwsgi_str(value);
 
@@ -455,7 +383,7 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	}
 
 	if (!uwsgi_ud) {
-		uwsgi.daemons = uwsgi_calloc(sizeof(struct uwsgi_daemon));
+		uwsgi.daemons = uwsgi_malloc(sizeof(struct uwsgi_daemon));
 		uwsgi_ud = uwsgi.daemons;
 	}
 	else {
@@ -464,7 +392,7 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 			uwsgi_ud = uwsgi_ud->next;
 		}
 
-		uwsgi_ud = uwsgi_calloc(sizeof(struct uwsgi_daemon));
+		uwsgi_ud = uwsgi_malloc(sizeof(struct uwsgi_daemon));
 		old_ud->next = uwsgi_ud;
 	}
 
@@ -479,8 +407,6 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	uwsgi_ud->daemonize = daemonize;
 	uwsgi_ud->pidfile = pidfile;
 	uwsgi_ud->control = 0;
-	uwsgi_ud->stop_signal = stop_signal;
-	uwsgi_ud->reload_signal = reload_signal;
 	if (!strcmp(opt, "attach-control-daemon")) {
 		uwsgi_ud->control = 1;
 	}
@@ -491,108 +417,3 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	uwsgi.daemons_cnt++;
 
 }
-
-void uwsgi_opt_add_daemon2(char *opt, char *value, void *none) {
-
-        struct uwsgi_daemon *uwsgi_ud = uwsgi.daemons, *old_ud;
-
-	char *d_command = NULL;
-	char *d_freq = NULL;
-	char *d_pidfile = NULL;
-	char *d_control = NULL;
-	char *d_legion = NULL;
-	char *d_daemonize = NULL;
-	char *d_touch = NULL;
-	char *d_stopsignal = NULL;
-	char *d_reloadsignal = NULL;
-	char *d_stdin = NULL;
-	char *d_uid = NULL;
-	char *d_gid = NULL;
-	char *d_ns_pid = NULL;
-	char *d_chdir = NULL;
-
-	char *arg = uwsgi_str(value);
-
-	if (uwsgi_kvlist_parse(arg, strlen(arg), ',', '=',
-		"command", &d_command,	
-		"cmd", &d_command,	
-		"exec", &d_command,	
-		"freq", &d_freq,	
-		"pidfile", &d_pidfile,	
-		"control", &d_control,	
-		"daemonize", &d_daemonize,	
-		"daemon", &d_daemonize,	
-		"touch", &d_touch,	
-		"stopsignal", &d_stopsignal,	
-		"stop_signal", &d_stopsignal,	
-		"reloadsignal", &d_reloadsignal,	
-		"reload_signal", &d_reloadsignal,	
-		"stdin", &d_stdin,	
-		"uid", &d_uid,	
-		"gid", &d_gid,	
-		"ns_pid", &d_ns_pid,	
-		"chdir", &d_chdir,	
-	NULL)) {
-		uwsgi_log("invalid --%s keyval syntax\n", opt);
-		exit(1);
-	}
-
-	if (!d_command) {
-		uwsgi_log("--%s: you need to specify a 'command' key\n", opt);
-		exit(1);
-	}
-
-#ifndef UWSGI_SSL
-	if (d_legion) {
-		uwsgi_log("legion subsystem is not supported on this uWSGI version, rebuild with ssl support\n");
-		exit(1);
-	}
-#endif
-
-
-
-        if (!uwsgi_ud) {
-                uwsgi.daemons = uwsgi_calloc(sizeof(struct uwsgi_daemon));
-                uwsgi_ud = uwsgi.daemons;
-        }
-        else {
-                while (uwsgi_ud) {
-                        old_ud = uwsgi_ud;
-                        uwsgi_ud = uwsgi_ud->next;
-                }
-
-                uwsgi_ud = uwsgi_calloc(sizeof(struct uwsgi_daemon));
-                old_ud->next = uwsgi_ud;
-        }
-        uwsgi_ud->command = d_command;
-        uwsgi_ud->freq = d_freq ? atoi(d_freq) : 10;
-        uwsgi_ud->daemonize = d_daemonize ? 1 : 0;
-        uwsgi_ud->pidfile = d_pidfile;
-        uwsgi_ud->stop_signal = d_stopsignal ? atoi(d_stopsignal) : SIGTERM;
-        uwsgi_ud->reload_signal = d_reloadsignal ? atoi(d_reloadsignal) : 0;
-        uwsgi_ud->control = d_control ? 1 : 0;
-	uwsgi_ud->uid = d_uid ? atoi(d_uid) : 0;
-	uwsgi_ud->gid = d_gid ? atoi(d_gid) : 0;
-	uwsgi_ud->honour_stdin = d_stdin ? 1 : 0;
-#ifdef UWSGI_SSL
-        uwsgi_ud->legion = d_legion;
-#endif
-        uwsgi_ud->ns_pid = d_ns_pid ? 1 : 0;
-
-	uwsgi_ud->chdir = d_chdir;
-
-	if (d_touch) {
-		size_t i,rlen = 0;
-		char **argv = uwsgi_split_quoted(d_touch, strlen(d_touch), ";", &rlen);
-		for(i=0;i<rlen;i++) {	
-			uwsgi_string_new_list(&uwsgi_ud->touch, argv[i]);
-		}
-		if (argv) free(argv);
-	}
-
-        uwsgi.daemons_cnt++;
-
-	free(arg);
-
-}
-

core/errors.c

@@ -1,30 +1,9 @@
 #include <uwsgi.h>
 
-extern struct uwsgi_server uwsgi;
-
-static int error_page(struct wsgi_request *wsgi_req, struct uwsgi_string_list *l) {
-	struct uwsgi_string_list *usl = NULL;
-	uwsgi_foreach(usl, l) {
-		struct stat st;
-		if (!stat(usl->value, &st)) {
-			int fd = open(usl->value, O_RDONLY);
-			if (fd >= 0) {
-				if (uwsgi_response_add_header(wsgi_req, "Content-Type", 12, "text/html", 9)) { close(fd); return 0;}
-				if (uwsgi_response_add_content_length(wsgi_req, st.st_size)) { close(fd); return 0;}
-				uwsgi_response_sendfile_do(wsgi_req, fd, 0, st.st_size);			
-				return -1;
-			}
-		}
-	}
-	return 0;
-}
-
 // generate internal server error message
 void uwsgi_500(struct wsgi_request *wsgi_req) {
 	if (uwsgi_response_prepare_headers(wsgi_req, "500 Internal Server Error", 25)) return;
 	if (uwsgi_response_add_connection_close(wsgi_req)) return;
-	if (error_page(wsgi_req, uwsgi.error_page_500)) return;
-	if (uwsgi_response_add_header(wsgi_req, "Content-Type", 12, "text/plain", 10)) return;
 	uwsgi_response_write_body_do(wsgi_req, "Internal Server Error", 21);
 }
 
@@ -32,7 +11,6 @@ void uwsgi_500(struct wsgi_request *wsgi_req) {
 void uwsgi_404(struct wsgi_request *wsgi_req) {
 	if (uwsgi_response_prepare_headers(wsgi_req, "404 Not Found", 13)) return;
 	if (uwsgi_response_add_connection_close(wsgi_req)) return;
-	if (error_page(wsgi_req, uwsgi.error_page_404)) return;
 	if (uwsgi_response_add_header(wsgi_req, "Content-Type", 12, "text/plain", 10)) return;
 	uwsgi_response_write_body_do(wsgi_req, "Not Found", 9);
 }
@@ -40,19 +18,10 @@ void uwsgi_404(struct wsgi_request *wsgi_req) {
 void uwsgi_403(struct wsgi_request *wsgi_req) {
 	if (uwsgi_response_prepare_headers(wsgi_req, "403 Forbidden", 13)) return;
 	if (uwsgi_response_add_connection_close(wsgi_req)) return;
-	if (error_page(wsgi_req, uwsgi.error_page_403)) return;
 	if (uwsgi_response_add_content_type(wsgi_req, "text/plain", 10)) return;
 	uwsgi_response_write_body_do(wsgi_req, "Forbidden", 9);
 }
 
-void uwsgi_405(struct wsgi_request *wsgi_req) {
-        if (uwsgi_response_prepare_headers(wsgi_req, "405 Method Not Allowed", 22)) return;
-        if (uwsgi_response_add_connection_close(wsgi_req)) return;
-        if (error_page(wsgi_req, uwsgi.error_page_403)) return;
-        if (uwsgi_response_add_content_type(wsgi_req, "text/plain", 10)) return;
-        uwsgi_response_write_body_do(wsgi_req, "Method Not Allowed", 18);
-}
-
 void uwsgi_redirect_to_slash(struct wsgi_request *wsgi_req) {
 
 	char *redirect = NULL;

core/event.c

@@ -414,11 +414,11 @@ int event_queue_wait_multi(int eq, int timeout, void *events, int nevents) {
 	}
 
 	if (ret < 0) {
-		if (errno == ETIME) return 0;
-                if (errno != EINTR) {
-                        uwsgi_error("port_getn()");
-                }
-                return -1;
+		if (errno != ETIME) {
+			uwsgi_error("port_getn()");
+			return -1;
+		}
+		return 0;
 	}
 
 	uint_t i;
@@ -452,7 +452,6 @@ int event_queue_wait(int eq, int timeout, int *interesting_fd) {
 	else {
 		ret = port_get(eq, &pe, NULL);
 	}
-
 	if (ret < 0) {
 		if (errno == ETIME) return 0;
 		if (errno != EINTR) {
@@ -948,7 +947,7 @@ int event_queue_wait(int eq, int timeout, int *interesting_fd) {
 	struct timespec ts;
 	struct kevent ev;
 
-	if (timeout < 0) {
+	if (timeout <= 0) {
 		ret = kevent(eq, NULL, 0, &ev, 1, NULL);
 	}
 	else {
@@ -1232,8 +1231,6 @@ static int timerfd_create(clockid_t __clock_id, int __flags) {
 	return syscall(283, __clock_id, __flags);
 #elif defined(__i386__)
 	return syscall(322, __clock_id, __flags);
-#elif defined(__arm__)
-	return syscall(350, __clock_id, __flags);
 #else
 	return -1;
 #endif
@@ -1244,10 +1241,6 @@ static int timerfd_settime(int __ufd, int __flags, __const struct itimerspec *__
 	return syscall(286, __ufd, __flags, __utmr, __otmr);
 #elif defined(__i386__)
 	return syscall(325, __ufd, __flags, __utmr, __otmr);
-#elif defined(__arm__)
-	return syscall(353, __ufd, __flags, __utmr, __otmr);
-#else
-	return -1;
 #endif
 }
 #endif

core/fifo.c

@@ -24,37 +24,16 @@ static char *uwsgi_fifo_by_slot() {
 	return uwsgi.master_fifo->value;
 }
 
-#define announce_fifo uwsgi_log_verbose("active master fifo is now %s\n", uwsgi_fifo_by_slot())
-
-static void uwsgi_fifo_set_slot_zero() { uwsgi.master_fifo_slot = 0; announce_fifo; }
-static void uwsgi_fifo_set_slot_one() { uwsgi.master_fifo_slot = 1; announce_fifo; }
-static void uwsgi_fifo_set_slot_two() { uwsgi.master_fifo_slot = 2; announce_fifo; }
-static void uwsgi_fifo_set_slot_three() { uwsgi.master_fifo_slot = 3; announce_fifo; }
-static void uwsgi_fifo_set_slot_four() { uwsgi.master_fifo_slot = 4; announce_fifo; }
-static void uwsgi_fifo_set_slot_five() { uwsgi.master_fifo_slot = 5; announce_fifo; }
-static void uwsgi_fifo_set_slot_six() { uwsgi.master_fifo_slot = 6; announce_fifo; }
-static void uwsgi_fifo_set_slot_seven() { uwsgi.master_fifo_slot = 7; announce_fifo; }
-static void uwsgi_fifo_set_slot_eight() { uwsgi.master_fifo_slot = 8; announce_fifo; }
-static void uwsgi_fifo_set_slot_nine() { uwsgi.master_fifo_slot = 9; announce_fifo; }
-
-static void subscriptions_blocker() {
-	if (uwsgi.subscriptions_blocked) {
-		uwsgi_log_verbose("subscriptions re-enabled\n");
-		uwsgi.subscriptions_blocked = 0;
-	}
-	else {
-		uwsgi.subscriptions_blocked = 1;
-		uwsgi_log_verbose("subscriptions blocked\n");
-	}
-}
-
-static void emperor_rescan() {
-	if (uwsgi.emperor_pid > 0) {
-		if (kill(uwsgi.emperor_pid, SIGWINCH)) {
-			uwsgi_error("emperor_rescan()/kill()");
-		}
-	}
-}
+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; }
 
 /*
 
@@ -80,10 +59,8 @@ void uwsgi_master_fifo_prepare() {
 
 	uwsgi_fifo_table['-'] = uwsgi_cheaper_decrease;
 	uwsgi_fifo_table['+'] = uwsgi_cheaper_increase;
-	uwsgi_fifo_table['B'] = vassal_sos; 
 	uwsgi_fifo_table['c'] = uwsgi_chain_reload;
 	uwsgi_fifo_table['C'] = uwsgi_go_cheap;
-	uwsgi_fifo_table['E'] = emperor_rescan;
 	uwsgi_fifo_table['f'] = uwsgi_refork_master;
 	uwsgi_fifo_table['l'] = uwsgi_log_reopen;
 	uwsgi_fifo_table['L'] = uwsgi_log_rotate;
@@ -94,7 +71,6 @@ void uwsgi_master_fifo_prepare() {
 	uwsgi_fifo_table['r'] = grace_them_all;
 	uwsgi_fifo_table['R'] = reap_them_all;
 	uwsgi_fifo_table['s'] = stats;
-	uwsgi_fifo_table['S'] = subscriptions_blocker;
 	uwsgi_fifo_table['w'] = uwsgi_reload_workers;
 	uwsgi_fifo_table['W'] = uwsgi_brutally_reload_workers;
 
@@ -123,7 +99,7 @@ int uwsgi_master_fifo() {
 }
 
 int uwsgi_master_fifo_manage(int fd) {
-	unsigned char cmd;
+	char cmd;
 	ssize_t rlen = read(fd, &cmd, 1);
 	if (rlen < 0) {
 		if (uwsgi_is_again()) return 0;
@@ -132,7 +108,6 @@ int uwsgi_master_fifo_manage(int fd) {
 	}
 	// fifo destroyed, recreate it
 	else if (rlen == 0) {
-		event_queue_del_fd(uwsgi.master_queue, uwsgi.master_fifo_fd, event_queue_read());
 		close(fd);
 		uwsgi.master_fifo_fd = uwsgi_master_fifo();
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.master_fifo_fd);

core/fsmon.c

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

core/gateway.c

@@ -29,8 +29,6 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop) (int, void *), v
 	ug->num = num;
 	ug->fullname = fullname;
 	ug->data = data;
-	ug->uid = 0;
-	ug->gid = 0;
 
 #if defined(SOCK_SEQPACKET) && defined(__linux__)
 	if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, ug->internal_subscription_pipe)) {
@@ -92,24 +90,6 @@ void gateway_respawn(int id) {
 		signal(SIGSTOP, SIG_IGN);
 		signal(SIGTSTP, SIG_IGN);
 
-		uwsgi_hooks_run(uwsgi.hook_as_gateway, "as-gateway", 1);
-
-		if (ug->gid) {
-			uwsgi_log("%s %d setgid() to %d\n", ug->name, ug->num, (int) ug->gid);
-			if (setgid(ug->gid)) {
-				uwsgi_error("gateway_respawn()/setgid()");
-				exit(1);
-			}
-		}
-
-		if (ug->uid) {
-			uwsgi_log("%s %d setuid() to %d\n", ug->name, ug->num, (int) ug->uid);
-			if (setuid(ug->uid)) {
-				uwsgi_error("gateway_respawn()/setuid()");
-				exit(1);
-			}
-		}
-
 		ug->loop(id, ug->data);
 		// never here !!! (i hope)
 		exit(1);

core/hash.c

@@ -17,7 +17,7 @@ uint32_t djb33x_hash(char *key, uint64_t keylen) {
 
 // Murmur2 hash Copyright (C) Austin Appleby
 // adapted from nginx
-static uint32_t murmur2_hash(char *key, uint64_t keylen) {
+uint32_t murmur2_hash(char *key, uint64_t keylen) {
 
 	uint32_t  h, k;
 	uint8_t *ukey = (uint8_t *) key;
@@ -56,23 +56,6 @@ static uint32_t murmur2_hash(char *key, uint64_t keylen) {
 	return h;
 }
 
-static uint32_t random_hash(char *key, uint64_t keylen) {
-	return (uint32_t) rand();
-}
-
-/*
-	not atomic, avoid its use in multithreaded modes
-*/
-static uint32_t rr_hash(char *key, uint64_t keylen) {
-	static uint32_t rr = 0;
-	uint32_t max_value = uwsgi_str_num(key, keylen);
-	uint32_t ret = rr;
-	rr++;
-	if (rr > max_value) {
-		rr = 0;
-	}
-	return ret;
-}
 
 struct uwsgi_hash_algo *uwsgi_hash_algo_get(char *name) {
 	struct uwsgi_hash_algo *uha = uwsgi.hash_algos;
@@ -107,7 +90,4 @@ void uwsgi_hash_algo_register(char *name, uint32_t (*func)(char *, uint64_t)) {
 void uwsgi_hash_algo_register_all() {
 	uwsgi_hash_algo_register("djb33x", djb33x_hash);
 	uwsgi_hash_algo_register("murmur2", murmur2_hash);
-	uwsgi_hash_algo_register("random", random_hash);
-	uwsgi_hash_algo_register("rand", random_hash);
-	uwsgi_hash_algo_register("rr", rr_hash);
 }

core/hooks.c

@@ -47,18 +47,6 @@ void uwsgi_register_hook(char *name, int (*func)(char *)) {
 	}
 }
 
-static int uwsgi_hook_alarm(char *arg) {
-	char *space = strchr(arg,' ');
-	if (!space) {
-		uwsgi_log("invalid alarm hook syntax, must be: <alarm> <msg>\n");
-		return -1;
-	}
-	*space = 0;
-	uwsgi_alarm_trigger(arg, space+1,  strlen(space+1));
-	*space = ' ';
-	return 0;
-}
-
 static int uwsgi_hook_chdir(char *arg) {
 	int ret = chdir(arg);
 	if (ret) {
@@ -67,22 +55,6 @@ static int uwsgi_hook_chdir(char *arg) {
 	return ret;
 }
 
-static int uwsgi_hook_mkdir(char *arg) {
-        int ret = mkdir(arg, 0777);
-        if (ret) {
-                uwsgi_error("uwsgi_hook_mkdir()");
-        }
-        return ret;
-}
-
-static int uwsgi_hook_putenv(char *arg) {
-        int ret = putenv(arg);
-        if (ret) {
-                uwsgi_error("uwsgi_hook_putenv()");
-        }
-        return ret;
-}
-
 static int uwsgi_hook_exec(char *arg) {
 	int ret = uwsgi_run_command_and_wait(NULL, arg);
 	if (ret != 0) {
@@ -106,300 +78,6 @@ static int uwsgi_hook_print(char *arg) {
 	return 0;
 }
 
-static int uwsgi_hook_unlink(char *arg) {
-	int ret = unlink(arg);
-	if (ret) {
-		uwsgi_error("uwsgi_hook_unlink()/unlink()");
-	}
-	return ret;
-}
-
-static int uwsgi_hook_writefifo(char *arg) {
-	char *space = strchr(arg, ' ');
-	if (!space) {
-		uwsgi_log("invalid hook writefifo syntax, must be: <file> <string>\n");
-		return -1;
-	}
-	*space = 0;
-	int fd = open(arg, O_WRONLY|O_NONBLOCK);
-	if (fd < 0) {
-		uwsgi_error_open(arg);
-		*space = ' ';
-		if (errno == ENODEV) return 0;
-#ifdef ENXIO
-		if (errno == ENXIO) return 0;
-#endif
-		return -1;
-	}
-	*space = ' ';
-	size_t l = strlen(space+1);
-	if (write(fd, space+1, l) != (ssize_t) l) {
-		uwsgi_error("uwsgi_hook_writefifo()/write()");
-		close(fd);
-		return -1;
-	}
-	close(fd);
-        return 0;
-}
-
-static int uwsgi_hook_write(char *arg) {
-        char *space = strchr(arg, ' ');
-        if (!space) {
-                uwsgi_log("invalid hook write syntax, must be: <file> <string>\n");
-                return -1;
-        }
-        *space = 0;
-        int fd = open(arg, O_WRONLY|O_CREAT|O_TRUNC, 0666);
-        if (fd < 0) {
-                uwsgi_error_open(arg);
-                *space = ' ';
-                return -1;
-        }
-        *space = ' ';
-        size_t l = strlen(space+1);
-        if (write(fd, space+1, l) != (ssize_t) l) {
-                uwsgi_error("uwsgi_hook_write()/write()");
-                close(fd);
-                return -1;
-        }
-        close(fd);
-        return 0;
-}
-
-static int uwsgi_hook_creat(char *arg) {
-        int fd = open(arg, O_WRONLY|O_CREAT|O_TRUNC, 0666);
-        if (fd < 0) {
-                uwsgi_error_open(arg);
-                return -1;
-        }
-        close(fd);
-        return 0;
-}
-
-
-static int uwsgi_hook_append(char *arg) {
-        char *space = strchr(arg, ' ');
-        if (!space) {
-                uwsgi_log("invalid hook append syntax, must be: <file> <string>\n");
-                return -1;
-        }
-        *space = 0;
-        int fd = open(arg, O_WRONLY|O_CREAT|O_APPEND, 0666);
-        if (fd < 0) {
-                uwsgi_error_open(arg);
-                *space = ' ';
-                return -1;
-        }
-        *space = ' ';
-        size_t l = strlen(space+1);
-        if (write(fd, space+1, l) != (ssize_t) l) {
-                uwsgi_error("uwsgi_hook_append()/write()");
-                close(fd);
-                return -1;
-        }
-        close(fd);
-        return 0;
-}
-
-
-static int uwsgi_hook_writen(char *arg) {
-        char *space = strchr(arg, ' ');
-        if (!space) {
-                uwsgi_log("invalid hook writen syntax, must be: <file> <string>\n");
-                return -1;
-        }
-        *space = 0;
-        int fd = open(arg, O_WRONLY|O_CREAT|O_TRUNC, 0666);
-        if (fd < 0) {
-                uwsgi_error_open(arg);
-                *space = ' ';
-                return -1;
-        }
-        *space = ' ';
-        size_t l = strlen(space+1);
-	char *buf = uwsgi_malloc(l + 1);
-	memcpy(buf, space+1, l);
-	buf[l] = '\n';
-        if (write(fd, buf, l+1) != (ssize_t) (l+1)) {
-                uwsgi_error("uwsgi_hook_writen()/write()");
-		free(buf);
-                close(fd);
-                return -1;
-        }
-	free(buf);
-        close(fd);
-        return 0;
-}
-
-static int uwsgi_hook_appendn(char *arg) {
-        char *space = strchr(arg, ' ');
-	if (space)
-        	*space = 0;
-        int fd = open(arg, O_WRONLY|O_CREAT|O_APPEND, 0666);
-        if (fd < 0) {
-                uwsgi_error_open(arg);
-		if (space)
-                	*space = ' ';
-                return -1;
-        }
-	if (!space) {
-		// simple newline
-		if (write(fd, "\n", 1) != 1) {
-                	uwsgi_error("uwsgi_hook_appendn()/write()");
-			close(fd);
-			return -1;
-		}
-		close(fd);
-		return 0;
-	}
-
-        *space = ' ';
-        size_t l = strlen(space+1);
-        char *buf = uwsgi_malloc(l + 1);
-	memcpy(buf, space+1, l);
-        buf[l] = '\n';
-        if (write(fd, buf, l+1) != (ssize_t) (l+1)) {
-                uwsgi_error("uwsgi_hook_appendn()/write()");
-                free(buf);
-                close(fd);
-                return -1;
-        }
-        free(buf);
-        close(fd);
-        return 0;
-}
-
-
-
-static int uwsgi_hook_chmod(char *arg) {
-	char *space = strchr(arg, ' ');
-        if (!space) {
-                uwsgi_log("invalid hook chmod syntax, must be: <file> <mode>\n");
-                return -1;
-        }
-        *space = 0;
-	int error = 0;
-	mode_t mask = uwsgi_mode_t(space+1, &error);
-	if (error) {
-		uwsgi_log("invalid hook chmod mask: %s\n", space+1); 
-		*space = ' ';
-		return -1;
-	}
-
-	int ret = chmod(arg, mask);
-	*space = ' ';
-	if (ret) {
-		uwsgi_error("uwsgi_hook_chmod()/chmod()");
-	}
-	return ret;
-}
-
-static int uwsgi_hook_sticky(char *arg) {
-	struct stat st;
-	if (stat(arg, &st)) {
-                uwsgi_error("uwsgi_hook_sticky()/stat()");
-		return -1;
-	}
-        if (chmod(arg, st.st_mode | S_ISVTX)) {
-                uwsgi_error("uwsgi_hook_sticky()/chmod()");
-		return -1;
-        }
-        return 0;
-}
-
-
-static int uwsgi_hook_chown(char *arg) {
-        char *space = strchr(arg, ' ');
-        if (!space) {
-                uwsgi_log("invalid hook chown syntax, must be: <file> <uid> <gid>\n");
-                return -1;
-        }
-        *space = 0;
-
-	char *space2 = strchr(space+1, ' ');
-	if (!space2) {
-		*space = ' ';
-                uwsgi_log("invalid hook chown syntax, must be: <file> <uid> <gid>\n");
-                return -1;
-	}
-	*space2 = 0;
-
-	struct passwd *pw = getpwnam(space+1);
-	if (!pw) {
-		uwsgi_log("unable to find uid %s\n", space+1);
-		*space = ' ';
-		*space2 = ' ';
-		return -1;
-	}
-
-	struct group *gr = getgrnam(space2+1);
-	if (!gr) {
-                uwsgi_log("unable to find gid %s\n", space2+1);
-                *space = ' ';
-                *space2 = ' ';
-                return -1;
-        }
-        int ret = chown(arg, pw->pw_uid, gr->gr_gid);
-        *space = ' ';
-        *space2 = ' ';
-        if (ret) {
-                uwsgi_error("uwsgi_hook_chown()/chown)");
-        }
-        return ret;
-}
-
-static int uwsgi_hook_chown2(char *arg) {
-        char *space = strchr(arg, ' ');
-        if (!space) {
-                uwsgi_log("invalid hook chown2 syntax, must be: <file> <uid> <gid>\n");
-                return -1;
-        }
-        *space = 0;
-
-        char *space2 = strchr(space+1, ' ');
-        if (!space2) {
-                *space = ' ';
-                uwsgi_log("invalid hook chown2 syntax, must be: <file> <uid> <gid>\n");
-                return -1;
-        }
-        *space2 = 0;
-
-	if (!is_a_number(space+1)) {
-		uwsgi_log("invalid hook chown2 syntax, uid must be a number\n");
-		*space = ' ';
-		*space2 = ' ';
-		return -1;
-	}
-
-	if (!is_a_number(space2+1)) {
-                uwsgi_log("invalid hook chown2 syntax, gid must be a number\n");
-                *space = ' ';
-                *space2 = ' ';
-                return -1;
-        }
-
-        int ret = chown(arg, atoi(space+1), atoi(space2+1));
-        *space = ' ';
-        *space2 = ' ';
-        if (ret) {
-                uwsgi_error("uwsgi_hook_chown2()/chown)");
-        }
-        return ret;
-}
-
-
-#ifdef __sun__
-extern int sethostname(char *, int);
-#endif
-static int uwsgi_hook_hostname(char *arg) {
-#ifdef __CYGWIN__
-	return -1;
-#else
-	return sethostname(arg, strlen(arg));
-#endif
-}
-
-
 static int uwsgi_hook_callint(char *arg) {
         char *space = strchr(arg, ' ');
         if (space) {
@@ -494,85 +172,11 @@ static int uwsgi_hook_callret(char *arg) {
         return func();
 }
 
-static int uwsgi_hook_rpc(char *arg) {
-
-	int ret = -1;
-	size_t i, argc = 0;
-        char **rargv = uwsgi_split_quoted(arg, strlen(arg), " \t", &argc);
-        if (!argc) goto end;
-	if (argc > 256) goto destroy;
-
-        char *argv[256];
-        uint16_t argvs[256];
-
-        char *node = NULL;
-        char *func = rargv[0];
-
-	char *at = strchr(func, '@');
-	if (at) {
-		*at = 0;
-		node = at + 1;
-	}
-
-        for(i=0;i<(argc-1);i++) {
-		size_t a_len = strlen(rargv[i+1]);
-		if (a_len > 0xffff) goto destroy;
-                argv[i] = rargv[i+1] ;
-                argvs[i] = a_len;
-        }
-
-        uint64_t size = 0;
-        // response must be always freed
-        char *response = uwsgi_do_rpc(node, func, argc-1, argv, argvs, &size);
-        if (response) {
-		if (at) *at = '@';
-		uwsgi_log("[rpc result from \"%s\"] %.*s\n", rargv[0], size, response);
-                free(response);
-		ret = 0;
-        }
-
-destroy:
-        for(i=0;i<argc;i++) {
-                free(rargv[i]);
-        }
-end:
-	free(rargv);
-	return ret;
-}
-
-static int uwsgi_hook_retryrpc(char *arg) {
-	for(;;) {
-		int ret = uwsgi_hook_rpc(arg);
-		if (!ret) break;
-		sleep(2);
-	}
-	return 0;
-}
 
 void uwsgi_register_base_hooks() {
 	uwsgi_register_hook("cd", uwsgi_hook_chdir);
-	uwsgi_register_hook("chdir", uwsgi_hook_chdir);
-
-	uwsgi_register_hook("mkdir", uwsgi_hook_mkdir);
-	uwsgi_register_hook("putenv", uwsgi_hook_putenv);
-	uwsgi_register_hook("chmod", uwsgi_hook_chmod);
-	uwsgi_register_hook("chown", uwsgi_hook_chown);
-	uwsgi_register_hook("chown2", uwsgi_hook_chown2);
-
-	uwsgi_register_hook("sticky", uwsgi_hook_sticky);
-
 	uwsgi_register_hook("exec", uwsgi_hook_exec);
 
-	uwsgi_register_hook("create", uwsgi_hook_creat);
-	uwsgi_register_hook("creat", uwsgi_hook_creat);
-
-	uwsgi_register_hook("write", uwsgi_hook_write);
-	uwsgi_register_hook("writen", uwsgi_hook_writen);
-	uwsgi_register_hook("append", uwsgi_hook_append);
-	uwsgi_register_hook("appendn", uwsgi_hook_appendn);
-	uwsgi_register_hook("writefifo", uwsgi_hook_writefifo);
-	uwsgi_register_hook("unlink", uwsgi_hook_unlink);
-
 	uwsgi_register_hook("mount", uwsgi_mount_hook);
 	uwsgi_register_hook("umount", uwsgi_umount_hook);
 
@@ -582,17 +186,9 @@ void uwsgi_register_base_hooks() {
 	uwsgi_register_hook("callint", uwsgi_hook_callint);
 	uwsgi_register_hook("callintret", uwsgi_hook_callintret);
 
-	uwsgi_register_hook("hostname", uwsgi_hook_hostname);
-
-	uwsgi_register_hook("alarm", uwsgi_hook_alarm);
-
-	uwsgi_register_hook("rpc", uwsgi_hook_rpc);
-	uwsgi_register_hook("retryrpc", uwsgi_hook_retryrpc);
-
 	// for testing
 	uwsgi_register_hook("exit", uwsgi_hook_exit);
 	uwsgi_register_hook("print", uwsgi_hook_print);
-	uwsgi_register_hook("log", uwsgi_hook_print);
 }
 
 void uwsgi_hooks_run(struct uwsgi_string_list *l, char *phase, int fatal) {
@@ -604,45 +200,17 @@ void uwsgi_hooks_run(struct uwsgi_string_list *l, char *phase, int fatal) {
 			exit(1);
 		}
 		*colon = 0;
-		int private = 0;
-		char *action = usl->value;
-		// private hook ?
-		if (action[0] == '!') {
-			action++;
-			private = 1;
-		}
-		struct uwsgi_hook *uh = uwsgi_hook_by_name(action);
+		struct uwsgi_hook *uh = uwsgi_hook_by_name(usl->value);
 		if (!uh) {
-			uwsgi_log("hook action not found: %s\n", action);
+			uwsgi_log("hook not found: %s\n", usl->value);
 			exit(1);
 		}
 		*colon = ':';
 
-		if (private) {
-			uwsgi_log("running --- PRIVATE HOOK --- (%s)...\n", phase);
-		}
-		else {
-			uwsgi_log("running \"%s\" (%s)...\n", usl->value, phase);
-		}
+		uwsgi_log("running \"%s\" (%s)...\n", usl->value, phase);
 			
 		int ret = uh->func(colon+1);
 		if (fatal && ret != 0) {
-			uwsgi_log_verbose("FATAL hook failed, destroying instance\n");
-			if (uwsgi.master_process) {
-				if (uwsgi.workers) {
-					if (uwsgi.workers[0].pid == getpid()) {
-						kill_them_all(0);
-						return;
-					}
-					else {
-                                        	if (kill(uwsgi.workers[0].pid, SIGINT)) {
-							uwsgi_error("uwsgi_hooks_run()/kill()");
-							exit(1);
-						}
-						return;
-                                	}
-				}
-			}
 			exit(1);
 		}
 	}

core/init.c

@@ -3,9 +3,9 @@
 extern struct uwsgi_server uwsgi;
 
 struct http_status_codes {
-        const char      key[3];
-        const char      *message;
-        int             message_size;
+        const char key[3];
+        const char *message;
+        int message_size;
 };
 
 /* statistically ordered */
@@ -51,7 +51,6 @@ struct http_status_codes hsc[] = {
         {"503", "Service Unavailable"},
         {"504", "Gateway Timeout"},
         {"505", "HTTP Version Not Supported"},
-        {"509", "Bandwidth Limit Exceeded"},
         {"", NULL},
 };
 
@@ -73,7 +72,7 @@ void uwsgi_init_default() {
 
 	uwsgi.stats_pusher_default_freq = 3;
 
-	uwsgi.original_log_fd = 2;
+	uwsgi.original_log_fd = -1;
 
 	uwsgi.emperor_fd_config = -1;
 	uwsgi.emperor_fd_proxy = -1;
@@ -113,18 +112,17 @@ void uwsgi_init_default() {
 	uwsgi.log_master_bufsize = 8192;
 
 	uwsgi.worker_reload_mercy = 60;
-	uwsgi.mule_reload_mercy = 60;
 
 	uwsgi.max_vars = MAX_VARS;
 	uwsgi.vec_size = 4 + 1 + (4 * MAX_VARS);
 
-	uwsgi.socket_timeout = 4;
-	uwsgi.logging_options.enabled = 1;
+	uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] = 4;
+	uwsgi.shared->options[UWSGI_OPTION_LOGGING] = 1;
 
 	// a workers hould be running for at least 10 seconds
-	uwsgi.min_worker_lifetime = 10;
+	uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME] = 10;
 
-	uwsgi.spooler_frequency = 30;
+	uwsgi.shared->spooler_frequency = 30;
 
 	uwsgi.shared->spooler_signal_pipe[0] = -1;
 	uwsgi.shared->spooler_signal_pipe[1] = -1;
@@ -171,8 +169,6 @@ void uwsgi_init_default() {
 
 	uwsgi.wait_read_hook = uwsgi_simple_wait_read_hook;
 	uwsgi.wait_write_hook = uwsgi_simple_wait_write_hook;
-	uwsgi.wait_milliseconds_hook = uwsgi_simple_wait_milliseconds_hook;
-	uwsgi.wait_read2_hook = uwsgi_simple_wait_read2_hook;
 
 	uwsgi_websockets_init();
 	
@@ -184,8 +180,6 @@ void uwsgi_init_default() {
 
 	uwsgi.master_fifo_fd = -1;
 	uwsgi_master_fifo_prepare();
-
-	uwsgi.notify_socket_fd = -1;
 }
 
 void uwsgi_setup_reload() {
@@ -199,7 +193,7 @@ void uwsgi_setup_reload() {
 		uwsgi.reloads++;
 		//convert reloads to string
 		int rlen = snprintf(env_reload_buf, 10, "%u", uwsgi.reloads);
-		if (rlen > 0 && rlen < 10) {
+		if (rlen > 0) {
 			env_reload_buf[rlen] = 0;
 			if (setenv("UWSGI_RELOADS", env_reload_buf, 1)) {
 				uwsgi_error("setenv()");
@@ -351,6 +345,7 @@ void uwsgi_setup_workers() {
 		uwsgi.workers[i].signal_pipe[0] = -1;
 		uwsgi.workers[i].signal_pipe[1] = -1;
 		snprintf(uwsgi.workers[i].name, 0xff, "uWSGI worker %d", i);
+		snprintf(uwsgi.workers[i].snapshot_name, 0xff, "uWSGI snapshot %d", i);
 	}
 
 	uint64_t total_memory = (sizeof(struct uwsgi_app) * uwsgi.max_apps) + (sizeof(struct uwsgi_core) * uwsgi.cores) + (sizeof(void *) * uwsgi.max_apps * uwsgi.cores) + (uwsgi.buffer_size * uwsgi.cores) + (sizeof(struct iovec) * uwsgi.vec_size * uwsgi.cores);
@@ -416,7 +411,7 @@ void sanitize_args() {
                 uwsgi.cores = uwsgi.threads;
         }
 
-        if (uwsgi.harakiri_options.workers > 0) {
+        if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
                 if (!uwsgi.post_buffering) {
                         uwsgi_log(" *** WARNING: you have enabled harakiri without post buffering. Slow upload could be rejected on post-unbuffered webservers *** \n");
                 }
@@ -452,13 +447,18 @@ void sanitize_args() {
 		}
         }
 
-	if (uwsgi.max_worker_lifetime > 0 && uwsgi.min_worker_lifetime >= uwsgi.max_worker_lifetime) {
+        if (uwsgi.auto_snapshot > 0 && uwsgi.auto_snapshot > uwsgi.numproc) {
+                uwsgi_log("invalid auto-snapshot value: must be <= than processes\n");
+                exit(1);
+        }
+
+	if (uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] > 0 && uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME] >= uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME]) {
 		uwsgi_log("invalid min-worker-lifetime value (%d), must be lower than max-worker-lifetime (%d)\n",
-			uwsgi.min_worker_lifetime, uwsgi.max_worker_lifetime);
+			uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME], uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME]);
 		exit(1);
 	}
 
-	if (uwsgi.cheaper_rss_limit_soft && uwsgi.logging_options.memory_report != 1 && uwsgi.force_get_memusage != 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);
 	}

core/io.c

@@ -15,7 +15,7 @@ int uwsgi_waitfd_event(int fd, int timeout, int event) {
 	struct pollfd upoll;
 
 	if (!timeout)
-		timeout = uwsgi.socket_timeout;
+		timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
 
 	timeout = timeout * 1000;
 	if (timeout < 0)
@@ -270,7 +270,7 @@ static char *uwsgi_scheme_emperor(char *url, size_t *size, int add_zero) {
 		}
 		rlen = read(uwsgi.emperor_fd_config, ptr, remains);
 		if (rlen <= 0) {
-			uwsgi_log("[uwsgi-vassal] error reading config header from %s !!!\n", url);
+			uwsgi_log("[uwsgi-vassal] error reading config header from !!!\n", url);
 			exit(1);
 		}
 		ptr+=rlen;
@@ -293,7 +293,7 @@ static char *uwsgi_scheme_emperor(char *url, size_t *size, int add_zero) {
                 }
 		rlen = read(uwsgi.emperor_fd_config, ptr, remains);
 		if (rlen <= 0) {
-                	uwsgi_log("[uwsgi-vassal] error reading config from %s !!!\n", url);
+                	uwsgi_log("[uwsgi-vassal] error reading config from !!!\n", url);
                         exit(1);
                 }
                 ptr+=rlen;
@@ -364,7 +364,6 @@ static char *uwsgi_scheme_data(char *url, size_t *size, int add_zero) {
 			}
 		}
 	}
-	close(fd);
 
 	return buffer;
 }
@@ -392,26 +391,6 @@ static char *uwsgi_scheme_call(char *url, size_t *size, int add_zero) {
         return buffer;
 }
 
-static char *uwsgi_scheme_callint(char *url, size_t *size, int add_zero) {
-        int (*func)(void) = dlsym(RTLD_DEFAULT, url);
-        if (!func) {
-                uwsgi_log("unable to find symbol %s\n", url);
-                exit(1);
-        }
-
-	char *s = uwsgi_num2str(func());
-        *size = strlen(s);
-        if (add_zero) {
-                *size += 1;
-        }
-        char *buffer = uwsgi_malloc(*size);
-        memset(buffer, 0, *size);
-        memcpy(buffer, s, strlen(s));
-	free(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;
@@ -537,28 +516,12 @@ fallback:
 			goto end;
 		}
 
-		// is it a potential virtual file (/proc, /sys...) ?
-		int is_virtual = 0;
-		if (sb.st_size == 0) {
-			is_virtual = 1;
-			sb.st_size = 4096;
-		}
-
 		buffer = uwsgi_malloc(sb.st_size + add_zero);
 
 		len = read(fd, buffer, sb.st_size);
-		if (!is_virtual) {
-			if (len != sb.st_size) {
-			}
-		}
-		else {
-			if (len >= 0) {
-				sb.st_size = len;
-			}
-			else {
-				uwsgi_error("read()");
-				exit(1);
-			}
+		if (len != sb.st_size) {
+			uwsgi_error("read()");
+			exit(1);
 		}
 
 		close(fd);
@@ -571,46 +534,7 @@ fallback:
 end:
 
 	if (magic_table) {
-		// here we inject blobs
-		struct uwsgi_string_list *usl = NULL;
-		if (uwsgi.inject_before || uwsgi.inject_after) {
-			struct uwsgi_buffer *ub = uwsgi_buffer_new(uwsgi.page_size);
-			uwsgi_foreach(usl, uwsgi.inject_before) {
-				size_t rlen = 0;
-				char *before = uwsgi_open_and_read(usl->value, &rlen, 0, NULL);
-				if (uwsgi_buffer_append(ub, before, rlen)) {
-					uwsgi_log("unable to inject data in the config file\n");
-					exit(1);
-				}	
-				free(before);
-			}
-			if (uwsgi_buffer_append(ub, buffer, *size - add_zero)) {
-                        	uwsgi_log("unable to inject data in the config file\n");
-                                exit(1);
-                        }
-			uwsgi_foreach(usl, uwsgi.inject_after) {
-				size_t rlen = 0;
-                                char *after = uwsgi_open_and_read(usl->value, &rlen, 0, NULL);
-                                if (uwsgi_buffer_append(ub, after, rlen)) {
-                                        uwsgi_log("unable to inject data in the config file\n");
-                                        exit(1);
-                                }       
-                                free(after);
-			}
-			if (add_zero) {
-				if (uwsgi_buffer_append(ub, "\0", 1)) {
-                                        uwsgi_log("unable to inject data in the config file\n");
-                                        exit(1);
-                                }
-			}
-			*size = ub->pos; 
-			// free resources
-			free(buffer);
-			buffer = ub->buf;
-			// aboid destroying buffer
-			ub->buf = NULL;
-			uwsgi_buffer_destroy(ub);
-		}
+
 		magic_buf = magic_sub(buffer, *size, size, magic_table);
 		free(buffer);
 		return magic_buf;
@@ -661,13 +585,11 @@ int *uwsgi_attach_fd(int fd, int *count_ptr, char *code, size_t code_len) {
 	len = recvmsg(fd, &msg, 0);
 	if (len <= 0) {
 		uwsgi_error("recvmsg()");
-		free(msg_control);
 		return NULL;
 	}
 
 	if (code && code_len > 0) {
 		if (uwsgi_strncmp(id, code_len, code, code_len)) {
-			free(msg_control);
 			return NULL;
 		}
 
@@ -683,19 +605,15 @@ int *uwsgi_attach_fd(int fd, int *count_ptr, char *code, size_t code_len) {
 	}
 
 	cmsg = CMSG_FIRSTHDR(&msg);
-	if (!cmsg) {
-		free(msg_control);
+	if (!cmsg)
 		return NULL;
-	}
 
 	if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
-		free(msg_control);
 		return NULL;
 	}
 
 	if ((size_t) (cmsg->cmsg_len - ((char *) CMSG_DATA(cmsg) - (char *) cmsg)) > (size_t) (sizeof(int) * (count + 1))) {
 		uwsgi_log("not enough space for sockets data, consider increasing it\n");
-		free(msg_control);
 		return NULL;
 	}
 
@@ -837,12 +755,11 @@ int uwsgi_write_true_nb(int fd, char *buf, size_t remains, int timeout) {
 	int ret;
 
         while(remains > 0) {
-		errno = 0;
 		ssize_t len = write(fd, ptr, remains);
 		if (len > 0) goto written;
 		if (len == 0) return -1;		
 		if (len < 0) {
-			if (uwsgi_is_again()) goto wait;
+			if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) goto wait;
 			return -1;
 		}
 wait:
@@ -987,21 +904,18 @@ int uwsgi_read_nb(int fd, char *buf, size_t remains, int timeout) {
 ssize_t uwsgi_read_true_nb(int fd, char *buf, size_t len, int timeout) {
         int ret;
 
-	errno = 0;
 	ssize_t rlen = read(fd, buf, len);
         if (rlen > 0) {
 		return rlen;	
 	}
         if (rlen == 0) return -1;
         if (rlen < 0) {
-        	if (uwsgi_is_again()) goto wait;
+        	if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) goto wait;
         }
         return -1;
 wait:
-	errno = 0;
         ret = uwsgi.wait_read_hook(fd, timeout);
         if (ret > 0) {
-		errno = 0;
         	rlen = read(fd, buf, len);
                 if (rlen > 0) {
 			return rlen;
@@ -1028,12 +942,12 @@ int uwsgi_read_whole_true_nb(int fd, char *buf, size_t remains, int timeout) {
 }
 
 /*
-	this is a pretty magic function used for reading a full uwsgi response
+	this is a pretty magic function used for read a full uwsgi response
 	it is true non blocking, so you can use it in request plugins
 	buffer is expected to be at least 4 bytes, rlen is a get/set value
 */
 
-int uwsgi_read_with_realloc(int fd, char **buffer, size_t *rlen, int timeout, uint8_t *modifier1, uint8_t *modifier2) {
+int uwsgi_read_with_realloc(int fd, char **buffer, size_t *rlen, int timeout) {
 	if (*rlen < 4) return -1;
 	char *buf = *buffer;
 	int ret;
@@ -1046,7 +960,7 @@ int uwsgi_read_with_realloc(int fd, char **buffer, size_t *rlen, int timeout, ui
                 if (len > 0) goto readok;
                 if (len == 0) return -1;
                 if (len < 0) {
-                        if (uwsgi_is_again()) goto wait;
+                        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) goto wait;
                         return -1;
                 }
 wait:
@@ -1064,10 +978,6 @@ readok:
 
 	struct uwsgi_header *uh = (struct uwsgi_header *) buf;
 	uint16_t pktsize = uh->pktsize;
-	if (modifier1)
-		*modifier1 = uh->modifier1;
-	if (modifier2)
-		*modifier2 = uh->modifier2;
 	
 	if (pktsize > *rlen) {
 		char *tmp_buf = realloc(buf, pktsize);
@@ -1088,7 +998,7 @@ readok:
                 if (len > 0) goto readok2;
                 if (len == 0) return -1;
                 if (len < 0) {
-                        if (uwsgi_is_again()) goto wait2;
+                        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) goto wait2;
                         return -1;
                 }
 wait2:
@@ -1269,7 +1179,6 @@ void uwsgi_setup_schemes() {
 	uwsgi_register_scheme("fd", uwsgi_scheme_fd);	
 	uwsgi_register_scheme("exec", uwsgi_scheme_exec);	
 	uwsgi_register_scheme("call", uwsgi_scheme_call);	
-	uwsgi_register_scheme("callint", uwsgi_scheme_callint);	
 }
 
 struct uwsgi_string_list *uwsgi_check_scheme(char *file) {
@@ -1301,204 +1210,3 @@ void uwsgi_remap_fd(int fd, char *filename) {
         }
 }
 
-int uwsgi_is_connected(int fd) {
-	int soopt;
-        socklen_t solen = sizeof(int);
-
-        if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *) (&soopt), &solen) < 0) {
-		return 0;
-        }
-        /* is something bad ? */
-        if (soopt) return 0;
-	return 1;
-}
-
-
-int uwsgi_pass_cred(int fd, char *code, size_t code_len) {
-#ifdef SCM_CREDENTIALS
-	struct msghdr cr_msg;
-        struct cmsghdr *cmsg;
-        struct iovec cr_iov;
-        void *cr_msg_control = uwsgi_calloc(CMSG_SPACE(sizeof(struct ucred)));
-
-        cr_iov.iov_base = code;
-        cr_iov.iov_len = code_len;
-
-        cr_msg.msg_name = NULL;
-        cr_msg.msg_namelen = 0;
-
-        cr_msg.msg_iov = &cr_iov;
-        cr_msg.msg_iovlen = 1;
-
-        cr_msg.msg_flags = 0;
-        cr_msg.msg_control = cr_msg_control;
-        cr_msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
-
-        cmsg = CMSG_FIRSTHDR(&cr_msg);
-        cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
-        cmsg->cmsg_level = SOL_SOCKET;
-        cmsg->cmsg_type = SCM_CREDENTIALS;
-
-        struct ucred *u = (struct ucred*) CMSG_DATA(cmsg);
-	u->pid = getpid();	
-	u->uid = getuid();	
-	u->gid = getgid();	
-
-        if (sendmsg(fd, &cr_msg, 0) < 0) {
-                uwsgi_error("uwsgi_pass_cred()/sendmsg()");
-        	free(cr_msg_control);
-		return -1;
-        }
-
-        free(cr_msg_control);
-	return 0;
-#else
-	return -1;
-#endif
-}
-
-int uwsgi_pass_cred2(int fd, char *code, size_t code_len, struct sockaddr *addr, size_t addr_len) {
-#ifdef SCM_CREDENTIALS
-        struct msghdr cr_msg;
-        struct cmsghdr *cmsg;
-        struct iovec cr_iov;
-        void *cr_msg_control = uwsgi_calloc(CMSG_SPACE(sizeof(struct ucred)));
-
-        cr_iov.iov_base = code;
-        cr_iov.iov_len = code_len;
-
-        cr_msg.msg_name = addr;
-        cr_msg.msg_namelen = addr_len;
-
-        cr_msg.msg_iov = &cr_iov;
-        cr_msg.msg_iovlen = 1;
-
-        cr_msg.msg_flags = 0;
-        cr_msg.msg_control = cr_msg_control;
-        cr_msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
-
-        cmsg = CMSG_FIRSTHDR(&cr_msg);
-        cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
-        cmsg->cmsg_level = SOL_SOCKET;
-        cmsg->cmsg_type = SCM_CREDENTIALS;
-
-        struct ucred *u = (struct ucred*) CMSG_DATA(cmsg);
-        u->pid = getpid();
-        u->uid = getuid();
-        u->gid = getgid();
-
-        if (sendmsg(fd, &cr_msg, 0) < 0) {
-                uwsgi_error("uwsgi_pass_cred2()/sendmsg()");
-                free(cr_msg_control);
-                return -1;
-        }
-
-        free(cr_msg_control);
-        return 0;
-#else
-        return -1;
-#endif
-}
-
-
-int uwsgi_recv_cred(int fd, char *code, size_t code_len, pid_t *pid, uid_t *uid, gid_t *gid) {
-#ifdef SCM_CREDENTIALS
-        struct iovec iov;
-	int ret = -1;
-
-        void *msg_control = uwsgi_calloc(CMSG_SPACE(sizeof(struct ucred)));
-
-        iov.iov_base = uwsgi_malloc(code_len);
-        iov.iov_len = code_len;
-
-	struct msghdr msg;
-        memset(&msg, 0, sizeof(msg));
-
-        msg.msg_name = NULL;
-        msg.msg_namelen = 0;
-
-        msg.msg_iov = &iov;
-        msg.msg_iovlen = 1;
-
-        msg.msg_control = msg_control;
-        msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
-
-        ssize_t len = recvmsg(fd, &msg, 0);
-	if (len <= 0) {
-		uwsgi_error("uwsgi_recv_cred()/recvmsg()");
-		goto clear;
-	}
-
-	struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
-	if (!cmsg) goto clear;
-
-	if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_CREDENTIALS) {
-		goto clear;
-        }
-
-	if (uwsgi_strncmp(code, code_len, iov.iov_base, iov.iov_len)) goto clear;
-
-	struct ucred *u = (struct ucred *) CMSG_DATA(cmsg);
-	*pid = u->pid;
-	*uid = u->uid;
-	*gid = u->gid;
-	ret = 0;
-
-clear:
-	free(msg_control);
-	free(iov.iov_base);
-	return ret;
-#else
-	return -1;
-#endif
-}
-
-ssize_t uwsgi_recv_cred2(int fd, char *buf, size_t buf_len, pid_t *pid, uid_t *uid, gid_t *gid) {
-#ifdef SCM_CREDENTIALS
-        struct iovec iov;
-        ssize_t ret = -1;
-
-        void *msg_control = uwsgi_calloc(CMSG_SPACE(sizeof(struct ucred)));
-
-        iov.iov_base = buf;
-        iov.iov_len = buf_len;
-
-        struct msghdr msg;
-        memset(&msg, 0, sizeof(msg));
-
-        msg.msg_name = NULL;
-        msg.msg_namelen = 0;
-
-        msg.msg_iov = &iov;
-        msg.msg_iovlen = 1;
-
-        msg.msg_control = msg_control;
-        msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
-
-        ssize_t len = recvmsg(fd, &msg, 0);
-        if (len <= 0) {
-                uwsgi_error("uwsgi_recv_cred2()/recvmsg()");
-                goto clear;
-        }
-
-        struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
-        if (!cmsg) goto clear;
-
-        if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_CREDENTIALS) {
-                goto clear;
-        }
-
-        struct ucred *u = (struct ucred *) CMSG_DATA(cmsg);
-        *pid = u->pid;
-        *uid = u->uid;
-        *gid = u->gid;
-        ret = len;
-
-clear:
-        free(msg_control);
-        return ret;
-#else
-        return -1;
-#endif
-}
-

core/json.c

@@ -4,207 +4,13 @@
 
 extern struct uwsgi_server uwsgi;
 
-#if defined(UWSGI_JSON_YAJL_OLD)
-#include <yajl/yajl_parse.h>
-
-struct uwsgi_yajl_old_state {
-	char *object;
-	char *key;
-	int in_object;
-	int is_array;
-};
-
-static int uwsgi_yajl_cb_null(void *ctx) {
-	struct uwsgi_yajl_old_state *uyos = (struct uwsgi_yajl_old_state *) ctx;
-	if (!uyos->key) return 1;
-	add_exported_option(uyos->key, strdup("0"), 0);
-	return 1;
-}
-
-static int uwsgi_yajl_cb_boolean(void *ctx, int b) {
-        struct uwsgi_yajl_old_state *uyos = (struct uwsgi_yajl_old_state *) ctx;
-        if (!uyos->key) return 1;
-	if (b) {
-        	add_exported_option(uyos->key, strdup("1"), 0);
-	}
-	else {
-        	add_exported_option(uyos->key, strdup("0"), 0);
-	}
-	return 1;
-}
-
-static int uwsgi_yajl_cb_integer(void *ctx, long n) {
-        struct uwsgi_yajl_old_state *uyos = (struct uwsgi_yajl_old_state *) ctx;
-        if (!uyos->key) return 1;
-        add_exported_option(uyos->key, uwsgi_64bit2str((int64_t) n), 0);
-	return 1;
-}
-
-static int uwsgi_yajl_cb_double(void *ctx, double n) {
-	return uwsgi_yajl_cb_integer(ctx, (long) n);
-}
-
-static int uwsgi_yajl_cb_string(void *ctx, const unsigned char *s, unsigned int s_len) {
-	struct uwsgi_yajl_old_state *uyos = (struct uwsgi_yajl_old_state *) ctx;
-        if (!uyos->key) return 1;
-        add_exported_option(uyos->key, uwsgi_concat2n((char *)s, (size_t)s_len, "", 0), 0);
-	return 1;
-}
-
-static int uwsgi_yajl_cb_number(void *ctx, const char *n, unsigned int n_len) {
-	return uwsgi_yajl_cb_string(ctx, (const unsigned char *)n, n_len);
-}
-
-static int uwsgi_yajl_cb_map_key(void *ctx, const unsigned char *s, unsigned int s_len) {
-	struct uwsgi_yajl_old_state *uyos = (struct uwsgi_yajl_old_state *) ctx;
-	if (!uyos->in_object) {
-		if (!uwsgi_strncmp(uyos->object, strlen(uyos->object), (char *)s, (size_t)s_len)) {
-			uyos->in_object = 1; 
-		}
-		return 1;
-	}
-
-	uyos->key = uwsgi_concat2n((char *)s, (size_t)s_len, "", 0);
-	return 1;
-}
-
-
-static yajl_callbacks callbacks = {
-	.yajl_null = uwsgi_yajl_cb_null,
-	.yajl_boolean = uwsgi_yajl_cb_boolean,
-	.yajl_integer = uwsgi_yajl_cb_integer,
-	.yajl_double = uwsgi_yajl_cb_double,
-	.yajl_number = uwsgi_yajl_cb_number,
-	.yajl_string = uwsgi_yajl_cb_string,
-	.yajl_start_map = NULL,
-	.yajl_map_key = uwsgi_yajl_cb_map_key,
-	.yajl_end_map = NULL,
-	.yajl_start_array = NULL,
-	.yajl_end_array = NULL,
-};
-
-void uwsgi_json_config(char *file, char *magic_table[]) {
-        size_t len = 0;
-
-        char *object_asked = "uwsgi";
-        char *colon;
-
-        if (uwsgi_check_scheme(file)) {
-                colon = uwsgi_get_last_char(file, '/');
-                colon = uwsgi_get_last_char(colon, ':');
-        }
-        else {
-                colon = uwsgi_get_last_char(file, ':');
-        }
-
-        if (colon) {
-                colon[0] = 0;
-                if (colon[1] != 0) {
-                        object_asked = colon + 1;
-                }
-        }
-
-	struct uwsgi_yajl_old_state uyos;
-	memset(&uyos, 0, sizeof(struct uwsgi_yajl_old_state));
-	uyos.object = object_asked;
-        uwsgi_log_initial("[uWSGI] getting JSON configuration from %s\n", file);
-
-        char *json_data = uwsgi_open_and_read(file, &len, 1, magic_table);
-
-	yajl_handle hand = yajl_alloc(&callbacks, NULL, NULL, &uyos);
-
-	yajl_status s = yajl_parse(hand, (const unsigned char *)json_data, len);
-	if (s != yajl_status_ok) {
-		uwsgi_log("%s\n", yajl_get_error(hand, 1, (const unsigned char *)json_data, len));
-		exit(1);
-	}
-}
-
-
-#elif defined(UWSGI_JSON_YAJL)
-#include <yajl/yajl_tree.h>
-
-void uwsgi_json_config(char *file, char *magic_table[]) {
-	size_t len = 0;
-
-        char *object_asked = "uwsgi";
-        char *colon;
-
-        if (uwsgi_check_scheme(file)) {
-                colon = uwsgi_get_last_char(file, '/');
-                colon = uwsgi_get_last_char(colon, ':');
-        }
-        else {
-                colon = uwsgi_get_last_char(file, ':');
-        }
-
-        if (colon) {
-                colon[0] = 0;
-                if (colon[1] != 0) {
-                        object_asked = colon + 1;
-                }
-        }
-
-        uwsgi_log_initial("[uWSGI] getting JSON configuration from %s\n", file);
-
-        char *json_data = uwsgi_open_and_read(file, &len, 1, magic_table);
-
-	char errbuf[1024];
-	yajl_val node = yajl_tree_parse((const char *)json_data, errbuf, sizeof(errbuf));
-
-	if (!node) {
-		uwsgi_log("error parsing JSON data: %s\n", errbuf);
-                exit(1);
-	}
-
-	const char * path[] = { object_asked, NULL };
-	yajl_val v = yajl_tree_get(node, path, yajl_t_any);
-	if (!YAJL_IS_OBJECT(v)) {
-		uwsgi_log("you must define a object named %s in your JSON data\n", object_asked);
-		exit(1);
-	}
-
-	size_t i;
-	for(i=0;i<v->u.object.len;i++) {
-		char *key = (char *) v->u.object.keys[i];
-		yajl_val o = v->u.object.values[i];
-		if (YAJL_IS_STRING(o)) {
-                        add_exported_option(key, YAJL_GET_STRING(o) , 0);
-                }
-                else if (YAJL_IS_TRUE(o)) {
-                        add_exported_option(key, strdup("1"), 0);
-                }
-                else if (YAJL_IS_FALSE(o) || YAJL_IS_NULL(o)) {
-                        add_exported_option(key, strdup("0"), 0);
-                }
-		else if (YAJL_IS_NUMBER(o) || YAJL_IS_INTEGER(o)) {
-                        add_exported_option(key, YAJL_GET_NUMBER(o), 0);
-		}
-                else if (YAJL_IS_ARRAY(o)) {
-			size_t j;
-			for(j=0;j<o->u.array.len;j++) {	
-				yajl_val a_o = o->u.array.values[j];		
-				if (YAJL_IS_STRING(a_o)) {
-                        		add_exported_option(key, YAJL_GET_STRING(a_o) , 0);
-                		}
-                		else if (YAJL_IS_TRUE(a_o)) {
-                        		add_exported_option(key, strdup("1"), 0);
-                		}
-                		else if (YAJL_IS_FALSE(a_o) || YAJL_IS_NULL(a_o)) {
-                        		add_exported_option(key, strdup("0"), 0);
-                		}
-                		else if (YAJL_IS_NUMBER(a_o) || YAJL_IS_INTEGER(a_o)) {
-                        		add_exported_option(key, YAJL_GET_NUMBER(a_o), 0);
-                		}
-			}
-                }
-	}
-}
-#else
-
 #include <jansson.h>
 
 
+/*
+	I really love the jansson library...
+   */
+
 void uwsgi_json_config(char *file, char *magic_table[]) {
 
 	size_t len = 0;
@@ -305,4 +111,3 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
 }
 
 #endif
-#endif

core/legion.c

@@ -279,12 +279,9 @@ static void legions_check_nodes_step2() {
 		// go on if i am not an arbiter
 		else if (ul->valor > 0) {
 			// no potential Lord is available, i will propose myself
-			// but only if i am not suspended...
-			if (uwsgi_now() > ul->suspended_til) {
-				best_valor = ul->valor;
-				memcpy(best_uuid, ul->uuid, 36);
-				i_am_the_best = 1;
-			}
+			best_valor = ul->valor;
+			memcpy(best_uuid, ul->uuid, 36);
+			i_am_the_best = 1;
 		}
 		else {
 			// empty lord
@@ -340,20 +337,13 @@ static void legions_check_nodes_step2() {
 			}
 			if (i_am_the_best) {
 				if (!ul->i_am_the_lord) {
+					uwsgi_log("[uwsgi-legion] i am now the Lord of the Legion %s\n", ul->legion);
 					// triggering lord hooks
-					uwsgi_log("[uwsgi-legion] attempting to become the Lord of the Legion %s\n", ul->legion);
 					struct uwsgi_string_list *usl = ul->lord_hooks;
 					while (usl) {
 						int ret = uwsgi_legion_action_call("lord", ul, usl);
 						if (ret) {
 							uwsgi_log("[uwsgi-legion] ERROR, lord hook returned: %d\n", ret);
-							if (uwsgi.legion_death_on_lord_error) {
-								ul->dead = 1;
-                						uwsgi_legion_announce(ul);
-								ul->suspended_til = uwsgi_now() + uwsgi.legion_death_on_lord_error;
-								uwsgi_log("[uwsgi-legion] suspending myself from Legion \"%s\" for %d seconds\n", ul->legion, uwsgi.legion_death_on_lord_error);
-								goto next;
-							}
 						}
 						usl = usl->next;
 					}
@@ -366,7 +356,6 @@ static void legions_check_nodes_step2() {
         				else {
                 				ul->lord_scroll_len = 0;
         				}
-					uwsgi_log("[uwsgi-legion] i am now the Lord of the Legion %s\n", ul->legion);
 					ul->i_am_the_lord = uwsgi_now();
 					// trick: reduce the time needed by the old lord to unlord itself
 					uwsgi_legion_announce(ul);
@@ -411,7 +400,7 @@ static void legions_check_nodes_step2() {
 			}
 			ul->last_warning = uwsgi_now();
 		}
-next:
+
 		ul = ul->next;
 	}
 }
@@ -507,15 +496,8 @@ static void *legion_loop(void *foobar) {
 		last_round = now;
 		// wait for event
 		int interesting_fd = -1;
-		if (uwsgi_instance_is_reloading || uwsgi_instance_is_dying) return NULL;
 		int rlen = event_queue_wait(uwsgi.legion_queue, timeout, &interesting_fd);
 
-		if (rlen < 0 && errno != EINTR) {
-			if (uwsgi_instance_is_reloading || uwsgi_instance_is_dying) return NULL;
-			uwsgi_nuclear_blast();
-			return NULL;	
-		}
-
 		now = uwsgi_now();
 		if (timeout == 0 || rlen == 0 || (now - last_round) >= timeout) {
 			struct uwsgi_legion *legions = uwsgi.legions;
@@ -609,8 +591,6 @@ static void *legion_loop(void *foobar) {
 			// check if the node is already accounted
 			struct uwsgi_legion_node *node = uwsgi_legion_get_node(ul, legion_msg.valor, legion_msg.name, legion_msg.name_len, legion_msg.uuid);
 			if (!node) {
-				// if a lord hook election fails, a node can announce itself as dead for long time...
-				if (legion_msg.dead) continue;
 				// add the new node
 				uwsgi_wlock(ul->lock);
 				node = uwsgi_legion_add_node(ul, legion_msg.valor, legion_msg.name, legion_msg.name_len, legion_msg.uuid);
@@ -668,12 +648,7 @@ int uwsgi_legion_action_call(char *phase, struct uwsgi_legion *ul, struct uwsgi_
 		return -1;
 	}
 
-	if (ula->log_msg) {
-		uwsgi_log("[uwsgi-legion] (phase: %s legion: %s) %s\n", phase, ul->legion, ula->log_msg);
-	}
-	else {
-		uwsgi_log("[uwsgi-legion] (phase: %s legion: %s) calling %s\n", phase, ul->legion, usl->value);
-	}
+	uwsgi_log("[uwsgi-legion] (phase: %s legion: %s) calling %s\n", phase, ul->legion, usl->value);
 	return ula->func(ul, usl->value + usl->custom);
 }
 
@@ -692,18 +667,6 @@ static int legion_action_log(struct uwsgi_legion *ul, char *arg) {
 	return 0;
 }
 
-static int legion_action_alarm(struct uwsgi_legion *ul, char *arg) {
-	char *space = strchr(arg,' ');
-        if (!space) {
-                uwsgi_log("invalid alarm action syntax, must be: <alarm> <msg>\n");
-                return -1;
-        }
-        *space = 0;
-        uwsgi_alarm_trigger(arg, space+1,  strlen(space+1));
-        *space = ' ';
-        return 0;
-}
-
 void uwsgi_start_legions() {
 	pthread_t legion_loop_t;
 
@@ -712,10 +675,8 @@ void uwsgi_start_legions() {
 
 	// register embedded actions
 	uwsgi_legion_action_register("cmd", legion_action_cmd);
-	uwsgi_legion_action_register("exec", legion_action_cmd);
 	uwsgi_legion_action_register("signal", legion_action_signal);
 	uwsgi_legion_action_register("log", legion_action_log);
-	uwsgi_legion_action_register("alarm", legion_action_alarm);
 
 	uwsgi.legion_queue = event_queue_init();
 	struct uwsgi_legion *legion = uwsgi.legions;
@@ -775,19 +736,13 @@ void uwsgi_legion_add(struct uwsgi_legion *ul) {
 }
 
 int uwsgi_legion_announce(struct uwsgi_legion *ul) {
-	time_t now = uwsgi_now();
-
-	if (now <= ul->suspended_til) return 0;
-	ul->suspended_til = 0;
-
 	struct uwsgi_buffer *ub = uwsgi_buffer_new(4096);
-	unsigned char *encrypted = NULL;
 
 	if (uwsgi_buffer_append_keyval(ub, "legion", 6, ul->legion, ul->legion_len))
 		goto err;
 	if (uwsgi_buffer_append_keynum(ub, "valor", 5, ul->valor))
 		goto err;
-	if (uwsgi_buffer_append_keynum(ub, "unix", 4, now))
+	if (uwsgi_buffer_append_keynum(ub, "unix", 4, uwsgi_now()))
 		goto err;
 	if (uwsgi_buffer_append_keynum(ub, "lord", 4, ul->i_am_the_lord ? ul->i_am_the_lord : 0))
 		goto err;
@@ -814,7 +769,7 @@ int uwsgi_legion_announce(struct uwsgi_legion *ul) {
                 	goto err;
 	}
 
-	encrypted = uwsgi_malloc(ub->pos + 4 + EVP_MAX_BLOCK_LENGTH);
+	unsigned char *encrypted = uwsgi_malloc(ub->pos + 4 + EVP_MAX_BLOCK_LENGTH);
 	if (EVP_EncryptInit_ex(ul->encrypt_ctx, NULL, NULL, NULL, NULL) <= 0) {
 		uwsgi_error("[uwsgi-legion] EVP_EncryptInit_ex()");
 		goto err;
@@ -853,7 +808,6 @@ int uwsgi_legion_announce(struct uwsgi_legion *ul) {
 	return 0;
 err:
 	uwsgi_buffer_destroy(ub);
-	free(encrypted);
 	return -1;
 }
 
@@ -870,7 +824,6 @@ void uwsgi_opt_legion_mcast(char *opt, char *value, void *foobar) {
                 exit(1);
         }
 	uwsgi_legion_register_node(ul, uwsgi_str(ul->addr));
-	free(legion);
 }
 
 void uwsgi_opt_legion_node(char *opt, char *value, void *foobar) {
@@ -1159,11 +1112,10 @@ struct uwsgi_legion_action *uwsgi_legion_action_get(char *name) {
 	return NULL;
 }
 
-struct uwsgi_legion_action *uwsgi_legion_action_register(char *name, int (*func) (struct uwsgi_legion *, char *)) {
-	struct uwsgi_legion_action *found_ula = uwsgi_legion_action_get(name);
-	if (found_ula) {
+void uwsgi_legion_action_register(char *name, int (*func) (struct uwsgi_legion *, char *)) {
+	if (uwsgi_legion_action_get(name)) {
 		uwsgi_log("[uwsgi-legion] action \"%s\" is already registered !!!\n", name);
-		return found_ula;
+		return;
 	}
 
 	struct uwsgi_legion_action *old_ula = NULL, *ula = uwsgi.legion_actions;
@@ -1182,8 +1134,6 @@ struct uwsgi_legion_action *uwsgi_legion_action_register(char *name, int (*func)
 	else {
 		uwsgi.legion_actions = ula;
 	}
-
-	return ula;
 }
 
 void uwsgi_legion_announce_death(void) {
@@ -1212,9 +1162,6 @@ next:
 		legion = legion->next;
 	}
 
-	// this must be called only by the master !!!
-	if (!uwsgi.workers) return;
-	if (uwsgi.workers[0].pid != getpid()) return;
 	uwsgi_legion_announce_death();
 }
 

core/lock.c

@@ -647,7 +647,6 @@ void *uwsgi_robust_mutexes_watchdog_loop(void *arg) {
 	for(;;) {
 		uwsgi_lock(uwsgi.the_thunder_lock);
 		uwsgi_unlock(uwsgi.the_thunder_lock);
-		sleep(1);
 	}
 	return NULL;
 }

core/logging.c

@@ -119,36 +119,6 @@ void uwsgi_log_verbose(const char *fmt, ...) {
 }
 
 
-/*
-	commodity function mainly useful in log rotation
-*/
-void uwsgi_logfile_write(const char *fmt, ...) {
-	va_list ap;
-        char logpkt[4096];
-
-        struct timeval tv;
-        char ctime_storage[26];
-
-	gettimeofday(&tv, NULL);
-#if defined(__sun__) && !defined(__clang__)
-        ctime_r((const time_t *) &tv.tv_sec, ctime_storage, 26);
-#else
-        ctime_r((const time_t *) &tv.tv_sec, ctime_storage);
-#endif
-        memcpy(logpkt, ctime_storage, 24);
-        memcpy(logpkt + 24, " - ", 3);
-
-        int rlen = 24 + 3;
-
-        va_start(ap, fmt);
-        rlen += vsnprintf(logpkt + rlen, 4096 - rlen, fmt, ap);
-        va_end(ap);
-
-        // do not check for errors
-        rlen = write(uwsgi.original_log_fd, logpkt, rlen);
-}
-
-
 
 static void fix_logpipe_buf(int *fd) {
 	int so_bufsize;
@@ -241,6 +211,49 @@ void create_logpipe(void) {
 
 }
 
+#ifdef UWSGI_ZEROMQ
+// the zeromq logger
+ssize_t uwsgi_zeromq_logger(struct uwsgi_logger *ul, char *message, size_t len) {
+
+	if (!ul->configured) {
+
+		if (!ul->arg) {
+			uwsgi_log_safe("invalid zeromq syntax\n");
+			exit(1);
+		}
+
+		void *ctx = uwsgi_zeromq_init();
+
+		ul->data = zmq_socket(ctx, ZMQ_PUSH);
+		if (ul->data == NULL) {
+			uwsgi_error_safe("zmq_socket()");
+			exit(1);
+		}
+
+		if (zmq_connect(ul->data, ul->arg) < 0) {
+			uwsgi_error_safe("zmq_connect()");
+			exit(1);
+		}
+
+		ul->configured = 1;
+	}
+
+	zmq_msg_t msg;
+	if (zmq_msg_init_size(&msg, len) == 0) {
+		memcpy(zmq_msg_data(&msg), message, len);
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3,0,0)
+		zmq_sendmsg(ul->data, &msg, 0);
+#else
+		zmq_send(ul->data, &msg, 0);
+#endif
+		zmq_msg_close(&msg);
+	}
+
+	return 0;
+}
+#endif
+
+
 // log to the specified file or udp address
 void logto(char *logfile) {
 
@@ -301,27 +314,19 @@ void logto(char *logfile) {
 	}
 
 
-	// if the log-master is already active, just re-set the original_log_fd
-	if (uwsgi.shared->worker_log_pipe[0] == -1) {
-		/* stdout */
-		if (fd != 1) {
-			if (dup2(fd, 1) < 0) {
-				uwsgi_error("dup2()");
-				exit(1);
-			}
-			close(fd);
-		}
-
-		/* stderr */
-		if (dup2(1, 2) < 0) {
+	/* stdout */
+	if (fd != 1) {
+		if (dup2(fd, 1) < 0) {
 			uwsgi_error("dup2()");
 			exit(1);
 		}
-
-		 uwsgi.original_log_fd = 2;
+		close(fd);
 	}
-	else {
-		uwsgi.original_log_fd = fd;
+
+	/* stderr */
+	if (dup2(1, 2) < 0) {
+		uwsgi_error("dup2()");
+		exit(1);
 	}
 }
 
@@ -354,51 +359,51 @@ void uwsgi_setup_log() {
 
 static struct uwsgi_logger *setup_choosen_logger(struct uwsgi_string_list *usl) {
 	char *id = NULL;
-	char *name = usl->value;
+                char *name = usl->value;
 
-	char *space = strchr(name, ' ');
-	if (space) {
-		int is_id = 1;
-		int i;
-		for (i = 0; i < (space - name); i++) {
-			if (!isalnum((int)name[i])) {
-				is_id = 0;
-				break;
-			}
-		}
-		if (is_id) {
-			id = uwsgi_concat2n(name, space - name, "", 0);
-			name = space + 1;
-		}
-	}
+                char *space = strchr(name, ' ');
+                if (space) {
+                        int is_id = 1;
+                        int i;
+                        for (i = 0; i < (space - name); i++) {
+                                if (!isalnum((int)name[i])) {
+                                        is_id = 0;
+                                        break;
+                                }
+                        }
+                        if (is_id) {
+                                id = uwsgi_concat2n(name, space - name, "", 0);
+                                name = space + 1;
+                        }
+                }
 
-	char *colon = strchr(name, ':');
-	if (colon) {
-		*colon = 0;
-	}
+                char *colon = strchr(name, ':');
+                if (colon) {
+                        *colon = 0;
+                }
 
-	struct uwsgi_logger *choosen_logger = uwsgi_get_logger(name);
-	if (!choosen_logger) {
-		uwsgi_log("unable to find logger %s\n", name);
-		exit(1);
-	}
+                struct uwsgi_logger *choosen_logger = uwsgi_get_logger(name);
+                if (!choosen_logger) {
+                        uwsgi_log("unable to find logger %s\n", name);
+                        exit(1);
+                }
 
-	// make a copy of the logger
-	struct uwsgi_logger *copy_of_choosen_logger = uwsgi_malloc(sizeof(struct uwsgi_logger));
-	memcpy(copy_of_choosen_logger, choosen_logger, sizeof(struct uwsgi_logger));
-	choosen_logger = copy_of_choosen_logger;
-	choosen_logger->id = id;
-	choosen_logger->next = NULL;
+                // make a copy of the logger
+                struct uwsgi_logger *copy_of_choosen_logger = uwsgi_malloc(sizeof(struct uwsgi_logger));
+                memcpy(copy_of_choosen_logger, choosen_logger, sizeof(struct uwsgi_logger));
+                choosen_logger = copy_of_choosen_logger;
+                choosen_logger->id = id;
+                choosen_logger->next = NULL;
 
-	if (colon) {
-		choosen_logger->arg = colon + 1;
-		// check for empty string
-		if (*choosen_logger->arg == 0) {
-			choosen_logger->arg = NULL;
-		}
-		*colon = ':';
-	}
-	return choosen_logger;
+                if (colon) {
+                        choosen_logger->arg = colon + 1;
+                        // check for empty string
+                        if (*choosen_logger->arg == 0) {
+                                choosen_logger->arg = NULL;
+                        }
+                        *colon = ':';
+                }
+		return choosen_logger;
 }
 
 void uwsgi_setup_log_master(void) {
@@ -485,21 +490,15 @@ void uwsgi_check_logrotate(void) {
 
 	int need_rotation = 0;
 	int need_reopen = 0;
-	off_t logsize;
 
 	if (uwsgi.log_master) {
-		logsize = lseek(uwsgi.original_log_fd, 0, SEEK_CUR);
+		uwsgi.shared->logsize = lseek(uwsgi.original_log_fd, 0, SEEK_CUR);
 	}
 	else {
-		logsize = lseek(2, 0, SEEK_CUR);
+		uwsgi.shared->logsize = lseek(2, 0, SEEK_CUR);
 	}
-	if (logsize < 0) {
-		uwsgi_error("uwsgi_check_logrotate()/lseek()");
-		return;
-	}
-	uwsgi.shared->logsize = logsize;
 
-	if (uwsgi.log_maxsize > 0 && (uint64_t) uwsgi.shared->logsize > uwsgi.log_maxsize) {
+	if (uwsgi.log_maxsize > 0 && uwsgi.shared->logsize > uwsgi.log_maxsize) {
 		need_rotation = 1;
 	}
 
@@ -519,53 +518,51 @@ void uwsgi_check_logrotate(void) {
 	}
 }
 
-void uwsgi_log_do_rotate(char *logfile, char *rotatedfile, off_t logsize, int log_fd) {
-	int need_free = 0;
-	char *rot_name = rotatedfile;
-
-	if (rot_name == NULL) {
-		char *ts_str = uwsgi_num2str((int) uwsgi_now());
-		rot_name = uwsgi_concat3(logfile, ".", ts_str);
-		free(ts_str);
-		need_free = 1;
-	}
-	// this will be rawly written to the logfile
-	uwsgi_logfile_write("logsize: %llu, triggering rotation to %s...\n", (unsigned long long) logsize, rot_name);
-	if (rename(logfile, rot_name) == 0) {
-		// reopen logfile and dup'it, on dup2 error, exit(1)
-		int fd = open(logfile, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
-		if (fd < 0) {
-			// this will be written to the original file
-			uwsgi_error_open(logfile);
-			exit(1);
-		}
-		else {
-			if (dup2(fd, log_fd) < 0) {
-				// this could be lost :(
-				uwsgi_error("uwsgi_log_do_rotate()/dup2()");
-				exit(1);
-			}
-			close(fd);
-		}
-	}
-	else {
-		uwsgi_error("unable to rotate log: rename()");
-	}
-	if (need_free)
-		free(rot_name);
-}
-
 void uwsgi_log_rotate() {
-	if (!uwsgi.logfile)
-		return;
-	uwsgi_log_do_rotate(uwsgi.logfile, uwsgi.log_backupname, uwsgi.shared->logsize, uwsgi.original_log_fd);
+	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 && ret < 1024) {
+        if (ret > 0) {
                         if (write(uwsgi.original_log_fd, message, ret) != ret) {
                                 // very probably this will never be printed
                                 uwsgi_error("write()");
@@ -578,10 +575,9 @@ void uwsgi_log_reopen() {
                 if (uwsgi.original_log_fd < 0) {
                         uwsgi_error_open(uwsgi.logfile);
                         grace_them_all(0);
-			return;
                 }
                 ret = snprintf(message, 1024, "[%d] %s reopened.\n", (int) uwsgi_now(), uwsgi.logfile);
-                if (ret > 0 && ret < 1024) {
+                if (ret > 0) {
                         if (write(uwsgi.original_log_fd, message, ret) != ret) {
                                 // very probably this will never be printed
                                 uwsgi_error("write()");
@@ -593,7 +589,7 @@ void uwsgi_log_reopen() {
 
 void log_request(struct wsgi_request *wsgi_req) {
 
-	int log_it = uwsgi.logging_options.enabled;
+	int log_it = uwsgi.shared->options[UWSGI_OPTION_LOGGING];
 
 	if (wsgi_req->do_not_log)
 		return;
@@ -603,25 +599,22 @@ void log_request(struct wsgi_request *wsgi_req) {
 	}
 
 /* conditional logging */
-	if (uwsgi.logging_options.zero && wsgi_req->response_size == 0) {
+	if (uwsgi.shared->options[UWSGI_OPTION_LOG_ZERO] && wsgi_req->response_size == 0) {
 		goto logit;
 	}
-	if (uwsgi.logging_options.slow && (uint32_t) wsgi_req_time >= uwsgi.logging_options.slow) {
+	if (uwsgi.shared->options[UWSGI_OPTION_LOG_SLOW] && (uint32_t) wsgi_req_time >= uwsgi.shared->options[UWSGI_OPTION_LOG_SLOW]) {
 		goto logit;
 	}
-	if (uwsgi.logging_options._4xx && (wsgi_req->status >= 400 && wsgi_req->status <= 499)) {
+	if (uwsgi.shared->options[UWSGI_OPTION_LOG_4xx] && (wsgi_req->status >= 400 && wsgi_req->status <= 499)) {
 		goto logit;
 	}
-	if (uwsgi.logging_options._5xx && (wsgi_req->status >= 500 && wsgi_req->status <= 599)) {
+	if (uwsgi.shared->options[UWSGI_OPTION_LOG_5xx] && (wsgi_req->status >= 500 && wsgi_req->status <= 599)) {
 		goto logit;
 	}
-	if (uwsgi.logging_options.big && (wsgi_req->response_size >= uwsgi.logging_options.big)) {
+	if (uwsgi.shared->options[UWSGI_OPTION_LOG_BIG] && (wsgi_req->response_size >= uwsgi.shared->options[UWSGI_OPTION_LOG_BIG])) {
 		goto logit;
 	}
-	if (uwsgi.logging_options.sendfile && wsgi_req->via == UWSGI_VIA_SENDFILE) {
-		goto logit;
-	}
-	if (uwsgi.logging_options.ioerror && wsgi_req->read_errors > 0 && wsgi_req->write_errors > 0) {
+	if (uwsgi.shared->options[UWSGI_OPTION_LOG_SENDFILE] && wsgi_req->via == UWSGI_VIA_SENDFILE) {
 		goto logit;
 	}
 
@@ -706,7 +699,7 @@ void uwsgi_logit_simple(struct wsgi_request *wsgi_req) {
 		logvecpos++;
 	}
 
-	if (uwsgi.logging_options.memory_report == 1) {
+	if (uwsgi.shared->options[UWSGI_OPTION_MEMORY_DEBUG] == 1) {
 		rlen = snprintf(mempkt, 4096, "{address space usage: %lld bytes/%lluMB} {rss usage: %llu bytes/%lluMB} ", (unsigned long long) uwsgi.workers[uwsgi.mywid].vsz_size, (unsigned long long) uwsgi.workers[uwsgi.mywid].vsz_size / 1024 / 1024,
 			(unsigned long long) uwsgi.workers[uwsgi.mywid].rss_size, (unsigned long long) uwsgi.workers[uwsgi.mywid].rss_size / 1024 / 1024);
 		logvec[logvecpos].iov_base = mempkt;
@@ -937,7 +930,7 @@ struct uwsgi_logger *uwsgi_get_logger_from_id(char *id) {
 	struct uwsgi_logger *ul = uwsgi.choosen_logger;
 
 	while (ul) {
-		if (ul->id && !strcmp(ul->id, id)) {
+		if (!strcmp(ul->id, id)) {
 			return ul;
 		}
 		ul = ul->next;
@@ -987,20 +980,6 @@ void uwsgi_logit_lf(struct wsgi_request *wsgi_req) {
 				uwsgi.logvectors[wsgi_req->async_id][pos].iov_len = 0;
 			}
 		}
-		// var
-		else if (logchunk->type == 5) {
-			uint16_t value_len = 0;
-			char *value = uwsgi_get_var(wsgi_req, logchunk->ptr, logchunk->len, &value_len);
-			// could be NULL
-                        uwsgi.logvectors[wsgi_req->async_id][pos].iov_base = value;
-                        uwsgi.logvectors[wsgi_req->async_id][pos].iov_len = (size_t) value_len;
-                }
-		// metric
-		else if (logchunk->type == 4) {
-			int64_t metric = uwsgi_metric_get(logchunk->ptr, NULL);
-			uwsgi.logvectors[wsgi_req->async_id][pos].iov_base = uwsgi_64bit2str(metric);
-			uwsgi.logvectors[wsgi_req->async_id][pos].iov_len = strlen(uwsgi.logvectors[wsgi_req->async_id][pos].iov_base);
-		}
 
 		if (uwsgi.logvectors[wsgi_req->async_id][pos].iov_len == 0 && logchunk->type != 0) {
 			uwsgi.logvectors[wsgi_req->async_id][pos].iov_base = (char *) empty_var;
@@ -1026,6 +1005,10 @@ void uwsgi_logit_lf(struct wsgi_request *wsgi_req) {
 	}
 }
 
+void uwsgi_logit_lf_strftime(struct wsgi_request *wsgi_req) {
+	uwsgi_log("lf strftime\n");
+}
+
 void uwsgi_build_log_format(char *format) {
 	int state = 0;
 	char *ptr = format;
@@ -1136,7 +1119,7 @@ static ssize_t uwsgi_lf_ltime(struct wsgi_request * wsgi_req, char **buf) {
 }
 
 static ssize_t uwsgi_lf_ftime(struct wsgi_request * wsgi_req, char **buf) {
-	if (!uwsgi.logformat_strftime || !uwsgi.log_strftime) {
+	if (!uwsgi.log_strftime) {
 		return uwsgi_lf_ltime(wsgi_req, buf);
 	}
 	*buf = uwsgi_malloc(64);
@@ -1149,16 +1132,6 @@ static ssize_t uwsgi_lf_ftime(struct wsgi_request * wsgi_req, char **buf) {
 	return ret;
 }
 
-static ssize_t uwsgi_lf_tmsecs(struct wsgi_request * wsgi_req, char **buf) {
-	*buf = uwsgi_64bit2str(wsgi_req->start_of_request / (int64_t) 1000);
-	return strlen(*buf);
-}
-
-static ssize_t uwsgi_lf_tmicros(struct wsgi_request * wsgi_req, char **buf) {
-	*buf = uwsgi_64bit2str(wsgi_req->start_of_request);
-	return strlen(*buf);
-}
-
 static ssize_t uwsgi_lf_micros(struct wsgi_request * wsgi_req, char **buf) {
 	*buf = uwsgi_num2str(wsgi_req->end_of_request - wsgi_req->start_of_request);
 	return strlen(*buf);
@@ -1234,54 +1207,6 @@ static ssize_t uwsgi_lf_headers(struct wsgi_request * wsgi_req, char **buf) {
 	return strlen(*buf);
 }
 
-static ssize_t uwsgi_lf_werr(struct wsgi_request * wsgi_req, char **buf) {
-	*buf = uwsgi_num2str((int) wsgi_req->write_errors);
-	return strlen(*buf);
-}
-
-static ssize_t uwsgi_lf_rerr(struct wsgi_request * wsgi_req, char **buf) {
-	*buf = uwsgi_num2str((int) wsgi_req->read_errors);
-	return strlen(*buf);
-}
-
-static ssize_t uwsgi_lf_ioerr(struct wsgi_request * wsgi_req, char **buf) {
-	*buf = uwsgi_num2str((int) (wsgi_req->write_errors + wsgi_req->read_errors));
-	return strlen(*buf);
-}
-
-struct uwsgi_logchunk *uwsgi_register_logchunk(char *name, ssize_t (*func)(struct wsgi_request *, char **), int need_free) {
-	struct uwsgi_logchunk *old_logchunk = NULL, *logchunk = uwsgi.registered_logchunks;
-	while(logchunk) {
-		if (!strcmp(logchunk->name, name)) goto found;
-		old_logchunk = logchunk;
-		logchunk = logchunk->next;
-	}
-	logchunk = uwsgi_calloc(sizeof(struct uwsgi_logchunk));
-	logchunk->name = name;
-	if (old_logchunk) {
-		old_logchunk->next = logchunk;
-	}
-	else {
-		uwsgi.registered_logchunks = logchunk;
-	}
-found:
-	logchunk->func = func;
-	logchunk->free = need_free;
-	logchunk->type = 3;
-	return logchunk;	
-}
-
-struct uwsgi_logchunk *uwsgi_get_logchunk_by_name(char *name, size_t name_len) {
-	struct uwsgi_logchunk *logchunk = uwsgi.registered_logchunks;
-	while(logchunk) {
-		if (!uwsgi_strncmp(name, name_len, logchunk->name, strlen(logchunk->name))) {
-			return logchunk;
-		}
-		logchunk = logchunk->next;
-	}
-	return NULL;
-}
-
 void uwsgi_add_logchunk(int variable, int pos, char *ptr, size_t len) {
 
 	struct uwsgi_logchunk *logchunk = uwsgi.logchunks;
@@ -1302,12 +1227,10 @@ void uwsgi_add_logchunk(int variable, int pos, char *ptr, size_t len) {
 	}
 
 	/*
-	   0 -> raw text
+	   0 -> raw test
 	   1 -> offsetof variable
 	   2 -> logvar
 	   3 -> func
-	   4 -> metric
-	   5 -> request variable
 	 */
 
 	logchunk->type = variable;
@@ -1317,29 +1240,161 @@ void uwsgi_add_logchunk(int variable, int pos, char *ptr, size_t len) {
 	logchunk->len = len;
 	// variable
 	if (variable) {
-		struct uwsgi_logchunk *rlc = uwsgi_get_logchunk_by_name(ptr, len);
-		if (rlc) {
-			if (rlc->type == 1) {
-				logchunk->pos = rlc->pos;
-				logchunk->pos_len = rlc->pos_len;
-			}
-			else if (rlc->type == 3) {
-				logchunk->type = 3;
-				logchunk->func = rlc->func;
-				logchunk->free = rlc->free;
-			}
+		if (!uwsgi_strncmp(ptr, len, "uri", 3)) {
+			logchunk->pos = offsetof(struct wsgi_request, uri);
+			logchunk->pos_len = offsetof(struct wsgi_request, uri_len);
 		}
-		// var
-		else if (!uwsgi_starts_with(ptr, len, "var.", 4)) {
-			logchunk->type = 5;
-			logchunk->ptr = ptr+4;
-			logchunk->len = len-4;
-			logchunk->free = 0;
+		else if (!uwsgi_strncmp(ptr, len, "method", 6)) {
+			logchunk->pos = offsetof(struct wsgi_request, method);
+			logchunk->pos_len = offsetof(struct wsgi_request, method_len);
 		}
-		// metric
-		else if (!uwsgi_starts_with(ptr, len, "metric.", 7)) {
-			logchunk->type = 4;
-			logchunk->ptr = uwsgi_concat2n(ptr+7, len - 7, "", 0);
+		else if (!uwsgi_strncmp(ptr, len, "user", 4)) {
+			logchunk->pos = offsetof(struct wsgi_request, remote_user);
+			logchunk->pos_len = offsetof(struct wsgi_request, remote_user_len);
+		}
+		else if (!uwsgi_strncmp(ptr, len, "addr", 4)) {
+			logchunk->pos = offsetof(struct wsgi_request, remote_addr);
+			logchunk->pos_len = offsetof(struct wsgi_request, remote_addr_len);
+		}
+		else if (!uwsgi_strncmp(ptr, len, "host", 4)) {
+			logchunk->pos = offsetof(struct wsgi_request, host);
+			logchunk->pos_len = offsetof(struct wsgi_request, host_len);
+		}
+		else if (!uwsgi_strncmp(ptr, len, "proto", 5)) {
+			logchunk->pos = offsetof(struct wsgi_request, protocol);
+			logchunk->pos_len = offsetof(struct wsgi_request, protocol_len);
+		}
+		else if (!uwsgi_strncmp(ptr, len, "uagent", 6)) {
+			logchunk->pos = offsetof(struct wsgi_request, user_agent);
+			logchunk->pos_len = offsetof(struct wsgi_request, user_agent_len);
+		}
+		else if (!uwsgi_strncmp(ptr, len, "referer", 7)) {
+			logchunk->pos = offsetof(struct wsgi_request, referer);
+			logchunk->pos_len = offsetof(struct wsgi_request, referer_len);
+		}
+		else if (!uwsgi_strncmp(ptr, len, "status", 6)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_status;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "rsize", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_rsize;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "hsize", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_hsize;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "size", 4)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_size;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "cl", 2)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_cl;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "micros", 6)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_micros;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "msecs", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_msecs;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "time", 4)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_time;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "ltime", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_ltime;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "ftime", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_ftime;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "ctime", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_ctime;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "epoch", 5)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_epoch;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "pid", 3)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_pid;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "wid", 3)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_wid;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "switches", 8)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_switches;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "vars", 4)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_vars;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "core", 4)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_core;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "vsz", 3)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_vsz;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "rss", 3)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_rss;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "vszM", 4)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_vszM;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "rssM", 4)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_rssM;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "pktsize", 7)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_pktsize;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "modifier1", 9)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_modifier1;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "modifier2", 9)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_modifier2;
+			logchunk->free = 1;
+		}
+		else if (!uwsgi_strncmp(ptr, len, "headers", 7)) {
+			logchunk->type = 3;
+			logchunk->func = uwsgi_lf_headers;
 			logchunk->free = 1;
 		}
 		// logvar
@@ -1786,7 +1841,7 @@ void uwsgi_log_encoder_parse_vars(struct uwsgi_log_encoder *ule) {
 /*
         // format: foo ${var} bar
         msg (the logline)
-        msgnl (the logline with newline)
+        msgnl (the logine with newline)
         unix (the time_t value)
         micros (current microseconds)
         strftime (strftime)
@@ -1859,7 +1914,7 @@ static char *uwsgi_log_encoder_json(struct uwsgi_log_encoder *ule, char *msg, si
                         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)+1);
+				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);
@@ -1868,7 +1923,7 @@ static char *uwsgi_log_encoder_json(struct uwsgi_log_encoder *ule, char *msg, si
                                 free(e_json);
                         }
                         else if (!uwsgi_strncmp(usl->value, usl->len, "msgnl", 5)) {
-				char *e_json = uwsgi_malloc((len * 2)+1);
+				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);
@@ -1889,7 +1944,7 @@ static char *uwsgi_log_encoder_json(struct uwsgi_log_encoder *ule, char *msg, si
                                 int strftime_len = strftime(sftime, 64, buf, localtime(&now));
                                 free(buf);
                                 if (strftime_len > 0) {
-					char *e_json = uwsgi_malloc((strftime_len * 2)+1);
+					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);
@@ -1912,51 +1967,6 @@ end:
         return buf;
 }
 
-#define r_logchunk(x) uwsgi_register_logchunk(#x, uwsgi_lf_ ## x, 1)
-#define r_logchunk_offset(x, y) { struct uwsgi_logchunk *lc = uwsgi_register_logchunk(#x, NULL, 0); lc->pos = offsetof(struct wsgi_request, y); lc->pos_len = offsetof(struct wsgi_request, y ## _len); lc->type = 1; lc->free=0;}
-void uwsgi_register_logchunks() {
-	// offsets
-	r_logchunk_offset(uri, uri);
-	r_logchunk_offset(method, method);
-	r_logchunk_offset(user, remote_user);
-	r_logchunk_offset(addr, remote_addr);
-	r_logchunk_offset(host, host);
-	r_logchunk_offset(proto, protocol);
-	r_logchunk_offset(uagent, user_agent);
-	r_logchunk_offset(referer, referer);
-
-	// funcs
-	r_logchunk(status);
-	r_logchunk(rsize);
-	r_logchunk(hsize);
-	r_logchunk(size);
-	r_logchunk(cl);
-	r_logchunk(micros);
-	r_logchunk(msecs);
-	r_logchunk(tmsecs);
-	r_logchunk(tmicros);
-	r_logchunk(time);
-	r_logchunk(ltime);
-	r_logchunk(ftime);
-	r_logchunk(ctime);
-	r_logchunk(epoch);
-	r_logchunk(pid);
-	r_logchunk(wid);
-	r_logchunk(switches);
-	r_logchunk(vars);
-	r_logchunk(core);
-	r_logchunk(vsz);
-	r_logchunk(rss);
-	r_logchunk(vszM);
-	r_logchunk(rssM);
-	r_logchunk(pktsize);
-	r_logchunk(modifier1);
-	r_logchunk(modifier2);
-	r_logchunk(headers);
-	r_logchunk(werr);
-	r_logchunk(rerr);
-	r_logchunk(ioerr);
-}
 
 void uwsgi_log_encoders_register_embedded() {
 	uwsgi_register_log_encoder("prefix", uwsgi_log_encoder_prefix);

core/master.c

@@ -2,39 +2,14 @@
 
 extern struct uwsgi_server uwsgi;
 
-void uwsgi_update_load_counters() {
-
-	int i;
-	uint64_t busy_workers = 0;
-	uint64_t idle_workers = 0;
-	static time_t last_sos = 0;
-
-        for (i = 1; i <= uwsgi.numproc; i++) {
-                if (uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].pid > 0) {
-                        if (uwsgi_worker_is_busy(i) == 0) {
-				idle_workers++;
-			}
-			else {
-				busy_workers++;
-			}
-                }
-        }
-
-	if (busy_workers >= (uint64_t) uwsgi.numproc) {
-		ushared->overloaded++;
-	
-		if (uwsgi.vassal_sos) {
-			if (uwsgi.current_time - last_sos > uwsgi.vassal_sos) {
-                        	uwsgi_log_verbose("asking Emperor for reinforcements (overload: %llu)...\n", (unsigned long long) ushared->overloaded);
-				vassal_sos();
-				last_sos = uwsgi.current_time;
-			}
-		}
+void uwsgi_restore_auto_snapshot(int signum) {
 
+	if (uwsgi.workers[1].snapshot > 0) {
+		uwsgi.restore_snapshot = 1;
+	}
+	else {
+		uwsgi_log("[WARNING] no snapshot available\n");
 	}
-
-	ushared->busy_workers = busy_workers;
-	ushared->idle_workers = idle_workers;
 
 }
 
@@ -57,25 +32,24 @@ void uwsgi_unblock_signal(int signum) {
 }
 
 void uwsgi_master_manage_udp(int udp_fd) {
-	char buf[4096];
 	struct sockaddr_in udp_client;
 	char udp_client_addr[16];
 	int i;
 
 	socklen_t udp_len = sizeof(udp_client);
-	ssize_t rlen = recvfrom(udp_fd, buf, 4096, 0, (struct sockaddr *) &udp_client, &udp_len);
+	ssize_t rlen = recvfrom(udp_fd, uwsgi.wsgi_req->buffer, uwsgi.buffer_size, 0, (struct sockaddr *) &udp_client, &udp_len);
 
 	if (rlen < 0) {
-		uwsgi_error("uwsgi_master_manage_udp()/recvfrom()");
+		uwsgi_error("recvfrom()");
 	}
 	else if (rlen > 0) {
 
 		memset(udp_client_addr, 0, 16);
 		if (inet_ntop(AF_INET, &udp_client.sin_addr.s_addr, udp_client_addr, 16)) {
-			if (buf[0] == UWSGI_MODIFIER_MULTICAST_ANNOUNCE) {
+			if (uwsgi.wsgi_req->buffer[0] == UWSGI_MODIFIER_MULTICAST_ANNOUNCE) {
 			}
-			else if (buf[0] == 0x30 && uwsgi.snmp) {
-				manage_snmp(udp_fd, (uint8_t *) buf, rlen, &udp_client);
+			else if (uwsgi.wsgi_req->buffer[0] == 0x30 && uwsgi.snmp) {
+				manage_snmp(udp_fd, (uint8_t *) uwsgi.wsgi_req->buffer, rlen, &udp_client);
 			}
 			else {
 
@@ -83,7 +57,7 @@ void uwsgi_master_manage_udp(int udp_fd) {
 				int udp_managed = 0;
 				for (i = 0; i < 256; i++) {
 					if (uwsgi.p[i]->manage_udp) {
-						if (uwsgi.p[i]->manage_udp(udp_client_addr, udp_client.sin_port, buf, rlen)) {
+						if (uwsgi.p[i]->manage_udp(udp_client_addr, udp_client.sin_port, uwsgi.wsgi_req->buffer, rlen)) {
 							udp_managed = 1;
 							break;
 						}
@@ -92,17 +66,42 @@ void uwsgi_master_manage_udp(int udp_fd) {
 
 				// else a simple udp logger
 				if (!udp_managed) {
-					uwsgi_log("[udp:%s:%d] %.*s", udp_client_addr, ntohs(udp_client.sin_port), (int) rlen, buf);
+					uwsgi_log("[udp:%s:%d] %.*s", udp_client_addr, ntohs(udp_client.sin_port), (int) rlen, uwsgi.wsgi_req->buffer);
 				}
 			}
 		}
 		else {
-			uwsgi_error("uwsgi_master_manage_udp()/inet_ntop()");
+			uwsgi_error("inet_ntop()");
 		}
 
 	}
 }
 
+void uwsgi_master_restore_snapshot() {
+	int i, waitpid_status;
+	uwsgi_log("[snapshot] restoring workers...\n");
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid == 0)
+			continue;
+		kill(uwsgi.workers[i].pid, SIGKILL);
+		if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+			uwsgi_error("waitpid()");
+		}
+		if (uwsgi.auto_snapshot > 0 && i > uwsgi.auto_snapshot) {
+			uwsgi.workers[i].pid = 0;
+			uwsgi.workers[i].snapshot = 0;
+		}
+		else {
+			uwsgi.workers[i].pid = uwsgi.workers[i].snapshot;
+			uwsgi.workers[i].snapshot = 0;
+			kill(uwsgi.workers[i].pid, SIGURG);
+			uwsgi_log("Restored uWSGI worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
+		}
+	}
+
+	uwsgi.restore_snapshot = 0;
+}
+
 void suspend_resume_them_all(int signum) {
 
 	int i;
@@ -145,15 +144,6 @@ void uwsgi_master_check_mercy() {
 			}
 		}
 	}
-
-	for (i = 0; i < uwsgi.mules_cnt; i++) {
-		if (uwsgi.mules[i].pid > 0 && uwsgi.mules[i].cursed_at) {
-			if (uwsgi_now() > uwsgi.mules[i].no_mercy_at) {
-				uwsgi_log_verbose("mule %d (pid: %d) is taking too much time to die...NO MERCY !!!\n", i + 1, uwsgi.mules[i].pid);
-				uwsgi_curse_mule(i, SIGKILL);
-			}
-		}
-	}
 }
 
 
@@ -187,34 +177,53 @@ void expire_rb_timeouts(struct uwsgi_rbtree *tree) {
 	}
 }
 
-static void get_tcp_info(struct uwsgi_socket *uwsgi_sock) {
+int uwsgi_get_tcp_info(int fd) {
 
 #if defined(__linux__) || defined(__FreeBSD__)
-	int fd = uwsgi_sock->fd;
-	struct tcp_info ti;
 	socklen_t tis = sizeof(struct tcp_info);
 
-	if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &ti, &tis)) {
+	if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &uwsgi.shared->ti, &tis)) {
 
 		// checks for older kernels
 #if defined(__linux__)
-		if (!ti.tcpi_sacked) {
+		if (!uwsgi.shared->ti.tcpi_sacked) {
 #elif defined(__FreeBSD__)
-		if (!ti.__tcpi_sacked) {
+		if (!uwsgi.shared->ti.__tcpi_sacked) {
 #endif
-			return;
+			return 0;
 		}
 
 #if defined(__linux__)
-		uwsgi_sock->queue = (uint64_t) ti.tcpi_unacked;
-		uwsgi_sock->max_queue = (uint64_t) ti.tcpi_sacked;
+		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.tcpi_unacked;
+		uwsgi.shared->max_load = (uint64_t) uwsgi.shared->ti.tcpi_sacked;
 #elif defined(__FreeBSD__)
-		uwsgi_sock->queue = (uint64_t) ti.__tcpi_unacked;
-		uwsgi_sock->max_queue = (uint64_t) ti.__tcpi_sacked;
+		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.__tcpi_unacked;
+		uwsgi.shared->max_load = (uint64_t) uwsgi.shared->ti.__tcpi_sacked;
 #endif
-	}
 
+		uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = uwsgi.shared->load;
+		if (uwsgi.vassal_sos_backlog > 0 && uwsgi.has_emperor) {
+			if (uwsgi.shared->load >= (uint64_t) uwsgi.vassal_sos_backlog) {
+				// ask emperor for help
+				char byte = 30;
+				if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
+					uwsgi_error("write()");
+				}
+				else {
+					uwsgi_log("asking emperor for reinforcements (backlog: %llu)...\n", (unsigned long long) uwsgi.shared->load);
+				}
+			}
+		}
+		if (uwsgi.shared->load >= uwsgi.shared->max_load) {
+			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%llu/%llu) ***\n", fd, (unsigned long long) uwsgi.shared->load, (unsigned long long) uwsgi.shared->max_load);
+			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
+		}
+
+		return uwsgi.shared->load;
+	}
 #endif
+
+	return 0;
 }
 
 
@@ -227,78 +236,25 @@ static void get_tcp_info(struct uwsgi_socket *uwsgi_sock) {
 
 #ifdef SIOBKLGQ
 
-static void get_linux_unbit_SIOBKLGQ(struct uwsgi_socket *uwsgi_sock) {
+int get_linux_unbit_SIOBKLGQ(int fd) {
 
-	int fd = uwsgi_sock->fd;
 	int queue = 0;
 	if (ioctl(fd, SIOBKLGQ, &queue) >= 0) {
-		uwsgi_sock->queue = (uint64_t) queue;
-		uwsgi_sock->max_queue = (uint64_t) uwsgi.listen_queue;
+		uwsgi.shared->load = queue;
+		uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = queue;
+		if (queue >= uwsgi.listen_queue) {
+			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, queue, uwsgi.listen_queue);
+			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
+		}
+		return queue;
 	}
+
+	return 0;
+
 }
 #endif
 #endif
 
-static void master_check_listen_queue() {
-
-	uint64_t backlog = 0;
-	struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
-	while(uwsgi_sock) {
-		if (uwsgi_sock->family == AF_INET) {
-			get_tcp_info(uwsgi_sock);
-                }
-#ifdef __linux__
-#ifdef SIOBKLGQ
-                else if (uwsgi_sock->family == AF_UNIX) {
-                	get_linux_unbit_SIOBKLGQ(uwsgi_sock);
-                }
-#endif
-#endif
-
-		if (uwsgi_sock->queue > backlog) {
-			backlog = uwsgi_sock->queue;
-		}
-		if (uwsgi_sock->queue > 0 && uwsgi_sock->queue >= uwsgi_sock->max_queue) {
-			uwsgi_log_verbose("*** uWSGI listen queue of socket \"%s\" (fd: %d) full !!! (%llu/%llu) ***\n", uwsgi_sock->name, uwsgi_sock->fd, (unsigned long long) uwsgi_sock->queue, (unsigned long long) uwsgi_sock->max_queue);
-		}
-
-		if (uwsgi.alarm_backlog) {
-			char buf[1024];
-			int ret = snprintf(buf, 1024, "listen queue of socket \"%s\" (fd: %d) full !!! (%llu/%llu)", uwsgi_sock->name, uwsgi_sock->fd, (unsigned long long) uwsgi_sock->queue, (unsigned long long) uwsgi_sock->max_queue);
-			if (ret > 0 && ret < 1024) {
-				struct uwsgi_string_list *usl = NULL;
-				uwsgi_foreach(usl, uwsgi.alarm_backlog) {
-					uwsgi_alarm_trigger(usl->value, buf, ret);
-				}
-			}
-		}
-		uwsgi_sock = uwsgi_sock->next;
-	}
-
-	// TODO load should be something more advanced based on different values
-	uwsgi.shared->load = backlog;
-
-	uwsgi.shared->backlog = backlog;
-
-        if (uwsgi.vassal_sos_backlog > 0 && uwsgi.has_emperor) {
-        	if (uwsgi.shared->backlog >= (uint64_t) uwsgi.vassal_sos_backlog) {
-                	// ask emperor for help
-                        uwsgi_log_verbose("asking Emperor for reinforcements (backlog: %llu)...\n", (unsigned long long) uwsgi.shared->backlog);
-			vassal_sos();
-                }
-	}
-}
-
-void vassal_sos() {
-	if (!uwsgi.has_emperor) {
-		uwsgi_log("[broodlord] instance not governed by an Emperor !!!\n");
-		return;	
-	}
-	char byte = 30;
-        if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
-        	uwsgi_error("vassal_sos()/write()");
-        }
-}
 
 int master_loop(char **argv, char **environ) {
 
@@ -343,6 +299,9 @@ int master_loop(char **argv, char **environ) {
 	}
 	uwsgi_unix_signal(SIGINT, kill_them_all);
 	uwsgi_unix_signal(SIGUSR1, stats);
+	if (uwsgi.auto_snapshot) {
+		uwsgi_unix_signal(SIGURG, uwsgi_restore_auto_snapshot);
+	}
 
 	atexit(uwsgi_master_cleanup_hooks);
 
@@ -359,12 +318,6 @@ int master_loop(char **argv, char **environ) {
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.master_fifo_fd);
 	}
 
-	if (uwsgi.notify_socket) {
-		uwsgi.notify_socket_fd = bind_to_unix_dgram(uwsgi.notify_socket);
-		uwsgi_log("notification socket enabled on %s (fd: %d)\n", uwsgi.notify_socket, uwsgi.notify_socket_fd);
-		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.notify_socket_fd);
-	}
-
 	if (uwsgi.spoolers) {
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->spooler_signal_pipe[0]);
 	}
@@ -393,7 +346,6 @@ int master_loop(char **argv, char **environ) {
 #ifdef UWSGI_SSL
 	uwsgi_start_legions();
 #endif
-	uwsgi_metrics_start_collector();
 
 	uwsgi_add_reload_fds();
 
@@ -417,18 +369,6 @@ int master_loop(char **argv, char **environ) {
 		}
 	}
 
-#ifdef __linux__
-	if (uwsgi.setns_socket) {
-		uwsgi.setns_socket_fd = bind_to_unix(uwsgi.setns_socket, uwsgi.listen_queue, 0, 0);
-		if (uwsgi.setns_socket_fd < 0) exit(1);
-		if (chmod(uwsgi.setns_socket, S_IRUSR|S_IWUSR)) {
-                	uwsgi_error("[setns-socket] chmod()");
-                        exit(1);
-                }
-                event_queue_add_fd_read(uwsgi.master_queue, uwsgi.setns_socket_fd);
-	}
-#endif
-
 	if (uwsgi.zerg_server) {
 		uwsgi.zerg_server_fd = bind_to_unix(uwsgi.zerg_server, uwsgi.listen_queue, 0, 0);
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.zerg_server_fd);
@@ -542,50 +482,10 @@ int master_loop(char **argv, char **environ) {
 		usl = usl->next;
 	}
 	uwsgi_check_touches(uwsgi.touch_signal);
-	// daemon touches
-	struct uwsgi_daemon *ud = uwsgi.daemons;
-        while (ud) {
-		if (ud->touch) {
-			uwsgi_check_touches(ud->touch);
-		}
-		ud = ud->next;
-	}
-	// hook touches
-	uwsgi_foreach(usl, uwsgi.hook_touch) {
-		char *space = strchr(usl->value, ' ');
-		if (space) {
-                        *space = 0;
-                        usl->len = strlen(usl->value);
-			uwsgi_string_new_list((struct uwsgi_string_list **)&usl->custom_ptr, space+1);
-                }
-	}
-	uwsgi_check_touches(uwsgi.hook_touch);
 
 	// fsmon
 	uwsgi_fsmon_setup();
 
-	uwsgi_foreach(usl, uwsgi.signal_timers) {
-		char *space = strchr(usl->value, ' ');
-		if (!space) {
-			uwsgi_log("invalid signal timer syntax, must be: <signal> <seconds>\n");
-			exit(1);
-		}
-		*space = 0;
-		uwsgi_add_timer(atoi(usl->value), atoi(space+1));
-		*space = ' ';
-	}
-
-	uwsgi_foreach(usl, uwsgi.rb_signal_timers) {
-                char *space = strchr(usl->value, ' ');
-                if (!space) {
-                        uwsgi_log("invalid redblack signal timer syntax, must be: <signal> <seconds>\n");
-                        exit(1);
-                }
-                *space = 0;
-                uwsgi_signal_add_rb_timer(atoi(usl->value), atoi(space+1), 0);
-                *space = ' ';
-        }
-
 	// setup cheaper algos (can be stacked)
 	uwsgi.cheaper_algo = uwsgi_cheaper_algo_spare;
 	if (uwsgi.requested_cheaper_algo) {
@@ -607,7 +507,6 @@ int master_loop(char **argv, char **environ) {
 	}
 
 	// here really starts the master loop
-	uwsgi_hooks_run(uwsgi.hook_master_start, "master-start", 1);
 
 	for (;;) {
 		//uwsgi_log("uwsgi.ready_to_reload %d %d\n", uwsgi.ready_to_reload, uwsgi.numproc);
@@ -640,6 +539,21 @@ int master_loop(char **argv, char **environ) {
 		// check for daemons (smart and dumb)
 		uwsgi_daemons_smart_check();
 
+
+		if (uwsgi.respawn_snapshots) {
+			for (i = 1; i <= uwsgi.respawn_snapshots; i++) {
+				if (uwsgi_respawn_worker(i))
+					return 0;
+			}
+
+			uwsgi.respawn_snapshots = 0;
+		}
+
+		if (uwsgi.restore_snapshot) {
+			uwsgi_master_restore_snapshot();
+			continue;
+		}
+
 		// cheaper management
 		if (uwsgi.cheaper && !uwsgi.status.is_cheap && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
 			if (!uwsgi_calc_cheaper())
@@ -668,11 +582,9 @@ int master_loop(char **argv, char **environ) {
 		if (diedpid == 0) {
 
 			/* all processes ok, doing status scan after N seconds */
-			check_interval = uwsgi.master_interval;
-			if (!check_interval) {
+			check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+			if (!check_interval)
 				check_interval = 1;
-				uwsgi.master_interval = 1;
-			}
 
 
 			// add unregistered file monitors
@@ -707,14 +619,14 @@ int master_loop(char **argv, char **environ) {
 
 			if (ushared->rb_timers_cnt > 0) {
 				min_timeout = uwsgi_min_rb_timer(rb_timers, NULL);
-				if (min_timeout) {
-					int delta = min_timeout->value - uwsgi_now();
-					if (delta <= 0) {
+				if (min_timeout == NULL) {
+					check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+				}
+				else {
+					check_interval = min_timeout->value - uwsgi_now();
+					if (check_interval <= 0) {
 						expire_rb_timeouts(rb_timers);
-					}
-					// if the timer expires before the check_interval, override it
-					else if (delta < check_interval) {
-						check_interval = delta;
+						check_interval = 0;
 					}
 				}
 			}
@@ -728,9 +640,6 @@ int master_loop(char **argv, char **environ) {
 				}
 			}
 
-			// update load counter
-			uwsgi_update_load_counters();
-
 
 			// check uwsgi-cron table
 			if (ushared->cron_cnt) {
@@ -770,25 +679,41 @@ int master_loop(char **argv, char **environ) {
 			// check for idle
 			uwsgi_master_check_idle();
 
-			check_interval = uwsgi.master_interval;
-			if (!check_interval) {
+			check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+			if (!check_interval)
 				check_interval = 1;
-				uwsgi.master_interval = 1;
+
+
+			// get listen_queue status
+			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+			int tmp_queue = 0;
+			while (uwsgi_sock) {
+				if (uwsgi_sock->family == AF_INET) {
+					uwsgi_sock->queue = uwsgi_get_tcp_info(uwsgi_sock->fd);
+				}
+#ifdef __linux__
+#ifdef SIOBKLGQ
+				else if (uwsgi_sock->family == AF_UNIX) {
+					uwsgi_sock->queue = get_linux_unbit_SIOBKLGQ(uwsgi_sock->fd);
+				}
+#endif
+#endif
+
+				if (uwsgi_sock->queue > tmp_queue) {
+					tmp_queue = uwsgi_sock->queue;
+				}
+				uwsgi_sock = uwsgi_sock->next;
 			}
+			// fix queue size on multiple sockets
+			uwsgi.shared->load = tmp_queue;
 
-
-			// check listen_queue status
-			master_check_listen_queue();
-
-			int someone_killed = 0;
 			// check if some worker has to die (harakiri, evil checks...)
-			if (uwsgi_master_check_workers_deadline()) someone_killed++;
-			if (uwsgi_master_check_gateways_deadline()) someone_killed++;
-			if (uwsgi_master_check_mules_deadline()) someone_killed++;
-			if (uwsgi_master_check_spoolers_deadline()) someone_killed++;
-			if (uwsgi_master_check_crons_deadline()) someone_killed++;
+			uwsgi_master_check_workers_deadline();
 
-			// this could trigger a complete exit...
+			uwsgi_master_check_gateways_deadline();
+			uwsgi_master_check_mules_deadline();
+			uwsgi_master_check_spoolers_deadline();
+			uwsgi_master_check_crons_deadline();
 			uwsgi_master_check_mountpoints();
 
 #ifdef __linux__
@@ -852,35 +777,8 @@ int master_loop(char **argv, char **environ) {
 					uwsgi_route_signal(signum);
 					uwsgi_log_verbose("[uwsgi-touch-signal] raising %u\n", signum);
 				}
-
-				// daemon touches
-        			struct uwsgi_daemon *ud = uwsgi.daemons;
-        			while (ud) {
-                			if (ud->pid > 0 && ud->touch) {
-                        			touched = uwsgi_check_touches(ud->touch);
-						if (touched) {
-							uwsgi_log_verbose("*** %s has been touched... reloading daemon \"%s\" (pid: %d) !!! ***\n", touched, ud->command, (int) ud->pid);
-							if (kill(-ud->pid, ud->stop_signal)) {
-								// killing process group failed, try to kill by process id
-								if (kill(ud->pid, ud->stop_signal)) {
-									uwsgi_error("[uwsgi-daemon/touch] kill()");
-								}
-							}
-						}
-                			}
-					ud = ud->next;
-                		}
-
-				// hook touches
-				touched = uwsgi_check_touches(uwsgi.hook_touch);
-				if (touched) {
-					uwsgi_hooks_run((struct uwsgi_string_list *) touched, "touch", 0);
-				}
-
 			}
 
-			// allows the KILL signal to be delivered;
-			if (someone_killed > 0) sleep(1);
 			continue;
 
 		}
@@ -935,7 +833,6 @@ int master_loop(char **argv, char **environ) {
 			for (i = 0; i < uwsgi.mules_cnt; i++) {
 				if (uwsgi.mules[i].pid == diedpid) {
 					uwsgi_log("mule %d (pid: %d) annihilated\n", i + 1, (int) diedpid);
-					uwsgi.mules[i].pid = 0;
 					goto next;
 				}
 			}
@@ -983,11 +880,6 @@ next:
 
 		if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_FAILED_APP_CODE) {
 			uwsgi_log("OOPS ! failed loading app in worker %d (pid %d) :( trying again...\n", thewid, (int) diedpid);
-			if (uwsgi.lazy_apps && uwsgi.need_app) {
-				uwsgi_log_verbose("need-app requested, destroying the instance...\n");
-				kill_them_all(0);
-				continue;
-			}
 		}
 		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_DE_HIJACKED_CODE) {
 			uwsgi_log("...restoring worker %d (pid: %d)...\n", thewid, (int) diedpid);
@@ -1003,10 +895,6 @@ next:
 			reap_them_all(0);
 			continue;
 		}
-		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_GO_CHEAP_CODE) {
-			uwsgi_log("worker %d asked for cheap mode (pid: %d)...\n", thewid, (int) diedpid);
-			uwsgi.workers[thewid].cheaped = 1;
-		}
 		else if (uwsgi.workers[thewid].manage_next_request) {
 			if (WIFSIGNALED(waitpid_status)) {
 				uwsgi_log("DAMN ! worker %d (pid: %d) died, killed by signal %d :( trying respawn ...\n", thewid, (int) diedpid, (int) WTERMSIG(waitpid_status));

core/master_checks.c

@@ -25,11 +25,6 @@ int uwsgi_master_check_reload(char **argv) {
                                 return 0;
                         }
                 }
-		for(i=0;i<uwsgi.mules_cnt;i++) {
-			if (uwsgi.mules[i].pid > 0) {
-				return 0;
-			}
-		}
 		uwsgi_reload(argv);
 		// never here (unless in shared library mode)
 		return -1;
@@ -40,44 +35,24 @@ int uwsgi_master_check_reload(char **argv) {
 // check for chain reload
 void uwsgi_master_check_chain() {
 	if (!uwsgi.status.chain_reloading) return;
-
-	// we need to ensure the previous worker (if alive) is accepting new requests
-	// before going on
-	if (uwsgi.status.chain_reloading > 1) {
-		struct uwsgi_worker *previous_worker = &uwsgi.workers[uwsgi.status.chain_reloading-1];
-		// is the previous worker alive ?
-		if (previous_worker->pid > 0 && !previous_worker->cheaped) {
-			// the worker has been respawned but it is still not ready
-			if (previous_worker->accepting == 0) {
-				uwsgi_log_verbose("chain is still waiting for worker %d...\n", uwsgi.status.chain_reloading-1);
-				return;
-			}
-		}
-	}
-
-	// if all the processes are recycled, the chain is over
-	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");
-		return;
 	}
-
 	uwsgi_block_signal(SIGHUP);
-	int i;
-	for(i=uwsgi.status.chain_reloading;i<=uwsgi.numproc;i++) {
-		struct uwsgi_worker *uw = &uwsgi.workers[i];
-		if (uw->pid > 0 && !uw->cheaped && uw->accepting) {
-			// the worker could have been already cursed
-			if (uw->cursed_at == 0) {
-				uwsgi_log_verbose("chain next victim is worker %d\n", i);
-				uwsgi_curse(i, SIGHUP);
-			}
+	for(i=1;i<=uwsgi.numproc;i++) {
+		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].cursed_at == 0 && i == uwsgi.status.chain_reloading) {
+			uwsgi_curse(i, SIGHUP);
 			break;
 		}
-		else {
-			uwsgi.status.chain_reloading++;
-		}
-        }
+	}
 	uwsgi_unblock_signal(SIGHUP);
 }
 
@@ -138,28 +113,13 @@ void uwsgi_master_check_idle() {
 			uwsgi.workers[i].cheaped = 1;
 			if (uwsgi.workers[i].pid == 0)
 				continue;
-			// first send SIGINT
-			kill(uwsgi.workers[i].pid, SIGINT);
-			// and start waiting upto 3 seconds
-			int j;
-			for(j=0;j<3;j++) {
-				sleep(1);
-				int ret = waitpid(uwsgi.workers[i].pid, &waitpid_status, WNOHANG);
-				if (ret == 0) continue;
-				if (ret == (int) uwsgi.workers[i].pid) goto done;
-				// on error, directly send SIGKILL
-				break;
-			}
 			kill(uwsgi.workers[i].pid, SIGKILL);
 			if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
 				if (errno != ECHILD)
 					uwsgi_error("uwsgi_master_check_idle()/waitpid()");
 			}
 			else {
-done:
 				uwsgi.workers[i].pid = 0;
-				uwsgi.workers[i].rss_size = 0;
-				uwsgi.workers[i].vsz_size = 0;
 			}
 		}
 		uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
@@ -169,22 +129,19 @@ done:
 
 }
 
-int uwsgi_master_check_workers_deadline() {
+void uwsgi_master_check_workers_deadline() {
 	int i;
-	int ret = 0;
 	for (i = 1; i <= uwsgi.numproc; i++) {
 		/* first check for harakiri */
 		if (uwsgi.workers[i].harakiri > 0) {
 			if (uwsgi.workers[i].harakiri < (time_t) uwsgi.current_time) {
 				trigger_harakiri(i);
-				ret = 1;
 			}
 		}
 		/* then user-defined harakiri */
 		if (uwsgi.workers[i].user_harakiri > 0) {
 			if (uwsgi.workers[i].user_harakiri < (time_t) uwsgi.current_time) {
 				trigger_harakiri(i);
-				ret = 1;
 			}
 		}
 		// then for evil memory checkers
@@ -193,7 +150,6 @@ int uwsgi_master_check_workers_deadline() {
 				uwsgi_log("*** EVIL RELOAD ON WORKER %d ADDRESS SPACE: %lld (pid: %d) ***\n", i, (long long) uwsgi.workers[i].vsz_size, uwsgi.workers[i].pid);
 				kill(uwsgi.workers[i].pid, SIGKILL);
 				uwsgi.workers[i].vsz_size = 0;
-				ret = 1;
 			}
 		}
 		if (uwsgi.evil_reload_on_rss) {
@@ -201,17 +157,15 @@ int uwsgi_master_check_workers_deadline() {
 				uwsgi_log("*** EVIL RELOAD ON WORKER %d RSS: %lld (pid: %d) ***\n", i, (long long) uwsgi.workers[i].rss_size, uwsgi.workers[i].pid);
 				kill(uwsgi.workers[i].pid, SIGKILL);
 				uwsgi.workers[i].rss_size = 0;
-				ret = 1;
 			}
 		}
 		// check if worker was running longer than allowed lifetime
-		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.max_worker_lifetime > 0) {
+		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] > 0) {
 			uint64_t lifetime = uwsgi_now() - uwsgi.workers[i].last_spawn;
-			if (lifetime > uwsgi.max_worker_lifetime && uwsgi.workers[i].manage_next_request == 1) {
+			if (lifetime > uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] && uwsgi.workers[i].manage_next_request == 1) {
 				uwsgi_log("worker %d lifetime reached, it was running for %llu second(s)\n", i, (unsigned long long) lifetime);
 				uwsgi.workers[i].manage_next_request = 0;
 				kill(uwsgi.workers[i].pid, SIGWINCH);
-				ret = 1;
 			}
 		}
 
@@ -220,32 +174,29 @@ int uwsgi_master_check_workers_deadline() {
 	}
 
 
-	return ret;
+
 }
 
 
-int uwsgi_master_check_gateways_deadline() {
+void uwsgi_master_check_gateways_deadline() {
 
 	int i;
-	int ret = 0;
+
 	for (i = 0; i < ushared->gateways_cnt; i++) {
 		if (ushared->gateways_harakiri[i] > 0) {
 			if (ushared->gateways_harakiri[i] < (time_t) uwsgi.current_time) {
 				if (ushared->gateways[i].pid > 0) {
 					uwsgi_log("*** HARAKIRI ON GATEWAY %s %d (pid: %d) ***\n", ushared->gateways[i].name, ushared->gateways[i].num, ushared->gateways[i].pid);
 					kill(ushared->gateways[i].pid, SIGKILL);
-					ret = 1;
 				}
 				ushared->gateways_harakiri[i] = 0;
 			}
 		}
 	}
-	return ret;
 }
 
-int uwsgi_master_check_mules_deadline() {
+void uwsgi_master_check_mules_deadline() {
 	int i;
-	int ret = 0;
 
 	for (i = 0; i < uwsgi.mules_cnt; i++) {
 		if (uwsgi.mules[i].harakiri > 0) {
@@ -253,7 +204,6 @@ int uwsgi_master_check_mules_deadline() {
 				uwsgi_log("*** HARAKIRI ON MULE %d HANDLING SIGNAL %d (pid: %d) ***\n", i + 1, uwsgi.mules[i].signum, uwsgi.mules[i].pid);
 				kill(uwsgi.mules[i].pid, SIGKILL);
 				uwsgi.mules[i].harakiri = 0;
-				ret = 1;
 			}
 		}
 		// user harakiri
@@ -262,32 +212,26 @@ int uwsgi_master_check_mules_deadline() {
                                 uwsgi_log("*** HARAKIRI ON MULE %d (pid: %d) ***\n", i + 1, uwsgi.mules[i].pid);
                                 kill(uwsgi.mules[i].pid, SIGKILL);
                                 uwsgi.mules[i].user_harakiri = 0;
-				ret = 1;
                         }
                 }
 	}
-	return ret;
 }
 
-int uwsgi_master_check_spoolers_deadline() {
-	int ret = 0;
+void uwsgi_master_check_spoolers_deadline() {
 	struct uwsgi_spooler *uspool = uwsgi.spoolers;
 	while (uspool) {
 		if (uspool->harakiri > 0 && uspool->harakiri < (time_t) uwsgi.current_time) {
 			uwsgi_log("*** HARAKIRI ON THE SPOOLER (pid: %d) ***\n", uspool->pid);
 			kill(uspool->pid, SIGKILL);
 			uspool->harakiri = 0;
-			ret = 1;
 		}
 		if (uspool->user_harakiri > 0 && uspool->user_harakiri < (time_t) uwsgi.current_time) {
                         uwsgi_log("*** HARAKIRI ON THE SPOOLER (pid: %d) ***\n", uspool->pid);
                         kill(uspool->pid, SIGKILL);
                         uspool->user_harakiri = 0;
-			ret = 1;
                 }
 		uspool = uspool->next;
 	}
-	return ret;
 }
 
 
@@ -348,7 +292,6 @@ int uwsgi_master_check_daemons_death(int diedpid) {
 
 int uwsgi_worker_is_busy(int wid) {
 	int i;
-	if (uwsgi.workers[uwsgi.mywid].sig) return 1;
 	for(i=0;i<uwsgi.cores;i++) {
 		if (uwsgi.workers[wid].cores[i].in_request) {
 			return 1;
@@ -371,18 +314,15 @@ int uwsgi_master_check_cron_death(int diedpid) {
 	return 0;
 }
 
-int uwsgi_master_check_crons_deadline() {
-	int ret = 0;
+void uwsgi_master_check_crons_deadline() {
 	struct uwsgi_cron *uc = uwsgi.crons;
 	while (uc) {
 		if (uc->pid >= 0 && uc->harakiri > 0 && uc->harakiri < (time_t) uwsgi.current_time) {
 			uwsgi_log("*** HARAKIRI ON CRON \"%s\" (pid: %d) ***\n", uc->command, uc->pid);
 			kill(-uc->pid, SIGKILL);
-			ret = 1;
 		}
 		uc = uc->next;
 	}
-	return ret;
 }
 
 void uwsgi_master_check_mountpoints() {

core/master_events.c

@@ -22,10 +22,6 @@ int uwsgi_master_manage_events(int interesting_fd) {
 		return uwsgi_master_fifo_manage(uwsgi.master_fifo_fd);
 	}
 
-	if (uwsgi.notify_socket_fd > -1 && interesting_fd == uwsgi.notify_socket_fd) {
-		return uwsgi_notify_socket_manage(interesting_fd);
-	}
-
 	// stats server ?
 	if (uwsgi.stats && uwsgi.stats_fd > -1) {
 		if (interesting_fd == uwsgi.stats_fd) {
@@ -55,12 +51,6 @@ int uwsgi_master_manage_events(int interesting_fd) {
 		}
 	}
 
-#ifdef __linux__
-	if (uwsgi.setns_socket && uwsgi.setns_socket_fd > -1 && interesting_fd == uwsgi.setns_socket_fd) {
-		uwsgi_master_manage_setns(uwsgi.setns_socket_fd);
-	}
-#endif
-
 	if (uwsgi_fsmon_event(interesting_fd)) {
                 return 0;
 	}
@@ -128,7 +118,6 @@ int uwsgi_master_manage_events(int interesting_fd) {
                                 	reap_them_all(0);
                                 	uwsgi_unblock_signal(SIGTERM);
 				}
-                                if (usl->custom2 > 8) free(tmp);
                                 return 0;
                         }
                         usl = usl->next;

core/master_utils.c

@@ -24,15 +24,6 @@ void uwsgi_curse(int wid, int sig) {
 	}
 }
 
-void uwsgi_curse_mule(int mid, int sig) {
-	uwsgi.mules[mid].cursed_at = uwsgi_now();
-	uwsgi.mules[mid].no_mercy_at = uwsgi.mules[mid].cursed_at + uwsgi.mule_reload_mercy;
-
-	if (sig) {
-		(void) kill(uwsgi.mules[mid].pid, sig);
-	}
-}
-
 static void uwsgi_signal_spoolers(int signum) {
 
         struct uwsgi_spooler *uspool = uwsgi.spoolers;
@@ -52,6 +43,13 @@ void uwsgi_destroy_processes() {
 
         uwsgi_signal_spoolers(SIGKILL);
 
+        if (uwsgi.emperor_pid >= 0) {
+                kill(uwsgi.emperor_pid, SIGKILL);
+                waitpid(uwsgi.emperor_pid, &waitpid_status, 0);
+		uwsgi_log("The Emperor has been buried (pid: %d)\n", (int) uwsgi.emperor_pid);
+        }
+
+
         uwsgi_detach_daemons();
 
         for (i = 0; i < ushared->gateways_cnt; i++) {
@@ -62,25 +60,14 @@ void uwsgi_destroy_processes() {
 		}
         }
 
-	if (uwsgi.emperor_pid > 0) {
-                kill(uwsgi.emperor_pid, SIGINT);
-		time_t timeout = uwsgi_now() + (uwsgi.reload_mercy ? uwsgi.reload_mercy : 3);
-		// increase timeout for being more tolerant
-		timeout+=2;
-		int waitpid_status;
-		while (uwsgi_now() < timeout) {
-			pid_t diedpid = waitpid(uwsgi.emperor_pid, &waitpid_status, WNOHANG);
-			if (diedpid == uwsgi.emperor_pid) {
-				goto nomoremperor;
-			}
-			uwsgi_log("waiting for Emperor death...\n");
-			sleep(1);
+	// TODO mules can be programmed to be gracefully reloaded
+        for (i = 0; i < uwsgi.mules_cnt; i++) {
+                if (uwsgi.mules[i].pid > 0) {
+                        kill(uwsgi.mules[i].pid, SIGKILL);
+			waitpid(uwsgi.mules[i].pid, &waitpid_status, 0);
+			uwsgi_log("mule %d has been buried (pid: %d)\n", i, (int) uwsgi.mules[i].pid);
 		}
-		kill(uwsgi.emperor_pid, SIGKILL);
-		waitpid(uwsgi.emperor_pid, &waitpid_status, 0);
-nomoremperor:
-		uwsgi_log("The Emperor has been buried (pid: %d)\n", (int) uwsgi.emperor_pid);
-	}
+        }
 }
 
 
@@ -114,7 +101,7 @@ int uwsgi_calc_cheaper(void) {
 
 	int i;
 	static time_t last_check = 0;
-	int check_interval = uwsgi.master_interval;
+	int check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
 
 	if (!last_check)
 		last_check = uwsgi_now();
@@ -162,7 +149,6 @@ int uwsgi_calc_cheaper(void) {
 			ignore_algo = 1;
 		}
 		uwsgi.cheaper_fifo_delta = 0;
-		goto safe;
 	}
 
 	// if cheaper limits wants to change worker count, then skip cheaper algo
@@ -173,7 +159,6 @@ int uwsgi_calc_cheaper(void) {
 		needed_workers = 0;
 	}
 
-safe:
 	if (needed_workers > 0) {
 		for (i = 1; i <= uwsgi.numproc; i++) {
 			if (uwsgi.workers[i].cheaped == 1 && uwsgi.workers[i].pid == 0) {
@@ -201,8 +186,6 @@ safe:
 			uwsgi_log("worker %d should die...\n", oldest_worker);
 #endif
 			uwsgi.workers[oldest_worker].cheaped = 1;
-			uwsgi.workers[oldest_worker].rss_size = 0;
-			uwsgi.workers[oldest_worker].vsz_size = 0;
 			uwsgi.workers[oldest_worker].manage_next_request = 0;
 			uwsgi_curse(oldest_worker, SIGWINCH);
 		}
@@ -347,7 +330,7 @@ int uwsgi_cheaper_algo_backlog(int can_spawn) {
 
 	int i;
 #ifdef __linux__
-	int backlog = uwsgi.shared->backlog;
+	int backlog = uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS];
 #else
 	int backlog = 0;
 #endif
@@ -400,37 +383,28 @@ void uwsgi_reload(char **argv) {
 		// 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);
 		}
 
-		// call atexit user exec
-		uwsgi_exec_atexit();
-
 		uwsgi_log("binary reloading uWSGI...\n");
 	}
 	else {
 		uwsgi_log("fork()'ing uWSGI...\n");
 	}
 
-	// ask for configuration (if needed)
-	if (uwsgi.has_emperor && uwsgi.emperor_fd_config > -1) {
-		char byte = 2;
-                if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
-                        uwsgi_error("uwsgi_reload()/write()");
-                }
-	}
-
 	uwsgi_log("chdir() to %s\n", uwsgi.cwd);
 	if (chdir(uwsgi.cwd)) {
-		uwsgi_error("uwsgi_reload()/chdir()");
+		uwsgi_error("chdir()");
 	}
 
 	/* check fd table (a module can obviosly open some fd on initialization...) */
 	uwsgi_log("closing all non-uwsgi socket fds > 2 (max_fd = %d)...\n", (int) uwsgi.max_fd);
 	for (i = 3; i < (int) uwsgi.max_fd; i++) {
-		if (uwsgi.close_on_exec2) fcntl(i, F_SETFD, 0);
 
 		if (uwsgi_fd_is_safe(i)) continue;
 
@@ -569,10 +543,9 @@ void uwsgi_fixup_fds(int wid, int muleid, struct uwsgi_gateway *ug) {
 			}
 		}
 
-		
-		if (uwsgi.shared->spooler_signal_pipe[0] != -1)
-                	close(uwsgi.shared->spooler_signal_pipe[0]);
 		if (uwsgi.i_am_a_spooler && uwsgi.i_am_a_spooler->pid != getpid()) {
+			if (uwsgi.shared->spooler_signal_pipe[0] != -1)
+				close(uwsgi.shared->spooler_signal_pipe[0]);
 			if (uwsgi.shared->spooler_signal_pipe[1] != -1)
 				close(uwsgi.shared->spooler_signal_pipe[1]);
 		}
@@ -611,21 +584,6 @@ void uwsgi_fixup_fds(int wid, int muleid, struct uwsgi_gateway *ug) {
 		}
 
 		if (uwsgi.master_fifo_fd > -1) close(uwsgi.master_fifo_fd);
-
-		if (uwsgi.notify_socket_fd > -1) close(uwsgi.notify_socket_fd);
-
-#ifdef __linux__
-		for(i=0;i<uwsgi.setns_fds_count;i++) {
-			close(uwsgi.setns_fds[i]);
-		}
-#endif
-
-		// fd alarms
-		struct uwsgi_alarm_fd *uafd = uwsgi.alarm_fds;
-        	while(uafd) {
-			close(uafd->fd);
-                	uafd = uafd->next;
-        	}
 	}
 
 
@@ -634,8 +592,6 @@ void uwsgi_fixup_fds(int wid, int muleid, struct uwsgi_gateway *ug) {
 int uwsgi_respawn_worker(int wid) {
 
 	int respawns = uwsgi.workers[wid].respawn_count;
-	// the workers is not accepting (obviously)
-	uwsgi.workers[wid].accepting = 0;
 	// we count the respawns before errors...
 	uwsgi.workers[wid].respawn_count++;
 	// ... same for update time
@@ -755,9 +711,9 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 		goto end;
 
 #ifdef __linux__
-	if (uwsgi_stats_keylong_comma(us, "listen_queue", (unsigned long long) uwsgi.shared->backlog))
+	if (uwsgi_stats_keylong_comma(us, "listen_queue", (unsigned long long) uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS]))
 		goto end;
-	if (uwsgi_stats_keylong_comma(us, "listen_queue_errors", (unsigned long long) uwsgi.shared->backlog_errors))
+	if (uwsgi_stats_keylong_comma(us, "listen_queue_errors", (unsigned long long) uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]))
 		goto end;
 #endif
 
@@ -798,7 +754,7 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 
 			// allocate 2x the size of original command
 			// in case we need to escape all chars
-			char *cmd = uwsgi_malloc((strlen(ud->command)*2)+1);
+			char *cmd = uwsgi_malloc(strlen(ud->command)*2);
 			escape_json(ud->command, strlen(ud->command), cmd);
 			if (uwsgi_stats_keyval_comma(us, "cmd", cmd)) {
 				free(cmd);
@@ -915,70 +871,6 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 		goto end;
 	}
 
-	if (uwsgi.has_metrics && !uwsgi.stats_no_metrics) {
-		if (uwsgi_stats_key(us, "metrics"))
-                	goto end;
-
-		if (uwsgi_stats_object_open(us))
-			goto end;
-
-		uwsgi_rlock(uwsgi.metrics_lock);
-		struct uwsgi_metric *um = uwsgi.metrics;
-		while(um) {
-        		int64_t um_val = *um->value;
-
-			if (uwsgi_stats_key(us, um->name)) {
-				uwsgi_rwunlock(uwsgi.metrics_lock);
-                		goto end;
-			}
-
-			if (uwsgi_stats_object_open(us)) {
-				uwsgi_rwunlock(uwsgi.metrics_lock);
-                                goto end;
-			}
-
-			if (uwsgi_stats_keylong(us, "type", (long long) um->type)) {
-        			uwsgi_rwunlock(uwsgi.metrics_lock);
-				goto end;
-			} 
-
-			if (uwsgi_stats_comma(us)) {
-        			uwsgi_rwunlock(uwsgi.metrics_lock);
-				goto end;
-			}
-
-			if (uwsgi_stats_keyval_comma(us, "oid", um->oid ? um->oid : "")) {
-                                uwsgi_rwunlock(uwsgi.metrics_lock);
-                                goto end;
-                        }
-
-			if (uwsgi_stats_keyslong(us, "value", (long long) um_val)) {
-        			uwsgi_rwunlock(uwsgi.metrics_lock);
-				goto end;
-			} 
-
-			if (uwsgi_stats_object_close(us)) {
-                                uwsgi_rwunlock(uwsgi.metrics_lock);
-                                goto end;
-                        }
-
-			um = um->next;
-			if (um) {
-				if (uwsgi_stats_comma(us)) {
-        				uwsgi_rwunlock(uwsgi.metrics_lock);
-					goto end;
-				}
-			}
-		}
-        	uwsgi_rwunlock(uwsgi.metrics_lock);
-
-		if (uwsgi_stats_object_close(us))
-			goto end;
-
-		if (uwsgi_stats_comma(us))
-		goto end;
-	}
-
 	if (uwsgi_stats_key(us, "sockets"))
 		goto end;
 
@@ -999,9 +891,6 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 		if (uwsgi_stats_keylong_comma(us, "queue", (unsigned long long) uwsgi_sock->queue))
 			goto end;
 
-		if (uwsgi_stats_keylong_comma(us, "max_queue", (unsigned long long) uwsgi_sock->max_queue))
-			goto end;
-
 		if (uwsgi_stats_keylong_comma(us, "shared", (unsigned long long) uwsgi_sock->shared))
 			goto end;
 
@@ -1037,8 +926,6 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 			goto end;
 		if (uwsgi_stats_keylong_comma(us, "pid", (unsigned long long) uwsgi.workers[i + 1].pid))
 			goto end;
-		if (uwsgi_stats_keylong_comma(us, "accepting", (unsigned long long) uwsgi.workers[i + 1].accepting))
-			goto end;
 		if (uwsgi_stats_keylong_comma(us, "requests", (unsigned long long) uwsgi.workers[i + 1].requests))
 			goto end;
 		if (uwsgi_stats_keylong_comma(us, "delta_requests", (unsigned long long) uwsgi.workers[i + 1].delta_requests))
@@ -1125,7 +1012,7 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 			if (uwsgi_stats_keylong_comma(us, "exceptions", ua->exceptions))
 				goto end;
 
-			if (*ua->chdir) {
+			if (ua->chdir) {
 				if (uwsgi_stats_keyval(us, "chdir", ua->chdir))
 					goto end;
 			}
@@ -1147,8 +1034,6 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 		if (uwsgi_stats_list_close(us))
 			goto end;
 
-		if (uwsgi.stats_no_cores) goto nocores;
-
 		if (uwsgi_stats_comma(us))
 			goto end;
 
@@ -1180,9 +1065,6 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 			if (uwsgi_stats_keylong_comma(us, "write_errors", (unsigned long long) uc->write_errors))
 				goto end;
 
-			if (uwsgi_stats_keylong_comma(us, "read_errors", (unsigned long long) uc->read_errors))
-				goto end;
-
 			if (uwsgi_stats_keylong_comma(us, "in_request", (unsigned long long) uc->in_request))
 				goto end;
 
@@ -1210,12 +1092,9 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 		if (uwsgi_stats_list_close(us))
 			goto end;
 
-nocores:
-
 		if (uwsgi_stats_object_close(us))
 			goto end;
 
-
 		if (i < uwsgi.numproc - 1) {
 			if (uwsgi_stats_comma(us))
 				goto end;
@@ -1291,7 +1170,7 @@ nocores:
 			if (uwsgi_stats_keyslong_comma(us, "week", (long long) ucron->week))
 				goto end;
 
-			char *cmd = uwsgi_malloc((strlen(ucron->command)*2)+1);
+			char *cmd = uwsgi_malloc(strlen(ucron->command)*2);
 			escape_json(ucron->command, strlen(ucron->command), cmd);
 			if (uwsgi_stats_keyval_comma(us, "command", cmd)) {
 				free(cmd);
@@ -1503,7 +1382,7 @@ void uwsgi_register_cheaper_algo(char *name, int (*func) (int)) {
 
 void trigger_harakiri(int i) {
 	int j;
-	uwsgi_log_verbose("*** HARAKIRI ON WORKER %d (pid: %d, try: %d) ***\n", i, uwsgi.workers[i].pid, uwsgi.workers[i].pending_harakiri + 1);
+	uwsgi_log("*** HARAKIRI ON WORKER %d (pid: %d, try: %d) ***\n", i, uwsgi.workers[i].pid, uwsgi.workers[i].pending_harakiri + 1);
 	if (uwsgi.harakiri_verbose) {
 #ifdef __linux__
 		int proc_file;
@@ -1551,12 +1430,15 @@ void trigger_harakiri(int i) {
 			}
 		}
 
-		uwsgi_dump_worker(i, "HARAKIRI");
+		kill(uwsgi.workers[i].pid, SIGUSR2);
+		// allow SIGUSR2 to be delivered
+		sleep(1);
 		kill(uwsgi.workers[i].pid, SIGKILL);
 		if (!uwsgi.workers[i].pending_harakiri)
 			uwsgi.workers[i].harakiri_count++;
 		uwsgi.workers[i].pending_harakiri++;
 	}
+	// to avoid races
 
 }
 
@@ -1696,8 +1578,6 @@ void uwsgi_go_cheap() {
 	uwsgi.status.is_cheap = 1;
                 for (i = 1; i <= uwsgi.numproc; i++) {
                         uwsgi.workers[i].cheaped = 1;
-			uwsgi.workers[i].rss_size = 0;
-        		uwsgi.workers[i].vsz_size = 0;
                         if (uwsgi.workers[i].pid == 0)
                                 continue;
 			uwsgi_log("killing worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
@@ -1710,156 +1590,3 @@ void uwsgi_go_cheap() {
                 uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
                 uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
 }
-
-#ifdef __linux__
-void uwsgi_setns_preopen() {
-	struct dirent *de;
-        DIR *ns = opendir("/proc/self/ns");
-        if (!ns) {
-                uwsgi_error("uwsgi_setns_preopen()/opendir()");
-		exit(1);
-        }
-        while ((de = readdir(ns)) != NULL) {
-                if (strlen(de->d_name) > 0 && de->d_name[0] == '.') continue;
-		if (!strcmp(de->d_name, "user")) continue;
-                struct uwsgi_string_list *usl = NULL;
-                int found = 0;
-                uwsgi_foreach(usl, uwsgi.setns_socket_skip) {
-                        if (!strcmp(de->d_name, usl->value)) {
-                                found = 1;
-                                break;
-                        }
-                }
-                if (found) continue;
-                char *filename = uwsgi_concat2("/proc/self/ns/", de->d_name);
-                uwsgi.setns_fds[uwsgi.setns_fds_count] = open(filename, O_RDONLY);
-                if (uwsgi.setns_fds[uwsgi.setns_fds_count] < 0) {
-                        uwsgi_error_open(filename);
-                        free(filename);
-			exit(1);
-                }
-                free(filename);
-                uwsgi.setns_fds_count++;
-        }
-	closedir(ns);
-}
-void uwsgi_master_manage_setns(int fd) {
-
-        struct sockaddr_un snsun;
-        socklen_t snsun_len = sizeof(struct sockaddr_un);
-
-        int setns_client = accept(fd, (struct sockaddr *) &snsun, &snsun_len);
-        if (setns_client < 0) {
-                uwsgi_error("uwsgi_master_manage_setns()/accept()");
-                return;
-        }
-
-	int i;
-	int tmp_fds[64];
-	int *fds = tmp_fds;
-        int num_fds = 0;
-
-	struct msghdr sn_msg;
-        void *sn_msg_control;
-        struct iovec sn_iov[2];
-        struct cmsghdr *cmsg;
-	DIR *ns = NULL;
-
-	if (uwsgi.setns_fds_count) {
-		fds = uwsgi.setns_fds;
-		num_fds = uwsgi.setns_fds_count;
-		goto send;
-	}
-
-	struct dirent *de;
-	ns = opendir("/proc/self/ns");
-	if (!ns) {
-		close(setns_client);
-		uwsgi_error("uwsgi_master_manage_setns()/opendir()");
-		return;
-	}
-	while ((de = readdir(ns)) != NULL) {
-		if (strlen(de->d_name) > 0 && de->d_name[0] == '.') continue;
-		if (!strcmp(de->d_name, "user")) continue;
-		struct uwsgi_string_list *usl = NULL;
-		int found = 0;
-		uwsgi_foreach(usl, uwsgi.setns_socket_skip) {
-			if (!strcmp(de->d_name, usl->value)) {
-				found = 1;
-				break;
-			}
-		}
-		if (found) continue;
-		char *filename = uwsgi_concat2("/proc/self/ns/", de->d_name);
-		fds[num_fds] = open(filename, O_RDONLY);
-		if (fds[num_fds] < 0) {
-			uwsgi_error_open(filename);
-			free(filename);
-			goto clear;
-		}
-		free(filename);
-		num_fds++;
-	}
-
-send:
-
-        sn_msg_control = uwsgi_malloc(CMSG_SPACE(sizeof(int) * num_fds));
-
-        sn_iov[0].iov_base = "uwsgi-setns";
-        sn_iov[0].iov_len = 11;
-        sn_iov[1].iov_base = &num_fds;
-        sn_iov[1].iov_len = sizeof(int);
-
-        sn_msg.msg_name = NULL;
-        sn_msg.msg_namelen = 0;
-
-        sn_msg.msg_iov = sn_iov;
-        sn_msg.msg_iovlen = 2;
-
-        sn_msg.msg_flags = 0;
-        sn_msg.msg_control = sn_msg_control;
-        sn_msg.msg_controllen = CMSG_SPACE(sizeof(int) * num_fds);
-
-        cmsg = CMSG_FIRSTHDR(&sn_msg);
-        cmsg->cmsg_len = CMSG_LEN(sizeof(int) * num_fds);
-        cmsg->cmsg_level = SOL_SOCKET;
-        cmsg->cmsg_type = SCM_RIGHTS;
-
-        int *sn_fd_ptr = (int *) CMSG_DATA(cmsg);
-	for(i=0;i<num_fds;i++) {
-		sn_fd_ptr[i] = fds[i];
-	}
-
-        if (sendmsg(setns_client, &sn_msg, 0) < 0) {
-                uwsgi_error("uwsgi_master_manage_setns()/sendmsg()");
-        }
-
-        free(sn_msg_control);
-
-clear:
-	close(setns_client);
-	if (ns) {
-		closedir(ns);
-		for(i=0;i<num_fds;i++) {
-			close(fds[i]);
-		}
-	}
-}
-
-#endif
-
-/*
-	this is racey, but the worst thing would be printing garbage in the logs...
-*/
-void uwsgi_dump_worker(int wid, char *msg) {
-	int i;
-	uwsgi_log_verbose("%s !!! worker %d status !!!\n", msg, wid);
-	for(i=0;i<uwsgi.cores;i++) {
-		struct uwsgi_core *uc = &uwsgi.workers[wid].cores[i];
-		struct wsgi_request *wsgi_req = &uc->req;
-		if (uc->in_request) {
-			uwsgi_log_verbose("%s [core %d] %.*s - %.*s %.*s since %llu\n", msg, i, wsgi_req->remote_addr_len, wsgi_req->remote_addr, wsgi_req->method_len, wsgi_req->method, wsgi_req->uri_len, wsgi_req->uri, (unsigned long long) (wsgi_req->start_of_request/(1000*1000)));
-		}
-	}
-	uwsgi_log_verbose("%s !!! end of worker %d status !!!\n",msg, wid);
-}

core/mount.c

@@ -54,9 +54,6 @@ static struct uwsgi_mount_flag umflags[] = {
 #ifdef MS_REMOUNT
 	{"remount", MS_REMOUNT},
 #endif
-#ifdef MS_NOSUID
-	{"nosuid", MS_NOSUID},
-#endif
 #ifdef MS_SYNCHRONOUS
 	{"sync", MS_SYNCHRONOUS},
 #endif
@@ -105,7 +102,7 @@ uint64_t uwsgi_mount_flag(char *mflag) {
 	return 0;
 }
 
-int uwsgi_mount(char *fs, char *what, char *where, char *flags, char *data) {
+int uwsgi_mount(char *fs, char *what, char *where, char *flags) {
 #if defined(__FreeBSD__) || defined(__GNU_kFreeBSD__)
 	struct iovec iov[6];
 #endif
@@ -124,7 +121,7 @@ int uwsgi_mount(char *fs, char *what, char *where, char *flags, char *data) {
 	free(mflags);
 parsed:
 #ifdef __linux__
-	return mount(what, where, fs, mountflags, data);
+	return mount(what, where, fs, mountflags, NULL);
 #elif defined(__FreeBSD__) || defined(__GNU_kFreeBSD__)
 	iov[0].iov_base = "fstype";
 	iov[0].iov_len = 7;
@@ -200,7 +197,6 @@ unmountable:
 }
 
 int uwsgi_mount_hook(char *arg) {
-	char *data = NULL;
 	char *tmp_arg = uwsgi_str(arg);
 	char *fs = tmp_arg;
 	char *what = strchr(fs, ' ');
@@ -212,12 +208,8 @@ int uwsgi_mount_hook(char *arg) {
 	char *flags = strchr(where, ' ');
 	if (flags) {
 		*flags = 0; flags++;
-		data = strchr(flags, ' ');
-		if (data) {
-			*data = 0; data++;
-		}
 	}
-	if (uwsgi_mount(fs, what, where, flags, data)) {
+	if (uwsgi_mount(fs, what, where, flags)) {
 		uwsgi_error("uwsgi_mount()");
 		free(tmp_arg);
 		return -1;

core/mule.c

@@ -43,7 +43,7 @@ void uwsgi_mule(int id) {
 #endif
 
 		signal(SIGALRM, SIG_IGN);
-                signal(SIGHUP, end_me);
+                signal(SIGHUP, SIG_IGN);
                 signal(SIGINT, end_me);
                 signal(SIGTERM, end_me);
                 signal(SIGUSR1, SIG_IGN);
@@ -77,7 +77,6 @@ void uwsgi_mule(int id) {
 			}
 		}
 
-		uwsgi_hooks_run(uwsgi.hook_as_mule, "as-mule", 1);
 		uwsgi_mule_run();
 
 	}
@@ -329,13 +328,11 @@ next:
 		}
 	}
 
-	int ret = -1;
-retry:
-	ret = poll(mulepoll, count + farms_count, timeout);
-	if (ret < 0) {
-		uwsgi_error("uwsgi_mule_get_msg()/poll()");
+	int ret = poll(mulepoll, count + farms_count, timeout);
+	if (ret <= 0) {
+		uwsgi_error("poll");
 	}
-	else if (ret > 0 ) {
+	else {
 		if (mulepoll[0].revents & POLLIN) {
 			len = read(uwsgi.mules[uwsgi.muleid - 1].queue_pipe[1], message, buffer_size);
 		}
@@ -355,7 +352,7 @@ retry:
 				if (interesting_fd > -1) {
 					len = read(interesting_fd, &uwsgi_signal, 1);
 					if (len <= 0) {
-						if (uwsgi_is_again()) goto retry;
+						if (len < 0 && (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK)) goto clear;
 						uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
 						end_me(0);
 					}
@@ -382,7 +379,6 @@ retry:
 	}
 
 	if (len < 0) {
-		if (uwsgi_is_again()) goto retry;
 		uwsgi_error("read()");
 		goto clear;
 	}

core/notify.c

@@ -1,4 +1,4 @@
-#include <uwsgi.h>
+#include "uwsgi.h"
 
 extern struct uwsgi_server uwsgi;
 
@@ -75,39 +75,3 @@ void uwsgi_systemd_init(char *systemd_socket) {
 	uwsgi.notify_ready = uwsgi_systemd_notify_ready;
 
 }
-
-int uwsgi_notify_socket_manage(int fd) {
-	char buf[8192];
-        ssize_t rlen = read(fd, buf, 8192);
-        if (rlen < 0) {
-                if (uwsgi_is_again()) return 0;
-                uwsgi_error("uwsgi_notify_socket_manage()/read()");
-                exit(1);
-        }
-
-	if (rlen > 0) {
-		uwsgi_log_verbose("[notify-socket] %.*s\n", rlen, buf);
-        }
-
-        return 0;
-}
-
-int uwsgi_notify_msg(char *dst, char *msg, size_t len) {
-	static int notify_fd = -1;
-	if (notify_fd < 0) {
-		notify_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
-		if (notify_fd < 0) {
-			uwsgi_error("uwsgi_notify_msg()/socket()");
-			return -1;
-		}
-	}
-	struct sockaddr_un un_addr;
-	memset(&un_addr, 0, sizeof(struct sockaddr_un));
-        un_addr.sun_family = AF_UNIX;
-        // use 102 as the magic number
-        strncat(un_addr.sun_path, dst, 102);
-        if (sendto(notify_fd, msg, len, 0, (struct sockaddr *) &un_addr, sizeof(un_addr)) < 0) {
-		return -1;
-	}
-	return 0;
-}

core/offload.c

@@ -55,9 +55,6 @@ static int uwsgi_offload_enqueue(struct wsgi_request *wsgi_req, struct uwsgi_off
 		}
 		return -1;
 	}
-#ifdef UWSGI_DEBUG
-        uwsgi_log("[offload] created session %p\n", uor);
-#endif
 	return 0;
 }
 
@@ -162,12 +159,6 @@ static int u_offload_sendfile_prepare(struct wsgi_request *wsgi_req, struct uwsg
 }
 
 static void uwsgi_offload_close(struct uwsgi_thread *ut, struct uwsgi_offload_request *uor) {
-
-	// call the free function asap
-	if (uor->free) {
-		uor->free(uor);
-	}
-
 	// close the socket and the file descriptor
 	if (uor->takeover && uor->s > -1) {
 		close(uor->s);
@@ -206,41 +197,12 @@ static void uwsgi_offload_close(struct uwsgi_thread *ut, struct uwsgi_offload_re
 		uwsgi_buffer_destroy(uor->ubuf);
 	}
 
-	if (uor->ubuf1) {
-		uwsgi_buffer_destroy(uor->ubuf1);
-	}
-	if (uor->ubuf2) {
-		uwsgi_buffer_destroy(uor->ubuf2);
-	}
-	if (uor->ubuf3) {
-		uwsgi_buffer_destroy(uor->ubuf3);
-	}
-	if (uor->ubuf4) {
-		uwsgi_buffer_destroy(uor->ubuf4);
-	}
-	if (uor->ubuf5) {
-		uwsgi_buffer_destroy(uor->ubuf5);
-	}
-	if (uor->ubuf6) {
-		uwsgi_buffer_destroy(uor->ubuf6);
-	}
-	if (uor->ubuf7) {
-		uwsgi_buffer_destroy(uor->ubuf7);
-	}
-	if (uor->ubuf8) {
-		uwsgi_buffer_destroy(uor->ubuf8);
-	}
-
 	if (uor->pipe[0] != -1) {
 		close(uor->pipe[1]);
 		close(uor->pipe[0]);
 	}
 
 	free(uor);
-
-#ifdef UWSGI_DEBUG
-	uwsgi_log("[offload] destroyed session %p\n", uor);
-#endif
 }
 
 static void uwsgi_offload_append(struct uwsgi_thread *ut, struct uwsgi_offload_request *uor) {
@@ -275,7 +237,6 @@ static void uwsgi_offload_loop(struct uwsgi_thread *ut) {
 	void *events = event_queue_alloc(uwsgi.offload_threads_events);
 
 	for (;;) {
-		// TODO make timeout tunable
 		int nevents = event_queue_wait_multi(ut->queue, -1, events, uwsgi.offload_threads_events);
 		for (i = 0; i < nevents; i++) {
 			int interesting_fd = event_queue_interesting_fd(events, i);
@@ -495,13 +456,6 @@ static int u_offload_transfer_do(struct uwsgi_thread *ut, struct uwsgi_offload_r
 		// write event (or just connected)
 		case 1:
 			if (fd == uor->fd) {
-				// maybe we want only a connection...
-				if (uor->ubuf->pos == 0) {
-					uor->status = 2;
-					if (event_queue_add_fd_read(ut->queue, uor->s)) return -1;
-					if (event_queue_fd_write_to_read(ut->queue, uor->fd)) return -1;
-					return 0;
-				}
 				rlen = write(uor->fd, uor->ubuf->buf + uor->written, uor->ubuf->pos-uor->written);	
 				if (rlen > 0) {
 					uor->written += rlen;

core/plugins_builder.c

@@ -1,112 +0,0 @@
-#include <uwsgi.h>
-
-#define UWSGI_BUILD_DIR ".uwsgi_plugins_builder"
-
-/*
-
-	steps:
-
-		mkdir(.uwsgi_plugin_builder)
-		generate .uwsgi_plugin_builder/uwsgi.h
-		generate .uwsgi_plugin_builder/uwsgiconfig.py
-		setenv(UWSGI_PLUGINS_BUILDER_CFLAGS=uwsgi_cflags)
-		exec PYTHON .uwsgi_plugin_builder/uwsgiconfig.py --extra-plugin <directory> [name]
-
-*/
-
-void uwsgi_build_plugin(char *directory) {
-
-	if (!uwsgi_file_exists(UWSGI_BUILD_DIR)) {
-		if (mkdir(UWSGI_BUILD_DIR, S_IRWXU) < 0) {
-        		uwsgi_error("uwsgi_build_plugin()/mkdir() " UWSGI_BUILD_DIR "/");
-			_exit(1);
-		}
-	}
-
-	char *dot_h = uwsgi_get_dot_h();
-	if (!dot_h) {
-		uwsgi_log("unable to generate uwsgi.h");
-		_exit(1);
-	}
-
-	if (strlen(dot_h) == 0) {
-		free(dot_h);
-		uwsgi_log("invalid uwsgi.h");
-		_exit(1);
-	}
-
-	int dot_h_fd = open(UWSGI_BUILD_DIR "/uwsgi.h", O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
-	if (dot_h_fd < 0) {
-		uwsgi_error_open(UWSGI_BUILD_DIR "/uwsgi.h");
-		free(dot_h);
-		_exit(1);
-	}
-
-	ssize_t dot_h_len = (ssize_t) strlen(dot_h);
-	if (write(dot_h_fd, dot_h, dot_h_len) != dot_h_len) {
-		uwsgi_error("uwsgi_build_plugin()/write()");
-		_exit(1);
-	}
-
-	char *config_py = uwsgi_get_config_py();
-        if (!config_py) {
-                uwsgi_log("unable to generate uwsgiconfig.py");
-                _exit(1);
-        }
-
-        if (strlen(config_py) == 0) {
-                uwsgi_log("invalid uwsgiconfig.py");
-                _exit(1);
-        }
-
-        int config_py_fd = open(UWSGI_BUILD_DIR "/uwsgiconfig.py", O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
-        if (config_py_fd < 0) {
-                uwsgi_error_open(UWSGI_BUILD_DIR "/uwsgiconfig.py");
-                _exit(1);
-        }
-
-        ssize_t config_py_len = (ssize_t) strlen(config_py);
-        if (write(config_py_fd, config_py, config_py_len) != config_py_len) {
-                uwsgi_error("uwsgi_build_plugin()/write()");
-                _exit(1);
-        }
-
-	char *cflags = uwsgi_get_cflags();
-	if (!cflags) {
-		uwsgi_log("unable to find cflags\n");
-		_exit(1);
-	}
-	if (strlen(cflags) == 0) {
-		uwsgi_log("invalid cflags\n");
-		_exit(1);
-	}
-
-	if (setenv("UWSGI_PLUGINS_BUILDER_CFLAGS", cflags, 1)) {
-		uwsgi_error("uwsgi_build_plugin()/setenv()");
-		_exit(1);
-	}
-	
-	// now run the python script
-	char *argv[6];
-
-	argv[0] = getenv("PYTHON");
-	if (!argv[0]) argv[0] = "python";
-
-	argv[1] = UWSGI_BUILD_DIR "/uwsgiconfig.py";
-	argv[2] = "--extra-plugin";
-	char *space = strchr(directory, ' ');
-	if (space) {
-		*space = 0;
-		argv[3] = directory;
-                argv[4] = space+1;
-		argv[5] = NULL;
-	}
-	else {
-		argv[3] = directory;
-		argv[4] = NULL;
-	}
-
-	execvp(argv[0], argv);
-	// never here...	
-	_exit(1);
-}

core/progress.c

@@ -77,7 +77,7 @@ int uwsgi_upload_progress_update(struct wsgi_request *wsgi_req, int fd, size_t r
 	char buf[4096];
 
 	int ret = snprintf(buf, 4096, "{ \"state\" : \"uploading\", \"received\" : %llu, \"size\" : %llu }\r\n", (unsigned long long) (wsgi_req->post_cl - remains), (unsigned long long) wsgi_req->post_cl);
-	if (ret <= 0 || ret >= 4096) {
+	if (ret < 0) {
 		return -1;
 	}
 

core/protocol.c

@@ -18,6 +18,81 @@ static size_t get_content_length(char *buf, uint16_t size) {
 }
 
 
+ssize_t send_udp_message(uint8_t modifier1, uint8_t modifier2, char *host, char *message, uint16_t message_size) {
+
+	int fd;
+	struct sockaddr_in udp_addr;
+	struct sockaddr_un un_addr;
+	char *udp_port;
+	ssize_t ret;
+
+	struct uwsgi_header *uh;
+
+	udp_port = strchr(host, ':');
+	if (udp_port) {
+		udp_port[0] = 0;
+
+		fd = socket(AF_INET, SOCK_DGRAM, 0);
+		if (fd < 0) {
+			uwsgi_error("socket()");
+			return -1;
+		}
+
+		memset(&udp_addr, 0, sizeof(struct sockaddr_in));
+		udp_addr.sin_family = AF_INET;
+		udp_addr.sin_port = htons(atoi(udp_port + 1));
+		udp_addr.sin_addr.s_addr = inet_addr(host);
+	}
+	else {
+		fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+		if (fd < 0) {
+			uwsgi_error("socket()");
+			return -1;
+		}
+
+		memset(&un_addr, 0, sizeof(struct sockaddr_un));
+		un_addr.sun_family = AF_UNIX;
+		// use 102 as the magic number
+		strncat(un_addr.sun_path, host, 102);
+
+	}
+
+	if (message) {
+		uh = (struct uwsgi_header *) message;
+	}
+	else {
+		uh = (struct uwsgi_header *) uwsgi_malloc(4);
+	}
+
+	uh->modifier1 = modifier1;
+#ifdef __BIG_ENDIAN__
+	uh->pktsize = uwsgi_swap16(message_size);
+#else
+	uh->pktsize = message_size;
+#endif
+	uh->modifier2 = modifier2;
+
+	if (udp_port) {
+		ret = sendto(fd, (char *) uh, message_size + 4, 0, (struct sockaddr *) &udp_addr, sizeof(udp_addr));
+		udp_port[0] = ':';
+	}
+	else {
+		ret = sendto(fd, (char *) uh, message_size + 4, 0, (struct sockaddr *) &un_addr, sizeof(un_addr));
+	}
+	if (ret < 0) {
+		uwsgi_error("send_udp_message()/sendto()");
+	}
+	close(fd);
+
+	if ((char *) uh != message) {
+		free(uh);
+	}
+
+	return ret;
+
+}
+
+
 int uwsgi_read_response(int fd, struct uwsgi_header *uh, int timeout, char **buf) {
 
 	char *ptr = (char *) uh;
@@ -337,12 +412,6 @@ static int uwsgi_proto_check_11(struct wsgi_request *wsgi_req, char *key, char *
 		return 0;
 	}
 
-	if (!uwsgi_proto_key("HTTP_ORIGIN", 11)) {
-                wsgi_req->http_origin = buf;
-                wsgi_req->http_origin_len = len;
-                return 0;
-        }
-
 	return 0;
 }
 
@@ -494,7 +563,7 @@ static int uwsgi_proto_check_18(struct wsgi_request *wsgi_req, char *key, char *
 
 
 static int uwsgi_proto_check_20(struct wsgi_request *wsgi_req, char *key, char *buf, uint16_t len) {
-	if (uwsgi.logging_options.log_x_forwarded_for && !uwsgi_proto_key("HTTP_X_FORWARDED_FOR", 20)) {
+	if (uwsgi.log_x_forwarded_for && !uwsgi_proto_key("HTTP_X_FORWARDED_FOR", 20)) {
 		wsgi_req->remote_addr = buf;
 		wsgi_req->remote_addr_len = len;
 		return 0;
@@ -520,33 +589,9 @@ static int uwsgi_proto_check_22(struct wsgi_request *wsgi_req, char *key, char *
 		wsgi_req->if_modified_since_len = len;
 		return 0;
 	}
-
-	if (!uwsgi_proto_key("HTTP_SEC_WEBSOCKET_KEY", 22)) {
-		wsgi_req->http_sec_websocket_key = buf;
-		wsgi_req->http_sec_websocket_key_len = len;
-		return 0;
-	}
-
-	if (!uwsgi_proto_key("HTTP_X_FORWARDED_PROTO", 22)) {
-                wsgi_req->scheme = buf;
-                wsgi_req->scheme_len = len;
-        }
-
 	return 0;
 }
 
-static int uwsgi_proto_check_27(struct wsgi_request *wsgi_req, char *key, char *buf, uint16_t len) {
-
-        if (!uwsgi_proto_key("HTTP_SEC_WEBSOCKET_PROTOCOL", 27)) {
-                wsgi_req->http_sec_websocket_protocol = buf;
-                wsgi_req->http_sec_websocket_protocol_len = len;
-                return 0;
-        }
-
-        return 0;
-}
-
-
 void uwsgi_proto_hooks_setup() {
 	int i = 0;
 	for(i=0;i<UWSGI_PROTO_MAX_CHECK;i++) {
@@ -564,7 +609,6 @@ void uwsgi_proto_hooks_setup() {
 	uwsgi.proto_hooks[18] = uwsgi_proto_check_18;
 	uwsgi.proto_hooks[20] = uwsgi_proto_check_20;
 	uwsgi.proto_hooks[22] = uwsgi_proto_check_22;
-	uwsgi.proto_hooks[27] = uwsgi_proto_check_27;
 }
 
 
@@ -736,40 +780,25 @@ next:
 			}
 
 			for (i = 0; i < uwsgi_apps_cnt; i++) {
-				char* mountpoint = uwsgi_apps[i].mountpoint;
-				int mountpoint_len = uwsgi_apps[i].mountpoint_len;
-
-				// Ignore trailing mountpoint slashes
-				if (mountpoint_len > 0 && mountpoint[mountpoint_len - 1] == '/') {
-					mountpoint_len -= 1;
-				}
-
 				//uwsgi_log("app mountpoint = %.*s\n", uwsgi_apps[i].mountpoint_len, uwsgi_apps[i].mountpoint);
+				if (orig_path_info_len >= uwsgi_apps[i].mountpoint_len) {
+					if (!uwsgi_startswith(orig_path_info, uwsgi_apps[i].mountpoint, uwsgi_apps[i].mountpoint_len) && uwsgi_apps[i].mountpoint_len > best_found) {
+						best_found = uwsgi_apps[i].mountpoint_len;
+						wsgi_req->script_name = uwsgi_apps[i].mountpoint;
+						wsgi_req->script_name_len = uwsgi_apps[i].mountpoint_len;
+						wsgi_req->path_info = orig_path_info + wsgi_req->script_name_len;
+						wsgi_req->path_info_len = orig_path_info_len - wsgi_req->script_name_len;
 
-				// Check if mountpoint could be a possible candidate
-				if (orig_path_info_len < mountpoint_len || // it should be shorter than or equal to path_info
-					mountpoint_len <= best_found || // it should be better than the previous found
-					// should have the same prefix of path_info
-					uwsgi_startswith(orig_path_info, mountpoint, mountpoint_len) ||
-					// and should not be "misleading"
-					(orig_path_info_len > mountpoint_len && orig_path_info[mountpoint_len] != '/' )) {
-					continue;
-				}
+						wsgi_req->hvec[wsgi_req->script_name_pos].iov_base = wsgi_req->script_name;
+						wsgi_req->hvec[wsgi_req->script_name_pos].iov_len = wsgi_req->script_name_len;
 
-				best_found = mountpoint_len;
-				wsgi_req->script_name = uwsgi_apps[i].mountpoint;
-				wsgi_req->script_name_len = uwsgi_apps[i].mountpoint_len;
-				wsgi_req->path_info = orig_path_info + wsgi_req->script_name_len;
-				wsgi_req->path_info_len = orig_path_info_len - wsgi_req->script_name_len;
-
-				wsgi_req->hvec[wsgi_req->script_name_pos].iov_base = wsgi_req->script_name;
-				wsgi_req->hvec[wsgi_req->script_name_pos].iov_len = wsgi_req->script_name_len;
-
-				wsgi_req->hvec[wsgi_req->path_info_pos].iov_base = wsgi_req->path_info;
-				wsgi_req->hvec[wsgi_req->path_info_pos].iov_len = wsgi_req->path_info_len;
+						wsgi_req->hvec[wsgi_req->path_info_pos].iov_base = wsgi_req->path_info;
+						wsgi_req->hvec[wsgi_req->path_info_pos].iov_len = wsgi_req->path_info_len;
 #ifdef UWSGI_DEBUG
-				uwsgi_log("managed SCRIPT_NAME = %.*s PATH_INFO = %.*s\n", wsgi_req->script_name_len, wsgi_req->script_name, wsgi_req->path_info_len, wsgi_req->path_info);
+						uwsgi_log("managed SCRIPT_NAME = %.*s PATH_INFO = %.*s\n", wsgi_req->script_name_len, wsgi_req->script_name, wsgi_req->path_info_len, wsgi_req->path_info);
 #endif
+					}
+				}
 			}
 		}
 	}
@@ -1071,7 +1100,7 @@ char *uwsgi_req_append(struct wsgi_request *wsgi_req, char *key, uint16_t keylen
 	wsgi_req->var_cnt++;
 	ptr += keylen;
 
-
+	
 
 	*ptr++ = (uint8_t) (vallen & 0xff);
 	*ptr++ = (uint8_t) ((vallen >> 8) & 0xff);
@@ -1138,13 +1167,13 @@ int uwsgi_req_append_path_info_with_index(struct wsgi_request *wsgi_req, char *i
 		*ptr ++= '/';
 	}
 	memcpy(ptr, index, index_len);
-
+	
 	wsgi_req->hvec[wsgi_req->var_cnt].iov_base = new_path_info;
         wsgi_req->hvec[wsgi_req->var_cnt].iov_len = wsgi_req->path_info_len;
         wsgi_req->var_cnt++;
 
 	wsgi_req->uh->pktsize += 13 + wsgi_req->path_info_len;
 	wsgi_req->path_info = new_path_info;
-
+	
 	return 0;
 }

core/reader.c

@@ -24,39 +24,6 @@ int uwsgi_simple_wait_read_hook(int fd, int timeout) {
         return ret;
 }
 
-int uwsgi_simple_wait_read2_hook(int fd0, int fd1, int timeout, int *fd) {
-        struct pollfd upoll[2];
-        timeout = timeout * 1000;
-
-        upoll[0].fd = fd0;
-        upoll[0].events = POLLIN;
-        upoll[0].revents = 0;
-
-        upoll[1].fd = fd1;
-        upoll[1].events = POLLIN;
-        upoll[1].revents = 0;
-
-        int ret = poll(upoll, 2, timeout);
-
-        if (ret > 0) {
-                if (upoll[0].revents & POLLIN) {
-			*fd = fd0;
-                        return 1;
-                }
-                if (upoll[1].revents & POLLIN) {
-			*fd = fd1;
-                        return 1;
-                }
-                return -1;
-        }
-        if (ret < 0) {
-                uwsgi_error("uwsgi_simple_wait_read_hook2()/poll()");
-        }
-
-        return ret;
-}
-
-
 /*
 	seek()/rewind() language-independent implementations.
 */
@@ -65,16 +32,14 @@ void uwsgi_request_body_seek(struct wsgi_request *wsgi_req, off_t pos) {
 	if (wsgi_req->post_file) {
 		if (pos < 0) {
 			if (fseek(wsgi_req->post_file, pos, SEEK_CUR)) {
-                        	uwsgi_req_error("uwsgi_request_body_seek()/fseek()");
-				wsgi_req->read_errors++;
+                        	uwsgi_error("uwsgi_request_body_seek()/fseek()");
                 	}
 			wsgi_req->post_pos = ftell(wsgi_req->post_file);
 			return;
 		}
 
 		if (fseek(wsgi_req->post_file, pos, SEEK_SET)) {
-			uwsgi_req_error("uwsgi_request_body_seek()/fseek()");
-			wsgi_req->read_errors++;
+			uwsgi_error("uwsgi_request_body_seek()/fseek()");
 		}
 		wsgi_req->post_pos = ftell(wsgi_req->post_file);
 		return;
@@ -123,14 +88,14 @@ static int consume_body_for_readline(struct wsgi_request *wsgi_req) {
 
 	// allocate more memory if needed
 	if (wsgi_req->post_readline_size - wsgi_req->post_readline_watermark == 0) {
-		memmove(wsgi_req->post_readline_buf, wsgi_req->post_readline_buf + wsgi_req->post_readline_pos, wsgi_req->post_readline_watermark - wsgi_req->post_readline_pos);
+		memcpy(wsgi_req->post_readline_buf, wsgi_req->post_readline_buf + wsgi_req->post_readline_pos, wsgi_req->post_readline_watermark - wsgi_req->post_readline_pos);
 		wsgi_req->post_readline_watermark -= wsgi_req->post_readline_pos;
 		wsgi_req->post_readline_pos = 0;
 		// still something to use ?
 		if (wsgi_req->post_readline_size - wsgi_req->post_readline_watermark < remains) {
         		char *tmp_buf = realloc(wsgi_req->post_readline_buf, wsgi_req->post_readline_size + remains);
                 	if (!tmp_buf) {
-                		uwsgi_req_error("consume_body_for_readline()/realloc()");
+                		uwsgi_error("consume_body_for_readline()/realloc()");
                         	return -1;
                 	}
                 	wsgi_req->post_readline_buf = tmp_buf;
@@ -149,7 +114,7 @@ static int consume_body_for_readline(struct wsgi_request *wsgi_req) {
 	if (wsgi_req->post_file) {
 		size_t ret = fread(wsgi_req->post_readline_buf + wsgi_req->post_readline_watermark, remains, 1, wsgi_req->post_file);	
 		if (ret == 0) {
-			uwsgi_req_error("consume_body_for_readline()/fread()");
+			uwsgi_error("consume_body_for_readline()/fread()");
 			return -1;
 		}
 		wsgi_req->post_pos += remains;
@@ -175,7 +140,6 @@ static int consume_body_for_readline(struct wsgi_request *wsgi_req) {
 	}
 	if (len == 0) {
 		uwsgi_read_error(remains);
-		wsgi_req->read_errors++;
 		return -1;	
 	}
 	if (len < 0) {
@@ -183,7 +147,6 @@ static int consume_body_for_readline(struct wsgi_request *wsgi_req) {
 			goto wait;
 		}
 		uwsgi_read_error(remains);
-		wsgi_req->read_errors++;
 		return -1;
 	}
 wait:
@@ -196,7 +159,6 @@ wait:
 			return 0;
 		}
 		uwsgi_read_error(remains);
-		wsgi_req->read_errors++;
                 return -1;
 	}
         // 0 means timeout
@@ -205,7 +167,6 @@ wait:
 		return -1;
         }
 	uwsgi_read_error(remains);
-	wsgi_req->read_errors++;
         return -1;
 }
 
@@ -243,8 +204,7 @@ char *uwsgi_request_body_readline(struct wsgi_request *wsgi_req, ssize_t hint, s
 		size_t amount = UMIN(uwsgi.buffer_size, wsgi_req->post_cl);
 		wsgi_req->post_readline_buf = malloc(amount);
 		if (!wsgi_req->post_readline_buf) {
-			uwsgi_req_error("uwsgi_request_body_readline()/malloc()");
-			wsgi_req->read_errors++;
+			uwsgi_error("uwsgi_request_body_readline()/malloc()");
 			*rlen = -1;
 			return NULL;
 		}
@@ -257,7 +217,6 @@ char *uwsgi_request_body_readline(struct wsgi_request *wsgi_req, ssize_t hint, s
 		if (wsgi_req->post_pos >= wsgi_req->post_cl) break;
 
                         if (consume_body_for_readline(wsgi_req)) {
-				wsgi_req->read_errors++;
                                 *rlen = -1;
                                 return NULL;
                         }
@@ -313,9 +272,8 @@ char *uwsgi_request_body_read(struct wsgi_request *wsgi_req, ssize_t hint, ssize
 			if (avail > wsgi_req->post_read_buf_size) {
 				char *tmp_buf = realloc(wsgi_req->post_read_buf, avail);
 				if (!tmp_buf) {
-                                	uwsgi_req_error("uwsgi_request_body_read()/realloc()");
+                                	uwsgi_error("uwsgi_request_body_read()/realloc()");
                                 	*rlen = -1;
-					wsgi_req->read_errors++;
                                 	return NULL;
                         	}
                         	wsgi_req->post_read_buf = tmp_buf;
@@ -362,8 +320,7 @@ char *uwsgi_request_body_read(struct wsgi_request *wsgi_req, ssize_t hint, ssize
 	if (!wsgi_req->post_read_buf) {
 		wsgi_req->post_read_buf = malloc(remains);
 		if (!wsgi_req->post_read_buf) {
-			uwsgi_req_error("uwsgi_request_body_read()/malloc()");
-			wsgi_req->read_errors++;
+			uwsgi_error("uwsgi_request_body_read()/malloc()");
 			*rlen = -1;
 			return NULL;
 		}
@@ -374,8 +331,7 @@ char *uwsgi_request_body_read(struct wsgi_request *wsgi_req, ssize_t hint, ssize
 		if ((remains+*rlen) > wsgi_req->post_read_buf_size) {
 			char *tmp_buf = realloc(wsgi_req->post_read_buf, (remains+*rlen));
 			if (!tmp_buf) {
-				uwsgi_req_error("uwsgi_request_body_read()/realloc()");
-				wsgi_req->read_errors++;
+				uwsgi_error("uwsgi_request_body_read()/realloc()");
 				*rlen = -1;
 				return NULL;
 			}
@@ -392,8 +348,7 @@ char *uwsgi_request_body_read(struct wsgi_request *wsgi_req, ssize_t hint, ssize
 	if (wsgi_req->post_file) {
 		if (fread(wsgi_req->post_read_buf + *rlen, remains, 1, wsgi_req->post_file) != 1) {
 			*rlen = -1;
-			uwsgi_req_error("uwsgi_request_body_read()/fread()");
-			wsgi_req->read_errors++;
+			uwsgi_error("uwsgi_request_body_read()/fread()");
 			return NULL;
 		}
 		*rlen += remains;
@@ -423,7 +378,6 @@ char *uwsgi_request_body_read(struct wsgi_request *wsgi_req, ssize_t hint, ssize
 			}
 			*rlen = -1;
 			uwsgi_read_error(remains);
-			wsgi_req->read_errors++;
 			return NULL;
 		}
 wait:
@@ -435,7 +389,7 @@ wait:
 				remains -= len;
                         	*rlen += len;
                         	continue;
-			}else if (len < 0 && (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS)) {
+			}else if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) {
 				goto wait;
 			}
 			*rlen = -1;
@@ -444,7 +398,6 @@ wait:
 			}
 			else {
 				uwsgi_read_error(remains);
-				wsgi_req->read_errors++;
 			}
 			return NULL;
 		}
@@ -456,7 +409,6 @@ wait:
 		}
 		*rlen = -1;
 		uwsgi_read_error(remains);
-		wsgi_req->read_errors++;
 		return NULL;
 	}
 
@@ -476,8 +428,8 @@ int uwsgi_postbuffer_do_in_mem(struct wsgi_request *wsgi_req) {
         char *ptr = wsgi_req->post_buffering_buf;
 
         while (remains > 0) {
-                if (uwsgi.harakiri_options.workers > 0) {
-                        inc_harakiri(uwsgi.harakiri_options.workers);
+                if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+                        inc_harakiri(uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 }
 
                 ssize_t rlen = wsgi_req->socket->proto_read_body(wsgi_req, ptr, remains);
@@ -495,7 +447,6 @@ int uwsgi_postbuffer_do_in_mem(struct wsgi_request *wsgi_req) {
                                 goto wait;
                         }
 			uwsgi_read_error(remains);
-			wsgi_req->read_errors++;
                         return -1;
                 }
 
@@ -511,7 +462,6 @@ wait:
 		}
                 if (ret < 0) {
 			uwsgi_read_error(remains);
-			wsgi_req->read_errors++;
                         return -1;
                 }
 		uwsgi_read_timeout(remains);
@@ -532,8 +482,7 @@ int uwsgi_postbuffer_do_in_disk(struct wsgi_request *wsgi_req) {
 
         wsgi_req->post_file = uwsgi_tmpfile();
         if (!wsgi_req->post_file) {
-                uwsgi_req_error("uwsgi_postbuffer_do_in_disk()/uwsgi_tmpfile()");
-		wsgi_req->read_errors++;
+                uwsgi_error("uwsgi_postbuffer_do_in_disk()/uwsgi_tmpfile()");
                 return -1;
         }
 
@@ -550,8 +499,8 @@ int uwsgi_postbuffer_do_in_disk(struct wsgi_request *wsgi_req) {
         while (post_remains > 0) {
 
                 // during post buffering we need to constantly reset the harakiri
-                if (uwsgi.harakiri_options.workers > 0) {
-                        inc_harakiri(uwsgi.harakiri_options.workers);
+                if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+                        inc_harakiri(uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 }
 
                 // we use the already available post buffering buffer to read chunks....
@@ -569,7 +518,6 @@ int uwsgi_postbuffer_do_in_disk(struct wsgi_request *wsgi_req) {
                                 goto wait;
                         }
 			uwsgi_read_error(remains);
-			wsgi_req->read_errors++;
                         goto end;
                 }
 
@@ -583,13 +531,11 @@ wait:
 			}
 			else {
 				uwsgi_read_error(remains);
-				wsgi_req->read_errors++;
 			}
                         goto end;
 		}
                 if (ret < 0) {
 			uwsgi_read_error(remains);
-			wsgi_req->read_errors++;
                         goto end;
                 }
 		uwsgi_read_timeout(remains);
@@ -597,8 +543,7 @@ wait:
 
 write:
                 if (fwrite(wsgi_req->post_buffering_buf, rlen, 1, wsgi_req->post_file) != 1) {
-                        uwsgi_req_error("uwsgi_postbuffer_do_in_disk()/fwrite()");
-			wsgi_req->read_errors++;
+                        uwsgi_error("uwsgi_postbuffer_do_in_disk()/fwrite()");
                         goto end;
                 }
 

core/routing.c

@@ -312,7 +312,6 @@ int uwsgi_apply_error_routes(struct wsgi_request *wsgi_req) {
 
 int uwsgi_apply_response_routes(struct wsgi_request *wsgi_req) {
 
-
         if (!uwsgi.response_routes) return 0;
         if (wsgi_req->response_routes_applied) return 0;
 
@@ -583,121 +582,6 @@ static int uwsgi_router_break(struct uwsgi_route *ur, char *arg) {
 	return 0;
 }
 
-static int uwsgi_router_return_func(struct wsgi_request *wsgi_req, struct uwsgi_route *route)
-{
-
-	if (route->data_len < 3)
-		return UWSGI_ROUTE_BREAK;
-	uint16_t status_msg_len = 0;
-	const char *status_msg = uwsgi_http_status_msg(route->data, &status_msg_len);
-
-	if (!status_msg)
-		return UWSGI_ROUTE_BREAK;
-
-	char *buf = uwsgi_concat3n(route->data, route->data_len, " ", 1, (char *) status_msg, status_msg_len);
-	if (uwsgi_response_prepare_headers(wsgi_req, buf, route->data_len + 1 + status_msg_len))
-		goto end;
-	if (uwsgi_response_add_content_type(wsgi_req, "text/plain", 10))
-		goto end;
-	if (uwsgi_response_add_content_length(wsgi_req, status_msg_len))
-		goto end;
-	uwsgi_response_write_body_do(wsgi_req, (char *) status_msg, status_msg_len);
-
-end:
-	free(buf);
-	return UWSGI_ROUTE_BREAK;
-}
-
-static int uwsgi_router_return(struct uwsgi_route *ur, char *arg)
-{
-	ur->func = uwsgi_router_return_func;
-	ur->data = arg;
-	ur->data_len = strlen(arg);
-	return 0;
-}
-
-// simple math router
-static int uwsgi_router_simple_math_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);
-
-	uint16_t var_vallen = 0;
-	char *var_value = uwsgi_get_var(wsgi_req, ur->data, ur->data_len, &var_vallen);
-	if (!var_value) return UWSGI_ROUTE_BREAK;
-
-	int64_t base_value = uwsgi_str_num(var_value, var_vallen);
-	int64_t value = 1;
-
-	if (ur->data2_len) {
-        	struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data2, ur->data2_len);
-        	if (!ub) return UWSGI_ROUTE_BREAK;
-		value = uwsgi_str_num(ub->buf, ub->pos);
-		uwsgi_buffer_destroy(ub);
-	}
-
-	char out[sizeof(UMAX64_STR)+1];
-	int64_t total = 0;
-
-	switch(ur->custom) {
-		// -
-		case 1:
-			total = base_value - value;
-			break;
-		// *
-		case 2:
-			total = base_value * value;
-			break;
-		// /
-		case 3:
-			if (value == 0) total = 0;
-			else {
-				total = base_value/value;
-			}
-			break;
-		default:
-			total = base_value + value;
-			break;
-	}
-
-	int ret = uwsgi_long2str2n(total, out, sizeof(UMAX64_STR)+1);
-	if (ret <= 0) return UWSGI_ROUTE_BREAK;
-
-        if (!uwsgi_req_append(wsgi_req, ur->data, ur->data_len, out, ret)) {
-                return UWSGI_ROUTE_BREAK;
-        }
-        return UWSGI_ROUTE_NEXT;
-}
-
-static int uwsgi_router_simple_math_plus(struct uwsgi_route *ur, char *arg) {
-        ur->func = uwsgi_router_simple_math_func;
-	char *comma = strchr(arg, ',');
-	if (comma) {
-		ur->data = arg;
-		ur->data_len = comma - arg;
-		ur->data2 = comma+1;
-		ur->data2_len = strlen(ur->data);
-	}
-	else {
-		ur->data = arg;
-		ur->data_len = strlen(arg);
-	}
-        return 0;
-}
-
-static int uwsgi_router_simple_math_minus(struct uwsgi_route *ur, char *arg) {
-	ur->custom = 1;
-	return uwsgi_router_simple_math_plus(ur, arg);
-}
-
-static int uwsgi_router_simple_math_multiply(struct uwsgi_route *ur, char *arg) {
-	ur->custom = 2;
-	return uwsgi_router_simple_math_plus(ur, arg);
-}
-
-static int uwsgi_router_simple_math_divide(struct uwsgi_route *ur, char *arg) {
-	ur->custom = 2;
-	return uwsgi_router_simple_math_plus(ur, arg);
-}
 
 // harakiri router
 static int uwsgi_router_harakiri_func(struct wsgi_request *wsgi_req, struct uwsgi_route *route) {
@@ -739,7 +623,7 @@ static int uwsgi_router_flush(struct uwsgi_route *ur, char *arg) {
 static int transform_fixcl(struct wsgi_request *wsgi_req, struct uwsgi_transformation *ut) {
 	char buf[sizeof(UMAX64_STR)+1];
         int ret = snprintf(buf, sizeof(UMAX64_STR)+1, "%llu", (unsigned long long) ut->chunk->pos);
-        if (ret <= 0 || ret >= (int) (sizeof(UMAX64_STR)+1)) {
+        if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
                 wsgi_req->write_errors++;
                 return -1;
         }
@@ -756,6 +640,7 @@ static int uwsgi_router_fixcl(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
+
 // log route
 static int uwsgi_router_log_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
 
@@ -976,20 +861,6 @@ static int uwsgi_router_clearheaders(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
-// disable headers
-static int uwsgi_router_disableheaders_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
-	wsgi_req->headers_sent = 1;
-        return UWSGI_ROUTE_NEXT;
-}
-
-static int uwsgi_router_disableheaders(struct uwsgi_route *ur, char *arg) {
-        ur->func = uwsgi_router_disableheaders_func;
-        ur->data = arg;
-        ur->data_len = strlen(arg);
-        return 0;
-}
-
-
 
 // signal route
 static int uwsgi_router_signal_func(struct wsgi_request *wsgi_req, struct uwsgi_route *route) {
@@ -1010,7 +881,7 @@ static int uwsgi_router_chdir_func(struct wsgi_request *wsgi_req, struct uwsgi_r
         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 (chdir(ub->buf)) {
-		uwsgi_req_error("uwsgi_router_chdir_func()/chdir()");
+		uwsgi_error("uwsgi_router_chdir_func()/chdir()");
 		uwsgi_buffer_destroy(ub);
 		return UWSGI_ROUTE_BREAK;
 	}
@@ -1119,32 +990,6 @@ static int uwsgi_router_seturi(struct uwsgi_route *ur, char *arg) {
         ur->data_len = strlen(arg);
         return 0;
 }
-
-// setremoteaddr route
-static int uwsgi_router_setremoteaddr_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
-        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
-        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
-
-        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
-        if (!ub) return UWSGI_ROUTE_BREAK;
-        char *ptr = uwsgi_req_append(wsgi_req, "REMOTE_ADDR", 11, ub->buf, ub->pos);
-        if (!ptr) {
-                uwsgi_buffer_destroy(ub);
-                return UWSGI_ROUTE_BREAK;
-        }
-        wsgi_req->remote_addr = ptr;
-        wsgi_req->remote_addr_len = ub->pos;
-        uwsgi_buffer_destroy(ub);
-        return UWSGI_ROUTE_NEXT;
-}
-static int uwsgi_router_setremoteaddr(struct uwsgi_route *ur, char *arg) {
-        ur->func = uwsgi_router_setremoteaddr_func;
-        ur->data = arg;
-        ur->data_len = strlen(arg);
-        return 0;
-}
-
-
 // setdocroot route
 static int uwsgi_router_setdocroot_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
         char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
@@ -1218,26 +1063,6 @@ static int uwsgi_router_setscheme(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
-// setmodifiers
-static int uwsgi_router_setmodifier1_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
-	wsgi_req->uh->modifier1 = ur->custom;
-	return UWSGI_ROUTE_NEXT;
-}
-static int uwsgi_router_setmodifier1(struct uwsgi_route *ur, char *arg) {
-        ur->func = uwsgi_router_setmodifier1_func;
-	ur->custom = atoi(arg);
-        return 0;
-}
-static int uwsgi_router_setmodifier2_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
-	wsgi_req->uh->modifier2 = ur->custom;
-	return UWSGI_ROUTE_NEXT;
-}
-static int uwsgi_router_setmodifier2(struct uwsgi_route *ur, char *arg) {
-        ur->func = uwsgi_router_setmodifier2_func;
-	ur->custom = atoi(arg);
-        return 0;
-}
-
 
 // setuser route
 static int uwsgi_router_setuser_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
@@ -1374,21 +1199,10 @@ static int uwsgi_router_alarm(struct uwsgi_route *ur, char *arg) {
 
 // send route
 static int uwsgi_router_send_func(struct wsgi_request *wsgi_req, struct uwsgi_route *route) {
-	char **subject = (char **) (((char *)(wsgi_req))+route->subject);
-        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+route->subject_len);
-
-	struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, route, *subject, *subject_len, route->data, route->data_len);
-        if (!ub) {
-                return UWSGI_ROUTE_BREAK;
-        }
+	uwsgi_response_write_body_do(wsgi_req, route->data, route->data_len);
 	if (route->custom) {
-		if (uwsgi_buffer_append(ub, "\r\n", 2)) {
-			uwsgi_buffer_destroy(ub);
-			return UWSGI_ROUTE_BREAK;
-		}
+		uwsgi_response_write_body_do(wsgi_req, "\r\n", 2);
 	}
-	uwsgi_response_write_body_do(wsgi_req, ub->buf, ub->pos);
-	uwsgi_buffer_destroy(ub);
         return UWSGI_ROUTE_NEXT;
 }
 static int uwsgi_router_send(struct uwsgi_route *ur, char *arg) {
@@ -1750,11 +1564,7 @@ static char *uwsgi_route_var_uwsgi(struct wsgi_request *wsgi_req, char *key, uin
         }
 
 	else if (!uwsgi_strncmp(key, keylen, "lq", 2)) {
-                ret = uwsgi_num2str(uwsgi.shared->backlog);
-                *vallen = strlen(ret);
-        }
-	else if (!uwsgi_strncmp(key, keylen, "rsize", 5)) {
-                ret = uwsgi_64bit2str(wsgi_req->response_size);
+                ret = uwsgi_num2str(uwsgi.shared->load);
                 *vallen = strlen(ret);
         }
 
@@ -1767,7 +1577,7 @@ static char *uwsgi_route_var_mime(struct wsgi_request *wsgi_req, char *key, uint
         char *var_value = uwsgi_get_var(wsgi_req, key, keylen, &var_vallen);
         if (var_value) {
 		size_t mime_type_len = 0;
-		ret = uwsgi_get_mime_type(var_value, var_vallen, &mime_type_len);
+		char *ret = uwsgi_get_mime_type(key, keylen, &mime_type_len);
 		if (ret) *vallen = mime_type_len;
         }
         return ret;
@@ -1819,13 +1629,53 @@ static char *uwsgi_route_var_hex(struct wsgi_request *wsgi_req, char *key, uint1
         return ret;
 }
 
+#ifdef UWSGI_MATHEVAL
+static char *uwsgi_route_var_math(struct wsgi_request *wsgi_req, char *key, uint16_t keylen, uint16_t *vallen) {
+	char *ret = NULL;
+	// avoid crash	
+	if (!wsgi_req->var_cnt) return NULL;
+	// we make a bit of fun here, we do a copy of the vars buffer (+1 byte for final zero) and zeor-pad all of the strings
+	char *vars_buf = uwsgi_malloc(wsgi_req->uh->pktsize + keylen + 1);
+	char **names = uwsgi_malloc(sizeof(char *) * (wsgi_req->var_cnt/2));
+	double *values = uwsgi_calloc(sizeof(double) * (wsgi_req->var_cnt/2));
+	int i,j = 0;
+	char *ptr = vars_buf;
+	for (i = wsgi_req->var_cnt-1; i > 0; i -= 2) {
+		memcpy(ptr, wsgi_req->hvec[i-1].iov_base, wsgi_req->hvec[i-1].iov_len);	
+		names[j] = ptr;
+		ptr += wsgi_req->hvec[i-1].iov_len;
+		*ptr++=0;
+		char *num = ptr;
+		memcpy(ptr, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len);
+		ptr += wsgi_req->hvec[i].iov_len;
+                *ptr++=0;
+		values[j] = strtod(num, NULL);
+		j++;
+        }
+
+	char *expr = ptr;
+	memcpy(ptr, key, keylen); ptr += keylen;
+	*ptr++=0;
+
+	void *e = evaluator_create(expr);
+        if (!e) goto end;
+        double n = evaluator_evaluate(e, j, names, values);
+        evaluator_destroy(e);
+	ret = uwsgi_num2str((int)n);
+	*vallen = strlen(ret);
+end:
+	free(vars_buf);
+	free(names);
+	free(values);
+	return ret;
+}
+#endif
+
 // register embedded routers
 void uwsgi_register_embedded_routers() {
 	uwsgi_register_router("continue", uwsgi_router_continue);
         uwsgi_register_router("last", uwsgi_router_continue);
         uwsgi_register_router("break", uwsgi_router_break);
-	uwsgi_register_router("return", uwsgi_router_return);
-	uwsgi_register_router("break-with-status", uwsgi_router_return);
         uwsgi_register_router("log", uwsgi_router_log);
         uwsgi_register_router("donotlog", uwsgi_router_donotlog);
         uwsgi_register_router("logvar", uwsgi_router_logvar);
@@ -1836,7 +1686,6 @@ void uwsgi_register_embedded_routers() {
         uwsgi_register_router("remheader", uwsgi_router_remheader);
         uwsgi_register_router("clearheaders", uwsgi_router_clearheaders);
         uwsgi_register_router("resetheaders", uwsgi_router_clearheaders);
-        uwsgi_register_router("disableheaders", uwsgi_router_disableheaders);
         uwsgi_register_router("signal", uwsgi_router_signal);
         uwsgi_register_router("send", uwsgi_router_send);
         uwsgi_register_router("send-crnl", uwsgi_router_send_crnl);
@@ -1848,21 +1697,12 @@ void uwsgi_register_embedded_routers() {
         uwsgi_register_router("setscriptname", uwsgi_router_setscriptname);
         uwsgi_register_router("setmethod", uwsgi_router_setmethod);
         uwsgi_register_router("seturi", uwsgi_router_seturi);
-        uwsgi_register_router("setremoteaddr", uwsgi_router_setremoteaddr);
         uwsgi_register_router("setpathinfo", uwsgi_router_setpathinfo);
         uwsgi_register_router("setdocroot", uwsgi_router_setdocroot);
         uwsgi_register_router("setscheme", uwsgi_router_setscheme);
         uwsgi_register_router("setprocname", uwsgi_router_setprocname);
         uwsgi_register_router("alarm", uwsgi_router_alarm);
 
-        uwsgi_register_router("setmodifier1", uwsgi_router_setmodifier1);
-        uwsgi_register_router("setmodifier2", uwsgi_router_setmodifier2);
-
-        uwsgi_register_router("+", uwsgi_router_simple_math_plus);
-        uwsgi_register_router("-", uwsgi_router_simple_math_minus);
-        uwsgi_register_router("*", uwsgi_router_simple_math_multiply);
-        uwsgi_register_router("/", uwsgi_router_simple_math_divide);
-
         uwsgi_register_router("flush", uwsgi_router_flush);
         uwsgi_register_router("fixcl", uwsgi_router_fixcl);
 
@@ -1906,6 +1746,10 @@ void uwsgi_register_embedded_routers() {
 	urv->need_free = 1;
         urv = uwsgi_register_route_var("httptime", uwsgi_route_var_httptime);
 	urv->need_free = 1;
+#ifdef UWSGI_MATHEVAL
+        urv = uwsgi_register_route_var("math", uwsgi_route_var_math);
+	urv->need_free = 1;
+#endif
         urv = uwsgi_register_route_var("base64", uwsgi_route_var_base64);
 	urv->need_free = 1;
 
@@ -2045,19 +1889,5 @@ next4:
 		usl->custom2 = strlen(space+1);
 		uwsgi_log("collecting header %.*s to var %s\n", usl->custom, usl->value, usl->custom_ptr);
 	}
-
-	uwsgi_foreach(usl, uwsgi.pull_headers) {
-                char *space = strchr(usl->value, ' ');
-                if (!space) {
-                        uwsgi_log("invalid pull 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("pulling header %.*s to var %s\n", usl->custom, usl->value, usl->custom_ptr);
-        }
 }
 #endif

core/rpc.c

@@ -59,11 +59,11 @@ already:
 	return ret;
 }
 
-uint64_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], char **output) {
+uint16_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], char *output) {
 
 	struct uwsgi_rpc *urpc = NULL;
 	uint64_t i;
-	uint64_t ret = 0;
+	uint16_t ret = 0;
 
 	int pos = (uwsgi.mywid * uwsgi.rpc_max);
 
@@ -85,15 +85,8 @@ uint64_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], cha
 	return ret;
 }
 
-static void rpc_context_hook(char *key, uint16_t kl, char *value, uint16_t vl, void *data) {
-	size_t *r = (size_t *) data;
 
-	if (!uwsgi_strncmp(key, kl, "CONTENT_LENGTH", 14)) {
-		*r = uwsgi_str_num(value, vl);
-	}
-}
-
-char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t argvs[], uint64_t * len) {
+char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t argvs[], uint16_t * len) {
 
 	uint8_t i;
 	uint16_t ulen;
@@ -104,14 +97,9 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
 
 	if (node == NULL || !strcmp(node, "")) {
 		// allocate the whole buffer
-		if (!uwsgi.rpc_table) {
-                	uwsgi_log("local rpc subsystem is still not initialized !!!\n");
-                	return NULL;
-        	}
-		*len = uwsgi_rpc(func, argc, argv, argvs, &buffer);
-		if (buffer)
-			return buffer;
-		return NULL;
+		buffer = uwsgi_malloc(UMAX16);
+		*len = uwsgi_rpc(func, argc, argv, argvs, buffer);
+		return buffer;
 	}
 
 
@@ -121,7 +109,7 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
 		return NULL;
 
 	// wait for connection;
-	int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
+	int ret = uwsgi.wait_write_hook(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 	if (ret <= 0) {
 		close(fd);
 		return NULL;
@@ -159,47 +147,26 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
 		bufptr += ulen;
 	}
 
-	// ok the request is ready, let's send it in non blocking way
-	if (uwsgi_write_true_nb(fd, buffer, buffer_size+4, uwsgi.socket_timeout)) {
+	// ok the reuqest is ready, let's send it in non blocking way
+	if (uwsgi_write_true_nb(fd, buffer, buffer_size+4, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 		goto error;
 	}
 
 	// ok time to wait for the response in non blocking way
 	size_t rlen = buffer_size+4;
-	uint8_t modifier2 = 0;
-	if (uwsgi_read_with_realloc(fd, &buffer, &rlen, uwsgi.socket_timeout, NULL, &modifier2)) {
+	if (uwsgi_read_with_realloc(fd, &buffer, &rlen, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 		goto error;
 	}
 
-	// 64bit response ?
-	if (modifier2 == 5) {
-		size_t content_len = 0;
-		if (uwsgi_hooked_parse(buffer, rlen, rpc_context_hook, &content_len )) goto error;
-
-		if (content_len > rlen) {
-			char *tmp_buf = realloc(buffer, content_len);
-			if (!tmp_buf) goto error;
-			buffer = tmp_buf;
-		}
-
-		rlen = content_len;
-
-		// read the raw value from the socket
-                if (uwsgi_read_whole_true_nb(fd, buffer, rlen, uwsgi.socket_timeout)) {
-			goto error;
-                }
-	}
-
 	close(fd);
 	*len = rlen;
 	if (*len == 0) {
-		goto error2;
+		goto error;
 	}
 	return buffer;
 
 error:
 	close(fd);
-error2:
 	free(buffer);
 	return NULL;
 

core/sendfile.c

@@ -20,18 +20,9 @@ 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(__GNU_kFreeBSD__)
+#elif defined(__linux__) || defined(__sun__) || defined(__GNU_kFreeBSD__)
 	off_t off = pos;
 	return sendfile(sockfd, filefd, &off, len);
-#elif defined(__sun__)
-	off_t off = pos;
-	ssize_t wlen = sendfile(sockfd, filefd, &off, len);
-	if (wlen < 0 && uwsgi_is_again()) {
-		if (off - pos > 0) {
-			return off-pos;
-		}
-	}
-	return wlen;
 #endif
 
 no_sendfile:

core/sharedarea.c

@@ -1,423 +0,0 @@
-#include <uwsgi.h>
-
-extern struct uwsgi_server uwsgi;
-
-/*
-
-This is an high-performance memory area shared by all workers/cores/threads
-
-Contrary to the caching subsystem it is 1-copy (caching for non-c apps is 2-copy)
-
-Languages not allowing that kind of access should emulate it calling uwsgi_malloc and then copying it back to
-the language object.
-
-The memory areas could be monitored for changes (read: cores can be suspended while waiting for values)
-
-You can configure multiple areas specifying multiple --sharedarea options
-
-This is a very low-level api, try to use it to build higher-level primitives or rely on the caching subsystem
-
-*/
-
-struct uwsgi_sharedarea *uwsgi_sharedarea_get_by_id(int id, uint64_t pos) {
-	if (id > uwsgi.sharedareas_cnt-1) return NULL;
-	struct uwsgi_sharedarea *sa = uwsgi.sharedareas[id];
-	if (pos > sa->max_pos) return NULL;
-	return sa;
-}
-
-int uwsgi_sharedarea_update(int id) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, 0);
-        if (!sa) return -1;
-	sa->updates++;
-        return 0;
-}
-
-int uwsgi_sharedarea_rlock(int id) {
-	struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, 0);
-        if (!sa) return -1;	
-	uwsgi_rlock(sa->lock);
-	return 0;
-}
-
-int uwsgi_sharedarea_wlock(int id) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, 0);
-        if (!sa) return -1;
-        uwsgi_wlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_unlock(int id) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, 0);
-        if (!sa) return -1;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-
-int64_t uwsgi_sharedarea_read(int id, uint64_t pos, char *blob, uint64_t len) {
-	struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + len > sa->max_pos + 1) return -1;
-	if (len == 0) len = (sa->max_pos + 1) - pos;
-	if (sa->honour_used && sa->used-pos < len) len = sa->used-pos ;
-        uwsgi_rlock(sa->lock);
-        memcpy(blob, sa->area + pos, len);
-        sa->hits++;
-        uwsgi_rwunlock(sa->lock);
-        return len;
-} 
-
-int uwsgi_sharedarea_write(int id, uint64_t pos, char *blob, uint64_t len) {
-	struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-	if (!sa) return -1;
-	if (pos + len > sa->max_pos + 1) return -1;
-	uwsgi_wlock(sa->lock);
-	memcpy(sa->area + pos, blob, len);	
-	sa->updates++;
-	uwsgi_rwunlock(sa->lock);
-	return 0;
-} 
-
-int uwsgi_sharedarea_read64(int id, uint64_t pos, int64_t *value) {
-	int64_t rlen = uwsgi_sharedarea_read(id, pos, (char *) value, 8);
-	return rlen == 8 ? 0 : -1;
-}
-
-int uwsgi_sharedarea_write64(int id, uint64_t pos, int64_t *value) {
-	return uwsgi_sharedarea_write(id, pos, (char *) value, 8);
-}
-
-int uwsgi_sharedarea_read8(int id, uint64_t pos, int8_t *value) {
-	int64_t rlen = uwsgi_sharedarea_read(id, pos, (char *) value, 1);
-	return rlen == 1 ? 0 : -1;
-}
-
-int uwsgi_sharedarea_write8(int id, uint64_t pos, int8_t *value) {
-	return uwsgi_sharedarea_write(id, pos, (char *) value, 1);
-}
-
-int uwsgi_sharedarea_read16(int id, uint64_t pos, int16_t *value) {
-	int64_t rlen = uwsgi_sharedarea_read(id, pos, (char *) value, 2);
-	return rlen == 2 ? 0 : -1;
-}
-
-int uwsgi_sharedarea_write16(int id, uint64_t pos, int16_t *value) {
-	return uwsgi_sharedarea_write(id, pos, (char *) value, 2);
-}
-
-
-int uwsgi_sharedarea_read32(int id, uint64_t pos, int32_t *value) {
-	int64_t rlen = uwsgi_sharedarea_read(id, pos, (char *) value, 4);
-	return rlen == 4 ? 0 : -1;
-}
-
-int uwsgi_sharedarea_write32(int id, uint64_t pos, int32_t *value) {
-	return uwsgi_sharedarea_write(id, pos, (char *) value, 4);
-}
-
-int uwsgi_sharedarea_inc8(int id, uint64_t pos, int8_t amount) {
-	struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 1 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-	int8_t *n_ptr = (int8_t *) (sa->area + pos);
-        *n_ptr+=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_inc16(int id, uint64_t pos, int16_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 2 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int16_t *n_ptr = (int16_t *) (sa->area + pos);
-        *n_ptr+=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_inc32(int id, uint64_t pos, int32_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 4 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int32_t *n_ptr = (int32_t *) (sa->area + pos);
-        *n_ptr+=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_inc64(int id, uint64_t pos, int64_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 4 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int64_t *n_ptr = (int64_t *) (sa->area + pos);
-        *n_ptr+=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-
-int uwsgi_sharedarea_dec8(int id, uint64_t pos, int8_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 1 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int8_t *n_ptr = (int8_t *) (sa->area + pos);
-        *n_ptr-=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_dec16(int id, uint64_t pos, int16_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 2 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int16_t *n_ptr = (int16_t *) (sa->area + pos);
-        *n_ptr-=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_dec32(int id, uint64_t pos, int32_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 4 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int32_t *n_ptr = (int32_t *) (sa->area + pos);
-        *n_ptr-=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-int uwsgi_sharedarea_dec64(int id, uint64_t pos, int64_t amount) {
-        struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-        if (!sa) return -1;
-        if (pos + 4 > sa->max_pos + 1) return -1;
-        uwsgi_wlock(sa->lock);
-        int64_t *n_ptr = (int64_t *) (sa->area + pos);
-        *n_ptr-=amount;
-        sa->updates++;
-        uwsgi_rwunlock(sa->lock);
-        return 0;
-}
-
-
-
-/*
-	returns:
-		0 -> on updates
-		-1 -> on error
-		-2 -> on timeout
-*/
-int uwsgi_sharedarea_wait(int id, int freq, int timeout) {
-	int waiting = 0;
-	struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, 0);
-	if (!sa) return -1;
-	if (!freq) freq = 100;
-	uwsgi_rlock(sa->lock);
-	uint64_t updates = sa->updates;
-	uwsgi_rwunlock(sa->lock);
-	while(timeout == 0 || waiting == 0 || (timeout > 0 && waiting > 0 && (waiting/1000) < timeout)) {
-		if (uwsgi.wait_milliseconds_hook(freq)) {
-			uwsgi_rwunlock(sa->lock);
-			return -1;
-		}
-		waiting += freq;
-		// lock sa
-		uwsgi_rlock(sa->lock);
-		if (sa->updates != updates) {
-			uwsgi_rwunlock(sa->lock);
-			return 0;
-		}
-		// unlock sa
-		uwsgi_rwunlock(sa->lock);
-	}
-	return -2;
-}
-
-int uwsgi_sharedarea_new_id() {
-	int id = uwsgi.sharedareas_cnt;
-        uwsgi.sharedareas_cnt++;
-        if (!uwsgi.sharedareas) {
-                uwsgi.sharedareas = uwsgi_malloc(sizeof(struct uwsgi_sharedarea *));
-        }
-        else {
-                struct uwsgi_sharedarea **usa = realloc(uwsgi.sharedareas, ((sizeof(struct uwsgi_sharedarea *)) * uwsgi.sharedareas_cnt));
-                if (!usa) {
-                        uwsgi_error("uwsgi_sharedarea_init()/realloc()");
-                        exit(1);
-                }
-                uwsgi.sharedareas = usa;
-        }
-	return id;
-}
-
-static struct uwsgi_sharedarea *announce_sa(struct uwsgi_sharedarea *sa) {
-	uwsgi_log("sharedarea %d created at %p (%d pages, area at %p)\n", sa->id, sa, sa->pages, sa->area);
-	return sa;
-}
-
-
-struct uwsgi_sharedarea *uwsgi_sharedarea_init_fd(int fd, uint64_t len, off_t offset) {
-        int id = uwsgi_sharedarea_new_id();
-        uwsgi.sharedareas[id] = uwsgi_calloc_shared(sizeof(struct uwsgi_sharedarea));
-        uwsgi.sharedareas[id]->area = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, offset); 
-	if (uwsgi.sharedareas[id]->area == MAP_FAILED) {
-		uwsgi_error("uwsgi_sharedarea_init_fd()/mmap()");
-		exit(1);
-	}
-        uwsgi.sharedareas[id]->id = id;
-        uwsgi.sharedareas[id]->fd = fd;
-        uwsgi.sharedareas[id]->pages = len / uwsgi.page_size;
-        if (len % uwsgi.page_size != 0) uwsgi.sharedareas[id]->pages++;
-        uwsgi.sharedareas[id]->max_pos = len-1;
-        char *id_str = uwsgi_num2str(id);
-        uwsgi.sharedareas[id]->lock = uwsgi_rwlock_init(uwsgi_concat2("sharedarea", id_str));
-        free(id_str);
-        return announce_sa(uwsgi.sharedareas[id]);
-}
-
-
-struct uwsgi_sharedarea *uwsgi_sharedarea_init(int pages) {
-	int id = uwsgi_sharedarea_new_id();
-	uwsgi.sharedareas[id] = uwsgi_calloc_shared(uwsgi.page_size * (pages + 1));
-	uwsgi.sharedareas[id]->area = ((char *) uwsgi.sharedareas[id]) + uwsgi.page_size;
-	uwsgi.sharedareas[id]->id = id;
-	uwsgi.sharedareas[id]->fd = -1;
-	uwsgi.sharedareas[id]->pages = pages;
-	uwsgi.sharedareas[id]->max_pos = (uwsgi.page_size * pages) -1;
-	char *id_str = uwsgi_num2str(id);
-	uwsgi.sharedareas[id]->lock = uwsgi_rwlock_init(uwsgi_concat2("sharedarea", id_str));
-	free(id_str);
-	return announce_sa(uwsgi.sharedareas[id]);
-}
-
-struct uwsgi_sharedarea *uwsgi_sharedarea_init_ptr(char *area, uint64_t len) {
-        int id = uwsgi_sharedarea_new_id();
-        uwsgi.sharedareas[id] = uwsgi_calloc_shared(sizeof(struct uwsgi_sharedarea));
-        uwsgi.sharedareas[id]->area = area;
-        uwsgi.sharedareas[id]->id = id;
-        uwsgi.sharedareas[id]->fd = -1;
-        uwsgi.sharedareas[id]->pages = len / uwsgi.page_size;
-	if (len % uwsgi.page_size != 0) uwsgi.sharedareas[id]->pages++;
-        uwsgi.sharedareas[id]->max_pos = len-1;
-        char *id_str = uwsgi_num2str(id);
-        uwsgi.sharedareas[id]->lock = uwsgi_rwlock_init(uwsgi_concat2("sharedarea", id_str));
-        free(id_str);
-	return announce_sa(uwsgi.sharedareas[id]);
-}
-
-struct uwsgi_sharedarea *uwsgi_sharedarea_init_keyval(char *arg) {
-	char *s_pages = NULL;
-	char *s_file = NULL;
-	char *s_fd = NULL;
-	char *s_ptr = NULL;
-	char *s_size = NULL;
-	char *s_offset = NULL;
-	if (uwsgi_kvlist_parse(arg, strlen(arg), ',', '=',
-		"pages", &s_pages,
-		"file", &s_file,
-		"fd", &s_fd,
-		"ptr", &s_ptr,
-		"size", &s_size,
-		"offset", &s_offset,
-		NULL)) {
-		uwsgi_log("invalid sharedarea keyval syntax\n");
-		exit(1);
-	}
-
-	uint64_t len = 0;
-	off_t offset = 0;
-	int pages = 0;
-	if (s_size) {
-		if (strlen(s_size) > 2 && s_size[0] == '0' && s_size[1] == 'x') {
-			len = strtoul(s_size+2, NULL, 16);
-		}
-		else {
-			len = uwsgi_n64(s_size);
-		}
-		pages = len / uwsgi.page_size;
-        	if (len % uwsgi.page_size != 0) pages++;
-	}
-
-	if (s_offset) {
-		if (strlen(s_offset) > 2 && s_offset[0] == '0' && s_offset[1] == 'x') {
-                        offset = strtoul(s_offset+2, NULL, 16);
-                }
-                else {
-                        offset = uwsgi_n64(s_offset);
-                }
-	}
-	
-	if (s_pages) {
-		pages = atoi(s_pages);	
-	}
-
-	char *area = NULL;
-	struct uwsgi_sharedarea *sa = NULL;
-
-	int fd = -1;
-	if (s_file) {
-		fd = open(s_file, O_RDWR|O_SYNC);
-		if (fd < 0) {
-			uwsgi_error_open(s_file);
-			exit(1);
-		}	
-	}
-	else if (s_fd) {
-		fd = atoi(s_fd);
-	}
-	else if (s_ptr) {
-	}
-
-	if (pages) {
-		if (fd > -1) {
-			sa = uwsgi_sharedarea_init_fd(fd, len, offset);
-		}
-		else if (area) {
-			sa = uwsgi_sharedarea_init_ptr(area, len);
-		}
-		else {
-			sa = uwsgi_sharedarea_init(pages);	
-		}
-	}
-	else {
-		uwsgi_log("you need to set a size for a sharedarea !!! [%s]\n", arg);
-		exit(1);
-	}
-
-	if (s_pages) free(s_pages);
-	if (s_file) free(s_file);
-	if (s_fd) free(s_fd);
-	if (s_ptr) free(s_ptr);
-	if (s_size) free(s_size);
-	if (s_offset) free(s_offset);
-
-	return sa;
-}
-
-
-void uwsgi_sharedareas_init() {
-	struct uwsgi_string_list *usl = NULL;
-	uwsgi_foreach(usl, uwsgi.sharedareas_list) {
-		char *is_keyval = strchr(usl->value, '=');
-		if (!is_keyval) {
-			uwsgi_sharedarea_init(atoi(usl->value));
-		}
-		else {
-			uwsgi_sharedarea_init_keyval(usl->value);
-		}
-	}
-}

core/signal.c

@@ -45,21 +45,21 @@ int uwsgi_signal_handler(uint8_t sig) {
 		uwsgi.workers[uwsgi.mywid].sig = 1;
 		uwsgi.workers[uwsgi.mywid].signum = sig;
 		uwsgi.workers[uwsgi.mywid].signals++;
-		if (uwsgi.harakiri_options.workers > 0) {
-			set_harakiri(uwsgi.harakiri_options.workers);
+		if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+			set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
 		}
 	}
 	else if (uwsgi.muleid > 0) {
 		uwsgi.mules[uwsgi.muleid - 1].sig = 1;
 		uwsgi.mules[uwsgi.muleid - 1].signum = sig;
 		uwsgi.mules[uwsgi.muleid - 1].signals++;
-		if (uwsgi.harakiri_options.mules > 0) {
-			set_mule_harakiri(uwsgi.harakiri_options.mules);
+		if (uwsgi.shared->options[UWSGI_OPTION_MULE_HARAKIRI] > 0) {
+			set_mule_harakiri(uwsgi.shared->options[UWSGI_OPTION_MULE_HARAKIRI]);
 		}
 	}
 	else if (uwsgi.i_am_a_spooler && (getpid() == uwsgi.i_am_a_spooler->pid)) {
-		if (uwsgi.harakiri_options.spoolers > 0) {
-			set_spooler_harakiri(uwsgi.harakiri_options.spoolers);
+		if (uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+			set_spooler_harakiri(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI]);
 		}
 	}
 
@@ -78,7 +78,7 @@ int uwsgi_signal_handler(uint8_t sig) {
 		}
 	}
 	else if (uwsgi.i_am_a_spooler && (getpid() == uwsgi.i_am_a_spooler->pid)) {
-		if (uwsgi.harakiri_options.spoolers > 0) {
+		if (uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
 			set_spooler_harakiri(0);
 		}
 	}
@@ -269,22 +269,20 @@ int uwsgi_remote_signal_send(char *addr, uint8_t sig) {
 	uh.pktsize = 0;
 	uh.modifier2 = sig;
 
-        int fd = uwsgi_connect(addr, 0, 1);
-        if (fd < 0) return -1;
+	int fd = uwsgi_connect(addr, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
+	if (fd < 0)
+		return -1;
 
-        // wait for connection
-        if (uwsgi.wait_write_hook(fd, uwsgi.socket_timeout) <= 0) goto end;
+	if (write(fd, (char *) &uh, 4) != 4) {
+		uwsgi_error("uwsgi_remote_signal_send()");
+		close(fd);
+		return -1;
+	}
 
-        if (uwsgi_write_true_nb(fd, (char *) &uh, 4, uwsgi.socket_timeout)) goto end;
+	int ret = uwsgi_read_response(fd, &uh, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], NULL);
 
-	if (uwsgi_read_whole_true_nb(fd, (char *) &uh, 4, uwsgi.socket_timeout)) goto end;
 	close(fd);
-
-	return uh.modifier2;
-
-end:
-	close(fd);
-	return -1;
+	return ret;
 
 }
 
@@ -303,10 +301,8 @@ int uwsgi_signal_send(int fd, uint8_t sig) {
 		else {
 			uwsgi_error("uwsgi_signal_send()");
 		}
-		uwsgi.shared->unrouted_signals++;
 		return -1;
 	}
-	uwsgi.shared->routed_signals++;
 	return 0;
 
 }
@@ -331,16 +327,6 @@ void uwsgi_route_signal(uint8_t sig) {
 			}
 		}
 	}
-	// send to al lactive workers
-	else if (!strcmp(use->receiver, "active-workers")) {
-                for (i = 1; i <= uwsgi.numproc; i++) {
-			if (uwsgi.workers[i].pid > 0 && !uwsgi.workers[i].cheaped && !uwsgi.workers[i].suspended) {
-                        	if (uwsgi_signal_send(uwsgi.workers[i].signal_pipe[0], sig)) {
-                                	uwsgi_log("could not deliver signal %d to worker %d\n", sig, i);
-                        	}
-			}
-                }
-        }
 	// route to specific worker
 	else if (!strncmp(use->receiver, "worker", 6)) {
 		i = atoi(use->receiver + 6);

core/snmp.c

@@ -23,7 +23,6 @@ static uint64_t get_uwsgi_custom_snmp_value(uint64_t, uint8_t *);
 static uint8_t snmp_int_to_snmp(uint64_t, uint8_t, uint8_t *);
 
 static ssize_t build_snmp_response(uint8_t, uint8_t, uint8_t *, int, uint8_t *, uint8_t *, uint8_t *);
-static ssize_t build_snmp_metric_response(int64_t, uint8_t, uint8_t *, int, uint8_t *, uint8_t *, uint8_t *);
 
 void manage_snmp(int fd, uint8_t * buffer, int size, struct sockaddr_in *client_addr) {
 
@@ -72,7 +71,7 @@ void manage_snmp(int fd, uint8_t * buffer, int size, struct sockaddr_in *client_
 	uwsgi_debug("SNMP version: %d\n", version);
 #endif
 
-	// check for community string (this must be set from the api using uwsgi.snmp_community or with --snmp-community arg)
+	// check for community string (this must be set from the python vm using uwsgi.snmp_community or with --snmp-community arg)
 	if (*ptr != SNMP_STRING)
 		return;
 	ptr++;
@@ -197,7 +196,7 @@ void manage_snmp(int fd, uint8_t * buffer, int size, struct sockaddr_in *client_
 	ptr++;
 
 	oidlen = *ptr;
-	if (oidlen < 11)
+	if (oidlen != 11)
 		return;
 	ptr++;
 
@@ -209,33 +208,21 @@ void manage_snmp(int fd, uint8_t * buffer, int size, struct sockaddr_in *client_
 
 	oid_part[0] = *ptr;
 
-	// old-style SNMP metrics
-	if (oid_part[0] == 1 || oid_part[0] == 2) {
-		ptr++;
+	if (oid_part[0] != 1 && oid_part[0] != 2)
+		return;
+	ptr++;
 
-		oid_part[1] = *ptr;
-		if (oid_part[1] < 1 || oid_part[1] > 100)
-			return;
-		ptr++;
+	oid_part[1] = *ptr;
+	if (oid_part[1] < 1 || oid_part[1] > 100)
+		return;
+	ptr++;
 
-		// check for null
-		if (memcmp((char *) ptr, "\x05\x00", 2))
-			return;
-		ptr += 2;
-		size = build_snmp_response(oid_part[0], oid_part[1], buffer, size, seq1, seq2, seq3);
-	}
-	// metrics subsystem
-	else {
-		size_t metric_asn_len = oidlen - 9;
-		char *metric_asn = (char *) ptr;
-		struct uwsgi_metric *um = uwsgi_metric_find_by_asn(metric_asn, metric_asn_len);
-		if (!um) return;
-		uwsgi_rlock(uwsgi.metrics_lock);
-		int64_t value = *um->value;
-		uwsgi_rwunlock(uwsgi.metrics_lock);
-		size = build_snmp_metric_response(value, um->type, buffer, size, seq1, seq2, seq3);
-	}
+	// check for null
+	if (memcmp((char *) ptr, "\x05\x00", 2))
+		return;
+	ptr += 2;
 
+	size = build_snmp_response(oid_part[0], oid_part[1], buffer, size, seq1, seq2, seq3);
 
 	if (size > 0) {
 		if (sendto(fd, buffer, size, 0, (struct sockaddr *) client_addr, sizeof(struct sockaddr_in)) < 0) {
@@ -305,7 +292,6 @@ static uint8_t snmp_int_to_snmp(uint64_t snmp_val, uint8_t oid_type, uint8_t * b
 	uint8_t tlen;
 	int i, j;
 	uint8_t *ptr = (uint8_t *) & snmp_val;
-	int32_t val32 = (int32_t) snmp_val;
 
 	// check for counter, counter64 or gauge
 
@@ -317,7 +303,6 @@ static uint8_t snmp_int_to_snmp(uint64_t snmp_val, uint8_t oid_type, uint8_t * b
 	}
 	else {
 		tlen = 4;
-		ptr = (uint8_t *) &val32;
 	}
 
 	buffer[0] = tlen;
@@ -367,32 +352,6 @@ static ssize_t build_snmp_response(uint8_t oid1, uint8_t oid2, uint8_t * buffer,
 
 }
 
-static ssize_t build_snmp_metric_response(int64_t value, uint8_t type, uint8_t * buffer, int size, uint8_t * seq1, uint8_t * seq2, uint8_t * seq3) {
-        uint8_t oid_sz;
-
-	if (type == UWSGI_METRIC_GAUGE) {
-        	buffer[size - 2] = SNMP_GAUGE;
-        	oid_sz = snmp_int_to_snmp(value, SNMP_GAUGE, buffer + (size - 1));
-	}
-	else {
-		buffer[size - 2] = SNMP_COUNTER64;
-        	oid_sz = snmp_int_to_snmp(value, SNMP_COUNTER64, buffer + (size - 1));
-	}
-
-        if (oid_sz < 1)
-                return -1;
-
-        oid_sz--;
-
-        buffer[1] += oid_sz;
-        *seq1 += oid_sz;
-        *seq2 += oid_sz;
-        *seq3 += oid_sz;
-
-        return size + oid_sz;
-
-}
-
 void uwsgi_opt_snmp(char *opt, char *value, void *foobar) {
 	uwsgi.snmp = 1;
 	if (value) {

core/socket.c

@@ -6,22 +6,6 @@ static int connect_to_unix(char *, int, int);
 static int connect_to_tcp(char *, int, int, int);
 static int connect_to_udp(char *, int);
 
-void uwsgi_socket_setup_protocol(struct uwsgi_socket *uwsgi_sock, char *protocol) {
-        if (!protocol) protocol = "uwsgi";
-        struct uwsgi_protocol *up = uwsgi.protocols;
-        while(up) {
-                if (!strcmp(protocol, up->name)) {
-                        up->func(uwsgi_sock);
-                        return;
-                }
-                up = up->next;
-        }
-
-        uwsgi_log("unable to find protocol %s\n", protocol);
-        exit(1);
-}
-
-
 static int uwsgi_socket_strcmp(char *sock1, char *sock2) {
 	size_t sock1_len = strlen(sock1);
 	size_t sock2_len = strlen(sock2);
@@ -76,66 +60,18 @@ char *uwsgi_getsockname(int fd) {
 	return NULL;
 }
 
-static int create_server_socket(int domain, int type) {
-	int serverfd = socket(domain, type, 0);
-	if (serverfd < 0) {
-		uwsgi_error("socket()");
-		uwsgi_nuclear_blast();
-		return -1;
-	}
-
-	if (uwsgi.close_on_exec2 && fcntl(serverfd, F_SETFD, FD_CLOEXEC) < 0)
-		uwsgi_error("fcntl()");
-
-	if (domain != AF_UNIX) {
-		int reuse = 1;
-		if (setsockopt(serverfd, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse, sizeof(int)) < 0) {
-			uwsgi_error("SO_REUSEADDR setsockopt()");
-			uwsgi_nuclear_blast();
-			return -1;
-		}
-	}
-
-	if (type == SOCK_STREAM) {
-		if (uwsgi.so_sndbuf) {
-			socklen_t sndbuf = (socklen_t) uwsgi.so_sndbuf;
-			if (setsockopt(serverfd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(socklen_t)) < 0) {
-				uwsgi_error("SO_SNDBUF setsockopt()");
-				uwsgi_nuclear_blast();
-				return -1;
-			}
-		}
-
-		if (uwsgi.so_rcvbuf) {
-			socklen_t rcvbuf = (socklen_t) uwsgi.so_rcvbuf;
-			if (setsockopt(serverfd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(socklen_t)) < 0) {
-				uwsgi_error("SO_RCVBUF setsockopt()");
-				uwsgi_nuclear_blast();
-				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
-	}
-
-	return serverfd;
-}
-
 int bind_to_unix_dgram(char *socket_name) {
 
 	int serverfd;
 	struct sockaddr_un *uws_addr;
 	socklen_t len;
 
-	serverfd = create_server_socket(AF_UNIX, SOCK_DGRAM);
-	if (serverfd < 0) return -1;
+	serverfd = socket(AF_UNIX, SOCK_DGRAM, 0);
+	if (serverfd < 0) {
+		uwsgi_error("socket()");
+		uwsgi_nuclear_blast();
+		return -1;
+	}
 
 	if (unlink(socket_name) != 0 && errno != ENOENT) {
 		uwsgi_error("error removing unix socket, unlink()");
@@ -188,14 +124,15 @@ int bind_to_unix(char *socket_name, int listen_queue, int chmod_socket, int abst
 	}
 
 	memset(uws_addr, 0, sizeof(struct sockaddr_un));
-	serverfd = create_server_socket(AF_UNIX, SOCK_STREAM);
+	serverfd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (serverfd < 0) {
-		free(uws_addr);
+		uwsgi_error("socket()");
+		uwsgi_nuclear_blast();
 		return -1;
 	}
 	if (abstract_socket == 0) {
 		if (unlink(socket_name) != 0 && errno != ENOENT) {
-			uwsgi_error("error removing unix socket, unlink()");
+			uwsgi_error("unlink()");
 		}
 	}
 
@@ -203,6 +140,24 @@ int bind_to_unix(char *socket_name, int listen_queue, int chmod_socket, int abst
 		uwsgi_log("setting abstract socket mode (warning: only Linux supports this)\n");
 	}
 
+	if (uwsgi.so_sndbuf) {
+                socklen_t sndbuf = (socklen_t) uwsgi.so_sndbuf;
+                if (setsockopt(serverfd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(socklen_t)) < 0) {
+                        uwsgi_error("SO_SNDBUF setsockopt()");
+                        uwsgi_nuclear_blast();
+                        return -1;
+                }
+        }
+
+        if (uwsgi.so_rcvbuf) {
+                socklen_t rcvbuf = (socklen_t) uwsgi.so_rcvbuf;
+                if (setsockopt(serverfd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(socklen_t)) < 0) {
+                        uwsgi_error("SO_RCVBUF setsockopt()");
+                        uwsgi_nuclear_blast();
+                        return -1;
+                }
+        }
+
 	uws_addr->sun_family = AF_UNIX;
 	if (socket_name[0] == '@') {
 		memcpy(uws_addr->sun_path + abstract_socket, socket_name + 1, UMIN(strlen(socket_name + 1), 101));
@@ -232,6 +187,15 @@ 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()");
 		uwsgi_nuclear_blast();
@@ -263,6 +227,7 @@ int bind_to_udp(char *socket_name, int multicast, int broadcast) {
 	struct sockaddr_in uws_addr;
 	char *udp_port;
 	int bcast = 1;
+	int reuse = 1;
 
 	struct ip_mreq mc;
 
@@ -307,8 +272,15 @@ int bind_to_udp(char *socket_name, int multicast, int broadcast) {
 	}
 
 
-	serverfd = create_server_socket(AF_INET, SOCK_DGRAM);
-	if (serverfd < 0) return -1;
+	serverfd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (serverfd < 0) {
+		uwsgi_error("socket()");
+		return -1;
+	}
+
+	if (setsockopt(serverfd, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse, sizeof(int)) < 0) {
+		uwsgi_error("setsockopt()");
+	}
 
 	if (multicast) {
 		// if multicast is enabled remember to bind to INADDR_ANY
@@ -566,7 +538,6 @@ char *generate_socket_name(char *socket_name) {
 		ifa = ifap;
 		while (ifa) {
 			memset(new_addr, 0, 16);
-			if (!ifa->ifa_addr) goto next;
 			sin = (struct sockaddr_in *) ifa->ifa_addr;
 			if (inet_ntop(AF_INET, (void *) &sin->sin_addr.s_addr, new_addr, 16)) {
 				if (!strncmp(socket_name, new_addr, strlen(socket_name))) {
@@ -579,7 +550,6 @@ char *generate_socket_name(char *socket_name) {
 
 			}
 
-next:
 			ifaf = ifa;
 			ifa = ifaf->ifa_next;
 
@@ -663,6 +633,7 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 #else
 	struct sockaddr_in uws_addr;
 #endif
+	int reuse = 1;
 	int family = AF_INET;
 	socklen_t addr_len = sizeof(struct sockaddr_in);
 
@@ -680,9 +651,37 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 #endif
 
 
-	serverfd = create_server_socket(family, SOCK_STREAM);
-	if (serverfd < 0) return -1;
+	serverfd = socket(family, SOCK_STREAM, 0);
+	if (serverfd < 0) {
+		uwsgi_error("socket()");
+		uwsgi_nuclear_blast();
+		return -1;
+	}
 	
+	if (uwsgi.so_sndbuf) {
+		socklen_t sndbuf = (socklen_t) uwsgi.so_sndbuf;
+		if (setsockopt(serverfd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(socklen_t)) < 0) {
+                	uwsgi_error("SO_SNDBUF setsockopt()");
+                	uwsgi_nuclear_blast();
+                	return -1;
+        	}
+	}
+
+	if (uwsgi.so_rcvbuf) {
+                socklen_t rcvbuf = (socklen_t) uwsgi.so_rcvbuf;
+                if (setsockopt(serverfd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(socklen_t)) < 0) {
+                        uwsgi_error("SO_RCVBUF setsockopt()");
+                        uwsgi_nuclear_blast();
+                        return -1;
+                }
+        }
+
+	if (setsockopt(serverfd, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse, sizeof(int)) < 0) {
+		uwsgi_error("SO_REUSEADDR setsockopt()");
+		uwsgi_nuclear_blast();
+		return -1;
+	}
+
 #ifdef __linux__
 #ifndef IP_FREEBIND
 #define IP_FREEBIND 15
@@ -735,7 +734,7 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 	if (!uwsgi.no_defer_accept) {
 
 #ifdef __linux__
-		if (setsockopt(serverfd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &uwsgi.socket_timeout, sizeof(int))) {
+		if (setsockopt(serverfd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], sizeof(int))) {
 			uwsgi_error("TCP_DEFER_ACCEPT setsockopt()");
 		}
 		// OSX has no SO_ACCEPTFILTER !!!
@@ -766,6 +765,15 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 		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()");
 		uwsgi_nuclear_blast();
@@ -1358,7 +1366,7 @@ void uwsgi_add_sockets_to_queue(int queue, int async_id) {
 
 	struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
 	while (uwsgi_sock) {
-		if (uwsgi_sock->fd_threads && async_id > -1 && uwsgi_sock->fd_threads[async_id] > -1) {
+		if (uwsgi_sock->fd_threads && async_id > -1) {
 			event_queue_add_fd_read(queue, uwsgi_sock->fd_threads[async_id]);
 		}
 		else if (uwsgi_sock->fd > -1) {
@@ -1738,6 +1746,13 @@ void uwsgi_bind_sockets() {
 		uwsgi_sock = uwsgi_sock->next;
 	}
 
+
+	if (uwsgi.chown_socket) {
+		if (!uwsgi.master_as_root) {
+			uwsgi_as_root();
+		}
+	}
+
 	int zero_used = 0;
 	uwsgi_sock = uwsgi.sockets;
 	while (uwsgi_sock) {
@@ -1758,24 +1773,6 @@ void uwsgi_bind_sockets() {
 				uwsgi_sock->fd = 0;
 				uwsgi_sock->bound = 1;
 				uwsgi_log("uwsgi socket %d inherited UNIX address %s fd 0\n", uwsgi_get_socket_num(uwsgi_sock), uwsgi_sock->name);
-				if (!uwsgi.is_a_reload) {
-					if (uwsgi.chown_socket) {
-                                        	uwsgi_chown(uwsgi_sock->name, uwsgi.chown_socket);
-                                	}
-					if (uwsgi.chmod_socket) {
-                				if (uwsgi.chmod_socket_value) {
-                        				if (chmod(uwsgi_sock->name, uwsgi.chmod_socket_value) != 0) {
-                                				uwsgi_error("inherit fd0: chmod()");
-                        				}
-                				}
-                				else {
-                        				uwsgi_log("chmod() fd0 socket to 666 for lazy and brave users\n");
-                        				if (chmod(uwsgi_sock->name, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) != 0) {
-                                				uwsgi_error("inherit fd0: chmod()");
-                        				}
-						}
-                			}
-				}
 			}
 			else {
 				uwsgi_sock = uwsgi_new_socket(uwsgi_getsockname(0));
@@ -1810,13 +1807,6 @@ void uwsgi_bind_sockets() {
 
 stdin_done:
 
-	if (uwsgi.chown_socket) {
-		if (!uwsgi.master_as_root) {
-			uwsgi_as_root();
-		}
-	}
-
-
 	// check for auto_port socket
 	uwsgi_sock = uwsgi.sockets;
 	while (uwsgi_sock) {
@@ -1863,8 +1853,109 @@ void uwsgi_set_sockets_protocols() {
 
 
 setup_proto:
-		if (!requested_protocol) requested_protocol = uwsgi.protocol;
-		uwsgi_socket_setup_protocol(uwsgi_sock, requested_protocol);
+		if (!requested_protocol) {
+			requested_protocol = uwsgi.protocol;
+		}
+
+		if (requested_protocol && !strcmp("http", requested_protocol)) {
+			uwsgi_sock->proto = uwsgi_proto_http_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("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;
+			uwsgi_sock->proto_prepare_headers = uwsgi_proto_base_cgi_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_fastcgi_read_body;
+                        uwsgi_sock->proto_write = uwsgi_proto_fastcgi_write;
+                        uwsgi_sock->proto_write_headers = uwsgi_proto_fastcgi_write;
+                        uwsgi_sock->proto_sendfile = uwsgi_proto_fastcgi_sendfile;	
+			uwsgi_sock->proto_close = uwsgi_proto_fastcgi_close;
+		}
+		else if (requested_protocol && (!strcmp("fastcgi-nph", requested_protocol) || !strcmp("fcgi-nph", requested_protocol))) {
+                        uwsgi_sock->proto = uwsgi_proto_fastcgi_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_fastcgi_read_body;
+                        uwsgi_sock->proto_write = uwsgi_proto_fastcgi_write;
+                        uwsgi_sock->proto_write_headers = uwsgi_proto_fastcgi_write;
+                        uwsgi_sock->proto_sendfile = uwsgi_proto_fastcgi_sendfile;
+                        uwsgi_sock->proto_close = uwsgi_proto_fastcgi_close;
+                }
+
+		else if (requested_protocol && (!strcmp("scgi", requested_protocol) || !strcmp("scgi", requested_protocol))) {
+                        uwsgi_sock->proto = uwsgi_proto_scgi_parser;
+                        uwsgi_sock->proto_accept = uwsgi_proto_base_accept;
+                        uwsgi_sock->proto_prepare_headers = uwsgi_proto_base_cgi_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;
+                }
+
+		else if (requested_protocol && (!strcmp("scgi-nph", requested_protocol) || !strcmp("scgi-nph", requested_protocol))) {
+                        uwsgi_sock->proto = uwsgi_proto_scgi_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;
+                }
+
+
+#ifdef UWSGI_ZEROMQ
+		else if (requested_protocol && !strcmp("zmq", requested_protocol)) {
+			uwsgi.zeromq = 1;
+		}
+#endif
+		else {
+			uwsgi_sock->proto = uwsgi_proto_uwsgi_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;
+		}
 nextsock:
 		uwsgi_sock = uwsgi_sock->next;
 	}
@@ -1900,56 +1991,3 @@ int uwsgi_accept(int server_fd) {
 
 }
 
-struct uwsgi_protocol *uwsgi_register_protocol(char *name, void (*func)(struct uwsgi_socket *)) {
-	struct uwsgi_protocol *old_up = NULL, *up = uwsgi.protocols;
-	while(up) {
-		if (!strcmp(name, up->name)) {
-			goto found;
-		}
-		old_up = up;
-		up = up->next;
-	}
-	up = uwsgi_calloc(sizeof(struct uwsgi_protocol));
-	up->name = name;
-	if (old_up) {
-		old_up->next = up;
-	}
-	else {
-		uwsgi.protocols = up;
-	}
-found:
-	up->func = func;
-	return up;
-}
-
-int uwsgi_socket_passcred(int fd) {
-#ifdef SO_PASSCRED
-	int optval = 1;
-	if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &optval, sizeof(optval)) < 0) {
-                uwsgi_error("uwsgi_socket_passcred()/setsockopt()");
-		return -1;
-	}
-	return 0;
-#else
-	return -1;
-#endif
-}
-
-void uwsgi_protocols_register() {
-	uwsgi_register_protocol("uwsgi", uwsgi_proto_uwsgi_setup);
-	uwsgi_register_protocol("puwsgi", uwsgi_proto_puwsgi_setup);
-
-	uwsgi_register_protocol("http", uwsgi_proto_http_setup);
-
-#ifdef UWSGI_SSL
-	uwsgi_register_protocol("suwsgi", uwsgi_proto_suwsgi_setup);
-	uwsgi_register_protocol("https", uwsgi_proto_https_setup);
-#endif
-	uwsgi_register_protocol("fastcgi", uwsgi_proto_fastcgi_setup);
-	uwsgi_register_protocol("fastcgi-nph", uwsgi_proto_fastcgi_nph_setup);
-
-	uwsgi_register_protocol("scgi", uwsgi_proto_scgi_setup);
-	uwsgi_register_protocol("scgi-nph", uwsgi_proto_scgi_nph_setup);
-
-	uwsgi_register_protocol("raw", uwsgi_proto_raw_setup);
-}

core/spooler.c

@@ -72,12 +72,12 @@ struct uwsgi_spooler *uwsgi_new_spooler(char *dir) {
 }
 
 
-struct uwsgi_spooler *uwsgi_get_spooler_by_name(char *name, size_t name_len) {
+struct uwsgi_spooler *uwsgi_get_spooler_by_name(char *name) {
 
 	struct uwsgi_spooler *uspool = uwsgi.spoolers;
 
 	while (uspool) {
-		if (!uwsgi_strncmp(uspool->dir, strlen(uspool->dir), name, name_len)) {
+		if (!strcmp(uspool->dir, name)) {
 			return uspool;
 		}
 		uspool = uspool->next;
@@ -167,125 +167,47 @@ void destroy_spool(char *dir, char *file) {
 
 }
 
-struct spooler_req {
-	char *spooler;
-	size_t spooler_len;
-	char *priority;
-	size_t priority_len;
-	time_t at;
-};
 
-static void spooler_req_parser_hook(char *key, uint16_t key_len, char *value, uint16_t value_len, void *data) {
-	struct spooler_req *sr = (struct spooler_req *) data;
-	if (!uwsgi_strncmp(key, key_len, "spooler", 7)) {
-		sr->spooler = value;
-		sr->spooler_len = value_len;
-		return;
-	} 
-
-	if (!uwsgi_strncmp(key, key_len, "priority", 8)) {
-                sr->priority = value;
-                sr->priority_len = value_len;
-                return;
-        }
-
-	if (!uwsgi_strncmp(key, key_len, "at", 2)) {
-		// at can be a float...
-		char *dot = memchr(value, '.', value_len);
-		if (dot) {
-			value_len = dot - value;
-		}
-		sr->at = uwsgi_str_num(value, value_len);
-		return;
-	}
-}
-
-/*
-CHANGED in 2.0.7: wsgi_req is useless !
-*/
-char *uwsgi_spool_request(struct wsgi_request *wsgi_req, char *buf, size_t len, char *body, size_t body_len) {
+int spool_request(struct uwsgi_spooler *uspool, char *filename, int rn, int core_id, char *buffer, int size, char *priority, time_t at, char *body, size_t body_len) {
 
 	struct timeval tv;
-	static uint64_t internal_counter = 0;
-	int fd = -1;
-	struct spooler_req sr;
+	int fd;
+	struct uwsgi_header uh;
 
-	if (len > 0xffff) {
-		uwsgi_log("[uwsgi-spooler] args buffer is limited to 64k, use the 'body' for bigger values\n");
-		return NULL;
-	}
-
-	// parse the request buffer
-	memset(&sr, 0, sizeof(struct spooler_req));
-	uwsgi_hooked_parse(buf, len, spooler_req_parser_hook, &sr);
-	
-	struct uwsgi_spooler *uspool = uwsgi.spoolers;
 	if (!uspool) {
-		uwsgi_log("[uwsgi-spooler] no spooler available\n");
-		return NULL;
-	}
-
-	// if it is a number, get the spooler by id instead of by name
-	if (sr.spooler && sr.spooler_len) {
-		uspool = uwsgi_get_spooler_by_name(sr.spooler, sr.spooler_len);
-		if (!uspool) {
-			uwsgi_log("[uwsgi-spooler] unable to find spooler \"%.*s\"\n", sr.spooler_len, sr.spooler);
-			return NULL;
-		}
+		uspool = uwsgi.spoolers;
 	}
 
 	// this lock is for threads, the pid value in filename will avoid multiprocess races
 	uwsgi_lock(uspool->lock);
 
-	// we increase it even if the request fails
-	internal_counter++;
-
 	gettimeofday(&tv, NULL);
 
-	char *filename = NULL;
-	size_t filename_len = 0;
-
-	if (sr.priority && sr.priority_len) {
-		filename_len = strlen(uspool->dir) + sr.priority_len + strlen(uwsgi.hostname) + 256;	
-		filename = uwsgi_malloc(filename_len);
-		int ret = snprintf(filename, filename_len, "%s/%.*s", uspool->dir, (int) sr.priority_len, sr.priority);
-		if (ret <= 0 || ret >= (int) filename_len) {
-			uwsgi_log("[uwsgi-spooler] error generating spooler filename\n");
-			free(filename);
+	if (priority) {
+		if (snprintf(filename, 1024, "%s/%s", uspool->dir, priority) <= 0) {
 			uwsgi_unlock(uspool->lock);
-			return NULL;
+			return 0;
 		}
 		// no need to check for errors...
 		(void) mkdir(filename, 0777);
 
-		ret = snprintf(filename, filename_len, "%s/%.*s/uwsgi_spoolfile_on_%s_%d_%llu_%d_%llu_%llu", uspool->dir, (int)sr.priority_len, sr.priority, uwsgi.hostname, (int) getpid(), (unsigned long long) internal_counter, rand(),
-				(unsigned long long) tv.tv_sec, (unsigned long long) tv.tv_usec);
-		if (ret <= 0 || ret >=(int)  filename_len) {
-                        uwsgi_log("[uwsgi-spooler] error generating spooler filename\n");
-			free(filename);
+		if (snprintf(filename, 1024, "%s/%s/uwsgi_spoolfile_on_%s_%d_%d_%d_%llu_%llu", uspool->dir, priority, uwsgi.hostname, (int) getpid(), rn, core_id, (unsigned long long) tv.tv_sec, (unsigned long long) tv.tv_usec) <= 0) {
 			uwsgi_unlock(uspool->lock);
-			return NULL;
+			return 0;
 		}
 	}
 	else {
-		filename_len = strlen(uspool->dir) + strlen(uwsgi.hostname) + 256;
-                filename = uwsgi_malloc(filename_len);
-		int ret = snprintf(filename, filename_len, "%s/uwsgi_spoolfile_on_%s_%d_%llu_%d_%llu_%llu", uspool->dir, uwsgi.hostname, (int) getpid(), (unsigned long long) internal_counter,
-				rand(), (unsigned long long) tv.tv_sec, (unsigned long long) tv.tv_usec);
-		if (ret <= 0 || ret >= (int) filename_len) {
-                        uwsgi_log("[uwsgi-spooler] error generating spooler filename\n");
-			free(filename);
+		if (snprintf(filename, 1024, "%s/uwsgi_spoolfile_on_%s_%d_%d_%d_%llu_%llu", uspool->dir, uwsgi.hostname, (int) getpid(), rn, core_id, (unsigned long long) tv.tv_sec, (unsigned long long) tv.tv_usec) <= 0) {
 			uwsgi_unlock(uspool->lock);
-			return NULL;
+			return 0;
 		}
 	}
 
 	fd = open(filename, O_CREAT | O_EXCL | O_WRONLY, S_IRUSR | S_IWUSR);
 	if (fd < 0) {
 		uwsgi_error_open(filename);
-		free(filename);
 		uwsgi_unlock(uspool->lock);
-		return NULL;
+		return 0;
 	}
 
 	// now lock the file, it will no be runnable, until the lock is not removed
@@ -293,15 +215,13 @@ char *uwsgi_spool_request(struct wsgi_request *wsgi_req, char *buf, size_t len,
 	// in such case the spooler will detect a zeroed file and will retry later
 	if (uwsgi_fcntl_lock(fd)) {
 		close(fd);
-		free(filename);
 		uwsgi_unlock(uspool->lock);
-		return NULL;
+		return 0;
 	}
 
-	struct uwsgi_header uh;
 	uh.modifier1 = 17;
 	uh.modifier2 = 0;
-	uh.pktsize = (uint16_t) len;
+	uh.pktsize = (uint16_t) size;
 #ifdef __BIG_ENDIAN__
 	uh.pktsize = uwsgi_swap16(uh.pktsize);
 #endif
@@ -311,7 +231,7 @@ char *uwsgi_spool_request(struct wsgi_request *wsgi_req, char *buf, size_t len,
 		goto clear;
 	}
 
-	if (write(fd, buf, len) != (ssize_t) len) {
+	if (write(fd, buffer, size) != size) {
 		uwsgi_log("[spooler] unable to write args for %s\n", filename);
 		goto clear;
 	}
@@ -323,28 +243,28 @@ char *uwsgi_spool_request(struct wsgi_request *wsgi_req, char *buf, size_t len,
 		}
 	}
 
-	if (sr.at > 0) {
+	if (at > 0) {
 #ifdef __UCLIBC__
 		struct timespec ts[2]; 
-		ts[0].tv_sec = sr.at; 
+		ts[0].tv_sec = at; 
 		ts[0].tv_nsec = 0;
-		ts[1].tv_sec = sr.at;
+		ts[1].tv_sec = at;
 		ts[1].tv_nsec = 0; 
 		if (futimens(fd, ts)) {
-			uwsgi_error("uwsgi_spooler_request()/futimens()");	
+			uwsgi_error("futimens()");	
 		}
 #else
 		struct timeval tv[2];
-		tv[0].tv_sec = sr.at;
+		tv[0].tv_sec = at;
 		tv[0].tv_usec = 0;
-		tv[1].tv_sec = sr.at;
+		tv[1].tv_sec = at;
 		tv[1].tv_usec = 0;
 #ifdef __sun__
 		if (futimesat(fd, NULL, tv)) {
 #else
 		if (futimes(fd, tv)) {
 #endif
-			uwsgi_error("uwsgi_spooler_request()/futimes()");
+			uwsgi_error("futimes()");
 		}
 #endif
 	}
@@ -353,7 +273,7 @@ char *uwsgi_spool_request(struct wsgi_request *wsgi_req, char *buf, size_t len,
 	close(fd);
 
 	if (!uwsgi.spooler_quiet)
-		uwsgi_log("[spooler] written %lu bytes to file %s\n", (unsigned long) len + body_len + 4, filename);
+		uwsgi_log("[spooler] written %lu bytes to file %s\n", (unsigned long) size + body_len + 4, filename);
 
 	// and here waiting threads can continue
 	uwsgi_unlock(uspool->lock);
@@ -373,19 +293,18 @@ char *uwsgi_spool_request(struct wsgi_request *wsgi_req, char *buf, size_t len,
 		spoolers = spoolers->next;
 	}
 
-	return filename;
+	return 1;
 
 
 clear:
 	uwsgi_unlock(uspool->lock);
-	uwsgi_error("uwsgi_spool_request()/write()");
+	uwsgi_error("write()");
 	if (unlink(filename)) {
-		uwsgi_error("uwsgi_spool_request()/unlink()");
+		uwsgi_error("unlink()");
 	}
-	free(filename);
 	// unlock the file too
 	close(fd);
-	return NULL;
+	return 0;
 }
 
 
@@ -448,7 +367,7 @@ void spooler(struct uwsgi_spooler *uspool) {
 			spooler_readdir(uspool, NULL);
 		}
 
-		int timeout = uwsgi.shared->spooler_frequency ? uwsgi.shared->spooler_frequency : uwsgi.spooler_frequency;
+		int timeout = uwsgi.shared->spooler_frequency;
 		if (wakeup > 0) {
 			timeout = 0;
 		}
@@ -633,11 +552,11 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 			for (i = 0; i < 256; i++) {
 				if (uwsgi.p[i]->spooler) {
 					time_t now = uwsgi_now();
-					if (uwsgi.harakiri_options.spoolers > 0) {
-						set_spooler_harakiri(uwsgi.harakiri_options.spoolers);
+					if (uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+						set_spooler_harakiri(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI]);
 					}
 					ret = uwsgi.p[i]->spooler(task, spool_buf, uh.pktsize, body, body_len);
-					if (uwsgi.harakiri_options.spoolers > 0) {
+					if (uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
 						set_spooler_harakiri(0);
 					}
 					if (ret == 0)

core/ssl.c

@@ -95,38 +95,15 @@ static int uwsgi_sni_cb(SSL *ssl, int *ad, void *arg) {
         const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
         if (!servername) return SSL_TLSEXT_ERR_NOACK;
         size_t servername_len = strlen(servername);
-	// reduce DOS attempts
-	int count = 5;
 
-	while(count > 0) {
-        	struct uwsgi_string_list *usl = uwsgi.sni;
-        	while(usl) {
-                	if (!uwsgi_strncmp(usl->value, usl->len, (char *)servername, servername_len)) {
-                        	SSL_set_SSL_CTX(ssl, (SSL_CTX *) usl->custom_ptr);
-				// the following steps are taken from nginx
-				SSL_set_verify(ssl, SSL_CTX_get_verify_mode((SSL_CTX *)usl->custom_ptr),
-				SSL_CTX_get_verify_callback((SSL_CTX *)usl->custom_ptr));
-				SSL_set_verify_depth(ssl, SSL_CTX_get_verify_depth((SSL_CTX *)usl->custom_ptr));	
-#ifdef SSL_CTRL_CLEAR_OPTIONS
-				SSL_clear_options(ssl, SSL_get_options(ssl) & ~SSL_CTX_get_options((SSL_CTX *)usl->custom_ptr));
-#endif
-				SSL_set_options(ssl, SSL_CTX_get_options((SSL_CTX *)usl->custom_ptr));
-                        	return SSL_TLSEXT_ERR_OK;
-                	}
-                	usl = usl->next;
-        	}
-		if (!uwsgi.subscription_dotsplit) break;
-		char *next = memchr(servername+1, '.', servername_len-1);
-		if (next) {
-			servername_len -= next - servername;
-			servername = next;
-			count--;
-			continue;
-		}
-		break;
-	}
-
-	if (uwsgi.subscription_dotsplit) goto end;
+        struct uwsgi_string_list *usl = uwsgi.sni;
+        while(usl) {
+                if (!uwsgi_strncmp(usl->value, usl->len, (char *)servername, servername_len)) {
+                        SSL_set_SSL_CTX(ssl, usl->custom_ptr);
+                        return SSL_TLSEXT_ERR_OK;
+                }
+                usl = usl->next;
+        }
 
 #ifdef UWSGI_PCRE
         struct uwsgi_regexp_list *url = uwsgi.sni_regexp;
@@ -149,12 +126,13 @@ static int uwsgi_sni_cb(SSL *ssl, int *ad, void *arg) {
 			if (uwsgi_file_exists(sni_dir_client_ca)) {
 				client_ca = sni_dir_client_ca;
 			}
-			struct uwsgi_string_list *usl = uwsgi_ssl_add_sni_item(uwsgi_str((char *)servername), sni_dir_cert, sni_dir_key, uwsgi.sni_dir_ciphers, client_ca);
+			usl = uwsgi_ssl_add_sni_item(uwsgi_str((char *)servername), sni_dir_cert, sni_dir_key, uwsgi.sni_dir_ciphers, client_ca);
 			if (!usl) goto done;
 			free(sni_dir_cert);
 			free(sni_dir_key);
 			free(sni_dir_client_ca);
 			SSL_set_SSL_CTX(ssl, usl->custom_ptr);
+			uwsgi_log("[uwsgi-sni for pid %d] added context for %s\n", (int) getpid(), servername);
 			return SSL_TLSEXT_ERR_OK;
 		}
 done:
@@ -162,39 +140,13 @@ done:
 		free(sni_dir_key);
 		free(sni_dir_client_ca);
 	}
-end:
+
         return SSL_TLSEXT_ERR_NOACK;
 }
 #endif
 
-char *uwsgi_write_pem_to_file(char *name, char *buf, size_t len, char *ext) {
-	if (!uwsgi.ssl_tmp_dir) return NULL;
-	char *filename = uwsgi_concat4(uwsgi.ssl_tmp_dir, "/", name, ext);
-	int fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR);
-	if (fd < 0) {
-		uwsgi_error_open(filename);
-		free(filename);
-		return NULL;
-	}
-
-	if (write(fd, buf, len) != (ssize_t) len) {
-		uwsgi_log("unable to write pem data in file %s\n", filename);
-		uwsgi_error("uwsgi_write_pem_to_file()/write()");
-		free(filename);
-		close(fd);
-                return NULL;
-	}
-
-	close(fd);
-	return filename;
-}
-
 SSL_CTX *uwsgi_ssl_new_server_context(char *name, char *crt, char *key, char *ciphers, char *client_ca) {
 
-	int crt_need_free = 0;
-	int key_need_free = 0;
-	int client_ca_need_free = 0;
-
         SSL_CTX *ctx = SSL_CTX_new(SSLv23_server_method());
         if (!ctx) {
                 uwsgi_log("[uwsgi-ssl] unable to initialize context \"%s\"\n", name);
@@ -210,35 +162,15 @@ SSL_CTX *uwsgi_ssl_new_server_context(char *name, char *crt, char *key, char *ci
         ssloptions |= SSL_OP_NO_COMPRESSION;
 #endif
 
-	if (!uwsgi.sslv3) {
-		ssloptions |= SSL_OP_NO_SSLv3;
-	}
-
 // release/reuse buffers as soon as possibile
 #ifdef SSL_MODE_RELEASE_BUFFERS
         SSL_CTX_set_mode(ctx, SSL_MODE_RELEASE_BUFFERS);
 #endif
-	
-	/*
-		we need to support both file-based certs and stream based
-		as dealing with openssl memory bio for keys is really overkill,
-		we store them in a tmp directory
-	*/
-
-	if (uwsgi.ssl_tmp_dir && !uwsgi_starts_with(crt, strlen(crt), "-----BEGIN ", 11)) {
-		crt = uwsgi_write_pem_to_file(name, crt, strlen(crt), ".crt");
-		if (!crt) {
-			SSL_CTX_free(ctx);
-                	return NULL;
-		}	
-		crt_need_free = 1;	
-	}
 
         if (SSL_CTX_use_certificate_chain_file(ctx, crt) <= 0) {
-               	uwsgi_log("[uwsgi-ssl] unable to assign certificate %s for context \"%s\"\n", crt, name);
-               	SSL_CTX_free(ctx);
-		if (crt_need_free) free(crt);
-               	return NULL;
+                uwsgi_log("[uwsgi-ssl] unable to assign certificate %s for context \"%s\"\n", crt, name);
+                SSL_CTX_free(ctx);
+                return NULL;
         }
 
 // this part is based from stud
@@ -247,43 +179,26 @@ SSL_CTX *uwsgi_ssl_new_server_context(char *name, char *crt, char *key, char *ci
                 DH *dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
                 BIO_free(bio);
                 if (dh) {
-                        SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
                         SSL_CTX_set_tmp_dh(ctx, dh);
                         DH_free(dh);
-                }
-        }
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #ifndef OPENSSL_NO_ECDH
 #ifdef NID_X9_62_prime256v1
-        EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-        if (ecdh) {
-                SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE);
-                SSL_CTX_set_tmp_ecdh(ctx, ecdh);
-                EC_KEY_free(ecdh);
-        }
+                        EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+                        SSL_CTX_set_tmp_ecdh(ctx, ecdh);
+                        EC_KEY_free(ecdh);
 #endif
 #endif
 #endif
-
-	if (crt_need_free) free(crt);
-
-	if (uwsgi.ssl_tmp_dir && !uwsgi_starts_with(key, strlen(key), "-----BEGIN ", 11)) {
-                key = uwsgi_write_pem_to_file(name, key, strlen(key), ".key");
-                if (!key) {
-                        SSL_CTX_free(ctx);
-                        return NULL;
                 }
-                key_need_free = 1;
         }
 
         if (SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM) <= 0) {
                 uwsgi_log("[uwsgi-ssl] unable to assign key %s for context \"%s\"\n", key, name);
                 SSL_CTX_free(ctx);
-		if (key_need_free) free(key);
                 return NULL;
         }
 
-	if (key_need_free) free(key);
 
 	// if ciphers are specified, prefer server ciphers
         if (ciphers && strlen(ciphers) > 0) {
@@ -311,37 +226,19 @@ SSL_CTX *uwsgi_ssl_new_server_context(char *name, char *crt, char *key, char *ci
                 }
                 // in the future we should allow to set the verify depth
                 SSL_CTX_set_verify_depth(ctx, 1);
-
-		if (uwsgi.ssl_tmp_dir && !uwsgi_starts_with(client_ca, strlen(client_ca), "-----BEGIN ", 11)) {
-			if (!name) {
-                        	SSL_CTX_free(ctx);
-                        	return NULL;
-			}
-                	client_ca = uwsgi_write_pem_to_file(name, client_ca, strlen(client_ca), ".ca");
-                	if (!client_ca) {
-                        	SSL_CTX_free(ctx);
-                        	return NULL;
-                	}
-                	client_ca_need_free = 1;
-        	}
-
                 if (SSL_CTX_load_verify_locations(ctx, client_ca, NULL) == 0) {
                         uwsgi_log("[uwsgi-ssl] unable to set ssl verify locations (%s) for context \"%s\"\n", client_ca, name);
                         SSL_CTX_free(ctx);
-			if (client_ca_need_free) free(client_ca);
                         return NULL;
                 }
                 STACK_OF(X509_NAME) * list = SSL_load_client_CA_file(client_ca);
                 if (!list) {
                         uwsgi_log("unable to load client CA certificate (%s) for context \"%s\"\n", client_ca, name);
                         SSL_CTX_free(ctx);
-			if (client_ca_need_free) free(client_ca);
                         return NULL;
                 }
 
                 SSL_CTX_set_client_CA_list(ctx, list);
-
-		if (client_ca_need_free) free(client_ca);
         }
 
 
@@ -400,11 +297,6 @@ SSL_CTX *uwsgi_ssl_new_server_context(char *name, char *crt, char *key, char *ci
 
         SSL_CTX_set_timeout(ctx, uwsgi.ssl_sessions_timeout);
 
-	struct uwsgi_string_list *usl = NULL;
-	uwsgi_foreach(usl, uwsgi.ssl_options) {
-		ssloptions |= atoi(usl->value);
-	}
-
         SSL_CTX_set_options(ctx, ssloptions);
 
 
@@ -619,41 +511,10 @@ struct uwsgi_string_list *uwsgi_ssl_add_sni_item(char *name, char *crt, char *ke
 	SSL_CTX *ctx = uwsgi_ssl_new_server_context(name, crt, key, ciphers, client_ca);
         if (!ctx) {
                 uwsgi_log("[uwsgi-ssl] DANGER unable to initialize context for \"%s\"\n", name);
-		free(name);
 		return NULL;
 	}
 
 	struct uwsgi_string_list *usl = uwsgi_string_new_list(&uwsgi.sni, name);
 	usl->custom_ptr = ctx;
-	// mark it as dynamic
-	usl->custom = 1;
-	uwsgi_log_verbose("[uwsgi-sni for pid %d] added SSL context for %s\n", (int) getpid(), name);
 	return usl;
 }
-
-void uwsgi_ssl_del_sni_item(char *name, uint16_t name_len) {
-	struct uwsgi_string_list *usl = NULL, *last_sni = NULL, *sni_item = NULL;
-	uwsgi_foreach(usl, uwsgi.sni) {
-		if (!uwsgi_strncmp(usl->value, usl->len, name, name_len) && usl->custom) {
-			sni_item = usl;
-			break;
-		}
-		last_sni = usl;
-	}
-
-	if (!sni_item) return;
-
-	if (last_sni) {
-		last_sni->next = sni_item->next;
-	}
-	else {
-		uwsgi.sni = sni_item->next;
-	}
-
-	// we are free to destroy it as no more clients are using it
-	SSL_CTX_free((SSL_CTX *) sni_item->custom_ptr);
-	free(sni_item->value);
-	free(sni_item);	
-
-	uwsgi_log_verbose("[uwsgi-sni for pid %d] destroyed SSL context for %s\n",(int) getpid(), name);
-}

core/static.c

@@ -450,8 +450,7 @@ int uwsgi_real_file_serve(struct wsgi_request *wsgi_req, char *real_filename, si
 	if (wsgi_req->if_modified_since_len) {
 		time_t ims = parse_http_date(wsgi_req->if_modified_since, wsgi_req->if_modified_since_len);
 		if (st->st_mtime <= ims) {
-			if (uwsgi_response_prepare_headers(wsgi_req, "304 Not Modified", 16))
-				return -1;
+			uwsgi_response_prepare_headers(wsgi_req, "304 Not Modified", 16); 
 			return uwsgi_response_write_headers_do(wsgi_req);
 		}
 	}
@@ -459,8 +458,6 @@ int uwsgi_real_file_serve(struct wsgi_request *wsgi_req, char *real_filename, si
 	uwsgi_log("[uwsgi-fileserve] file %s found\n", real_filename);
 #endif
 
-	// static file - don't update avg_rt after request
-	wsgi_req->do_not_account_avg_rt = 1;
 
 	size_t fsize = st->st_size;
         if (wsgi_req->range_to) {

core/stats.c

@@ -111,7 +111,7 @@ int uwsgi_stats_keyval(struct uwsgi_stats *us, char *key, char *value) {
 	size_t available = watermark - ptr;
 
 	int ret = snprintf(ptr, available, "\"%s\":\"%s\"", key, value);
-	if (ret <= 0)
+	if (ret < 0)
 		return -1;
 	while (ret >= (int) available) {
 		char *new_base = realloc(us->base, us->size + us->chunk);
@@ -123,7 +123,7 @@ int uwsgi_stats_keyval(struct uwsgi_stats *us, char *key, char *value) {
 		watermark = us->base + us->size;
 		available = watermark - ptr;
 		ret = snprintf(ptr, available, "\"%s\":\"%s\"", key, value);
-		if (ret <= 0)
+		if (ret < 0)
 			return -1;
 	}
 
@@ -149,7 +149,7 @@ int uwsgi_stats_keyvalnum(struct uwsgi_stats *us, char *key, char *value, unsign
 	size_t available = watermark - ptr;
 
 	int ret = snprintf(ptr, available, "\"%s\":\"%s%llu\"", key, value, num);
-	if (ret <= 0)
+	if (ret < 0)
 		return -1;
 	while (ret >= (int) available) {
 		char *new_base = realloc(us->base, us->size + us->chunk);
@@ -161,7 +161,7 @@ int uwsgi_stats_keyvalnum(struct uwsgi_stats *us, char *key, char *value, unsign
 		watermark = us->base + us->size;
 		available = watermark - ptr;
 		ret = snprintf(ptr, available, "\"%s\":\"%s%llu\"", key, value, num);
-		if (ret <= 0)
+		if (ret < 0)
 			return -1;
 	}
 
@@ -188,7 +188,7 @@ int uwsgi_stats_keyvaln(struct uwsgi_stats *us, char *key, char *value, int vall
 	size_t available = watermark - ptr;
 
 	int ret = snprintf(ptr, available, "\"%s\":\"%.*s\"", key, vallen, value);
-	if (ret <= 0)
+	if (ret < 0)
 		return -1;
 	while (ret >= (int) available) {
 		char *new_base = realloc(us->base, us->size + us->chunk);
@@ -200,7 +200,7 @@ int uwsgi_stats_keyvaln(struct uwsgi_stats *us, char *key, char *value, int vall
 		watermark = us->base + us->size;
 		available = watermark - ptr;
 		ret = snprintf(ptr, available, "\"%s\":\"%.*s\"", key, vallen, value);
-		if (ret <= 0)
+		if (ret < 0)
 			return -1;
 	}
 
@@ -227,7 +227,7 @@ int uwsgi_stats_key(struct uwsgi_stats *us, char *key) {
 	size_t available = watermark - ptr;
 
 	int ret = snprintf(ptr, available, "\"%s\":", key);
-	if (ret <= 0)
+	if (ret < 0)
 		return -1;
 	while (ret >= (int) available) {
 		char *new_base = realloc(us->base, us->size + us->chunk);
@@ -239,7 +239,7 @@ int uwsgi_stats_key(struct uwsgi_stats *us, char *key) {
 		watermark = us->base + us->size;
 		available = watermark - ptr;
 		ret = snprintf(ptr, available, "\"%s\":", key);
-		if (ret <= 0)
+		if (ret < 0)
 			return -1;
 	}
 
@@ -254,7 +254,7 @@ int uwsgi_stats_str(struct uwsgi_stats *us, char *str) {
 	size_t available = watermark - ptr;
 
 	int ret = snprintf(ptr, available, "\"%s\"", str);
-	if (ret <= 0)
+	if (ret < 0)
 		return -1;
 	while (ret >= (int) available) {
 		char *new_base = realloc(us->base, us->size + us->chunk);
@@ -266,7 +266,7 @@ int uwsgi_stats_str(struct uwsgi_stats *us, char *str) {
 		watermark = us->base + us->size;
 		available = watermark - ptr;
 		ret = snprintf(ptr, available, "\"%s\"", str);
-		if (ret <= 0)
+		if (ret < 0)
 			return -1;
 	}
 
@@ -287,7 +287,7 @@ int uwsgi_stats_keylong(struct uwsgi_stats *us, char *key, unsigned long long nu
 	size_t available = watermark - ptr;
 
 	int ret = snprintf(ptr, available, "\"%s\":%llu", key, num);
-	if (ret <= 0)
+	if (ret < 0)
 		return -1;
 	while (ret >= (int) available) {
 		char *new_base = realloc(us->base, us->size + us->chunk);
@@ -299,7 +299,7 @@ int uwsgi_stats_keylong(struct uwsgi_stats *us, char *key, unsigned long long nu
 		watermark = us->base + us->size;
 		available = watermark - ptr;
 		ret = snprintf(ptr, available, "\"%s\":%llu", key, num);
-		if (ret <= 0)
+		if (ret < 0)
 			return -1;
 	}
 
@@ -325,7 +325,7 @@ int uwsgi_stats_keyslong(struct uwsgi_stats *us, char *key, long long num) {
         size_t available = watermark - ptr;
 
         int ret = snprintf(ptr, available, "\"%s\":%lld", key, num);
-        if (ret <= 0)
+        if (ret < 0)
                 return -1;
         while (ret >= (int) available) {
                 char *new_base = realloc(us->base, us->size + us->chunk);
@@ -337,7 +337,7 @@ int uwsgi_stats_keyslong(struct uwsgi_stats *us, char *key, long long num) {
                 watermark = us->base + us->size;
                 available = watermark - ptr;
                 ret = snprintf(ptr, available, "\"%s\":%lld", key, num);
-                if (ret <= 0)
+                if (ret < 0)
                         return -1;
         }
 
@@ -379,7 +379,7 @@ void uwsgi_send_stats(int fd, struct uwsgi_stats *(*func) (void)) {
 	size_t remains = us->pos;
 	off_t pos = 0;
 	while (remains > 0) {
-		int ret = uwsgi_waitfd_write(client_fd, uwsgi.socket_timeout);
+		int ret = uwsgi_waitfd_write(client_fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		if (ret <= 0) {
 			goto end0;
 		}
@@ -440,11 +440,6 @@ void uwsgi_stats_pusher_loop(struct uwsgi_thread *ut) {
 	void *events = event_queue_alloc(1);
 	for (;;) {
 		int nevents = event_queue_wait_multi(ut->queue, 1, events, 1);
-		if (nevents < 0) {
-			if (errno == EINTR) continue;
-			uwsgi_log_verbose("ending the stats pusher thread...\n");
-			return;
-		}
 		if (nevents > 0) {
 			int interesting_fd = event_queue_interesting_fd(events, 0);
 			char buf[4096];
@@ -462,8 +457,7 @@ void uwsgi_stats_pusher_loop(struct uwsgi_thread *ut) {
 		struct uwsgi_stats *us = NULL;
 		while (uspi) {
 			int delta = uspi->freq ? uspi->freq : uwsgi.stats_pusher_default_freq;
-			if (((uspi->last_run + delta) <= now) || (uspi->needs_retry && (uspi->next_retry <= now))) {
-				if (uspi->needs_retry) uspi->retries++;
+			if ((uspi->last_run + delta) <= now) {
 				if (uspi->raw) {
 					uspi->pusher->func(uspi, now, NULL, 0);
 				}
@@ -476,17 +470,6 @@ void uwsgi_stats_pusher_loop(struct uwsgi_thread *ut) {
 					uspi->pusher->func(uspi, now, us->base, us->pos);
 				}
 				uspi->last_run = now;
-				if (uspi->needs_retry && uspi->max_retries > 0 && uspi->retries < uspi->max_retries) {
-					uwsgi_log("[uwsgi-stats-pusher] %s failed (%d), retry in %ds\n", uspi->pusher->name, uspi->retries, uspi->retry_delay);
-					uspi->next_retry = now + uspi->retry_delay;
-				} else if (uspi->needs_retry && uspi->retries >= uspi->max_retries) {
-					uwsgi_log("[uwsgi-stats-pusher] %s failed and maximum number of retries was reached (%d)\n", uspi->pusher->name, uspi->retries);
-					uspi->needs_retry = 0;
-					uspi->retries = 0;
-				} else if (uspi->retries) {
-					uwsgi_log("[uwsgi-stats-pusher] retry succeeded for %s\n", uspi->pusher->name);
-					uspi->retries = 0;
-				}
 			}
 next:
 			uspi = uspi->next;
@@ -548,19 +531,72 @@ struct uwsgi_stats_pusher *uwsgi_register_stats_pusher(char *name, void (*func)
 	return pusher;
 }
 
+struct uwsgi_stats_pusher_file_conf {
+	char *path;
+	char *freq;
+	char *separator;
+};
+
+void uwsgi_stats_pusher_file(struct uwsgi_stats_pusher_instance *uspi, time_t now, char *json, size_t json_len) {
+	struct uwsgi_stats_pusher_file_conf *uspic = (struct uwsgi_stats_pusher_file_conf *) uspi->data;
+	if (!uspi->configured) {
+		uspic = uwsgi_calloc(sizeof(struct uwsgi_stats_pusher_file_conf));
+		if (uspi->arg) {
+			if (uwsgi_kvlist_parse(uspi->arg, strlen(uspi->arg), ',', '=', "path", &uspic->path, "separator", &uspic->separator, "freq", &uspic->freq, NULL)) {
+				free(uspi);
+				return;
+			}
+		}
+		if (!uspic->path)
+			uspic->path = "uwsgi.stats";
+		if (!uspic->separator)
+			uspic->separator = "\n\n";
+		if (uspic->freq)
+			uspi->freq = atoi(uspic->freq);
+		uspi->configured = 1;
+		uspi->data = uspic;
+	}
+
+	int fd = open(uspic->path, O_RDWR | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP);
+	if (fd < 0) {
+		uwsgi_error_open(uspic->path);
+		return;
+	}
+	ssize_t rlen = write(fd, json, json_len);
+	if (rlen != (ssize_t) json_len) {
+		uwsgi_error("uwsgi_stats_pusher_file() -> write()\n");
+	}
+
+	rlen = write(fd, uspic->separator, strlen(uspic->separator));
+	if (rlen != (ssize_t) strlen(uspic->separator)) {
+		uwsgi_error("uwsgi_stats_pusher_file() -> write()\n");
+	}
+
+	close(fd);
+}
+
 static void stats_dump_var(char *k, uint16_t kl, char *v, uint16_t vl, void *data) {
 	struct uwsgi_stats *us = (struct uwsgi_stats *) data;
 	if (us->dirty) return;
+	uint16_t i;
+	// replace " with '
+	for(i=0;i<kl;i++) {
+		if (k[i] == '"') {
+			k[i] = '\'';
+		}
+	}
+	for(i=0;i<vl;i++) {
+		if (v[i] == '"') {
+			v[i] = '\'';
+		}
+	}
 	char *var = uwsgi_concat3n(k, kl, "=", 1, v,vl);
-	char *escaped_var = uwsgi_malloc(((kl+vl+1)*2)+1);
-	escape_json(var, strlen(var), escaped_var);
-	free(var);
-	if (uwsgi_stats_str(us, escaped_var)) {
+	if (uwsgi_stats_str(us, var)) {
 		us->dirty = 1;
-		free(escaped_var);
+		free(var);
 		return;
 	}
-	free(escaped_var);
+	free(var);
 	if (uwsgi_stats_comma(us)) {
 		us->dirty = 1;
 	}	
@@ -569,7 +605,7 @@ static void stats_dump_var(char *k, uint16_t kl, char *v, uint16_t vl, void *dat
 
 int uwsgi_stats_dump_vars(struct uwsgi_stats *us, struct uwsgi_core *uc) {
 	if (!uc->in_request) return 0;
-	struct uwsgi_header *uh = (struct uwsgi_header *) uc->buffer;
+	struct uwsgi_header *uh = (struct uwsgi_header *) uwsgi.workers[0].cores[0].buffer;
 	uint16_t pktsize = uh->pktsize;
 	if (!pktsize) return 0;
 	char *dst = uwsgi.workers[0].cores[0].buffer;

core/subscription.c

@@ -20,57 +20,6 @@
 
 extern struct uwsgi_server uwsgi;
 
-#ifdef UWSGI_SSL
-static void uwsgi_subscription_sni_check(struct uwsgi_subscribe_slot *current_slot, struct uwsgi_subscribe_req *usr) {
-	if (usr->sni_key_len > 0 && usr->sni_crt_len > 0) {
-		if (!current_slot->sni_enabled) {
-			char *sni_key = uwsgi_concat2n(usr->sni_key, usr->sni_key_len, "", 0);
-			char *sni_crt = uwsgi_concat2n(usr->sni_crt, usr->sni_crt_len, "", 0);
-			char *sni_ca = NULL;
-			if (usr->sni_ca_len > 0) {
-				sni_ca = uwsgi_concat2n(usr->sni_ca, usr->sni_ca_len, "", 0);
-			}
-			char *servername = NULL;
-			char *colon = memchr(current_slot->key, ':', current_slot->keylen);
-			if (colon) {
-				servername = uwsgi_concat2n(current_slot->key, colon - current_slot->key, "", 0);
-			}
-			else {
-				servername = uwsgi_concat2n(current_slot->key, current_slot->keylen, "", 0);
-			}
-			if (uwsgi_ssl_add_sni_item(servername, sni_crt, sni_key, uwsgi.sni_dir_ciphers, sni_ca)) {
-				current_slot->sni_enabled = 1;
-			}
-			if (sni_key)
-				free(sni_key);
-			if (sni_crt)
-				free(sni_crt);
-			if (sni_ca)
-				free(sni_ca);
-		}
-	}
-}
-#endif
-
-int uwsgi_subscription_credentials_check(struct uwsgi_subscribe_slot *slot, struct uwsgi_subscribe_req *usr) {
-	struct uwsgi_string_list *usl = NULL;
-	uwsgi_foreach(usl, uwsgi.subscriptions_credentials_check_dir) {
-		char *filename = uwsgi_concat2n(usl->value, usl->len, slot->key, slot->keylen);
-		struct stat st;
-		int ret = stat(filename, &st);
-		free(filename);
-		if (ret != 0)
-			continue;
-		if (st.st_uid != usr->uid)
-			continue;
-		if (st.st_gid != usr->gid)
-			continue;
-		// accepted...
-		return 1;
-	}
-	return 0;
-}
-
 struct uwsgi_subscribe_slot *uwsgi_get_subscribe_slot(struct uwsgi_subscribe_slot **slot, char *key, uint16_t keylen) {
 
 	if (keylen > 0xff)
@@ -352,16 +301,10 @@ int uwsgi_remove_subscribe_node(struct uwsgi_subscribe_slot **slot, struct uwsgi
 		// first check if i am the only node
 		if ((!prev_slot && !next_slot) || next_slot == node_slot) {
 #ifdef UWSGI_SSL
-			if (node_slot->sign_ctx) {
+			if (uwsgi.subscriptions_sign_check_dir) {
 				EVP_PKEY_free(node_slot->sign_public_key);
 				EVP_MD_CTX_destroy(node_slot->sign_ctx);
 			}
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-			// if there is a SNI context active, destroy it
-			if (node_slot->sni_enabled) {
-				uwsgi_ssl_del_sni_item(node_slot->key, node_slot->keylen);
-			}
-#endif
 #endif
 			free(node_slot);
 			slot[hash_key] = NULL;
@@ -381,7 +324,7 @@ int uwsgi_remove_subscribe_node(struct uwsgi_subscribe_slot **slot, struct uwsgi
 		}
 
 #ifdef UWSGI_SSL
-		if (node_slot->sign_ctx) {
+		if (uwsgi.subscriptions_sign_check_dir) {
 			EVP_PKEY_free(node_slot->sign_public_key);
 			EVP_MD_CTX_destroy(node_slot->sign_ctx);
 		}
@@ -394,11 +337,6 @@ end:
 	return ret;
 }
 
-#ifdef UWSGI_SSL
-static int subscription_new_sign_ctx(struct uwsgi_subscribe_slot *, struct uwsgi_subscribe_req *);
-static int subscription_is_safe(struct uwsgi_subscribe_req *);
-#endif
-
 struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slot **slot, struct uwsgi_subscribe_req *usr) {
 
 	struct uwsgi_subscribe_slot *current_slot = uwsgi_get_subscribe_slot(slot, usr->key, usr->keylen), *old_slot = NULL, *a_slot;
@@ -407,28 +345,28 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 	if (usr->address_len > 0xff || usr->address_len == 0)
 		return NULL;
 
+#ifdef UWSGI_SSL
+	if (uwsgi.subscriptions_sign_check_dir) {
+		if (usr->sign_len == 0 || usr->base_len == 0)
+			return NULL;
+	}
+#endif
+
 	if (current_slot) {
 #ifdef UWSGI_SSL
 		if (uwsgi.subscriptions_sign_check_dir && !uwsgi_subscription_sign_check(current_slot, usr)) {
 			return NULL;
 		}
 #endif
-
-		if (uwsgi.subscriptions_credentials_check_dir && !uwsgi_subscription_credentials_check(current_slot, usr)) {
-			return NULL;
-		}
-
 		node = current_slot->nodes;
 		while (node) {
 			if (!uwsgi_strncmp(node->name, node->len, usr->address, usr->address_len)) {
 #ifdef UWSGI_SSL
 				// this should avoid sending sniffed packets...
-				if (current_slot->sign_ctx && !subscription_is_safe(usr) && usr->unix_check <= node->unix_check) {
+				if (uwsgi.subscriptions_sign_check_dir && usr->unix_check <= node->unix_check) {
 					uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n", (int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
 					return NULL;
 				}
-				// eventually the packet could be upgraded to sni...
-				uwsgi_subscription_sni_check(current_slot, usr);
 #endif
 				// remove death mark and update cores and load
 				node->death_mark = 0;
@@ -446,12 +384,10 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 		}
 
 #ifdef UWSGI_SSL
-		if (current_slot->sign_ctx && !subscription_is_safe(usr) && usr->unix_check < (uwsgi_now() - (time_t) uwsgi.subscriptions_sign_check_tolerance)) {
+		if (uwsgi.subscriptions_sign_check_dir && usr->unix_check < (uwsgi_now() - (time_t) uwsgi.subscriptions_sign_check_tolerance)) {
 			uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n", (int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
-                        return NULL;
+			return NULL;
 		}
-		// check here as we are sure the node will be added
-		uwsgi_subscription_sni_check(current_slot, usr);
 #endif
 
 		node = uwsgi_malloc(sizeof(struct uwsgi_subscribe_node));
@@ -460,8 +396,7 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 		node->modifier2 = usr->modifier2;
 		node->requests = 0;
 		node->last_requests = 0;
-		node->tx = 0;
-		node->rx = 0;
+		node->transferred = 0;
 		node->reference = 0;
 		node->death_mark = 0;
 		node->failcnt = 0;
@@ -472,14 +407,6 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 		if (!node->weight)
 			node->weight = 1;
 		node->wrr = 0;
-		node->pid = usr->pid;
-		node->uid = usr->uid;
-		node->gid = usr->gid;
-		node->notify[0] = 0;
-		if (usr->notify_len > 0 && usr->notify_len < 102) {
-			memcpy(node->notify, usr->notify, usr->notify_len);
-			node->notify[usr->notify_len] = 0;
-		}
 		node->last_check = uwsgi_now();
 		node->slot = current_slot;
 		memcpy(node->name, usr->address, usr->address_len);
@@ -487,51 +414,66 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 			old_node->next = node;
 		}
 		node->next = NULL;
-
 		uwsgi_log("[uwsgi-subscription for pid %d] %.*s => new node: %.*s\n", (int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address);
-		if (node->notify[0]) {
-			char buf[1024];
-			int ret = snprintf(buf, 1024, "[subscription ack] %.*s => new node: %.*s", usr->keylen, usr->key, usr->address_len, usr->address);
-			if (ret > 0 && ret < 1024)
-				uwsgi_notify_msg(node->notify, buf, ret);
-		}
 		return node;
 	}
 	else {
-		current_slot = uwsgi_malloc(sizeof(struct uwsgi_subscribe_slot));
 #ifdef UWSGI_SSL
-		current_slot->sign_ctx = NULL;
-		if (uwsgi.subscriptions_sign_check_dir && !subscription_new_sign_ctx(current_slot, usr)) {
-			free(current_slot);
-			return NULL;
+		FILE *kf = NULL;
+		if (uwsgi.subscriptions_sign_check_dir) {
+			if (usr->unix_check < (uwsgi_now() - (time_t) uwsgi.subscriptions_sign_check_tolerance)) {
+				uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n", (int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
+				return NULL;
+			}
+			char *keyfile = uwsgi_sanitize_cert_filename(uwsgi.subscriptions_sign_check_dir, usr->key, usr->keylen);
+			kf = fopen(keyfile, "r");
+			free(keyfile);
+			if (!kf)
+				return NULL;
+
 		}
 #endif
+		current_slot = uwsgi_malloc(sizeof(struct uwsgi_subscribe_slot));
 		uint32_t hash = djb33x_hash(usr->key, usr->keylen);
 		int hash_key = hash % 0xffff;
 		current_slot->hash = hash_key;
-		current_slot->keylen = usr->keylen;
-		memcpy(current_slot->key, usr->key, usr->keylen);
-		if (uwsgi.subscriptions_credentials_check_dir) {
-			if (!uwsgi_subscription_credentials_check(current_slot, usr)) {
+#ifdef UWSGI_SSL
+		if (uwsgi.subscriptions_sign_check_dir) {
+			current_slot->sign_public_key = PEM_read_PUBKEY(kf, NULL, NULL, NULL);
+			fclose(kf);
+			if (!current_slot->sign_public_key) {
+				uwsgi_log("unable to load public key for %.*s\n", usr->keylen, usr->key);
+				free(current_slot);
+				return NULL;
+			}
+			current_slot->sign_ctx = EVP_MD_CTX_create();
+			if (!current_slot->sign_ctx) {
+				uwsgi_log("unable to initialize EVP context for %.*s\n", usr->keylen, usr->key);
+				EVP_PKEY_free(current_slot->sign_public_key);
+				free(current_slot);
+				return NULL;
+			}
+
+			if (!uwsgi_subscription_sign_check(current_slot, usr)) {
+				EVP_PKEY_free(current_slot->sign_public_key);
+				EVP_MD_CTX_destroy(current_slot->sign_ctx);
 				free(current_slot);
 				return NULL;
 			}
 		}
-
+#endif
+		current_slot->keylen = usr->keylen;
+		memcpy(current_slot->key, usr->key, usr->keylen);
 		current_slot->key[usr->keylen] = 0;
 		current_slot->hits = 0;
-#ifdef UWSGI_SSL
-		current_slot->sni_enabled = 0;
-		uwsgi_subscription_sni_check(current_slot, usr);
-#endif
+
 		current_slot->nodes = uwsgi_malloc(sizeof(struct uwsgi_subscribe_node));
 		current_slot->nodes->slot = current_slot;
 		current_slot->nodes->len = usr->address_len;
 		current_slot->nodes->reference = 0;
 		current_slot->nodes->requests = 0;
 		current_slot->nodes->last_requests = 0;
-		current_slot->nodes->tx = 0;
-		current_slot->nodes->rx = 0;
+		current_slot->nodes->transferred = 0;
 		current_slot->nodes->death_mark = 0;
 		current_slot->nodes->failcnt = 0;
 		current_slot->nodes->modifier1 = usr->modifier1;
@@ -543,14 +485,6 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 		if (!current_slot->nodes->weight)
 			current_slot->nodes->weight = 1;
 		current_slot->nodes->wrr = 0;
-		current_slot->nodes->pid = usr->pid;
-		current_slot->nodes->uid = usr->uid;
-		current_slot->nodes->gid = usr->gid;
-		current_slot->nodes->notify[0] = 0;
-		if (usr->notify_len > 0 && usr->notify_len < 102) {
-			memcpy(current_slot->nodes->notify, usr->notify, usr->notify_len);
-			current_slot->nodes->notify[usr->notify_len] = 0;
-		}
 		memcpy(current_slot->nodes->name, usr->address, usr->address_len);
 		current_slot->nodes->last_check = uwsgi_now();
 
@@ -577,157 +511,42 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
 
 		uwsgi_log("[uwsgi-subscription for pid %d] new pool: %.*s (hash key: %d)\n", (int) uwsgi.mypid, usr->keylen, usr->key, current_slot->hash);
 		uwsgi_log("[uwsgi-subscription for pid %d] %.*s => new node: %.*s\n", (int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address);
-
-		if (current_slot->nodes->notify[0]) {
-			char buf[1024];
-			int ret = snprintf(buf, 1024, "[subscription ack] %.*s => new node: %.*s", usr->keylen, usr->key, usr->address_len, usr->address);
-			if (ret > 0 && ret < 1024)
-				uwsgi_notify_msg(current_slot->nodes->notify, buf, ret);
-		}
 		return current_slot->nodes;
 	}
 
 }
 
-static void send_subscription(int sfd, char *host, char *message, uint16_t message_size) {
 
-	int fd = sfd;
-	struct sockaddr_in udp_addr;
-	struct sockaddr_un un_addr;
-	ssize_t ret;
+void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, uint8_t modifier1, uint8_t modifier2, uint8_t cmd, char *socket_name, char *sign) {
 
-	char *udp_port = strchr(host, ':');
+	if (socket_name == NULL && !uwsgi.sockets)
+		return;
 
-	if (fd == -1) {
-		if (udp_port) {
-			fd = socket(AF_INET, SOCK_DGRAM, 0);
-		}
-		else {
-			fd = socket(AF_UNIX, SOCK_DGRAM, 0);
-		}
-		if (fd < 0) {
-			uwsgi_error("send_subscription()/socket()");
-			return;
-		}
-		uwsgi_socket_nb(fd);
-	}
-	else if (fd == -2) {
-		static int unix_fd = -1;
-		static int inet_fd = -1;
-		if (udp_port) {
-			if (inet_fd == -1) {
-				inet_fd = socket(AF_INET, SOCK_DGRAM, 0);
-				if (inet_fd < 0) {
-					uwsgi_error("send_subscription()/socket()");
-					return;
-				}
-				uwsgi_socket_nb(inet_fd);
-			}
-			fd = inet_fd;
-		}
-		else {
-			if (unix_fd == -1) {
-				unix_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
-				if (unix_fd < 0) {
-					uwsgi_error("send_subscription()/socket()");
-					return;
-				}
-				uwsgi_socket_nb(unix_fd);
-			}
-			fd = unix_fd;
-		}
+	if (!socket_name) {
+		socket_name = uwsgi.sockets->name;
 	}
 
-	if (udp_port) {
-		udp_port[0] = 0;
-		memset(&udp_addr, 0, sizeof(struct sockaddr_in));
-		udp_addr.sin_family = AF_INET;
-		udp_addr.sin_port = htons(atoi(udp_port + 1));
-		udp_addr.sin_addr.s_addr = inet_addr(host);
-		ret = sendto(fd, message, message_size, 0, (struct sockaddr *) &udp_addr, sizeof(udp_addr));
-		udp_port[0] = ':';
-	}
-	else {
-		memset(&un_addr, 0, sizeof(struct sockaddr_un));
-		un_addr.sun_family = AF_UNIX;
-		// use 102 as the magic number
-		strncat(un_addr.sun_path, host, 102);
-		if (uwsgi.subscriptions_use_credentials) {
-			// could be useless as internally the socket could add them automagically
-			ret = uwsgi_pass_cred2(fd, message, message_size, (struct sockaddr *) &un_addr, sizeof(un_addr));
-		}
-		else {
-			ret = sendto(fd, message, message_size, 0, (struct sockaddr *) &un_addr, sizeof(un_addr));
-		}
-	}
-
-	if (ret < 0) {
-		uwsgi_error("send_subscription()/sendto()");
-	}
-
-	if (sfd == -1)
-		close(fd);
-}
-
-static struct uwsgi_buffer *uwsgi_subscription_ub(char *key, size_t keysize, uint8_t modifier1, uint8_t modifier2, uint8_t cmd, char *socket_name, char *sign, char *sni_key, char *sni_crt, char *sni_ca) {
-	struct uwsgi_buffer *ub = uwsgi_buffer_new(4096);
+	struct uwsgi_buffer *ub =  uwsgi_buffer_new(4096);
 
 	// make space for uwsgi header
 	ub->pos = 4;
 
-	if (uwsgi_buffer_append_keyval(ub, "key", 3, key, keysize))
-		goto end;
-	if (uwsgi_buffer_append_keyval(ub, "address", 7, socket_name, strlen(socket_name)))
-		goto end;
-
-	if (uwsgi.subscribe_with_modifier1) {
-		modifier1 = atoi(uwsgi.subscribe_with_modifier1);
-	}
-	if (uwsgi_buffer_append_keynum(ub, "modifier1", 9, modifier1))
-		goto end;
-	if (uwsgi_buffer_append_keynum(ub, "modifier2", 9, modifier2))
-		goto end;
-	if (uwsgi_buffer_append_keynum(ub, "cores", 5, uwsgi.numproc * uwsgi.cores))
-		goto end;
-	if (uwsgi_buffer_append_keynum(ub, "load", 4, uwsgi.shared->load))
-		goto end;
+	if (uwsgi_buffer_append_keyval(ub, "key", 3, key, keysize)) goto end;
+	if (uwsgi_buffer_append_keyval(ub, "address", 7, socket_name, strlen(socket_name))) goto end;
+	if (uwsgi_buffer_append_keynum(ub, "modifier1", 9, modifier1)) goto end;
+	if (uwsgi_buffer_append_keynum(ub, "modifier2", 9, modifier2)) goto end;
+	if (uwsgi_buffer_append_keynum(ub, "cores", 5, uwsgi.numproc * uwsgi.cores)) goto end;
+	if (uwsgi_buffer_append_keynum(ub, "load", 4, uwsgi.shared->load)) goto end;
 	if (uwsgi.auto_weight) {
-		if (uwsgi_buffer_append_keynum(ub, "weight", 6, uwsgi.numproc * uwsgi.cores))
-			goto end;
+		if (uwsgi_buffer_append_keynum(ub, "weight", 6, uwsgi.numproc * uwsgi.cores )) goto end;
 	}
 	else {
-		if (uwsgi_buffer_append_keynum(ub, "weight", 6, uwsgi.weight))
-			goto end;
-	}
-
-	if (sni_key) {
-		if (uwsgi_buffer_append_keyval(ub, "sni_key", 7, sni_key, strlen(sni_key)))
-			goto end;
-	}
-
-	if (sni_crt) {
-		if (uwsgi_buffer_append_keyval(ub, "sni_crt", 7, sni_crt, strlen(sni_crt)))
-			goto end;
-	}
-
-	if (sni_ca) {
-		if (uwsgi_buffer_append_keyval(ub, "sni_ca", 6, sni_ca, strlen(sni_ca)))
-			goto end;
-	}
-
-	if (uwsgi.subscription_notify_socket) {
-		if (uwsgi_buffer_append_keyval(ub, "notify", 6, uwsgi.subscription_notify_socket, strlen(uwsgi.subscription_notify_socket)))
-			goto end;
-	}
-	else if (uwsgi.notify_socket_fd > -1 && uwsgi.notify_socket) {
-		if (uwsgi_buffer_append_keyval(ub, "notify", 6, uwsgi.notify_socket, strlen(uwsgi.notify_socket)))
-			goto end;
+		if (uwsgi_buffer_append_keynum(ub, "weight", 6, uwsgi.weight )) goto end;
 	}
 
 #ifdef UWSGI_SSL
 	if (sign) {
-		if (uwsgi_buffer_append_keynum(ub, "unix", 4, (uwsgi_now() + (time_t) cmd)))
-			goto end;
+		if (uwsgi_buffer_append_keynum(ub, "unix", 4, (uwsgi_now() + (time_t) cmd) )) goto end;
 
 		unsigned int signature_len = 0;
 		char *signature = uwsgi_rsa_sign(sign, ub->buf + 4, ub->pos - 4, &signature_len);
@@ -741,98 +560,15 @@ static struct uwsgi_buffer *uwsgi_subscription_ub(char *key, size_t keysize, uin
 	}
 #endif
 
-	// add uwsgi header
-	if (uwsgi_buffer_set_uh(ub, 224, cmd))
-		goto end;
-
-	return ub;
 
+	send_udp_message(224, cmd, udp_address, ub->buf, ub->pos - 4);
 end:
 	uwsgi_buffer_destroy(ub);
-	return NULL;
 }
 
-void uwsgi_send_subscription_from_fd(int fd, char *udp_address, char *key, size_t keysize, uint8_t modifier1, uint8_t modifier2, uint8_t cmd, char *socket_name, char *sign, char *sni_key, char *sni_crt, char *sni_ca) {
-
-	if (socket_name == NULL && !uwsgi.sockets)
-		return;
-
-	if (!socket_name) {
-		socket_name = uwsgi.sockets->name;
-	}
-
-	struct uwsgi_buffer *ub = uwsgi_subscription_ub(key, keysize, modifier1, modifier2, cmd, socket_name, sign, sni_key, sni_crt, sni_ca);
-
-	if (!ub)
-		return;
-
-	send_subscription(fd, udp_address, ub->buf, ub->pos);
-	uwsgi_buffer_destroy(ub);
-}
-
-
-void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, uint8_t modifier1, uint8_t modifier2, uint8_t cmd, char *socket_name, char *sign, char *sni_key, char *sni_crt, char *sni_ca) {
-	uwsgi_send_subscription_from_fd(-1, udp_address, key, keysize, modifier1, modifier2, cmd, socket_name, sign, sni_key, sni_crt, sni_ca);
-}
 
 #ifdef UWSGI_SSL
-static int subscription_is_safe(struct uwsgi_subscribe_req *usr) {
-	struct uwsgi_string_list *usl = NULL;
-        uwsgi_foreach(usl, uwsgi.subscriptions_sign_skip_uid) {
-                if (usl->custom == 0) {
-                        usl->custom = atoi(usl->value);
-                }
-                if (usr->uid > 0 && usr->uid == (uid_t) usl->custom) {
-                        return 1;
-                }
-        }
-	return 0;
-}
-static int subscription_new_sign_ctx(struct uwsgi_subscribe_slot *slot, struct uwsgi_subscribe_req *usr) {
-	if (subscription_is_safe(usr)) return 1;
-
-	if (usr->sign_len == 0 || usr->base_len == 0)
-		return 0;
-
-	if (usr->unix_check < (uwsgi_now() - (time_t) uwsgi.subscriptions_sign_check_tolerance)) {
-        	uwsgi_log("[uwsgi-subscription for pid %d] invalid (sniffed ?) packet sent for slot: %.*s node: %.*s unix_check: %lu\n", (int) uwsgi.mypid, usr->keylen, usr->key, usr->address_len, usr->address, (unsigned long) usr->unix_check);
-		return 0;
-        }
-
-	char *keyfile = uwsgi_sanitize_cert_filename(uwsgi.subscriptions_sign_check_dir, usr->key, usr->keylen);
-	FILE *kf = fopen(keyfile, "r");
-	free(keyfile);
-	if (!kf) return 0;
-	slot->sign_public_key = PEM_read_PUBKEY(kf, NULL, NULL, NULL);
-	fclose(kf);
-	if (!slot->sign_public_key) {
-        	uwsgi_log("unable to load public key for %.*s\n", usr->keylen, usr->key);
-		return 0;
-	}
-	slot->sign_ctx = EVP_MD_CTX_create();
-	if (!slot->sign_ctx) {
-        	uwsgi_log("unable to initialize EVP context for %.*s\n", usr->keylen, usr->key);
-                EVP_PKEY_free(slot->sign_public_key);
-		return 0;
-	}
-
-	if (!uwsgi_subscription_sign_check(slot, usr)) {
-		EVP_PKEY_free(slot->sign_public_key);
-		EVP_MD_CTX_destroy(slot->sign_ctx);
-		return 0;
-	}
-
-	return 1;
-}
 int uwsgi_subscription_sign_check(struct uwsgi_subscribe_slot *slot, struct uwsgi_subscribe_req *usr) {
-	if (subscription_is_safe(usr)) return 1;
-
-	if (usr->sign_len == 0 || usr->base_len == 0)
-		return 0;
-
-	if (!slot->sign_ctx) {
-		if (!subscription_new_sign_ctx(slot, usr)) return 0;
-	}
 
 	if (EVP_VerifyInit_ex(slot->sign_ctx, uwsgi.subscriptions_sign_check_md, NULL) == 0) {
 		ERR_print_errors_fp(stderr);
@@ -874,133 +610,134 @@ struct uwsgi_subscribe_slot **uwsgi_subscription_init_ht() {
 
 void uwsgi_subscribe(char *subscription, uint8_t cmd) {
 
-	size_t subfile_size;
-	size_t i;
-	char *key = NULL;
-	int keysize = 0;
-	char *modifier1 = NULL;
-	int modifier1_len = 0;
-	char *socket_name = NULL;
-	char *udp_address = subscription;
-	char *udp_port = NULL;
-	char *subscription_key = NULL;
-	char *sign = NULL;
+        size_t subfile_size;
+        size_t i;
+        char *key = NULL;
+        int keysize = 0;
+        char *modifier1 = NULL;
+        int modifier1_len = 0;
+        char *socket_name = NULL;
+        char *udp_address = subscription;
+        char *udp_port = NULL;
+        char *subscription_key = NULL;
+        char *sign = NULL;
 
-	// check for explicit socket_name
-	char *equal = strchr(subscription, '=');
-	if (equal) {
-		socket_name = subscription;
-		if (socket_name[0] == '=') {
-			equal = strchr(socket_name + 1, '=');
-			if (!equal)
-				return;
-			*equal = '\0';
-			struct uwsgi_socket *us = uwsgi_get_shared_socket_by_num(atoi(socket_name + 1));
-			if (!us)
-				return;
-			socket_name = us->name;
-		}
-		*equal = '\0';
-		udp_address = equal + 1;
-	}
+        // check for explicit socket_name
+        char *equal = strchr(subscription, '=');
+        if (equal) {
+                socket_name = subscription;
+                if (socket_name[0] == '=') {
+                        equal = strchr(socket_name + 1, '=');
+                        if (!equal)
+                                return;
+                        *equal = '\0';
+                        struct uwsgi_socket *us = uwsgi_get_shared_socket_by_num(atoi(socket_name + 1));
+                        if (!us)
+                                return;
+                        socket_name = us->name;
+                }
+                *equal = '\0';
+                udp_address = equal + 1;
+        }
 
-	// check for unix socket
-	if (udp_address[0] != '/') {
-		udp_port = strchr(udp_address, ':');
-		if (!udp_port) {
-			if (equal)
-				*equal = '=';
-			return;
-		}
-		subscription_key = strchr(udp_port + 1, ':');
-	}
-	else {
-		subscription_key = strchr(udp_address + 1, ':');
-	}
+        // check for unix socket
+        if (udp_address[0] != '/') {
+                udp_port = strchr(udp_address, ':');
+                if (!udp_port) {
+                        if (equal)
+                                *equal = '=';
+                        return;
+                }
+                subscription_key = strchr(udp_port + 1, ':');
+        }
+        else {
+                subscription_key = strchr(udp_address + 1, ':');
+        }
 
-	if (!subscription_key) {
-		if (equal)
-			*equal = '=';
-		return;
-	}
+        if (!subscription_key) {
+                if (equal)
+                        *equal = '=';
+                return;
+        }
 
-	udp_address = uwsgi_concat2n(udp_address, subscription_key - udp_address, "", 0);
+        udp_address = uwsgi_concat2n(udp_address, subscription_key - udp_address, "", 0);
 
 	if (subscription_key[1] == '@') {
-		if (!uwsgi_file_exists(subscription_key + 2))
-			goto clear;
-		char *lines = uwsgi_open_and_read(subscription_key + 2, &subfile_size, 1, NULL);
-		if (subfile_size > 0) {
-			key = lines;
-			for (i = 0; i < subfile_size; i++) {
-				if (lines[i] == 0) {
-					if (keysize > 0) {
-						if (key[0] != '#' && key[0] != '\n') {
-							modifier1 = strchr(key, ',');
-							if (modifier1) {
-								modifier1[0] = 0;
-								modifier1++;
-								modifier1_len = strlen(modifier1);
-								keysize = strlen(key);
-							}
-							uwsgi_send_subscription(udp_address, key, keysize, uwsgi_str_num(modifier1, modifier1_len), 0, cmd, socket_name, sign, NULL, NULL, NULL);
-							modifier1 = NULL;
-							modifier1_len = 0;
-						}
-					}
-					break;
-				}
-				else if (lines[i] == '\n') {
-					if (keysize > 0) {
-						if (key[0] != '#' && key[0] != '\n') {
-							lines[i] = 0;
-							modifier1 = strchr(key, ',');
-							if (modifier1) {
-								modifier1[0] = 0;
-								modifier1++;
-								modifier1_len = strlen(modifier1);
-								keysize = strlen(key);
-							}
-							uwsgi_send_subscription(udp_address, key, keysize, uwsgi_str_num(modifier1, modifier1_len), 0, cmd, socket_name, sign, NULL, NULL, NULL);
-							modifier1 = NULL;
-							modifier1_len = 0;
-							lines[i] = '\n';
-						}
-					}
-					key = lines + i + 1;
-					keysize = 0;
-					continue;
-				}
-				keysize++;
-			}
-		}
-		free(lines);
-	}
-	else {
-		modifier1 = strchr(subscription_key + 1, ',');
-		if (modifier1) {
-			modifier1[0] = 0;
-			modifier1++;
+                if (!uwsgi_file_exists(subscription_key + 2))
+                        goto clear;
+                char *lines = uwsgi_open_and_read(subscription_key + 2, &subfile_size, 1, NULL);
+                if (subfile_size > 0) {
+                        key = lines;
+                        for (i = 0; i < subfile_size; i++) {
+                                if (lines[i] == 0) {
+                                        if (keysize > 0) {
+                                                if (key[0] != '#' && key[0] != '\n') {
+                                                        modifier1 = strchr(key, ',');
+                                                        if (modifier1) {
+                                                                modifier1[0] = 0;
+                                                                modifier1++;
+                                                                modifier1_len = strlen(modifier1);
+                                                                keysize = strlen(key);
+                                                        }
+                                                        uwsgi_send_subscription(udp_address, key, keysize, uwsgi_str_num(modifier1, modifier1_len), 0, cmd, socket_name, sign);
+                                                        modifier1 = NULL;
+                                                        modifier1_len = 0;
+                                                }
+                                        }
+                                        break;
+                                }
+                                else if (lines[i] == '\n') {
+                                        if (keysize > 0) {
+                                                if (key[0] != '#' && key[0] != '\n') {
+                                                        lines[i] = 0;
+                                                        modifier1 = strchr(key, ',');
+                                                        if (modifier1) {
+                                                                modifier1[0] = 0;
+                                                                modifier1++;
+                                                                modifier1_len = strlen(modifier1);
+                                                                keysize = strlen(key);
+                                                        }
+                                                        uwsgi_send_subscription(udp_address, key, keysize, uwsgi_str_num(modifier1, modifier1_len), 0, cmd, socket_name, sign);
+                                                        modifier1 = NULL;
+                                                        modifier1_len = 0;
+                                                        lines[i] = '\n';
+                                                }
+                                        }
+                                        key = lines + i + 1;
+                                        keysize = 0;
+                                        continue;
+                                }
+                                keysize++;
+                        }
 
-			sign = strchr(modifier1 + 1, ',');
-			if (sign) {
-				*sign = 0;
-				sign++;
-			}
-			modifier1_len = strlen(modifier1);
-		}
+                        free(lines);
+                }
+        }
+        else {
+                modifier1 = strchr(subscription_key + 1, ',');
+                if (modifier1) {
+                        modifier1[0] = 0;
+                        modifier1++;
 
-		uwsgi_send_subscription(udp_address, subscription_key + 1, strlen(subscription_key + 1), uwsgi_str_num(modifier1, modifier1_len), 0, cmd, socket_name, sign, NULL, NULL, NULL);
-		if (modifier1)
-			modifier1[-1] = ',';
-		if (sign)
-			sign[-1] = ',';
-	}
+                        sign = strchr(modifier1 + 1, ',');
+                        if (sign) {
+                                *sign = 0;
+                                sign++;
+                        }
+                        modifier1_len = strlen(modifier1);
+                }
+
+                uwsgi_send_subscription(udp_address, subscription_key + 1, strlen(subscription_key + 1), uwsgi_str_num(modifier1, modifier1_len), 0, cmd, socket_name, sign);
+                if (modifier1)
+                        modifier1[-1] = ',';
+                if (sign)
+                        sign[-1] = ',';
+        }
 
 clear:
-	if (equal)
-		*equal = '=';
-	free(udp_address);
+        if (equal)
+                *equal = '=';
+        free(udp_address);
 
 }
 
@@ -1015,20 +752,25 @@ void uwsgi_subscribe2(char *arg, uint8_t cmd) {
 	char *s2_modifier1 = NULL;
 	char *s2_modifier2 = NULL;
 	char *s2_check = NULL;
-	char *s2_sni_key = NULL;
-	char *s2_sni_crt = NULL;
-	char *s2_sni_ca = NULL;
 
-	if (uwsgi_kvlist_parse(arg, strlen(arg), ',', '=', "server", &s2_server, "key", &s2_key, "socket", &s2_socket, "addr", &s2_addr, "weight", &s2_weight, "modifier1", &s2_modifier1, "modifier2", &s2_modifier2, "sign", &s2_sign, "check", &s2_check, "sni_key", &s2_sni_key, "sni_crt", &s2_sni_crt, "sni_ca", &s2_sni_ca, NULL)) {
+	if (uwsgi_kvlist_parse(arg, strlen(arg), ',', '=',
+                        "server", &s2_server,
+                        "key", &s2_key,
+                        "socket", &s2_socket,
+                        "addr", &s2_addr,
+                        "weight", &s2_weight,
+                        "modifier1", &s2_modifier1,
+                        "modifier2", &s2_modifier2,
+                        "sign", &s2_sign,
+                        "check", &s2_check,
+		NULL)) {
 		return;
 	}
 
-	if (!s2_server || !s2_key)
-		goto end;
+	if (!s2_server || !s2_key) goto end;
 
 	if (s2_check) {
-		if (uwsgi_file_exists(s2_check))
-			goto end;
+		if (uwsgi_file_exists(s2_check)) goto end;
 	}
 
 	if (s2_weight) {
@@ -1056,56 +798,39 @@ void uwsgi_subscribe2(char *arg, uint8_t cmd) {
 		modifier2 = atoi(s2_modifier2);
 	}
 
-	uwsgi_send_subscription(s2_server, s2_key, strlen(s2_key), modifier1, modifier2, cmd, s2_addr, s2_sign, s2_sni_key, s2_sni_crt, s2_sni_ca);
+	uwsgi_send_subscription(s2_server, s2_key, strlen(s2_key), modifier1, modifier2, cmd, s2_addr, s2_sign);
 end:
-	if (s2_server)
-		free(s2_server);
-	if (s2_key)
-		free(s2_key);
-	if (s2_socket)
-		free(s2_socket);
-	if (s2_addr)
-		free(s2_addr);
-	if (s2_weight)
-		free(s2_weight);
-	if (s2_modifier1)
-		free(s2_modifier1);
-	if (s2_modifier2)
-		free(s2_modifier2);
-	if (s2_sign)
-		free(s2_sign);
-	if (s2_check)
-		free(s2_check);
-	if (s2_sni_crt)
-		free(s2_sni_crt);
-	if (s2_sni_key)
-		free(s2_sni_key);
-	if (s2_sni_ca)
-		free(s2_sni_ca);
+	if (s2_server) free(s2_server);
+	if (s2_key) free(s2_key);
+	if (s2_socket) free(s2_socket);
+	if (s2_addr) free(s2_addr);
+	if (s2_weight) free(s2_weight);
+	if (s2_modifier1) free(s2_modifier1);
+	if (s2_modifier2) free(s2_modifier2);
+	if (s2_sign) free(s2_sign);
+	if (s2_check) free(s2_check);
 }
 
 void uwsgi_subscribe_all(uint8_t cmd, int verbose) {
-
-	if (uwsgi.subscriptions_blocked)
-		return;
 	// -- subscribe
 	struct uwsgi_string_list *subscriptions = uwsgi.subscriptions;
-	while (subscriptions) {
+        while (subscriptions) {
 		if (verbose) {
-			uwsgi_log("%s %s\n", cmd ? "unsubscribing from" : "subscribing to", subscriptions->value);
+                	uwsgi_log("%s %s\n", cmd ? "unsubscribing from" : "subscribing to", subscriptions->value);
 		}
-		uwsgi_subscribe(subscriptions->value, cmd);
-		subscriptions = subscriptions->next;
-	}
+                uwsgi_subscribe(subscriptions->value, cmd);
+                subscriptions = subscriptions->next;
+        }
 
 	// --subscribe2
 	subscriptions = uwsgi.subscriptions2;
-	while (subscriptions) {
-		if (verbose) {
-			uwsgi_log("%s %s\n", cmd ? "unsubscribing from" : "subscribing to", subscriptions->value);
-		}
-		uwsgi_subscribe2(subscriptions->value, cmd);
-		subscriptions = subscriptions->next;
-	}
+        while (subscriptions) {
+        	if (verbose) {
+                        uwsgi_log("%s %s\n", cmd ? "unsubscribing from" : "subscribing to", subscriptions->value);
+        	}
+                uwsgi_subscribe2(subscriptions->value, cmd);
+                subscriptions = subscriptions->next;
+        }
 
 }
+

core/websockets.c

@@ -1,4 +1,4 @@
-#include <uwsgi.h>
+#include "uwsgi.h"
 
 /*
 
@@ -10,19 +10,9 @@
 
 extern struct uwsgi_server uwsgi;
 
-#define REQ_DATA wsgi_req->method_len, wsgi_req->method, wsgi_req->uri_len, wsgi_req->uri, wsgi_req->remote_addr_len, wsgi_req->remote_addr 
-
-static struct uwsgi_buffer *uwsgi_websocket_message(struct wsgi_request *wsgi_req, char *msg, size_t len, uint8_t opcode) {
-	struct uwsgi_buffer *ub = wsgi_req->websocket_send_buf;
-	if (!ub) {
-		wsgi_req->websocket_send_buf = uwsgi_buffer_new(10 + len);
-		ub = wsgi_req->websocket_send_buf;
-	}
-	else {
-		// reset the buffer
-		ub->pos = 0;
-	}
-	if (uwsgi_buffer_u8(ub, opcode)) goto error;
+static struct uwsgi_buffer *uwsgi_websocket_message(char *msg, size_t len) {
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(10 + len);
+	if (uwsgi_buffer_u8(ub, 0x81)) goto error;
 	if (len < 126) {
 		if (uwsgi_buffer_u8(ub, len)) goto error;
 	}
@@ -39,6 +29,7 @@ static struct uwsgi_buffer *uwsgi_websocket_message(struct wsgi_request *wsgi_re
 	return ub;
 
 error:
+	uwsgi_buffer_destroy(ub);
 	return NULL;
 }
 
@@ -63,84 +54,39 @@ static int uwsgi_websockets_check_pingpong(struct wsgi_request *wsgi_req) {
 	// pong not received ?
 	if (wsgi_req->websocket_last_pong < wsgi_req->websocket_last_ping) {
 		if (wsgi_req->websocket_last_ping - wsgi_req->websocket_last_pong > uwsgi.websockets_pong_tolerance) {
-                                uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) no PONG received in %d seconds !!!\n", REQ_DATA, uwsgi.websockets_pong_tolerance);
+                                uwsgi_log("[uwsgi-websocket] no PONG received in %d seconds !!!\n", uwsgi.websockets_pong_tolerance);
 				return -1;
 		}
 		return 0;
 	}
-	// pong received, send another ping
+	// pong received, send anther ping
         if (now - wsgi_req->websocket_last_ping >= uwsgi.websockets_ping_freq) {
                 return uwsgi_websockets_ping(wsgi_req);
 	}
 	return 0;
 }
 
-static int uwsgi_websocket_send_do(struct wsgi_request *wsgi_req, char *msg, size_t len, uint8_t opcode) {
-	struct uwsgi_buffer *ub = uwsgi_websocket_message(wsgi_req, msg, len, opcode);
+static int uwsgi_websocket_send_do(struct wsgi_request *wsgi_req, char *msg, size_t len) {
+	struct uwsgi_buffer *ub = uwsgi_websocket_message(msg, len);
 	if (!ub) return -1;
 
-	return uwsgi_response_write_body_do(wsgi_req, ub->buf, ub->pos);
-}
-
-static int uwsgi_websocket_send_from_sharedarea_do(struct wsgi_request *wsgi_req, int id, uint64_t pos, uint64_t len, uint8_t opcode) {
-	struct uwsgi_sharedarea *sa = uwsgi_sharedarea_get_by_id(id, pos);
-	if (!sa) return -1;
-	if (!len) {
-		len = sa->honour_used ? sa->used-pos : ((sa->max_pos+1)-pos);
-	}
-	uwsgi_rlock(sa->lock);
-	sa->hits++;
-        struct uwsgi_buffer *ub = uwsgi_websocket_message(wsgi_req, sa->area, len, opcode);
-	uwsgi_rwunlock(sa->lock);
-        if (!ub) return -1;
-
-        return uwsgi_response_write_body_do(wsgi_req, ub->buf, ub->pos);
+	ssize_t ret = uwsgi_response_write_body_do(wsgi_req, ub->buf, ub->pos);
+	uwsgi_buffer_destroy(ub);
+	return ret;
+	
 }
 
 int uwsgi_websocket_send(struct wsgi_request *wsgi_req, char *msg, size_t len) {
 	if (wsgi_req->websocket_closed) {
                 return -1;
         }
-	ssize_t ret = uwsgi_websocket_send_do(wsgi_req, msg, len, 0x81);
+	ssize_t ret = uwsgi_websocket_send_do(wsgi_req, msg, len);
 	if (ret < 0) {
 		wsgi_req->websocket_closed = 1;
 	}
 	return ret;
 }
 
-int uwsgi_websocket_send_from_sharedarea(struct wsgi_request *wsgi_req, int id, uint64_t pos, uint64_t len) {
-        if (wsgi_req->websocket_closed) {
-                return -1;
-        }
-        ssize_t ret = uwsgi_websocket_send_from_sharedarea_do(wsgi_req, id, pos, len, 0x81);
-        if (ret < 0) {
-                wsgi_req->websocket_closed = 1;
-        }
-        return ret;
-}
-
-int uwsgi_websocket_send_binary(struct wsgi_request *wsgi_req, char *msg, size_t len) {
-        if (wsgi_req->websocket_closed) {
-                return -1;
-        }
-        ssize_t ret = uwsgi_websocket_send_do(wsgi_req, msg, len, 0x82);
-        if (ret < 0) {
-                wsgi_req->websocket_closed = 1;
-        }
-        return ret;
-}
-
-int uwsgi_websocket_send_binary_from_sharedarea(struct wsgi_request *wsgi_req, int id, uint64_t pos, uint64_t len) {
-        if (wsgi_req->websocket_closed) {
-                return -1;
-        }
-        ssize_t ret = uwsgi_websocket_send_from_sharedarea_do(wsgi_req, id, pos, len, 0x82);
-        if (ret < 0) {
-                wsgi_req->websocket_closed = 1;
-        }
-        return ret;
-}
-
 static void uwsgi_websocket_parse_header(struct wsgi_request *wsgi_req) {
 	uint8_t byte1 = wsgi_req->websocket_buf->buf[0];
 	uint8_t byte2 = wsgi_req->websocket_buf->buf[1];
@@ -191,7 +137,7 @@ static ssize_t uwsgi_websockets_recv_pkt(struct wsgi_request *wsgi_req, int nb)
 				}
                                 goto wait;
                         }
-                        uwsgi_req_error("uwsgi_websockets_recv_pkt()");
+                        uwsgi_error("uwsgi_websockets_recv_pkt()");
                         return -1;
                 }
 
@@ -203,7 +149,7 @@ wait:
 			if (rlen <= 0) return -1;
 		}
                 if (ret < 0) {
-                        uwsgi_req_error("uwsgi_websockets_recv_pkt()");
+                        uwsgi_error("uwsgi_websockets_recv_pkt()");
 			return -1;
                 }
 		// send unsolicited pong
@@ -256,11 +202,11 @@ static struct uwsgi_buffer *uwsgi_websocket_recv_do(struct wsgi_request *wsgi_re
 						wsgi_req->websocket_size = uwsgi_be64(wsgi_req->websocket_buf->buf+2);
 					}
 					else {
-						uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) BUG error in websocket parser\n", REQ_DATA);
+						uwsgi_log("[uwsgi-websocket] BUG error in websocket parser\n");
 						return NULL;
 					}
 					if (wsgi_req->websocket_size > (uwsgi.websockets_max_size*1024)) {
-						uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) invalid packet size received: %llu, max allowed: %llu\n", REQ_DATA, wsgi_req->websocket_size, uwsgi.websockets_max_size * 1024);
+						uwsgi_log("[uwsgi-websocket] invalid packet size received: %llu, max allowed: %llu\n", wsgi_req->websocket_size, uwsgi.websockets_max_size * 1024);
 						return NULL;
 					}
 					wsgi_req->websocket_phase = 2;
@@ -273,7 +219,6 @@ static struct uwsgi_buffer *uwsgi_websocket_recv_do(struct wsgi_request *wsgi_re
 					}
 					else {
 						wsgi_req->websocket_need += wsgi_req->websocket_size;
-						wsgi_req->websocket_pktsize += wsgi_req->websocket_size;
 						wsgi_req->websocket_phase = 4;
 					}
 					break;
@@ -315,7 +260,7 @@ static struct uwsgi_buffer *uwsgi_websocket_recv_do(struct wsgi_request *wsgi_re
 					break;
 				// oops
 				default:
-					uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) BUG error in websocket parser\n", REQ_DATA);
+					uwsgi_log("[uwsgi-websocket] BUG error in websocket parser\n");
 					return NULL;
 			}
 		}
@@ -370,39 +315,18 @@ ssize_t uwsgi_websockets_simple_send(struct wsgi_request *wsgi_req, struct uwsgi
 	return len;
 }
 
-int uwsgi_websocket_handshake(struct wsgi_request *wsgi_req, char *key, uint16_t key_len, char *origin, uint16_t origin_len, char *proto, uint16_t proto_len) {
+int uwsgi_websocket_handshake(struct wsgi_request *wsgi_req, char *key, uint16_t key_len, char *origin, uint16_t origin_len) {
 #ifdef UWSGI_SSL
-	if (!key_len) {
-		key = wsgi_req->http_sec_websocket_key;
-		key_len = wsgi_req->http_sec_websocket_key_len;
-	}
-	if (key_len == 0) return -1;
-
 	char sha1[20];
 	if (uwsgi_response_prepare_headers(wsgi_req, "101 Web Socket Protocol Handshake", 33)) return -1;
 	if (uwsgi_response_add_header(wsgi_req, "Upgrade", 7, "WebSocket", 9)) return -1;
 	if (uwsgi_response_add_header(wsgi_req, "Connection", 10, "Upgrade", 7)) return -1;
-
-	// if origin was requested or proto_len is specified, send it back
-        if (wsgi_req->http_origin_len > 0 || origin_len > 0) {
-		if (!origin_len) {
-			origin = wsgi_req->http_origin;
-			origin_len = wsgi_req->http_origin_len;
-		}
+        if (origin_len > 0) {
 		if (uwsgi_response_add_header(wsgi_req, "Sec-WebSocket-Origin", 20, origin, origin_len)) return -1;
         }
         else {
 		if (uwsgi_response_add_header(wsgi_req, "Sec-WebSocket-Origin", 20, "*", 1)) return -1;
         }
-	
-	// if protocol was requested or proto_len is specified, send it back
-	if (wsgi_req->http_sec_websocket_protocol_len > 0 || proto_len > 0) {
-		if (!proto_len) {
-			proto = wsgi_req->http_sec_websocket_protocol;
-			proto_len = wsgi_req->http_sec_websocket_protocol_len;
-		}
-		if (uwsgi_response_add_header(wsgi_req, "Sec-WebSocket-Protocol", 22, proto, proto_len)) return -1;
-	}
 	// generate websockets sha1 and encode it to base64
         if (!uwsgi_sha1_2n(key, key_len, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", 36, sha1)) return -1;
 	size_t b64_len = 0;

core/writer.c

@@ -5,7 +5,7 @@ extern struct uwsgi_server uwsgi;
 int uwsgi_response_add_content_length(struct wsgi_request *wsgi_req, uint64_t cl) {
 	char buf[sizeof(UMAX64_STR)+1];
         int ret = snprintf(buf, sizeof(UMAX64_STR)+1, "%llu", (unsigned long long) cl);
-        if (ret <= 0 || ret >= (int) (sizeof(UMAX64_STR)+1)) {
+        if (ret <= 0 || ret > (int) (sizeof(UMAX64_STR)+1)) {
 		wsgi_req->write_errors++;
                 return -1;
         }
@@ -51,7 +51,7 @@ int uwsgi_response_add_content_range(struct wsgi_request *wsgi_req, uint64_t sta
 		end = cl-1;
 	}
         int ret = snprintf(buf, 6+(sizeof(UMAX64_STR)*3)+4, "bytes %llu-%llu/%llu", (unsigned long long) start, (unsigned long long) end, (unsigned long long) cl);
-        if (ret <= 0 || ret >= (int) (6+(sizeof(UMAX64_STR)*3)+4)) {
+        if (ret <= 0 || ret > (int) (6+(sizeof(UMAX64_STR)*3)+4)) {
                 wsgi_req->write_errors++;
                 return -1;
         }
@@ -82,14 +82,12 @@ int uwsgi_response_prepare_headers(struct wsgi_request *wsgi_req, char *status,
 	wsgi_req->status = uwsgi_str3_num(status);
 #ifdef UWSGI_ROUTING
 	// apply error routes
-	if (wsgi_req->is_error_routing == 0) {
-		if (uwsgi_apply_error_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
-			// from now on ignore write body requests...
-			wsgi_req->ignore_body = 1;
-			return -1;
-		}
-		wsgi_req->is_error_routing = 0;
+	if (uwsgi_apply_error_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
+		// from now on ignore write body requests...
+		wsgi_req->ignore_body = 1;
+		return -1;
 	}
+	wsgi_req->is_error_routing = 0;
 #endif
 	if (status_len <= 4) {
 		char *new_sc = NULL;
@@ -124,18 +122,9 @@ error:
 static int uwsgi_response_add_header_do(struct wsgi_request *wsgi_req, char *key, uint16_t key_len, char *value, uint16_t value_len) {
 
 
-	// pull/collect the header ?
+	// collect the header ?
 	struct uwsgi_string_list *usl = NULL;
 
-	uwsgi_foreach(usl, uwsgi.pull_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;
-                        }
-			return 0;
-                }
-        }
-
 	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)) {
@@ -190,21 +179,19 @@ int uwsgi_response_add_header_force(struct wsgi_request *wsgi_req, char *key, ui
         return uwsgi_response_add_header_do(wsgi_req, key, key_len, value, value_len);
 }
 
-static int uwsgi_response_write_headers_do0(struct wsgi_request *wsgi_req) {
+int uwsgi_response_write_headers_do(struct wsgi_request *wsgi_req) {
 	if (wsgi_req->headers_sent || !wsgi_req->headers || wsgi_req->response_size || wsgi_req->write_errors) {
 		return UWSGI_OK;
 	}
 
 #ifdef UWSGI_ROUTING
         // apply response routes
-	if (wsgi_req->is_response_routing == 0) {
-        	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;
-	}
+        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;
@@ -222,20 +209,11 @@ static int uwsgi_response_write_headers_do0(struct wsgi_request *wsgi_req) {
 
 	if (wsgi_req->socket->proto_fix_headers(wsgi_req)) { wsgi_req->write_errors++ ; return -1;}
 
-	return UWSGI_AGAIN;
-}
-
-int uwsgi_response_write_headers_do(struct wsgi_request *wsgi_req) {
-
-	int ret = uwsgi_response_write_headers_do0(wsgi_req);
-	if (ret != UWSGI_AGAIN) return ret;
-
 	for(;;) {
-		errno = 0;
                 int ret = wsgi_req->socket->proto_write_headers(wsgi_req, wsgi_req->headers->buf, wsgi_req->headers->pos);
                 if (ret < 0) {
                         if (!uwsgi.ignore_write_errors) {
-                                uwsgi_req_error("uwsgi_response_write_headers_do()");
+                                uwsgi_error("uwsgi_response_write_headers_do()");
                         }
 			wsgi_req->write_errors++;
                         return -1;
@@ -243,7 +221,6 @@ int uwsgi_response_write_headers_do(struct wsgi_request *wsgi_req) {
                 if (ret == UWSGI_OK) {
                         break;
                 }
-		if (!uwsgi_is_again()) continue;
                 ret = uwsgi_wait_write_req(wsgi_req);
                 if (ret < 0) { wsgi_req->write_errors++; return -1;}
                 if (ret == 0) {
@@ -261,100 +238,6 @@ int uwsgi_response_write_headers_do(struct wsgi_request *wsgi_req) {
         return UWSGI_OK;
 }
 
-/*
-	private function for highly optimized writes (1 single syscall for headers and body)
-*/
-static int uwsgi_response_writev_headers_and_body_do(struct wsgi_request *wsgi_req, char *buf, size_t len) {
-
-	struct iovec iov[2];
-
-        int ret = uwsgi_response_write_headers_do0(wsgi_req);
-        if (ret != UWSGI_AGAIN) return ret;
-
-	iov[0].iov_base = wsgi_req->headers->buf;
-	iov[0].iov_len = wsgi_req->headers->pos;
-	iov[1].iov_base = buf;
-	iov[1].iov_len = len;
-
-	size_t iov_len = 2;
-        for(;;) {
-                errno = 0;
-		// no need to use writev if a single iovec remains
-		if (iov_len == 1) {
-			buf = iov[0].iov_base;	
-			len = iov[0].iov_len;
-			// update counters
-			wsgi_req->headers_size += wsgi_req->headers->pos;
-			wsgi_req->headers_sent = 1;
-			wsgi_req->response_size += wsgi_req->write_pos - wsgi_req->headers_size;
-			wsgi_req->write_pos = 0;
-			goto fallback;
-		}
-                int ret = wsgi_req->socket->proto_writev(wsgi_req, iov, &iov_len);
-                if (ret < 0) {
-                        if (!uwsgi.ignore_write_errors) {
-                                uwsgi_req_error("uwsgi_response_writev_headers_and_body_do()");
-                        }
-                        wsgi_req->write_errors++;
-                        return -1;
-                }
-                if (ret == UWSGI_OK) {
-                        break;
-                }
-                if (!uwsgi_is_again()) continue;
-                ret = uwsgi_wait_write_req(wsgi_req);
-                if (ret < 0) { wsgi_req->write_errors++; return -1;}
-                if (ret == 0) {
-                        uwsgi_log("uwsgi_response_writev_headers_and_body_do() TIMEOUT !!!\n");
-                        wsgi_req->write_errors++;
-                        return -1;
-                }
-        }
-
-	wsgi_req->headers_size += wsgi_req->headers->pos;
-	wsgi_req->response_size += len;
-	wsgi_req->headers_sent = 1;
-
-	// reset for the next write
-        wsgi_req->write_pos = 0;
-
-        return UWSGI_OK;
-
-fallback:
-
-	for(;;) {
-                errno = 0;
-                int ret = wsgi_req->socket->proto_write(wsgi_req, buf, len);
-                if (ret < 0) {
-                        if (!uwsgi.ignore_write_errors) {
-				// here we use the parent name
-                                uwsgi_req_error("uwsgi_response_write_body_do()");
-                        }
-                        wsgi_req->write_errors++;
-                        return -1;
-                }
-                if (ret == UWSGI_OK) {
-                        break;
-                }
-                if (!uwsgi_is_again()) continue;
-                ret = uwsgi_wait_write_req(wsgi_req);
-                if (ret < 0) { wsgi_req->write_errors++; return -1;}
-                if (ret == 0) {
-			// here we use the parent name
-                        uwsgi_log("uwsgi_response_write_body_do() TIMEOUT !!!\n");
-                        wsgi_req->write_errors++;
-                        return -1;
-                }
-        }
-
-        wsgi_req->response_size += wsgi_req->write_pos;
-        // reset for the next write
-        wsgi_req->write_pos = 0;
-
-        return UWSGI_OK;
-
-}
-
 // this is the function called by all request plugins to send chunks to the client
 int uwsgi_response_write_body_do(struct wsgi_request *wsgi_req, char *buf, size_t len) {
 
@@ -365,14 +248,12 @@ int uwsgi_response_write_body_do(struct wsgi_request *wsgi_req, char *buf, size_
 	// special case here, we could need to set transformations before
 	if (!wsgi_req->headers_sent) {
         	// apply response routes
-		if (wsgi_req->is_response_routing == 0) {
-        		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;
-		}
+        	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
 
@@ -397,9 +278,6 @@ int uwsgi_response_write_body_do(struct wsgi_request *wsgi_req, char *buf, size_
 write:
 	// send headers if not already sent
 	if (!wsgi_req->headers_sent) {
-		if (wsgi_req->socket->proto_writev && len > 0 && wsgi_req->headers) {
-			return uwsgi_response_writev_headers_and_body_do(wsgi_req, buf, len);
-		}
 		int ret = uwsgi_response_write_headers_do(wsgi_req);
                 if (ret == UWSGI_OK) goto sendbody;
                 if (ret == UWSGI_AGAIN) return UWSGI_AGAIN;
@@ -412,11 +290,10 @@ sendbody:
 	if (len == 0) return UWSGI_OK;
 	
 	for(;;) {
-		errno = 0;
 		int ret = wsgi_req->socket->proto_write(wsgi_req, buf, len);
 		if (ret < 0) {
 			if (!uwsgi.ignore_write_errors) {
-				uwsgi_req_error("uwsgi_response_write_body_do()");
+				uwsgi_error("uwsgi_response_write_body_do()");
 			}
 			wsgi_req->write_errors++;
 			return -1;
@@ -424,7 +301,6 @@ sendbody:
 		if (ret == UWSGI_OK) {
 			break;
 		}
-		if (!uwsgi_is_again()) continue;
 		ret = uwsgi_wait_write_req(wsgi_req);			
 		if (ret < 0) { wsgi_req->write_errors++; return -1;}
                 if (ret == 0) {
@@ -441,132 +317,6 @@ sendbody:
 	return UWSGI_OK;	
 }
 
-int uwsgi_response_writev_body_do(struct wsgi_request *wsgi_req, struct iovec *iov, size_t len) {
-
-        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 (wsgi_req->is_response_routing == 0) {
-                	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
-
-	size_t i;
-	int buffering = 0;
-	// transformations apply to every vector
-	for(i=0;i<len;i++) {	
-        	// 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, iov[i].iov_base, iov[i].iov_len);
-                	if (t_ret == 0) {
-                        	iov[i].iov_base = wsgi_req->transformed_chunk;
-                        	iov[i].iov_len = wsgi_req->transformed_chunk_len;
-                        	// reset transformation
-                        	wsgi_req->transformed_chunk = NULL;
-                        	wsgi_req->transformed_chunk_len = 0;
-                        	goto write;
-                	}
-                	if (t_ret == 1) {
-				buffering = 1;
-				continue;
-                	}
-                	wsgi_req->write_errors++;
-                	return -1;
-		}
-        }
-
-	if (buffering) return UWSGI_OK;
-
-write:
-        // send headers if not already sent
-        if (!wsgi_req->headers_sent) {
-                int ret = uwsgi_response_write_headers_do(wsgi_req);
-                if (ret == UWSGI_OK) goto sendbody;
-                if (ret == UWSGI_AGAIN) return UWSGI_AGAIN;
-                wsgi_req->write_errors++;
-                return -1;
-        }
-
-sendbody:
-
-        if (len == 0) return UWSGI_OK;
-	// unfortunately vector based I/O cannot be accomplished on all protocols
-	if (!wsgi_req->socket->proto_writev) goto fallback;
-
-	// we use a copy to avoid mess
-	size_t iov_len = len;
-	for(;;) {
-        	errno = 0;
-                int ret = wsgi_req->socket->proto_writev(wsgi_req, iov, &iov_len);
-                if (ret < 0) {
-                	if (!uwsgi.ignore_write_errors) {
-                        	uwsgi_req_error("uwsgi_response_writev_body_do()");
-                        }
-                        wsgi_req->write_errors++;
-                        return -1;
-                }
-                if (ret == UWSGI_OK) {
-                	break;
-                }
-                if (!uwsgi_is_again()) continue;
-                ret = uwsgi_wait_write_req(wsgi_req);
-                if (ret < 0) { wsgi_req->write_errors++; return -1;}
-                if (ret == 0) {
-                	uwsgi_log("uwsgi_response_writev_body_do() TIMEOUT !!!\n");
-                        wsgi_req->write_errors++;
-                        return -1;
-                }
-	}
-
-	goto done;
-
-fallback:
-
-	for(i=0;i<len;i++) {
-        	for(;;) {
-                	errno = 0;
-                	int ret = wsgi_req->socket->proto_write(wsgi_req, iov[i].iov_base, iov[i].iov_len);
-                	if (ret < 0) {
-                        	if (!uwsgi.ignore_write_errors) {
-                                	uwsgi_req_error("uwsgi_response_writev_body_do()");
-                        	}
-                        	wsgi_req->write_errors++;
-                        	return -1;
-                	}
-                	if (ret == UWSGI_OK) {
-                        	break;
-                	}
-                	if (!uwsgi_is_again()) continue;
-                	ret = uwsgi_wait_write_req(wsgi_req);
-                	if (ret < 0) { wsgi_req->write_errors++; return -1;}
-                	if (ret == 0) {
-                        	uwsgi_log("uwsgi_response_writev_body_do() TIMEOUT !!!\n");
-                        	wsgi_req->write_errors++;
-                        	return -1;
-                	}
-		}
-        }
-
-done:
-
-        wsgi_req->response_size += wsgi_req->write_pos;
-        // reset for the next write
-        wsgi_req->write_pos = 0;
-
-        return UWSGI_OK;
-}
-
-
 int uwsgi_response_sendfile_do(struct wsgi_request *wsgi_req, int fd, size_t pos, size_t len) {
 	return uwsgi_response_sendfile_do_can_close(wsgi_req, fd, pos, len, 1);	
 }
@@ -599,7 +349,7 @@ sendfile:
 	if (len == 0) {
 		struct stat st;
 		if (fstat(fd, &st)) {
-			uwsgi_req_error("uwsgi_response_sendfile_do()/fstat()");
+			uwsgi_error("uwsgi_response_sendfile_do()/fstat()");
 			wsgi_req->write_errors++;
 			if (can_close) close(fd);
 			return -1;
@@ -617,7 +367,7 @@ sendfile:
 		if (!can_close) {
 			int tmp_fd = dup(fd);
 			if (tmp_fd < 0) {
-				uwsgi_req_error("uwsgi_response_sendfile_do()/dup()");
+				uwsgi_error("uwsgi_response_sendfile_do()/dup()");
 				wsgi_req->write_errors++;
 				return -1;
 			}
@@ -638,11 +388,10 @@ sendfile:
         wsgi_req->via = UWSGI_VIA_SENDFILE;
 
         for(;;) {
-		errno = 0;
                 int ret = wsgi_req->socket->proto_sendfile(wsgi_req, fd, pos, len);
                 if (ret < 0) {
                         if (!uwsgi.ignore_write_errors) {
-                                uwsgi_req_error("uwsgi_response_sendfile_do()");
+                                uwsgi_error("uwsgi_response_sendfile_do()");
                         }
 			wsgi_req->write_errors++;
 			if (can_close) close(fd);
@@ -651,7 +400,6 @@ sendfile:
                 if (ret == UWSGI_OK) {
                         break;
                 }
-		if (!uwsgi_is_again()) continue;
                 ret = uwsgi_wait_write_req(wsgi_req);
                 if (ret < 0) {
 			wsgi_req->write_errors++;
@@ -706,11 +454,10 @@ int uwsgi_simple_write(struct wsgi_request *wsgi_req, char *buf, size_t len) {
 	wsgi_req->write_pos = 0;
 
 	for(;;) {
-		errno = 0;
                 int ret = wsgi_req->socket->proto_write(wsgi_req, buf, len);
                 if (ret < 0) {
                         if (!uwsgi.ignore_write_errors) {
-                                uwsgi_req_error("uwsgi_simple_write()");
+                                uwsgi_error("uwsgi_simple_write()");
                         }
                         wsgi_req->write_errors++;
                         return -1;
@@ -718,7 +465,6 @@ int uwsgi_simple_write(struct wsgi_request *wsgi_req, char *buf, size_t len) {
                 if (ret == UWSGI_OK) {
                         break;
                 }
-		if (!uwsgi_is_again()) continue;
                 ret = uwsgi_wait_write_req(wsgi_req);
                 if (ret < 0) { wsgi_req->write_errors++; return -1;}
                 if (ret == 0) {

examples/mjpeg_stream.py

@@ -1,4 +1,5 @@
 import uwsgi
+
 import os
 
 def application(env, start_response):
@@ -14,12 +15,12 @@ def application(env, start_response):
 				]
 			)
 
-	yield "--%s\r\n" % boundary
+
+	yield "--%s\n" % boundary
 
 	while 1:
 		yield "Content-Type: image/jpeg\r\n\r\n"
-		print os.system('screencapture -t jpg -m -T 1 screenshot.jpg')
-		f = open('screenshot.jpg')
-                yield env['wsgi.file_wrapper'](f)
-		yield "\r\n--%s\r\n" % boundary
+		uwsgi.sendfile('screenshot.jpg')
+		yield "--%s\n" % boundary
 		#os.system('./isightcapture -w 640 -h 480 screenshot.jpg')
+		#os.system('screencapture -m -T 1 screenshot.jpg')

examples/uwsgistatus.py

@@ -42,6 +42,16 @@ def application(env, start_response):
 
     yield '<h2>dynamic options</h2>'
 
+    yield '<b>logging</b>: ' + str(uwsgi.get_option(0)) + '<br/>'
+    yield '<b>max_requests</b>: '  + str(uwsgi.getoption(1)) + '<br/>'
+    yield '<b>socket_timeout</b>: ' + str(uwsgi.getoption(2)) + '<br/>'
+    yield '<b>memory_debug</b>: ' + str(uwsgi.getoption(3)) + '<br/>'
+    yield '<b>master_interval</b>: ' + str(uwsgi.getoption(4)) + '<br/>'
+    yield '<b>harakiri</b>: ' + str(uwsgi.getoption(5)) + '<br/>'
+    yield '<b>cgi_mode</b>: ' + str(uwsgi.get_option(6)) + '<br/>'
+    yield '<b>threads</b>: ' + str(uwsgi.get_option(7)) + '<br/>'
+    yield '<b>process_reaper</b>: ' + str(uwsgi.get_option(8)) + '<br/>'
+
     yield '<table border="1">'
     yield '<th>worker id</th><th>pid</th><th>in request</th><th>requests</th><th>running time</th><th>address space</th><th>rss</th>'
 

examples/welcome.py

@@ -47,6 +47,11 @@ def serve_logo(e, sr):
     uwsgi.sendfile('logo_uWSGI.png')
     return ''
 
+def serve_options(e, sr):
+    sr('200 OK', [('Content-Type', 'text/html')])
+    for opt in range(0,256):
+        yield "<b>%d</b> = %d<br/>" % (opt, uwsgi.get_option(opt))
+
 def serve_config(e, sr):
     sr('200 OK', [('Content-Type', 'text/html')])
     for opt in uwsgi.opt.keys():
@@ -56,6 +61,7 @@ routes = {}
 routes['/xsendfile'] = xsendfile
 routes['/logo'] = serve_logo
 routes['/config'] = serve_config
+routes['/options'] = serve_options
 
 @postfork
 def setprocname():
@@ -113,6 +119,11 @@ def application(env, start_response):
 Configuration<br/>
 <iframe src="/config"></iframe><br/>
 
+<br/>
+
+Dynamic options<br/>
+<iframe src="/options"></iframe><br/>
+
 <br/>
 Workers and applications<br/>
 <table border="1">

examples/welcome3.py

@@ -9,6 +9,12 @@ def serve_logo(e, sr):
     sr('200 OK', [('Content-Type', 'image/png')])
     return uwsgi.sendfile('logo_uWSGI.png')
 
+def serve_options(e, sr):
+    sr('200 OK', [('Content-Type', 'text/html')])
+    for opt in range(0,256):
+        body = "{opt} = {optvalue}<br/>".format(opt=opt, optvalue=uwsgi.get_option(opt))
+        yield bytes(body.encode('ascii'))
+
 def serve_config(e, sr):
     sr('200 OK', [('Content-Type', 'text/html')])
     for opt in uwsgi.opt.keys():
@@ -19,6 +25,7 @@ routes = {}
 routes['/xsendfile'] = xsendfile
 routes['/logo'] = serve_logo
 routes['/config'] = serve_config
+routes['/options'] = serve_options
 
 def application(env, start_response):
 
@@ -36,6 +43,9 @@ Configuration<br/>
 
 <br/>
 
+Dynamic options<br/>
+<iframe src="/options"></iframe><br/>
+
     """.format(version=uwsgi.version.decode('ascii'))
 
     return bytes(body.encode('ascii'))

lib/linux_ns.c

@@ -52,22 +52,16 @@ int uwsgi_is_a_keep_mount(char *mp) {
 	
 }
 
-static int uwsgi_ns_start(void *v_argv) {
-	uwsgi_start(v_argv);
-	return uwsgi_run();
-}
-
 void linux_namespace_start(void *argv) {
 	for (;;) {
 		char stack[PTHREAD_STACK_MIN];
 		int waitpid_status;
-		char *pid_str = NULL;
 		uwsgi_log("*** jailing uWSGI in %s ***\n", uwsgi.ns);
 		int clone_flags = SIGCHLD | CLONE_NEWUTS | CLONE_NEWPID | CLONE_NEWIPC | CLONE_NEWNS;
 		if (uwsgi.ns_net) {
 			clone_flags |= CLONE_NEWNET;
 		}
-		pid_t pid = clone(uwsgi_ns_start, stack + PTHREAD_STACK_MIN, clone_flags, (void *) argv);
+		pid_t pid = clone(uwsgi_start, stack + PTHREAD_STACK_MIN, clone_flags, (void *) argv);
 		if (pid == -1) {
 			uwsgi_error("clone()");
 			exit(1);
@@ -78,12 +72,10 @@ void linux_namespace_start(void *argv) {
 			exit(1);
 		}
 #endif
-		pid_str = uwsgi_num2str((int) pid);
 		// run the post-jail scripts
-		if (setenv("UWSGI_JAIL_PID", pid_str, 1)) {
+		if (setenv("UWSGI_JAIL_PID", uwsgi_num2str((int) pid), 1)) {
 			uwsgi_error("setenv()");
 		}
-		free(pid_str);
 		uwsgi_hooks_run(uwsgi.hook_post_jail, "post-jail", 1);
         	struct uwsgi_string_list *usl = uwsgi.exec_post_jail;
         	while(usl) {
@@ -114,11 +106,6 @@ void linux_namespace_start(void *argv) {
 		if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == 1) {
 			exit(1);
 		}
-		else if (uwsgi.exit_on_reload && WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == 0) {
-			uwsgi_log("jailed master process exited and exit-on-reload is enabled, shutting down\n");
-			exit(0);
-		}
-
 
 		uwsgi_log("pid %d ended. Respawning...\n", (int) pid);
 	}

plugins/admin/admin_plugin.c

@@ -0,0 +1,46 @@
+#include "../../uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+/* uwsgi ADMIN|10 */
+int uwsgi_request_admin(struct wsgi_request *wsgi_req) {
+
+        uint32_t opt_value = 0;
+
+	if (wsgi_req->uh->pktsize != 0 && wsgi_req->uh->pktsize != 4)
+		return UWSGI_OK;
+
+	// write request
+	if (wsgi_req->uh->pktsize == 4) {
+                memcpy(&opt_value, wsgi_req->buffer, 4);
+        	uwsgi_log( "setting internal option %d to %d\n", wsgi_req->uh->modifier2, opt_value);
+        	uwsgi.shared->options[wsgi_req->uh->modifier2] = opt_value;
+
+        	// ACK
+        	wsgi_req->uh->modifier1 = 255;
+        	wsgi_req->uh->pktsize = 0;
+        	wsgi_req->uh->modifier2 = 1;
+		uwsgi_response_write_body_do(wsgi_req, (char *)wsgi_req->uh , 4);
+	}
+	// get request
+	else {
+		uwsgi_log( "internal option %d = %d\n", wsgi_req->uh->modifier2, uwsgi.shared->options[wsgi_req->uh->modifier2]);
+
+		wsgi_req->uh->modifier1 = 10;
+		wsgi_req->uh->pktsize = 4;
+		uwsgi_response_write_body_do(wsgi_req, (char *)wsgi_req->uh , 4);
+		uwsgi_response_write_body_do(wsgi_req, (char *) &uwsgi.shared->options[wsgi_req->uh->modifier2], 4);
+	}
+
+        return UWSGI_OK;
+}
+
+
+struct uwsgi_plugin admin_plugin = {
+
+        .name = "admin",
+        .modifier1 = 10,
+        .request = uwsgi_request_admin,
+
+};
+

plugins/admin/uwsgiplugin.py

@@ -0,0 +1,7 @@
+
+NAME='admin'
+CFLAGS = []
+LDFLAGS = []
+LIBS = []
+
+GCC_LIST = ['admin_plugin']

plugins/airbrake/airbrake_plugin.c

@@ -222,8 +222,8 @@ static void uwsgi_airbrake_loop(struct uwsgi_thread *ut) {
 	// ARGH !!!
 	if (!curl) return;
 
-	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, uwsgi.socket_timeout);
-	curl_easy_setopt(curl, CURLOPT_TIMEOUT, uwsgi.socket_timeout);
+	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+	curl_easy_setopt(curl, CURLOPT_TIMEOUT, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 	curl_easy_setopt(curl, CURLOPT_READFUNCTION, NULL);
 	curl_easy_setopt(curl, CURLOPT_READDATA, ut);
 	curl_easy_setopt(curl, CURLOPT_POST, 1L);
@@ -271,11 +271,12 @@ static void uwsgi_airbrake_loop(struct uwsgi_thread *ut) {
 }
 
 static void uwsgi_airbrake_init(struct uwsgi_alarm_instance *uai) {
-	struct uwsgi_airbrake_config *uacc = uwsgi_calloc(sizeof(struct uwsgi_airbrake_config));
-	uacc->arg = uai->arg;
-	struct uwsgi_thread *ut = uwsgi_thread_new_with_data(uwsgi_airbrake_loop, uacc);
+	struct uwsgi_thread *ut = uwsgi_thread_new(uwsgi_airbrake_loop);
 	if (!ut) return;
 	uai->data_ptr = ut;
+	struct uwsgi_airbrake_config *uacc = uwsgi_calloc(sizeof(struct uwsgi_airbrake_config));
+	uacc->arg = uai->arg;
+	ut->data = uacc;
 }
 
 static void uwsgi_airbrake_func(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {

plugins/alarm_curl/alarm_curl_plugin.c

@@ -3,18 +3,9 @@
 
 extern struct uwsgi_server uwsgi;
 
-struct uwsgi_alarm_curl {
-	CURL	*curl;
-	struct uwsgi_thread *ut;
-	int	pos;
-	int	blen;
-	char	*body;
-	int	hlen;
-	char	hdr[];
-};
-
 struct uwsgi_alarm_curl_config {
-	char *url;
+	int first;
+	char *arg;
 	char *subject;
 	char *to;
 };
@@ -26,7 +17,7 @@ struct uwsgi_alarm_curl_opt {
 };
 
 
-#ifdef CURLPROTO_SMTP
+#ifdef CURLOPT_MAIL_RCPT
 static void uwsgi_alarm_curl_to(CURL *curl, CURLoption option, char *arg, struct uwsgi_alarm_curl_config *uacc) {
 	uacc->to = arg;
 	struct curl_slist *list = NULL;
@@ -38,7 +29,6 @@ static void uwsgi_alarm_curl_to(CURL *curl, CURLoption option, char *arg, struct
 		p = strtok_r(NULL, ",", &ctx);
 	}
 	curl_easy_setopt(curl, option, list);
-	free(items);
 }
 #endif
 
@@ -54,33 +44,16 @@ static void uwsgi_alarm_curl_set_subject(CURL *curl, CURLoption option, char *ar
 	uacc->subject = arg;	
 }
 
-static void uwsgi_alarm_curl_url(CURL *curl, CURLoption option, char *arg, struct uwsgi_alarm_curl_config *uacc)
-{
-#ifndef CURLPROTO_SMTP
-	if (!uwsgi_strnicmp(arg, 4, "smtp", 4)) {
-		uwsgi_error("Please update libcurl to use SMTP protocol.\n");
-		exit(1);
-	}
-#endif
-	uacc->url = arg;
-	curl_easy_setopt(curl, option, arg);
-}
-
-static void uwsgi_alarm_curl_ssl_insecure(CURL *curl, CURLoption option, char *arg, struct uwsgi_alarm_curl_config *uacc)
-{
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-}
-
 static struct uwsgi_alarm_curl_opt uaco[] = {
-	{"url", CURLOPT_URL, uwsgi_alarm_curl_url},
-#ifdef CURLPROTO_SMTP
-	{"mail_to", CURLOPT_MAIL_RCPT, uwsgi_alarm_curl_to},
+	{"url", CURLOPT_URL, NULL},
+#ifdef CURLOPT_MAIL_RCPT
+	{"mail_to", CURLOPT_MAIL_RCPT, uwsgi_alarm_curl_to },
+#endif
+#ifdef CURLOPT_MAIL_FROM
 	{"mail_from", CURLOPT_MAIL_FROM, NULL},
 #endif
 	{"subject", 0, uwsgi_alarm_curl_set_subject},
 	{"ssl", CURLOPT_USE_SSL, uwsgi_alarm_curl_ssl},
-	{"ssl_insecure", 0, uwsgi_alarm_curl_ssl_insecure},
 	{"auth_user", CURLOPT_USERNAME, NULL},
 	{"auth_pass", CURLOPT_PASSWORD, NULL},
 	{"method", CURLOPT_CUSTOMREQUEST, NULL},
@@ -92,10 +65,14 @@ static struct uwsgi_alarm_curl_opt uaco[] = {
 static void uwsgi_alarm_curl_setopt(CURL *curl, char *opt, struct uwsgi_alarm_curl_config *uacc) {
 	struct uwsgi_alarm_curl_opt *o = uaco;
 	char *equal = strchr(opt,'=');
-	if (!equal && !uacc->url) {
-		uwsgi_alarm_curl_url(curl, CURLOPT_URL, opt, uacc);
+	if (!equal) {
+		if (!uacc->first) {
+			curl_easy_setopt(curl, CURLOPT_URL, opt);
+			uacc->first = 1;
+		}
 		return;
 	}
+	uacc->first = 1;
 	*equal = 0;
 	while(o->name) {
 		if (!strcmp(o->name, opt)) {
@@ -105,137 +82,91 @@ static void uwsgi_alarm_curl_setopt(CURL *curl, char *opt, struct uwsgi_alarm_cu
 			else {
 				curl_easy_setopt(curl, o->option, equal+1);
 			}
-			break;
+			goto end;
 		}
 		o++;
 	}
+end:
+	*equal = '=';
 }
 
 static size_t uwsgi_alarm_curl_read_callback(void *ptr, size_t size, size_t nmemb, void *userp) {
-	struct uwsgi_alarm_curl *uac = userp;
+	struct uwsgi_thread *ut = (struct uwsgi_thread *) userp;
 	size_t full_size = size * nmemb;
-	int remains = full_size;
+	size_t remains = ut->len - ut->pos;
+	struct uwsgi_alarm_curl_config *uacc = ut->data;
 
-	if (uac->pos < uac->hlen) {
-		if (remains > uac->hlen - uac->pos) {
-			memcpy(ptr, uac->hdr + uac->pos, uac->hlen - uac->pos);
-			ptr += uac->hlen - uac->pos;
-			remains -= uac->hlen - uac->pos;
-			uac->pos = uac->hlen;
-		} else {
-			memcpy(ptr, uac->hdr + uac->pos, remains);
-			uac->pos += remains;
-			return full_size;
+	if (remains == 0) return 0;
+
+	if (ut->custom0 == 0) {
+		size_t newline = 0;
+		size_t required = 1;
+		char *addr = ptr;
+		if (uacc->to) required += 4 + strlen(uacc->to) + 1;
+		if (uacc->subject) required += 9 + strlen(uacc->subject) + 1;
+		if (required > full_size) goto skip;
+
+
+		if (uacc->to) {
+			memcpy(addr, "To: ", 4); addr+=4;
+			memcpy(addr, uacc->to, strlen(uacc->to)); addr += strlen(uacc->to);
+			*addr ++= '\n';
+			newline = 1;
 		}
+
+		if (uacc->subject) {
+			memcpy(addr, "Subject: ", 9); addr+=9;
+			memcpy(addr, uacc->subject, strlen(uacc->subject)); addr += strlen(uacc->subject);
+			*addr ++= '\n';
+			newline = 1;
+		}
+skip:
+		if (newline > 0) {
+			*addr = '\n';
+		}
+		ut->custom0 = 1;
+		return required;
 	}
 
-	if (remains > uac->blen + uac->hlen - uac->pos) {
-		memcpy(ptr, uac->body + uac->pos - uac->hlen, uac->blen + uac->hlen - uac->pos);
-		remains -= uac->blen + uac->hlen - uac->pos;
-		uac->pos = uac->blen + uac->hlen;
-		return full_size - remains;
+	if (full_size < remains) {
+		remains = full_size;
 	}
 
-	memcpy(ptr, uac->body + uac->pos - uac->hlen, remains);
-	uac->pos += remains;
-	return full_size;
+	memcpy(ptr, ut->buf + ut->pos, remains);
+	ut->pos += remains;
+
+	return remains;	
 }
 
-static struct uwsgi_alarm_curl *uwsgi_alarm_curl_alloc(struct uwsgi_alarm_curl_config *uacc)
-{
-	char *addr;
-	struct uwsgi_alarm_curl *uac;
-	size_t required = 0;
+static void uwsgi_alarm_curl_loop(struct uwsgi_thread *ut) {
+	int interesting_fd;
+	ut->buf = uwsgi_malloc(uwsgi.log_master_bufsize);
 
-	if (uacc->to) required += 4 + strlen(uacc->to) + 2;
-	if (uacc->subject) required += 9 + strlen(uacc->subject) + 2;
-	if (required)
-		required += 2;	/* newline between MIME header and body */
-
-	uac = uwsgi_malloc(sizeof(*uac) + required);
-	uac->hlen = required;
-	addr = uac->hdr;
-
-	if (uacc->to) {
-		memcpy(addr, "To: ", 4); addr += 4;
-		memcpy(addr, uacc->to, strlen(uacc->to)); addr += strlen(uacc->to);
-		*addr++ = '\r';
-		*addr++ = '\n';
-	}
-
-	if (uacc->subject) {
-		memcpy(addr, "Subject: ", 9); addr += 9;
-		memcpy(addr, uacc->subject, strlen(uacc->subject)); addr += strlen(uacc->subject);
-		*addr++ = '\r';
-		*addr++ = '\n';
-	}
-
-	if (required) {
-		*addr++ = '\r';
-		*addr = '\n';
-	}
-
-	return uac;
-}
-
-static struct uwsgi_alarm_curl *uwsgi_alarm_curl_init_curl(struct uwsgi_alarm_instance *uai) {
 	CURL *curl = curl_easy_init();
-	if (!curl) {
-		uwsgi_error("Failed to initialize libcurl.\n");
-		exit(1);
-	}
+	// ARGH !!!
+	if (!curl) return;
 
-	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, uwsgi.socket_timeout);
-	curl_easy_setopt(curl, CURLOPT_TIMEOUT, uwsgi.socket_timeout);
+	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+	curl_easy_setopt(curl, CURLOPT_TIMEOUT, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 	curl_easy_setopt(curl, CURLOPT_READFUNCTION, uwsgi_alarm_curl_read_callback);
+	curl_easy_setopt(curl, CURLOPT_READDATA, ut);
 	curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 	curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	struct curl_slist *expect = NULL; expect = curl_slist_append(expect, "Expect:");
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, expect);
 	curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
 
-	struct uwsgi_alarm_curl_config uacc;
-	memset(&uacc, 0, sizeof(uacc));
-	char *opts = uwsgi_str(uai->arg);
+	struct uwsgi_alarm_curl_config *uacc = (struct uwsgi_alarm_curl_config *) ut->data;
+	char *opts = uwsgi_str(uacc->arg);
 
 	// fill curl options
 	char *ctx = NULL;
 	char *p = strtok_r(opts, ";", &ctx);
 	while(p) {
-		uwsgi_alarm_curl_setopt(curl, p, &uacc);
+		uwsgi_alarm_curl_setopt(curl, uwsgi_str(p), uacc);
 		p = strtok_r(NULL, ";", &ctx);
 	}
 
-	if (!uacc.url) {
-		uwsgi_error("An URL is required to trigger curl-based alarm.\n");
-		exit(1);
-	}
-
-	struct uwsgi_alarm_curl *uac = uwsgi_alarm_curl_alloc(&uacc);
-	curl_easy_setopt(curl, CURLOPT_READDATA, uac);
-	free(opts);
-	uac->curl = curl;
-	uai->data_ptr = uac;
-
-	return uac;
-}
-
-static void uwsgi_alarm_curl_call_curl(struct uwsgi_alarm_curl *uac, char *msg, int len)
-{
-	uac->pos = 0;
-	uac->body = msg;
-	uac->blen = len;
-	curl_easy_setopt(uac->curl, CURLOPT_INFILESIZE, uac->hlen + uac->blen);
-	CURLcode res = curl_easy_perform(uac->curl);
-	if (res != CURLE_OK)
-		uwsgi_log_alarm("-curl] curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
-}
-
-static void uwsgi_alarm_curl_loop(struct uwsgi_thread *ut) {
-	int interesting_fd;
-	struct uwsgi_alarm_curl *uac = uwsgi_alarm_curl_init_curl(ut->data);
-	uac->ut = ut;
-	ut->buf = uwsgi_malloc(uwsgi.log_master_bufsize);
 	for(;;) {
 		int ret = event_queue_wait(ut->queue, -1, &interesting_fd);	
 		if (ret < 0) return;
@@ -243,26 +174,31 @@ static void uwsgi_alarm_curl_loop(struct uwsgi_thread *ut) {
 		if (interesting_fd != ut->pipe[1]) continue;
 		ssize_t rlen = read(ut->pipe[1], ut->buf, uwsgi.log_master_bufsize);
 		if (rlen <= 0) continue;
-		uwsgi_alarm_curl_call_curl(uac, ut->buf, rlen);
+		ut->pos = 0;
+		ut->len = (size_t) rlen;
+		ut->custom0 = 0;
+		curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t) ut->len);
+		CURLcode res = curl_easy_perform(curl);
+		if (res != CURLE_OK) {
+			uwsgi_log_alarm("-curl] curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+		}
+		
 	}
 }
 
 static void uwsgi_alarm_curl_init(struct uwsgi_alarm_instance *uai) {
-	if (uwsgi.alarm_cheap)
-		uwsgi_alarm_curl_init_curl(uai);
-	else
-		uwsgi_thread_new_with_data(uwsgi_alarm_curl_loop, uai);
+	struct uwsgi_thread *ut = uwsgi_thread_new(uwsgi_alarm_curl_loop);
+	if (!ut) return;
+	uai->data_ptr = ut;
+	struct uwsgi_alarm_curl_config *uacc = uwsgi_calloc(sizeof(struct uwsgi_alarm_curl_config));
+	uacc->arg = uai->arg;
+	ut->data = uacc;
 }
 
 // pipe the message into the thread;
 static void uwsgi_alarm_curl_func(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
-	struct uwsgi_alarm_curl *uac = uai->data_ptr;
-	if (uwsgi.alarm_cheap)
-		uwsgi_alarm_curl_call_curl(uac, msg, len);
-	else {
-		struct uwsgi_thread *ut = uac->ut;
-		ut->rlen = write(ut->pipe[0], msg, len);
-	}
+	struct uwsgi_thread *ut = (struct uwsgi_thread *) uai->data_ptr;
+	ut->rlen = write(ut->pipe[0], msg, len);
 }
 
 static void uwsgi_alarm_curl_load(void) {

plugins/alarm_xmpp/alarm_xmpp_plugin.c

@@ -4,9 +4,10 @@ void uwsgi_alarm_xmpp_loop(struct uwsgi_thread *);
 
 static void uwsgi_alarm_xmpp_init(struct uwsgi_alarm_instance *uai) {
 
-	struct uwsgi_thread *ut = uwsgi_thread_new_with_data(uwsgi_alarm_xmpp_loop, uai->arg);
+	struct uwsgi_thread *ut = uwsgi_thread_new(uwsgi_alarm_xmpp_loop);
 	if (!ut) return;
 	uai->data_ptr = ut;
+	ut->data = uai->arg;
 }
 
 // pipe the message into the thread;

plugins/asyncio/asyncio.c

@@ -1,387 +0,0 @@
-#include "../python/uwsgi_python.h"
-
-/*
-
-	python >= 3.4 asyncio (PEP 3156) loop engine
-
-	EXPERIMENTAL !!!
-
-	Author: Roberto De Ioris
-
-*/
-
-extern struct uwsgi_server uwsgi;
-extern struct uwsgi_python up;
-
-static struct uwsgi_asyncio {
-	PyObject *mod;
-	PyObject *loop;
-	PyObject *request;
-	PyObject *hook_fd;
-	PyObject *hook_timeout;
-	PyObject *hook_fix;
-} uasyncio;
-
-#define free_req_queue uwsgi.async_queue_unused_ptr++; uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = wsgi_req
-
-static void uwsgi_opt_setup_asyncio(char *opt, char *value, void *null) {
-
-	// set async mode
-	uwsgi_opt_set_int(opt, value, &uwsgi.async);
-	if (uwsgi.socket_timeout < 30) {
-		uwsgi.socket_timeout = 30;
-	}
-	// set loop engine
-	uwsgi.loop = "asyncio";
-
-}
-
-static struct uwsgi_option asyncio_options[] = {
-        {"asyncio", required_argument, 0, "a shortcut enabling asyncio loop engine with the specified number of async cores and optimal parameters", uwsgi_opt_setup_asyncio, NULL, UWSGI_OPT_THREADS},
-        {0, 0, 0, 0, 0, 0, 0},
-
-};
-
-static void gil_asyncio_get() {
-	pthread_setspecific(up.upt_gil_key, (void *) PyGILState_Ensure());
-}
-
-static void gil_asyncio_release() {
-	PyGILState_Release((PyGILState_STATE) pthread_getspecific(up.upt_gil_key));
-}
-
-static int uwsgi_asyncio_wait_read_hook(int fd, int timeout) {
-
-	struct wsgi_request *wsgi_req = current_wsgi_req();
-
-	if (PyObject_CallMethod(uasyncio.loop, "add_reader", "iOl", fd, uasyncio.hook_fd,(long) wsgi_req) == NULL) {
-		goto error;
-	}
-
-	PyObject *ob_timeout = PyObject_CallMethod(uasyncio.loop, "call_later", "iOl", timeout, uasyncio.hook_timeout, (long)wsgi_req);
-	if (!ob_timeout) {
-		if (PyObject_CallMethod(uasyncio.loop, "remove_reader", "i", fd) == NULL) PyErr_Print();
-		goto error;
-	}
-	// back to loop
-	if (uwsgi.schedule_to_main) uwsgi.schedule_to_main(wsgi_req);
-	// back from loop
-
-	if (PyObject_CallMethod(uasyncio.loop, "remove_reader", "i", fd) == NULL) PyErr_Print();
-	if (PyObject_CallMethod(ob_timeout, "cancel", NULL) == NULL) PyErr_Print();
-
-	Py_DECREF(ob_timeout);
-
-	if (wsgi_req->async_timed_out) return 0;
-
-        return 1;
-
-error:
-	PyErr_Print();
-	return -1;
-}
-
-static int uwsgi_asyncio_wait_write_hook(int fd, int timeout) {
-
-        struct wsgi_request *wsgi_req = current_wsgi_req();
-
-        if (PyObject_CallMethod(uasyncio.loop, "add_writer", "iOl", fd, uasyncio.hook_fd,(long) wsgi_req) == NULL) {
-                goto error;
-        }
-
-        PyObject *ob_timeout = PyObject_CallMethod(uasyncio.loop, "call_later", "iOl", timeout, uasyncio.hook_timeout, (long)wsgi_req);
-        if (!ob_timeout) {
-		if (PyObject_CallMethod(uasyncio.loop, "remove_writer", "i", fd) == NULL) PyErr_Print();
-                goto error;
-        }
-        // back to loop
-        if (uwsgi.schedule_to_main) {
-		uwsgi.schedule_to_main(wsgi_req);
-	}
-        // back from loop
-
-        if (PyObject_CallMethod(uasyncio.loop, "remove_writer", "i", fd) == NULL) PyErr_Print();
-	if (PyObject_CallMethod(ob_timeout, "cancel", NULL) == NULL) PyErr_Print();
-
-        Py_DECREF(ob_timeout);
-
-        if (wsgi_req->async_timed_out) return 0;
-
-        return 1;
-
-error:
-        PyErr_Print();
-        return -1;
-}
-
-static PyObject *py_uwsgi_asyncio_request(PyObject *self, PyObject *args) {
-        long wsgi_req_ptr = 0;
-	int timed_out = 0;
-        if (!PyArg_ParseTuple(args, "l|i:uwsgi_asyncio_request", &wsgi_req_ptr, &timed_out)) {
-		uwsgi_log_verbose("[BUG] invalid arguments for asyncio callback !!!\n");
-		exit(1);
-        }
-
-        struct wsgi_request *wsgi_req = (struct wsgi_request *) wsgi_req_ptr;
-	uwsgi.wsgi_req = wsgi_req;
-
-	PyObject *ob_timeout = (PyObject *) wsgi_req->async_timeout;
-	if (PyObject_CallMethod(ob_timeout, "cancel", NULL) == NULL) PyErr_Print();
-	Py_DECREF(ob_timeout);
-	// avoid mess when closing the request
-	wsgi_req->async_timeout = NULL;
-
-	if (timed_out > 0) {
-		if (PyObject_CallMethod(uasyncio.loop, "remove_reader", "i", wsgi_req->fd) == NULL) PyErr_Print();
-		goto end;
-	}
-
-	int status = wsgi_req->socket->proto(wsgi_req);
-	if (status > 0) {
-		ob_timeout = PyObject_CallMethod(uasyncio.loop, "call_later", "iOli", uwsgi.socket_timeout, uasyncio.request, wsgi_req_ptr, 1);
-        	if (!ob_timeout) {
-                	if (PyObject_CallMethod(uasyncio.loop, "remove_reader", "i", wsgi_req->fd) == NULL) PyErr_Print();
-			goto end;
-        	}
-                // trick for reference counting
-                wsgi_req->async_timeout = (struct uwsgi_rb_timer *) ob_timeout;
-		goto again;
-	}
-
-	if (PyObject_CallMethod(uasyncio.loop, "remove_reader", "i", wsgi_req->fd) == NULL) {
-		PyErr_Print();
-		goto end;
-	}
-
-	if (status == 0) {
-		// we call this two time... overengineering :(
-		uwsgi.async_proto_fd_table[wsgi_req->fd] = NULL;
-		uwsgi.schedule_to_req();
-		goto again;
-	}
-
-end:
-	uwsgi.async_proto_fd_table[wsgi_req->fd] = NULL;
-	uwsgi_close_request(uwsgi.wsgi_req);	
-	free_req_queue;
-again:
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-
-static PyObject *py_uwsgi_asyncio_accept(PyObject *self, PyObject *args) {
-	long uwsgi_sock_ptr = 0;
-	if (!PyArg_ParseTuple(args, "l:uwsgi_asyncio_accept", &uwsgi_sock_ptr)) {
-                return NULL;
-        }
-
-	struct wsgi_request *wsgi_req = find_first_available_wsgi_req();
-
-        if (wsgi_req == NULL) {
-                uwsgi_async_queue_is_full(uwsgi_now());
-                goto end;
-        }
-
-	uwsgi.wsgi_req = wsgi_req;
-	struct uwsgi_socket *uwsgi_sock = (struct uwsgi_socket *) uwsgi_sock_ptr;
-
-        // fill wsgi_request structure
-        wsgi_req_setup(wsgi_req, wsgi_req->async_id, uwsgi_sock );
-
-        // mark core as used
-        uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request = 1;
-
-        // accept the connection (since uWSGI 1.5 all of the sockets are non-blocking)
-        if (wsgi_req_simple_accept(wsgi_req, uwsgi_sock->fd)) {
-                // in case of errors (or thundering herd, just reset it)
-                uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request = 0;
-                free_req_queue;
-                goto end;
-        }
-
-        wsgi_req->start_of_request = uwsgi_micros();
-        wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
-
-        // enter harakiri mode
-        if (uwsgi.harakiri_options.workers > 0) {
-                set_harakiri(uwsgi.harakiri_options.workers);
-        }
-
-	uwsgi.async_proto_fd_table[wsgi_req->fd] = wsgi_req;
-
-	// add callback for protocol
-	if (PyObject_CallMethod(uasyncio.loop, "add_reader", "iOl", wsgi_req->fd, uasyncio.request, (long) wsgi_req) == NULL) {
-		free_req_queue;
-		PyErr_Print();
-	}
-
-	// add timeout
-	PyObject *ob_timeout = PyObject_CallMethod(uasyncio.loop, "call_later", "iOli", uwsgi.socket_timeout, uasyncio.request, (long)wsgi_req, 1);
-        if (!ob_timeout) {
-		if (PyObject_CallMethod(uasyncio.loop, "remove_reader", "i", wsgi_req->fd) == NULL) PyErr_Print();
-		free_req_queue;
-        }
-	else {
-		// trick for reference counting
-		wsgi_req->async_timeout = (struct uwsgi_rb_timer *) ob_timeout;
-	}
-end:
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-PyObject *py_uwsgi_asyncio_hook_fd(PyObject *self, PyObject *args) {
-	long wsgi_req_ptr = 0;
-        if (!PyArg_ParseTuple(args, "l:uwsgi_asyncio_hook_fd", &wsgi_req_ptr)) {
-                return NULL;
-        }
-
-	uwsgi.wsgi_req = (struct wsgi_request *) wsgi_req_ptr;
-	uwsgi.schedule_to_req();
-
-	Py_INCREF(Py_None);
-        return Py_None;
-}
-
-PyObject *py_uwsgi_asyncio_hook_timeout(PyObject *self, PyObject *args) {
-        long wsgi_req_ptr = 0;
-        if (!PyArg_ParseTuple(args, "l", &wsgi_req_ptr)) {
-                return NULL;
-        }
-
-        uwsgi.wsgi_req = (struct wsgi_request *) wsgi_req_ptr;
-	uwsgi.wsgi_req->async_timed_out = 1;
-        uwsgi.schedule_to_req();
-
-        Py_INCREF(Py_None);
-        return Py_None;
-}
-
-PyObject *py_uwsgi_asyncio_hook_fix(PyObject *self, PyObject *args) {
-        long wsgi_req_ptr = 0;
-        if (!PyArg_ParseTuple(args, "l", &wsgi_req_ptr)) {
-                return NULL;
-        }
-
-        uwsgi.wsgi_req = (struct wsgi_request *) wsgi_req_ptr;
-        uwsgi.schedule_to_req();
-
-        Py_INCREF(Py_None);
-        return Py_None;
-}
-
-
-PyMethodDef uwsgi_asyncio_accept_def[] = { {"uwsgi_asyncio_accept", py_uwsgi_asyncio_accept, METH_VARARGS, ""} };
-PyMethodDef uwsgi_asyncio_request_def[] = { {"uwsgi_asyncio_request", py_uwsgi_asyncio_request, METH_VARARGS, ""} };
-PyMethodDef uwsgi_asyncio_hook_fd_def[] = { {"uwsgi_asyncio_hook_fd", py_uwsgi_asyncio_hook_fd, METH_VARARGS, ""} };
-PyMethodDef uwsgi_asyncio_hook_timeout_def[] = { {"uwsgi_asyncio_hook_timeout", py_uwsgi_asyncio_hook_timeout, METH_VARARGS, ""} };
-PyMethodDef uwsgi_asyncio_hook_fix_def[] = { {"uwsgi_asyncio_hook_fix", py_uwsgi_asyncio_hook_fix, METH_VARARGS, ""} };
-
-static void uwsgi_asyncio_schedule_fix(struct wsgi_request *wsgi_req) {
-        PyObject *cb = PyObject_CallMethod(uasyncio.loop, "call_soon", "Ol", uasyncio.hook_fix, (long) wsgi_req);
-	if (!cb) goto error;
-	Py_DECREF(cb);
-        return; 
-
-error:
-        PyErr_Print();
-} 
-
-static void asyncio_loop() {
-
-	if (!uwsgi.has_threads && uwsgi.mywid == 1) {
-		uwsgi_log("!!! Running asyncio without threads IS NOT recommended, enable them with --enable-threads !!!\n");
-	}
-
-	if (uwsgi.socket_timeout < 30) {
-		uwsgi_log("!!! Running asyncio with a socket-timeout lower than 30 seconds is not recommended, tune it with --socket-timeout !!!\n");
-	}
-
-	if (!uwsgi.async_waiting_fd_table)
-		uwsgi.async_waiting_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd);
-	if (!uwsgi.async_proto_fd_table)
-        	uwsgi.async_proto_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd);
-
-	// get the GIL
-	UWSGI_GET_GIL
-
-	up.gil_get = gil_asyncio_get;
-	up.gil_release = gil_asyncio_release;
-
-	uwsgi.wait_write_hook = uwsgi_asyncio_wait_write_hook;
-	uwsgi.wait_read_hook = uwsgi_asyncio_wait_read_hook;
-
-	if (uwsgi.async < 2) {
-		uwsgi_log("the asyncio loop engine requires async mode (--async <n>)\n");
-		exit(1);
-	}
-
-	if (!uwsgi.schedule_to_main) {
-                uwsgi_log("*** DANGER *** asyncio mode without coroutine/greenthread engine loaded !!!\n");
-        }
-
-	if (!uwsgi.schedule_to_req) {
-		uwsgi.schedule_to_req = async_schedule_to_req_green;
-	}
-	else {
-		uwsgi.schedule_fix = uwsgi_asyncio_schedule_fix;
-	}
-
-#ifndef PYTHREE
-	PyObject *asyncio = PyImport_ImportModule("trollius");
-#else
-	PyObject *asyncio = PyImport_ImportModule("asyncio");
-#endif
-	if (!asyncio) uwsgi_pyexit;
-
-	uasyncio.mod = asyncio;
-
-	uasyncio.loop = PyObject_CallMethod(asyncio, "get_event_loop", NULL);
-	if (!uasyncio.loop) uwsgi_pyexit;
-
-	 // main greenlet waiting for connection (one greenlet per-socket)
-        PyObject *asyncio_accept = PyCFunction_New(uwsgi_asyncio_accept_def, NULL);
-	Py_INCREF(asyncio_accept);
-
-	uasyncio.request = PyCFunction_New(uwsgi_asyncio_request_def, NULL);
-	if (!uasyncio.request) uwsgi_pyexit;
-
-	uasyncio.hook_fd = PyCFunction_New(uwsgi_asyncio_hook_fd_def, NULL);
-	if (!uasyncio.hook_fd) uwsgi_pyexit;
-	uasyncio.hook_timeout = PyCFunction_New(uwsgi_asyncio_hook_timeout_def, NULL);
-	if (!uasyncio.hook_timeout) uwsgi_pyexit;
-	uasyncio.hook_fix = PyCFunction_New(uwsgi_asyncio_hook_fix_def, NULL);
-	if (!uasyncio.hook_fix) uwsgi_pyexit;
-
-	Py_INCREF(uasyncio.request);
-	Py_INCREF(uasyncio.hook_fd);
-	Py_INCREF(uasyncio.hook_timeout);
-	Py_INCREF(uasyncio.hook_fix);
-
-	// call add_handler on each socket
-	struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
-	while(uwsgi_sock) {
-		if (PyObject_CallMethod(uasyncio.loop, "add_reader", "iOl", uwsgi_sock->fd, asyncio_accept, (long) uwsgi_sock) == NULL) {
-			uwsgi_pyexit;
-		}
-		uwsgi_sock = uwsgi_sock->next;
-	}	
-
-	if (PyObject_CallMethod(uasyncio.loop, "run_forever", NULL) == NULL) {
-		uwsgi_pyexit;
-	}
-
-	// never here ?
-}
-
-static void asyncio_init() {
-	uwsgi_register_loop( (char *) "asyncio", asyncio_loop);
-}
-
-
-struct uwsgi_plugin asyncio_plugin = {
-	.name = "asyncio",
-	.options = asyncio_options,
-	.on_load = asyncio_init,
-};

plugins/asyncio/uwsgiplugin.py

@@ -1,8 +0,0 @@
-from distutils import sysconfig
-
-NAME='asyncio'
-CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True)]
-LDFLAGS = []
-LIBS = []
-
-GCC_LIST = ['asyncio']

plugins/carbon/carbon.c

@@ -26,6 +26,9 @@ struct uwsgi_carbon {
 	unsigned long long *last_busyness_values;
 	unsigned long long *current_busyness_values;
 	int *was_busy;
+	int need_retry;
+	time_t last_update;
+	time_t next_retry;
 	int max_retries;
 	int retry_delay;
 	char *root_node;
@@ -37,7 +40,6 @@ struct uwsgi_carbon {
 	int zero_avg;
 	uint64_t last_requests;
 	struct uwsgi_stats_pusher *pusher;
-	int use_metrics;
 } u_carbon;
 
 static struct uwsgi_option carbon_options[] = {
@@ -53,7 +55,6 @@ static struct uwsgi_option carbon_options[] = {
 	{"carbon-name-resolve", no_argument, 0, "allow using hostname as carbon server address (default disabled)", uwsgi_opt_true, &u_carbon.resolve_hostname, 0},
 	{"carbon-resolve-names", no_argument, 0, "allow using hostname as carbon server address (default disabled)", uwsgi_opt_true, &u_carbon.resolve_hostname, 0},
 	{"carbon-idle-avg", required_argument, 0, "average values source during idle period (no requests), can be \"last\", \"zero\", \"none\" (default is last)", uwsgi_opt_set_str, &u_carbon.idle_avg, 0},
-	{"carbon-use-metrics", no_argument, 0, "don't compute all statistics, use metrics subsystem data instead (warning! key names will be different)", uwsgi_opt_true, &u_carbon.use_metrics, 0},
 	{0, 0, 0, 0, 0, 0, 0},
 
 };
@@ -71,9 +72,7 @@ static void carbon_post_init() {
 		u_server->errors = 0;
 
 		char *p, *ctx = NULL;
-		// make a copy to not clobber argv
-		char *tmp = uwsgi_str(usl->value);
-		uwsgi_foreach_token(tmp, ":", p, ctx) {
+		uwsgi_foreach_token(usl->value, ":", p, ctx) {
 			if (!u_server->hostname) {
 				u_server->hostname = uwsgi_str(p);
 			}
@@ -83,7 +82,6 @@ static void carbon_post_init() {
 			else
 				break;
 		}
-		free(tmp);
 		if (!u_server->hostname || !u_server->port) {
 			uwsgi_log("[carbon] invalid carbon server address (%s)\n", usl->value);
 			usl = usl->next;
@@ -110,7 +108,7 @@ static void carbon_post_init() {
 
 	if (u_carbon.freq < 1) u_carbon.freq = 60;
 	if (u_carbon.timeout < 1) u_carbon.timeout = 3;
-	if (u_carbon.max_retries < 0) u_carbon.max_retries = 0;
+	if (u_carbon.max_retries <= 0) u_carbon.max_retries = 1;
 	if (u_carbon.retry_delay <= 0) u_carbon.retry_delay = 7;
 	if (!u_carbon.id) {
 		u_carbon.id = uwsgi_str(uwsgi.sockets->name);
@@ -155,13 +153,14 @@ static void carbon_post_init() {
 		u_carbon.was_busy = uwsgi_calloc(sizeof(int) * uwsgi.numproc);
 	}
 
+	// set next update to now()+retry_delay, this way we will have first flush just after start
+	u_carbon.last_update = uwsgi_now() - u_carbon.freq + u_carbon.retry_delay;
+
 	uwsgi_log("[carbon] carbon plugin started, %is frequency, %is timeout, max retries %i, retry delay %is\n",
 		u_carbon.freq, u_carbon.timeout, u_carbon.max_retries, u_carbon.retry_delay);
 
 	struct uwsgi_stats_pusher_instance *uspi = uwsgi_stats_pusher_add(u_carbon.pusher, NULL);
 	uspi->freq = u_carbon.freq;
-	uspi->retry_delay = u_carbon.retry_delay;
-	uspi->max_retries = u_carbon.max_retries;
 	// no need to generate the json
 	uspi->raw=1;
 }
@@ -186,23 +185,22 @@ static int carbon_write(int fd, char *fmt,...) {
 	return 1;
 }
 
-static int carbon_push_stats(int retry_cycle, time_t now) {
+static void carbon_push_stats(int retry_cycle, time_t now) {
 	struct carbon_server_list *usl = u_carbon.servers_data;
-	if (!u_carbon.servers_data) return 0;
+	if (!u_carbon.servers_data) return;
 	int i;
 	int fd;
 	int wok;
 	char *ip;
 	char *carbon_address = NULL;
-	int needs_retry;
 
 	for (i = 0; i < uwsgi.numproc; i++) {
 		u_carbon.current_busyness_values[i] = uwsgi.workers[i+1].running_time - u_carbon.last_busyness_values[i];
 		u_carbon.last_busyness_values[i] = uwsgi.workers[i+1].running_time;
-		u_carbon.was_busy[i] += uwsgi_worker_is_busy(i+1);
+		u_carbon.was_busy[i-1] += uwsgi_worker_is_busy(i+1);
 	}
 
-	needs_retry = 0;
+	u_carbon.need_retry = 0;
 	while(usl) {
 		if (retry_cycle && usl->healthy)
 			// skip healthy servers during retry cycle
@@ -230,7 +228,15 @@ static int carbon_push_stats(int retry_cycle, time_t now) {
 		fd = uwsgi_connect(carbon_address, u_carbon.timeout, 0);
 		if (fd < 0) {
 			uwsgi_log("[carbon] Could not connect to carbon server at %s\n", carbon_address);
-			needs_retry = 1;
+			if (usl->errors < u_carbon.max_retries) {
+				u_carbon.need_retry = 1;
+				u_carbon.next_retry = uwsgi_now() + u_carbon.retry_delay;
+			} else {
+				uwsgi_log("[carbon] Maximum number of retries for %s (%d)\n",
+					carbon_address, u_carbon.max_retries);
+				usl->healthy = 0;
+				usl->errors = 0;
+			}
 			usl->healthy = 0;
 			usl->errors++;
 			free(carbon_address);
@@ -240,8 +246,6 @@ static int carbon_push_stats(int retry_cycle, time_t now) {
 		// put the socket in non-blocking mode
 		uwsgi_socket_nb(fd);
 
-		if (u_carbon.use_metrics) goto metrics_loop;
-
 		unsigned long long total_rss = 0;
 		unsigned long long total_vsz = 0;
 		unsigned long long total_tx = 0;
@@ -284,7 +288,7 @@ static int carbon_push_stats(int retry_cycle, time_t now) {
 				total_busyness += worker_busyness;
 				u_carbon.was_busy[i-1] = 0;
 
-				if (uwsgi.logging_options.memory_report == 1 || uwsgi.force_get_memusage) {
+				if (uwsgi.shared->options[UWSGI_OPTION_MEMORY_DEBUG] == 1 || uwsgi.force_get_memusage) {
 					// only running workers are counted in total memory stats and if memory-report option is enabled
 					total_rss += uwsgi.workers[i].rss_size;
 					total_vsz += uwsgi.workers[i].vsz_size;
@@ -297,7 +301,7 @@ static int carbon_push_stats(int retry_cycle, time_t now) {
 			wok = carbon_write(fd, "%s%s.%s.worker%d.requests %llu %llu\n", u_carbon.root_node, u_carbon.hostname, u_carbon.id, i, (unsigned long long) uwsgi.workers[i].requests, (unsigned long long) now);
 			if (!wok) goto clear;
 
-			if (uwsgi.logging_options.memory_report == 1 || uwsgi.force_get_memusage) {
+			if (uwsgi.shared->options[UWSGI_OPTION_MEMORY_DEBUG] == 1 || uwsgi.force_get_memusage) {
 				wok = carbon_write(fd, "%s%s.%s.worker%d.rss_size %llu %llu\n", u_carbon.root_node, u_carbon.hostname, u_carbon.id, i, (unsigned long long) uwsgi.workers[i].rss_size, (unsigned long long) now);
 				if (!wok) goto clear;
 
@@ -330,7 +334,7 @@ static int carbon_push_stats(int retry_cycle, time_t now) {
 
 		}
 
-		if (uwsgi.logging_options.memory_report == 1 || uwsgi.force_get_memusage) {
+		if (uwsgi.shared->options[UWSGI_OPTION_MEMORY_DEBUG] == 1 || uwsgi.force_get_memusage) {
 			wok = carbon_write(fd, "%s%s.%s.rss_size %llu %llu\n", u_carbon.root_node, u_carbon.hostname, u_carbon.id, (unsigned long long) total_rss, (unsigned long long) now);
 			if (!wok) goto clear;
 
@@ -376,23 +380,6 @@ static int carbon_push_stats(int retry_cycle, time_t now) {
 		wok = carbon_write(fd, "%s%s.%s.harakiri %llu %llu\n", u_carbon.root_node, u_carbon.hostname, u_carbon.id, (unsigned long long) total_harakiri, (unsigned long long) now);
 		if (!wok) goto clear;
 
-metrics_loop:
-		if (u_carbon.use_metrics) {
-			struct uwsgi_metric *um = uwsgi.metrics;
-			while(um) {
-				uwsgi_rlock(uwsgi.metrics_lock);
-				wok = carbon_write(fd, "%s%s.%s.%.*s %llu %llu\n", u_carbon.root_node, u_carbon.hostname, u_carbon.id, um->name_len, um->name, (unsigned long long) *um->value, (unsigned long long) now);
-				uwsgi_rwunlock(uwsgi.metrics_lock);
-				if (um->reset_after_push){
-					uwsgi_wlock(uwsgi.metrics_lock);
-					*um->value = um->initial_value;
-					uwsgi_rwunlock(uwsgi.metrics_lock);
-				}
-				if (!wok) goto clear;
-				um = um->next;
-			}
-		}
-
 		usl->healthy = 1;
 		usl->errors = 0;
 
@@ -403,12 +390,23 @@ clear:
 nxt:
 		usl = usl->next;
 	}
-
-	return needs_retry;
+	if (!retry_cycle) u_carbon.last_update = uwsgi_now();
+	if (u_carbon.need_retry)
+		// timeouts and retries might cause additional lags in carbon cycles, we will adjust timer to fix that
+		u_carbon.last_update -= u_carbon.timeout;
 }
 
 static void carbon_push(struct uwsgi_stats_pusher_instance *uspi, time_t now, char *json, size_t json_len) {
-	uspi->needs_retry = carbon_push_stats(uspi->retries, now);
+
+	if (u_carbon.need_retry && now >= u_carbon.next_retry) {
+		carbon_push_stats(1, now);
+	}
+	else {
+		// update
+		u_carbon.need_retry = 0;
+		carbon_push_stats(0, now);
+
+	}
 }
 
 static void carbon_cleanup() {

plugins/cgi/cgi_plugin.c

@@ -2,8 +2,6 @@
 
 extern struct uwsgi_server uwsgi;
 
-#define kill_on_error if (!uc.do_not_kill_on_error) { if (kill(cgi_pid, SIGKILL)) uwsgi_error("kill()");}
-
 struct uwsgi_cgi {
 	struct uwsgi_dyn_dict *mountpoint;
 	struct uwsgi_dyn_dict *helpers;
@@ -18,8 +16,6 @@ struct uwsgi_cgi {
 	int has_mountpoints;
 	struct uwsgi_dyn_dict *default_cgi;
 	int path_info;
-	int do_not_kill_on_error;
-	int async_max_attempts;
 } uc ;
 
 static void uwsgi_opt_add_cgi(char *opt, char *value, void *foobar) {
@@ -66,9 +62,6 @@ struct uwsgi_option uwsgi_cgi_options[] = {
 
         {"cgi-path-info", no_argument, 0, "disable PATH_INFO management in cgi scripts", uwsgi_opt_true, &uc.path_info, 0},
 
-        {"cgi-do-not-kill-on-error", no_argument, 0, "do not send SIGKILL to cgi script on errors", uwsgi_opt_true, &uc.do_not_kill_on_error, 0},
-        {"cgi-async-max-attempts", no_argument, 0, "max waitpid() attempts in cgi async mode (default 10)", uwsgi_opt_set_int, &uc.async_max_attempts, 0},
-
         {0, 0, 0, 0, 0, 0, 0},
 
 };
@@ -186,154 +179,78 @@ static char *uwsgi_cgi_get_helper(char *filename) {
 	
 }
 
-/*
-start reading each line until Status or Location are found
--1 error
-0 not found
-1 found
-*/
-static int uwsgi_cgi_check_status(struct wsgi_request *wsgi_req, char *buf, size_t len) {
+static int uwsgi_cgi_parse(struct wsgi_request *wsgi_req, char *buf, size_t len) {
+
+	size_t i;
 	char *key = buf, *value = NULL;
 	size_t header_size = 0;
-	size_t i;
+	int status_sent = 0;
 
 	for(i=0;i<len;i++) {
-       		// end of a line
-                if (buf[i] == '\n') {
-                	// end of headers
-                        if (key == NULL) {
-                        	// Default status
-#ifdef UWSGI_DEBUG
-				uwsgi_log("setting default Status header\n");
-#endif
-				if (uwsgi_response_prepare_headers(wsgi_req, "200 OK", 6)) return -1;
-				return 1;
+		// end of a line
+		if (buf[i] == '\n') {
+			// end of headers
+			if (key == NULL) {
+				i++;
+				goto send_body;
 			}
-                        // invalid header
-                        else if (value == NULL) return -1;
-                        header_size = (buf+i) - key;
-                        // security check
-                        if (buf+i > buf) {
-				// remove \r
-                        	if ((buf[i-1]) == '\r') {
-                                	header_size--;
-                                }
-                        }
-
-			// enough space for Status ?
-                        if (header_size >= 11) {
-                        	// "Status: NNN"
-                                if (!strncasecmp("Status: ", key, 8)) {
-#ifdef UWSGI_DEBUG
-                                	uwsgi_log("found Status header: %.*s\n", header_size, key);
-#endif
-                                        if (uwsgi_response_prepare_headers(wsgi_req, key+8, header_size - 8)) return -1;
-					return 1;
-                                }
-                                // Location: X
-                                if (!strncasecmp("Location: ", key, 10)) {
-#ifdef UWSGI_DEBUG
-                                	uwsgi_log("found Location header: %.*s\n", header_size, key);
-#endif
-                                        if (uwsgi_response_prepare_headers(wsgi_req, "302 Found", 9)) return -1;
-					return 1;
-                                }
+			// invalid header
+			else if (value == NULL) {
+				return -1;	
+			}
+			header_size = (buf+i) - key;
+			// security check
+			if (buf+i > buf) {
+				if ((buf[i-1]) == '\r') {
+					header_size--;
+				}
 			}
 
-                        key = NULL;
-                        value = NULL;
-		}
-                else if (buf[i] == ':') {
-			value = buf+i;
-                }
-                else if (buf[i] != '\r') {
-                	if (key == NULL) key = buf + i;
-                }
-
-	}
-
-	// no Status/Location found
-	return 0;
-
-}
-
-static int uwsgi_cgi_parse(struct wsgi_request *wsgi_req, int fd, char *buf, size_t blen) {
-
-	size_t i;
-	size_t header_size = 0;
-	int status_sent = 0;
-	size_t remains = blen;
-	char *ptr = buf;
-	size_t len = 0;
-
-	while(remains > 0) {
-		ssize_t rlen = uwsgi_read_true_nb(fd, ptr, remains, uc.timeout);
-		if (rlen < 0) {
-			if (!errno) return 1;
-			return -1;
-		}
-		// timed out
-		if (rlen == 0) return -1;
-		remains -= rlen;
-		len += rlen;
-		ptr += rlen;
-
-		// Search for Status/Location headers
-		if (!status_sent) {
-			status_sent = uwsgi_cgi_check_status(wsgi_req, buf, len); 
-			if (status_sent < 0) return -1;
-			// need more data ?
-			if (status_sent == 0) continue;
-		}
-
-		// send headers
-		char *key = buf;
-		char *value = NULL;
-
-		for(i=0;i<len;i++) {
-			// end of a line
-			if (buf[i] == '\n') {
-				// end of headers
-				if (key == NULL) {
-					i++;
-					goto send_body;
-				}
-				// invalid header
-				else if (value == NULL) {
-					return -1;
-				}
-				header_size = (buf+i) - key;
-				// security check
-				if (buf+i > buf) {
-					if ((buf[i-1]) == '\r') {
-						header_size--;
-					}
-				}
-
 #ifdef UWSGI_DEBUG
-				uwsgi_log("found CGI header: %.*s\n", header_size, key);
+			uwsgi_log("found CGI header: %.*s\n", header_size, key);
 #endif
 
-				// Ignore "Status: NNN" header
+			if (status_sent == 0) {
+				// "Status: NNN"
 				if (header_size >= 11) {
 					if (!strncasecmp("Status: ", key, 8)) {
+						if (uwsgi_response_prepare_headers(wsgi_req, key+8, header_size - 8)) return -1;
+						status_sent = 1;
 						key = NULL;
 						value = NULL;
 						continue;
 					}
 				}
+			}
 
-				uwsgi_response_add_header(wsgi_req, NULL, 0, key, header_size);
-				key = NULL;
-				value = NULL;
-			}
-			else if (buf[i] == ':') {
-				value = buf+i;
-			}
-			else if (buf[i] != '\r') {
-				if (key == NULL) {
-					key = buf + i;
+			// default status
+			if (status_sent == 0) {
+
+				// Location: X
+				if (header_size >= 11) {
+					if (!strncasecmp("Location: ", key, 10)) {
+						if (uwsgi_response_prepare_headers(wsgi_req, "302 Found", 9)) return -1;
+						status_sent = 1;
+					}
 				}
+
+				if (status_sent == 0) {
+					if (uwsgi_response_prepare_headers(wsgi_req, "200 OK", 6)) return -1;
+					status_sent = 1;
+				}
+			}
+
+			uwsgi_response_add_header(wsgi_req, NULL, 0, key, header_size);
+
+			key = NULL;
+			value = NULL;
+		}
+		else if (buf[i] == ':') {
+			value = buf+i;
+		}
+		else if (buf[i] != '\r') {
+			if (key == NULL) {
+				key = buf + i;
 			}
 		}
 	}
@@ -635,6 +552,7 @@ static int uwsgi_cgi_run(struct wsgi_request *wsgi_req, char *docroot, size_t do
 	int post_pipe[2];
 	int nargs = 0;
 	int waitpid_status;
+	ssize_t len;
 	int i;
 	char **argv;
 
@@ -672,96 +590,126 @@ static int uwsgi_cgi_run(struct wsgi_request *wsgi_req, char *docroot, size_t do
 		close(cgi_pipe[1]);
 		close(post_pipe[0]);
 
-		uwsgi_socket_nb(cgi_pipe[0]);
-		uwsgi_socket_nb(post_pipe[1]);
-
 		// ok start sending post data...
 		size_t remains = wsgi_req->post_cl;
 		while(remains > 0) {
                 	ssize_t rlen = 0;
                 	char *buf = uwsgi_request_body_read(wsgi_req, 8192, &rlen);
                 	if (!buf) {
+				close(post_pipe[1]);
 				goto clear2;
                 	}
                 	if (buf == uwsgi.empty) break;
                 	// write data to the node
                 	if (uwsgi_write_true_nb(post_pipe[1], buf, rlen, uc.timeout)) {
+				close(post_pipe[1]);
 				goto clear2;
                 	}
                 	remains -= rlen;
         	}
 
+		close(post_pipe[1]);
 		// wait for data
-		char *buf = uwsgi_malloc(uc.buffer_size);
+		char *headers_buf = uwsgi_malloc(uc.buffer_size);
+		char *ptr = headers_buf;
+		remains = uc.buffer_size;
+		int completed = 0;
+		while(remains > 0) {
+			int ret = uwsgi.wait_read_hook(cgi_pipe[0], uc.timeout);
+			if (ret > 0) {
+				len = read(cgi_pipe[0], ptr, remains);
+				if (len > 0) {
+					ptr+=len;
+					remains -= len;
+				}
+				else if (len == 0) {
+					completed = 1;
+					break;
+				}
+				else {
+					uwsgi_error("read()");
+					goto clear;
+				}
+				continue;
+			}
+			else if (ret == 0) {
+				uwsgi_log("CGI timeout !!!\n");
+				goto clear;
+			}
+			break;
+		}
 
-		int completed = uwsgi_cgi_parse(wsgi_req, cgi_pipe[0], buf, uc.buffer_size);
-		if (completed < 0) {
-			uwsgi_log("invalid CGI response !!!\n");
-			kill_on_error
+		if (uwsgi_cgi_parse(wsgi_req, headers_buf, uc.buffer_size-remains)) {
+			uwsgi_log("invalid CGI output !!!\n");
 			goto clear;
 		}
 
 		while (!completed) {
-			ssize_t rlen = uwsgi_read_true_nb(cgi_pipe[0], buf, uc.buffer_size, uc.timeout);
-			if (rlen > 0) {
-				if (uwsgi_response_write_body_do(wsgi_req, buf, rlen)) {
-					kill_on_error
+			int ret = uwsgi.wait_read_hook(cgi_pipe[0], uc.timeout);
+			if (ret > 0) {
+				len = read(cgi_pipe[0], headers_buf, uc.buffer_size);
+				if (len > 0) {
+					uwsgi_response_write_body_do(wsgi_req, headers_buf, len);
+				}
+				// end of output
+				else if (len == 0) {
+					break;
+				}
+				else {
+					uwsgi_error("read()");
 					goto clear;
 				}
+				continue;
 			}
-			else if (rlen == 0) {
-				uwsgi_log("CGI timeout !!!\n");
-				kill_on_error
-				goto clear;
-			}
-			else {
-				if (errno) {
-					uwsgi_req_error("error reading CGI response\n");
-					kill_on_error
-				}
-				goto clear;
-			}
+			else if (ret == 0) {
+                                uwsgi_log("CGI timeout !!!\n");
+                                goto clear;
+                        }
+                        break;
 		}
 
 clear:
-		free(buf);
+		free(headers_buf);
 clear2:
 		close(cgi_pipe[0]);
 		close(post_pipe[1]);
 
 		// now wait for process exit/death
-		// in async mode we need a trick...
-		if (uwsgi.async > 1) {
-			pid_t diedpid = waitpid(cgi_pid, &waitpid_status, WNOHANG);
-			if (diedpid < 0) {
-                               	uwsgi_error("waitpid()");
-                        }
-			else if (diedpid == 0) {
-				// pass the pid of the cgi to async_plagued (the after request hook will clear the process)
-				wsgi_req->async_plagued = (int) cgi_pid;
-			}
-		}
-		else {
-			if (waitpid(cgi_pid, &waitpid_status, 0) < 0) {
-				uwsgi_error("waitpid()");
-			}
+		if (waitpid(cgi_pid, &waitpid_status, 0) < 0) {
+			uwsgi_error("waitpid()");
 		}
 
 		return UWSGI_OK;
 	}
 
-	// now map wsgi_req->poll.fd (or async_post) to 0 & cgi_pipe[1] to 1
-	dup2(post_pipe[0], 0);
-	close(post_pipe[0]);
+	// close all the fd except wsgi_req->poll.fd and 2;
 
-	dup2(cgi_pipe[1],1);
-	close(cgi_pipe[1]);
-
-	// close all the fd > 2
-	for(i=3;i<(int)uwsgi.max_fd;i++) {
-		close(i);
+	for(i=0;i< (int)uwsgi.max_fd;i++) {
+		if (post_pipe[0] == i) {
+			continue;
+		}
+		if (wsgi_req->post_file) {
+			if (fileno(wsgi_req->post_file) == i) {
+				continue;
+			}
+		}
+		if (i != wsgi_req->fd && i != 2 && i != cgi_pipe[1]) {
+			close(i);
+		}
 	}
 
+	// now map wsgi_req->poll.fd (or async_post) to 0 & cgi_pipe[1] to 1
+	if (post_pipe[0] != 0) {
+		dup2(post_pipe[0], 0);
+		close(post_pipe[0]);
+	}
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("mapping cgi_pipe %d to 1\n", cgi_pipe[1]);
+#endif
+
+	dup2(cgi_pipe[1],1);
+	
 	// fill cgi env
 	for(i=0;i<wsgi_req->var_cnt;i++) {
 		// no need to free the putenv() memory
@@ -925,39 +873,6 @@ clear2:
 
 
 static void uwsgi_cgi_after_request(struct wsgi_request *wsgi_req) {
-	if (wsgi_req->async_plagued > 0) {
-		int waitpid_status;
-		pid_t cgi_pid = (pid_t) wsgi_req->async_plagued;
-		int max_attempts = uc.async_max_attempts;
-                        if (!max_attempts) max_attempts = 10;
-                        while(max_attempts) {
-                                pid_t diedpid = waitpid(cgi_pid, &waitpid_status, WNOHANG);
-                                if (diedpid < 0) {
-                                        uwsgi_error("waitpid()");
-                                        break;
-                                }
-                                else if (diedpid == 0) {
-                                        int ret = uwsgi.wait_milliseconds_hook(1000);
-                                        if (ret < 0) {
-                                                kill_on_error
-						if (waitpid(cgi_pid, &waitpid_status, 0) < 0) {
-                                			uwsgi_error("waitpid()");
-                        			}
-                                        }
-                                }
-                                else {
-                                        break;
-                                }
-                                max_attempts--;
-                        }
-                        if (max_attempts == 0) {
-                                kill_on_error
-				if (waitpid(cgi_pid, &waitpid_status, 0) < 0) {
-                                	uwsgi_error("waitpid()");
-                        	}
-                        }
-	}
-
 	log_request(wsgi_req);
 }
 

plugins/cheaper_backlog2/cheaper_backlog2.c

@@ -17,7 +17,7 @@ int cheaper_backlog2_algo(int can_spawn) {
 
         int i;
 #ifdef __linux__
-        int backlog = uwsgi.socket_timeout;
+        int backlog = uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS];
 #else
         int backlog = 0;
 #endif

plugins/cheaper_busyness/cheaper_busyness.c

@@ -13,13 +13,11 @@ struct uwsgi_cheaper_busyness_global {
 	uint64_t busyness_max;
 	uint64_t busyness_min;
 	uint64_t *last_values;
-	uint64_t *current_busyness;
-	uint64_t total_avg_busyness;
 	int *was_busy;
 	uint64_t tcheck;
 	uint64_t last_cheaped;      // last time worker was cheaped due to low busyness
 	uint64_t next_cheap;        // timestamp, we can cheap worker after it
-	uint64_t penalty;       // penalty for respawning to fast, it will be added to multiplier
+	uint64_t penalty;       // penelty for respawning to fast, it will be added to multiplier
 	uint64_t min_multi;     //initial multiplier will be stored here
 	uint64_t cheap_multi;   // current multiplier value
 	int last_action;            // 1 - spawn workers ; 2 - cheap worker
@@ -43,7 +41,7 @@ struct uwsgi_option uwsgi_cheaper_busyness_options[] = {
 		uwsgi_opt_set_64bit, &uwsgi_cheaper_busyness_global.busyness_max, 0},
 
 	{"cheaper-busyness-min", required_argument, 0,
-		"set the cheaper busyness low percent limit, below that value worker is considered idle (default 25)",
+		"set the cheaper busyness low percent limit, belowe that value worker is considered idle (default 25)",
 		uwsgi_opt_set_64bit, &uwsgi_cheaper_busyness_global.busyness_min, 0},
 
 	{"cheaper-busyness-multiplier", required_argument, 0,
@@ -59,7 +57,7 @@ struct uwsgi_option uwsgi_cheaper_busyness_options[] = {
 
 #ifdef __linux__
 	{"cheaper-busyness-backlog-alert", required_argument, 0,
-		"spawn emergency worker(s) if any time listen queue is higher than this value (default 33)",
+		"spawn emergency worker(s) if anytime listen queue is higher than this value (default 33)",
 		uwsgi_opt_set_int, &uwsgi_cheaper_busyness_global.backlog_alert, 0},
 	{"cheaper-busyness-backlog-multiplier", required_argument, 0,
 		"set cheaper multiplier used for emergency workers (default 3)",
@@ -150,6 +148,46 @@ int cheaper_busyness_algo(int can_spawn) {
 	// we use microseconds
 	uint64_t t = uwsgi.cheaper_overload*1000000;
 
+	// this happens on the first run, the required memory is allocated
+	if (!uwsgi_cheaper_busyness_global.last_values) {
+		uwsgi_cheaper_busyness_global.last_values = uwsgi_calloc(sizeof(uint64_t) * uwsgi.numproc);
+	}
+	if (!uwsgi_cheaper_busyness_global.was_busy) {
+		uwsgi_cheaper_busyness_global.was_busy = uwsgi_calloc(sizeof(int) * uwsgi.numproc);
+	}
+
+	// set defaults
+	if (!uwsgi_cheaper_busyness_global.busyness_max) uwsgi_cheaper_busyness_global.busyness_max = 50;
+	if (!uwsgi_cheaper_busyness_global.busyness_min) uwsgi_cheaper_busyness_global.busyness_min = 25;
+	if (!uwsgi_cheaper_busyness_global.cheap_multi) uwsgi_cheaper_busyness_global.cheap_multi = 10;
+	if (!uwsgi_cheaper_busyness_global.penalty) uwsgi_cheaper_busyness_global.penalty = 2;
+
+#ifdef __linux__
+	if (!uwsgi_cheaper_busyness_global.backlog_alert) uwsgi_cheaper_busyness_global.backlog_alert = 33;
+	if (!uwsgi_cheaper_busyness_global.backlog_multi) uwsgi_cheaper_busyness_global.backlog_multi = 3;
+	if (!uwsgi_cheaper_busyness_global.backlog_step) uwsgi_cheaper_busyness_global.backlog_step = 1;
+	if (!uwsgi_cheaper_busyness_global.backlog_nonzero_alert) uwsgi_cheaper_busyness_global.backlog_nonzero_alert = 60;
+#endif
+
+	if (!uwsgi_cheaper_busyness_global.min_multi) {
+		// store initial multiplier so we don't loose its initial value
+		uwsgi_cheaper_busyness_global.min_multi = uwsgi_cheaper_busyness_global.cheap_multi;
+		// since this is first run we will print current values
+		uwsgi_log("[busyness] settings: min=%llu%%, max=%llu%%, overload=%llu, multiplier=%llu, respawn penalty=%llu\n",
+			uwsgi_cheaper_busyness_global.busyness_min, uwsgi_cheaper_busyness_global.busyness_max,
+			uwsgi.cheaper_overload, uwsgi_cheaper_busyness_global.cheap_multi, uwsgi_cheaper_busyness_global.penalty);
+#ifdef __linux__
+		uwsgi_log("[busyness] backlog alert is set to %d request(s), step is %d\n",
+			uwsgi_cheaper_busyness_global.backlog_alert, uwsgi_cheaper_busyness_global.backlog_step);
+		uwsgi_log("[busyness] backlog non-zero alert is set to %llu second(s)\n", uwsgi_cheaper_busyness_global.backlog_nonzero_alert);
+#endif
+	}
+
+	// initialize with current time
+	if (uwsgi_cheaper_busyness_global.tcheck == 0) uwsgi_cheaper_busyness_global.tcheck = uwsgi_micros();
+
+	if (uwsgi_cheaper_busyness_global.next_cheap == 0) set_next_cheap_time();
+
 	int active_workers = 0;
 	uint64_t total_busyness = 0;
 	uint64_t avg_busyness = 0;
@@ -164,7 +202,7 @@ int cheaper_busyness_algo(int can_spawn) {
 	}
 
 #ifdef __linux__
-	int backlog = uwsgi.shared->backlog;
+	int backlog = uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS];
 #endif
 
 	uint64_t now = uwsgi_micros();
@@ -190,23 +228,11 @@ int cheaper_busyness_algo(int can_spawn) {
 				if (uwsgi_cheaper_busyness_global.verbose && active_workers > 1)
 					uwsgi_log("[busyness] worker nr %d %llus average busyness is at %llu%%\n",
 						i+1, uwsgi.cheaper_overload, percent);
-				if (uwsgi.has_metrics) {
-					// update metrics
-					uwsgi_wlock(uwsgi.metrics_lock);
-					uwsgi_cheaper_busyness_global.current_busyness[i] = percent;
-					uwsgi_rwunlock(uwsgi.metrics_lock);
-				}
 			}
 			uwsgi_cheaper_busyness_global.last_values[i] = uwsgi.workers[i+1].running_time;
 		}
 
 		avg_busyness = (active_workers ? total_busyness / active_workers : 0);
-		if (uwsgi.has_metrics) {
-			uwsgi_wlock(uwsgi.metrics_lock);
-			uwsgi_cheaper_busyness_global.total_avg_busyness = avg_busyness;
-			uwsgi_rwunlock(uwsgi.metrics_lock);
-		}
-
 		if (uwsgi_cheaper_busyness_global.verbose)
 			uwsgi_log("[busyness] %ds average busyness of %d worker(s) is at %d%%\n",
 				(int) uwsgi.cheaper_overload, (int) active_workers, (int) avg_busyness);
@@ -235,7 +261,7 @@ int cheaper_busyness_algo(int can_spawn) {
 					// worker was cheaped and then spawned back in less than current multiplier*cheaper_overload seconds
 					// we will increase the multiplier so that next time worker will need to wait longer before being cheaped
 					uwsgi_cheaper_busyness_global.cheap_multi += uwsgi_cheaper_busyness_global.penalty;
-					uwsgi_log("[busyness] worker(s) respawned to fast, increasing cheaper multiplier to %llu (+%llu)\n",
+					uwsgi_log("[busyness] worker(s) respawned to fast, increasing chpeaper multiplier to %llu (+%llu)\n",
 						uwsgi_cheaper_busyness_global.cheap_multi, uwsgi_cheaper_busyness_global.penalty);
 				} else {
 					decrease_multi();
@@ -307,7 +333,7 @@ int cheaper_busyness_algo(int can_spawn) {
 				// time needed to cheap them, than a lot min<busy<max when we do not reset timer
 				// and then another idle cycle than would trigger cheaping
 				if (uwsgi_cheaper_busyness_global.verbose)
-					uwsgi_log("[busyness] %llus average busyness is at %llu%%, %llu non-idle cycle(s), resetting cheaper timer\n",
+					uwsgi_log("[busyness] %llus average busyness is at %llu%%, %llu non-idle cycle(s), reseting cheaper timer\n",
 						uwsgi.cheaper_overload, avg_busyness, uwsgi_cheaper_busyness_global.tolerance_counter);
 				set_next_cheap_time();
 			} else {
@@ -359,73 +385,10 @@ void uwsgi_cheaper_register_busyness(void) {
 	uwsgi_register_cheaper_algo("busyness", cheaper_busyness_algo);
 }
 
-static int uwsgi_cheaper_busyness_init(void) {
-	if (!uwsgi.requested_cheaper_algo || strcmp(uwsgi.requested_cheaper_algo, "busyness")) return 0;
-	// this happens on the first run, the required memory is allocated
-	uwsgi_cheaper_busyness_global.last_values = uwsgi_calloc(sizeof(uint64_t) * uwsgi.numproc);
-	uwsgi_cheaper_busyness_global.was_busy = uwsgi_calloc(sizeof(int) * uwsgi.numproc);
-
-	if (uwsgi.has_metrics) {
-		// allocate metrics memory
-		uwsgi_cheaper_busyness_global.current_busyness = uwsgi_calloc(sizeof(uint64_t) * uwsgi.numproc);
-	}
-
-	// set defaults
-	if (!uwsgi_cheaper_busyness_global.busyness_max) uwsgi_cheaper_busyness_global.busyness_max = 50;
-	if (!uwsgi_cheaper_busyness_global.busyness_min) uwsgi_cheaper_busyness_global.busyness_min = 25;
-	if (!uwsgi_cheaper_busyness_global.cheap_multi) uwsgi_cheaper_busyness_global.cheap_multi = 10;
-	if (!uwsgi_cheaper_busyness_global.penalty) uwsgi_cheaper_busyness_global.penalty = 2;
-
-#ifdef __linux__
-	if (!uwsgi_cheaper_busyness_global.backlog_alert) uwsgi_cheaper_busyness_global.backlog_alert = 33;
-	if (!uwsgi_cheaper_busyness_global.backlog_multi) uwsgi_cheaper_busyness_global.backlog_multi = 3;
-	if (!uwsgi_cheaper_busyness_global.backlog_step) uwsgi_cheaper_busyness_global.backlog_step = 1;
-	if (!uwsgi_cheaper_busyness_global.backlog_nonzero_alert) uwsgi_cheaper_busyness_global.backlog_nonzero_alert = 60;
-#endif
-
-	// store initial multiplier so we don't loose that value
-	uwsgi_cheaper_busyness_global.min_multi = uwsgi_cheaper_busyness_global.cheap_multi;
-	// since this is first run we will print current values
-	uwsgi_log("[busyness] settings: min=%llu%%, max=%llu%%, overload=%llu, multiplier=%llu, respawn penalty=%llu\n",
-		uwsgi_cheaper_busyness_global.busyness_min, uwsgi_cheaper_busyness_global.busyness_max,
-		uwsgi.cheaper_overload, uwsgi_cheaper_busyness_global.cheap_multi, uwsgi_cheaper_busyness_global.penalty);
-#ifdef __linux__
-	uwsgi_log("[busyness] backlog alert is set to %d request(s), step is %d\n",
-		uwsgi_cheaper_busyness_global.backlog_alert, uwsgi_cheaper_busyness_global.backlog_step);
-	uwsgi_log("[busyness] backlog non-zero alert is set to %llu second(s)\n", uwsgi_cheaper_busyness_global.backlog_nonzero_alert);
-#endif
-
-	// register metrics if enabled
-	if (uwsgi.has_metrics) {
-		int i;
-		char buf[4096];
-		char buf2[4096];
-		for (i = 0; i < uwsgi.numproc; i++) {
-			if (snprintf(buf, 4096, "worker.%d.plugin.cheaper_busyness.busyness", i+1) <= 0) {
-				uwsgi_log("[busyness] unable to register busyness metric for worker %d\n", i+1);
-				exit(1);
-			}
-			if (snprintf(buf2, 4096, "3.%d.100.1", i+1) <= 0) {
-				uwsgi_log("[busyness] unable to register busyness metric oid for worker %d\n", i+1);
-				exit(1);
-			}
-			uwsgi_register_metric(buf, buf2, UWSGI_METRIC_GAUGE, "ptr", &uwsgi_cheaper_busyness_global.current_busyness[i], 0, NULL);
-		}
-		uwsgi_register_metric("plugin.cheaper_busyness.total_avg_busyness", "4.100.1", UWSGI_METRIC_GAUGE, "ptr", &uwsgi_cheaper_busyness_global.total_avg_busyness, 0, NULL);
-		uwsgi_log("[busyness] metrics registered\n");
-	}
-
-	// initialize timers
-	uwsgi_cheaper_busyness_global.tcheck = uwsgi_micros();
-	set_next_cheap_time();
-
-	return 0;
-}
-
 struct uwsgi_plugin cheaper_busyness_plugin = {
 
 	.name = "cheaper_busyness",
-	.on_load = uwsgi_cheaper_register_busyness,
+        .on_load = uwsgi_cheaper_register_busyness,
 	.options = uwsgi_cheaper_busyness_options,
-	.init = uwsgi_cheaper_busyness_init
+	
 };

plugins/corerouter/corerouter.c

@@ -41,11 +41,8 @@ struct corerouter_peer *uwsgi_cr_peer_add(struct corerouter_session *cs) {
 	peers->session = cs;
 	peers->fd = -1;
 	// create input buffer
-	size_t bufsize = cs->corerouter->buffer_size;
-	if (!bufsize) bufsize = uwsgi.page_size;
-	peers->in = uwsgi_buffer_new(bufsize);
+	peers->in = uwsgi_buffer_new(uwsgi.page_size);
 	// add timeout
-	peers->current_timeout = cs->corerouter->socket_timeout;
         peers->timeout = cr_add_timeout(cs->corerouter, peers);
 	peers->prev = old_peers;
 
@@ -75,12 +72,6 @@ void uwsgi_cr_peer_reset(struct corerouter_peer *peer) {
 		peer->hook_write = NULL;
 	}
 
-	if (peer->is_buffering) {
-		if (peer->buffering_fd != -1) {
-			close(peer->buffering_fd);
-		}
-	}
-
 	peer->failed = 0;
 	peer->soopt = 0;
 	peer->timed_out = 0;
@@ -90,13 +81,7 @@ void uwsgi_cr_peer_reset(struct corerouter_peer *peer) {
 }
 
 // destroy a peer
-int uwsgi_cr_peer_del(struct corerouter_peer *peer) {
-	// first of all check if we need to run a flush procedure
-	if (peer->flush && !peer->is_flushing) {
-		peer->is_flushing = 1;
-		// on success, suspend the execution
-		if (peer->flush(peer) >= 0) return -1;
-	}
+void uwsgi_cr_peer_del(struct corerouter_peer *peer) {
 	struct corerouter_peer *prev = peer->prev;
 	struct corerouter_peer *next = peer->next;
 
@@ -123,7 +108,6 @@ int uwsgi_cr_peer_del(struct corerouter_peer *peer) {
 		uwsgi_buffer_destroy(peer->out);
 	}
 	free(peer);
-	return 0;
 }
 
 void uwsgi_opt_corerouter(char *opt, char *value, void *cr) {
@@ -203,12 +187,11 @@ void uwsgi_opt_corerouter_zerg(char *opt, char *value, void *cr) {
 
         close(zerg_fd);
 
-        for(j=0;j<count;j++) {
-                if (zerg[j] == -1) break;
-                ugs = uwsgi_new_gateway_socket_from_fd(zerg[j], ucr->name);
-                ugs->zerg = optarg;
-        }
-        free(zerg);
+                        for(j=0;j<count;j++) {
+                                if (zerg[j] == -1) break;
+                                ugs = uwsgi_new_gateway_socket_from_fd(zerg[j], ucr->name);
+                                ugs->zerg = optarg;
+                        }
 }
 
 
@@ -288,22 +271,6 @@ void corerouter_manage_subscription(char *key, uint16_t keylen, char *val, uint1
 		usr->sign = val;
                 usr->sign_len = vallen;
 	}
-	else if (!uwsgi_strncmp("sni_key", 7, key, keylen)) {
-		usr->sni_key = val;
-                usr->sni_key_len = vallen;
-	}
-	else if (!uwsgi_strncmp("sni_crt", 7, key, keylen)) {
-		usr->sni_crt = val;
-                usr->sni_crt_len = vallen;
-	}
-	else if (!uwsgi_strncmp("sni_ca", 6, key, keylen)) {
-		usr->sni_ca = val;
-                usr->sni_ca_len = vallen;
-	}
-	else if (!uwsgi_strncmp("notify", 6, key, keylen)) {
-		usr->notify = val;
-                usr->notify_len = vallen;
-	}
 }
 
 void corerouter_close_peer(struct uwsgi_corerouter *ucr, struct corerouter_peer *peer) {
@@ -323,6 +290,7 @@ void corerouter_close_peer(struct uwsgi_corerouter *ucr, struct corerouter_peer
         }
 
 	if (peer->failed) {
+		
 		if (peer->soopt) {
                         if (!ucr->quiet)
                                 uwsgi_log("[uwsgi-%s] unable to connect() to node \"%.*s\" (%d retries): %s\n", ucr->short_name, (int) peer->instance_address_len, peer->instance_address, peer->retries, strerror(peer->soopt));
@@ -396,7 +364,7 @@ void corerouter_close_peer(struct uwsgi_corerouter *ucr, struct corerouter_peer
 	}
 
 end:
-	if (uwsgi_cr_peer_del(peer) < 0) return;
+	uwsgi_cr_peer_del(peer);
 
 	if (peer == cs->main_peer) {
 		cs->main_peer = NULL;
@@ -414,7 +382,7 @@ void corerouter_close_session(struct uwsgi_corerouter *ucr, struct corerouter_se
 
 	struct corerouter_peer *main_peer = cr_session->main_peer;
 	if (main_peer) {
-		if (uwsgi_cr_peer_del(main_peer) < 0) return;
+		uwsgi_cr_peer_del(main_peer);
 	}
 
 	// free peers
@@ -426,7 +394,7 @@ void corerouter_close_session(struct uwsgi_corerouter *ucr, struct corerouter_se
 		if (ucr->subscriptions && tmp_peer->un && tmp_peer->un->len) {
 			tmp_peer->un->reference--;
 		}
-		if (uwsgi_cr_peer_del(tmp_peer) < 0) return;
+		uwsgi_cr_peer_del(tmp_peer);
 	}
 
 	// could be used to free additional resources
@@ -581,9 +549,7 @@ struct corerouter_session *corerouter_alloc_session(struct uwsgi_corerouter *ucr
 
 	struct corerouter_peer *peer = uwsgi_calloc(sizeof(struct corerouter_peer));
 	// main_peer has only input buffer as output buffer is taken from backend peers
-	size_t bufsize = ucr->buffer_size;
-	if (!bufsize) bufsize = uwsgi.page_size;
-	peer->in = uwsgi_buffer_new(bufsize);
+	peer->in = uwsgi_buffer_new(uwsgi.page_size);
 
 	ucr->cr_table[new_connection] = peer;
 	cs->main_peer = peer;
@@ -595,8 +561,8 @@ struct corerouter_session *corerouter_alloc_session(struct uwsgi_corerouter *ucr
 	cs->corerouter = ucr;
 	cs->ugs = ugs;
 
-	// set initial timeout (could be overridden)
-	peer->current_timeout = ucr->socket_timeout;
+	// set initial timeout
+        peer->timeout = cr_add_timeout(ucr, ucr->cr_table[new_connection]);
 
 	ucr->active_sessions++;
 
@@ -635,10 +601,6 @@ struct corerouter_session *corerouter_alloc_session(struct uwsgi_corerouter *ucr
 		corerouter_close_session(ucr, cs);
 		cs = NULL;
 	}
-	else {
-		// truly set the timeout
-        	peer->timeout = cr_add_timeout(ucr, ucr->cr_table[new_connection]);
-	}
 
 	return cs;
 }
@@ -956,13 +918,10 @@ int uwsgi_corerouter_init(struct uwsgi_corerouter *ucr) {
 			uwsgi_log("starting %s in cheap mode\n", ucr->name);
 		}
 		for (i = 0; i < ucr->processes; i++) {
-			struct uwsgi_gateway *ug = register_gateway(ucr->name, uwsgi_corerouter_loop, ucr);
-			if (ug == NULL) {
+			if (register_gateway(ucr->name, uwsgi_corerouter_loop, ucr) == NULL) {
 				uwsgi_log("unable to register the %s gateway\n", ucr->name);
 				exit(1);
 			}
-			ug->uid = ucr->uid;
-			ug->gid = ucr->gid;
 		}
 	}
 
@@ -1061,9 +1020,6 @@ void corerouter_send_stats(struct uwsgi_corerouter *ucr) {
 				if (uwsgi_stats_keyvaln_comma(us, "key", s_slot->key, s_slot->keylen)) goto end0;
 				if (uwsgi_stats_keylong_comma(us, "hash", (unsigned long long) s_slot->hash)) goto end0;
 				if (uwsgi_stats_keylong_comma(us, "hits", (unsigned long long) s_slot->hits)) goto end0;
-#ifdef UWSGI_SSL
-				if (uwsgi_stats_keylong_comma(us, "sni_enabled", (unsigned long long) s_slot->sni_enabled)) goto end0;
-#endif
 
 				if (uwsgi_stats_key(us , "nodes")) goto end0;
 				if (uwsgi_stats_list_open(us)) goto end0;
@@ -1077,13 +1033,9 @@ void corerouter_send_stats(struct uwsgi_corerouter *ucr) {
 					if (uwsgi_stats_keylong_comma(us, "modifier1", (unsigned long long) s_node->modifier1)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "modifier2", (unsigned long long) s_node->modifier2)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "last_check", (unsigned long long) s_node->last_check)) goto end0;
-					if (uwsgi_stats_keylong_comma(us, "pid", (unsigned long long) s_node->pid)) goto end0;
-					if (uwsgi_stats_keylong_comma(us, "uid", (unsigned long long) s_node->uid)) goto end0;
-					if (uwsgi_stats_keylong_comma(us, "gid", (unsigned long long) s_node->gid)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "requests", (unsigned long long) s_node->requests)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "last_requests", (unsigned long long) s_node->last_requests)) goto end0;
-					if (uwsgi_stats_keylong_comma(us, "tx", (unsigned long long) s_node->tx)) goto end0;
-					if (uwsgi_stats_keylong_comma(us, "rx", (unsigned long long) s_node->rx)) goto end0;
+					if (uwsgi_stats_keylong_comma(us, "tx", (unsigned long long) s_node->transferred)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "cores", (unsigned long long) s_node->cores)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "load", (unsigned long long) s_node->load)) goto end0;
 					if (uwsgi_stats_keylong_comma(us, "weight", (unsigned long long) s_node->weight)) goto end0;
@@ -1123,7 +1075,7 @@ void corerouter_send_stats(struct uwsgi_corerouter *ucr) {
         size_t remains = us->pos;
         off_t pos = 0;
         while(remains > 0) {
-		int ret = uwsgi_waitfd_write(client_fd, uwsgi.socket_timeout);
+		int ret = uwsgi_waitfd_write(client_fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
                 if (ret <= 0) {
                         goto end0;
                 }

plugins/corerouter/cr.h

@@ -3,12 +3,12 @@
 #define COREROUTER_STATUS_RECV_HDR 2
 #define COREROUTER_STATUS_RESPONSE 3
 
-#define cr_add_timeout(u, x) uwsgi_add_rb_timer(u->timeouts, uwsgi_now()+x->current_timeout, x)
-#define cr_add_timeout_fast(u, x, t) uwsgi_add_rb_timer(u->timeouts, t+x->current_timeout, x)
+#define cr_add_timeout(u, x) uwsgi_add_rb_timer(u->timeouts, uwsgi_now()+u->socket_timeout, x)
+#define cr_add_timeout_fast(u, x, t) uwsgi_add_rb_timer(u->timeouts, t+u->socket_timeout, x)
 #define cr_del_timeout(u, x) uwsgi_del_rb_timer(u->timeouts, x->timeout); free(x->timeout);
 
-#define uwsgi_cr_error(x, y) uwsgi_log("[uwsgi-%s key: %.*s client_addr: %s client_port: %s] %s: %s [%s line %d]\n", x->session->corerouter->short_name, (x == x->session->main_peer) ? (x->session->peers ? x->session->peers->key_len: 0) : x->key_len, (x == x->session->main_peer) ? (x->session->peers ? x->session->peers->key: "") : x->key, x->session->client_address, x->session->client_port, y, strerror(errno), __FILE__, __LINE__)
-#define uwsgi_cr_log(x, y, ...) uwsgi_log("[uwsgi-%s key: %.*s client_addr: %s client_port: %s]" y, x->session->corerouter->short_name,  (x == x->session->main_peer) ? (x->session->peers ? x->session->peers->key_len: 0) : x->key_len, (x == x->session->main_peer) ? (x->session->peers ? x->session->peers->key: "") : x->key, x->session->client_address, x->session->client_port, __VA_ARGS__)
+#define uwsgi_cr_error(x, y) uwsgi_log("[uwsgi-%s client_addr: %s client_port: %s] %s: %s [%s line %d]\n", x->session->corerouter->short_name, x->session->client_address, x->session->client_port, y, strerror(errno), __FILE__, __LINE__)
+#define uwsgi_cr_log(x, y, ...) uwsgi_log("[uwsgi-%s client_addr: %s client_port: %s]" y, x->session->corerouter->short_name, x->session->client_address, x->session->client_port, __VA_ARGS__)
 
 #define cr_try_again if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS) {\
                      	errno = EINPROGRESS;\
@@ -21,7 +21,6 @@
                 uwsgi_cr_error(peer, f);\
                 return -1;\
         }\
-	if (peer != peer->session->main_peer && peer->un) peer->un->rx+=len;\
         peer->out_pos += len;
 
 #define cr_write_buf(peer, ubuf, f) write(peer->fd, ubuf->buf + ubuf##_pos, ubuf->pos - ubuf##_pos);\
@@ -30,7 +29,6 @@
                 uwsgi_cr_error(peer, f);\
                 return -1;\
         }\
-	if (peer != peer->session->main_peer && peer->un) peer->un->rx+=len;\
         ubuf##_pos += len;
 
 #define cr_write_complete(peer) peer->out_pos == peer->out->pos
@@ -53,7 +51,6 @@
                 uwsgi_cr_error(peer, f);\
                 return -1;\
         }\
-	if (peer != peer->session->main_peer && peer->un) peer->un->tx+=len;\
         peer->in->pos += len;\
 
 #define cr_read_exact(peer, l, f) read(peer->fd, peer->in->buf + peer->in->pos, (l - peer->in->pos));\
@@ -62,7 +59,6 @@
                 uwsgi_cr_error(peer, f);\
                 return -1;\
         }\
-	if (peer != peer->session->main_peer && peer->un) peer->un->tx+=len;\
         peer->in->pos += len;\
 
 #define cr_reset_hooks(peer) if(!peer->session->main_peer->disabled) {\
@@ -180,22 +176,14 @@ struct corerouter_peer {
 	uint16_t retries;
 
 	// parsed key
-        char key[0xff];
-        uint8_t key_len;
+        char *key;
+        uint16_t key_len;
 
 	uint8_t modifier1;
 	uint8_t modifier2;
 
 	struct corerouter_peer *prev;
 	struct corerouter_peer *next;
-
-	int current_timeout;
-
-	ssize_t (*flush)(struct corerouter_peer *);
-
-	int is_flushing;
-	int is_buffering;
-        int buffering_fd;
 };
 
 struct uwsgi_corerouter {
@@ -270,14 +258,6 @@ struct uwsgi_corerouter {
 
 	uint64_t active_sessions;
 
-	uid_t uid;
-	gid_t gid;
-
-        struct uwsgi_string_list *resubscribe;
-        char *resubscribe_bind;
-
-	size_t buffer_size;
-	int fallback_on_no_key;
 };
 
 // a session is started when a client connect to the router

plugins/corerouter/cr_common.c

@@ -4,7 +4,7 @@ common functions for various routers (fastrouter, http...)
 
 */
 
-#include <uwsgi.h>
+#include "../../uwsgi.h"
 
 extern struct uwsgi_server uwsgi;
 
@@ -79,9 +79,6 @@ void uwsgi_corerouter_setup_sockets(struct uwsgi_corerouter *ucr) {
 					}
 					else {
 						ugs->fd = bind_to_unix_dgram(ugs->name);
-						if (ugs->fd < 1 || (uwsgi.subscriptions_use_credentials && uwsgi_socket_passcred(ugs->fd))) {
-							exit(1);
-						}
 					}
 					uwsgi_socket_nb(ugs->fd);
 				}
@@ -116,17 +113,10 @@ void uwsgi_corerouter_manage_subscription(struct uwsgi_corerouter *ucr, int id,
 	int i;
 	struct uwsgi_subscribe_req usr;
 	char bbuf[4096];
-	ssize_t len = -1;
 
-	memset(&usr, 0, sizeof(struct uwsgi_subscribe_req));
-
-	if (uwsgi.subscriptions_use_credentials) {
-		len = uwsgi_recv_cred2(ugs->fd, bbuf, 4096, &usr.pid, &usr.uid, &usr.gid);
-	}
-	else {
-		len = recv(ugs->fd, bbuf, 4096, 0);
-	}
+	ssize_t len = recv(ugs->fd, bbuf, 4096, 0);
 	if (len > 0) {
+		memset(&usr, 0, sizeof(struct uwsgi_subscribe_req));
 		uwsgi_hooked_parse(bbuf + 4, len - 4, corerouter_manage_subscription, &usr);
 		if (usr.sign_len > 0) {
 			// calc the base size
@@ -154,6 +144,10 @@ void uwsgi_corerouter_manage_subscription(struct uwsgi_corerouter *ucr, int id,
 			if (node && node->len) {
 #ifdef UWSGI_SSL
 				if (uwsgi.subscriptions_sign_check_dir) {
+					if (usr.sign_len == 0 || usr.base_len == 0)
+						return;
+					if (usr.unix_check <= node->unix_check)
+						return;
 					if (!uwsgi_subscription_sign_check(node->slot, &usr)) {
 						return;
 					}
@@ -183,51 +177,6 @@ void uwsgi_corerouter_manage_subscription(struct uwsgi_corerouter *ucr, int id,
 				}
 			}
 		}
-
-		// resubscribe if needed ?
-		if (ucr->resubscribe) {
-			static char *address = NULL;
-			if (!address) {
-				struct uwsgi_gateway_socket *augs = uwsgi.gateway_sockets;
-        			while (augs) {
-                			if (!strcmp(ucr->name, augs->owner)) {
-                        			if (!augs->subscription) {
-							address = augs->name;
-							break;
-						}
-					}
-					augs = augs->next;
-				}
-			}
-			struct uwsgi_string_list *usl = NULL;
-			char *sni_key = NULL;
-			char *sni_cert = NULL;
-			char *sni_ca = NULL;
-			if (usr.sni_key_len) {
-				sni_key = uwsgi_concat2n(usr.sni_key, usr.sni_key_len, "", 0);
-			}
-			if (usr.sni_crt_len) {
-				sni_cert = uwsgi_concat2n(usr.sni_crt, usr.sni_crt_len, "", 0);
-			}
-			if (usr.sni_ca_len) {
-				sni_ca = uwsgi_concat2n(usr.sni_ca, usr.sni_ca_len, "", 0);
-			}
-			uwsgi_foreach(usl, ucr->resubscribe) {	
-				if (ucr->resubscribe_bind) {
-					static int rfd = -1;
-					if (rfd == -1) {
-						rfd = bind_to_udp(ucr->resubscribe_bind, 0, 0);
-					}
-					uwsgi_send_subscription_from_fd(rfd, usl->value, usr.key, usr.keylen, usr.modifier1, usr.modifier2, bbuf[3], address, NULL, sni_key, sni_cert, sni_ca);
-				}
-				else {
-					uwsgi_send_subscription_from_fd(-2, usl->value, usr.key, usr.keylen, usr.modifier1, usr.modifier2, bbuf[3], address, NULL, sni_key, sni_cert, sni_ca);
-				}
-			}
-			if (sni_key) free(sni_key);
-			if (sni_cert) free(sni_cert);
-			if (sni_ca) free(sni_ca);
-		}
 	}
 
 }

plugins/corerouter/cr_map.c

@@ -53,7 +53,6 @@ int uwsgi_cr_map_use_subscription(struct uwsgi_corerouter *ucr, struct coreroute
 		peer->instance_address = peer->un->name;
 		peer->instance_address_len = peer->un->len;
 		peer->modifier1 = peer->un->modifier1;
-		peer->modifier2 = peer->un->modifier2;
 	}
 	else if (ucr->cheap && !ucr->i_am_cheap && uwsgi_no_subscriptions(ucr->subscriptions)) {
 		uwsgi_gateway_go_cheap(ucr->name, ucr->queue, &ucr->i_am_cheap);
@@ -66,11 +65,8 @@ int uwsgi_cr_map_use_subscription_dotsplit(struct uwsgi_corerouter *ucr, struct
 
 	char *name = peer->key;
 	uint16_t name_len = peer->key_len;
-	// max 5 split, reduce DOS attempts
-	int count = 5;
 
 split:
-	if (!count) return 0;
 #ifdef UWSGI_DEBUG
 	uwsgi_log("trying with %.*s\n", name_len, name);
 #endif
@@ -80,7 +76,6 @@ split:
 		if (next) {
 			name_len -= next - name;
 			name = next;
-			count--;
 			goto split;
 		}
 	}
@@ -89,7 +84,6 @@ split:
                 peer->instance_address = peer->un->name;
                 peer->instance_address_len = peer->un->len;
                 peer->modifier1 = peer->un->modifier1;
-                peer->modifier2 = peer->un->modifier2;
         }
         else if (ucr->cheap && !ucr->i_am_cheap && uwsgi_no_subscriptions(ucr->subscriptions)) {
                 uwsgi_gateway_go_cheap(ucr->name, ucr->queue, &ucr->i_am_cheap);

plugins/coroae/coroae.c

@@ -12,8 +12,8 @@ static void uwsgi_opt_setup_coroae(char *opt, char *value, void *null) {
 
         // set async mode
         uwsgi_opt_set_int(opt, value, &uwsgi.async);
-        if (uwsgi.socket_timeout < 30) {
-                uwsgi.socket_timeout = 30;
+        if (uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] < 30) {
+                uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] = 30;
         }
         // set loop engine
         uwsgi.loop = "coroae";
@@ -51,7 +51,7 @@ SV * coroae_coro_new(CV *block) {
         XPUSHs(sv_2mortal(newSVpv( "Coro", 4)));
         XPUSHs(newRV_inc((SV *)block));
         PUTBACK;
-        call_method("new", G_SCALAR|G_EVAL);
+        call_method("new", G_SCALAR);
         SPAGAIN;
         if(SvTRUE(ERRSV)) {
                 uwsgi_log("[uwsgi-perl error] %s", SvPV_nolen(ERRSV));
@@ -65,15 +65,6 @@ SV * coroae_coro_new(CV *block) {
 	return newobj;
 }
 
-static int coroae_wait_milliseconds(int timeout) {
-	char buf[256];
-	double d = ((double)timeout)/1000.0;
-	int ret = snprintf(buf, 256, "Coro::AnyEvent::sleep %f", d);
-	if (ret <= 0 || ret > 256) return -1;
-	perl_eval_pv(buf, 0);
-	return 0;
-}
-
 static int coroae_wait_fd_read(int fd, int timeout) {
 	int ret = 0;
 	dSP;
@@ -83,7 +74,7 @@ static int coroae_wait_fd_read(int fd, int timeout) {
         XPUSHs(newSViv(fd));
         XPUSHs(newSViv(timeout));
         PUTBACK;
-        call_pv("Coro::AnyEvent::readable", G_SCALAR|G_EVAL);
+        call_pv("Coro::AnyEvent::readable", G_SCALAR);
         SPAGAIN;
         if(SvTRUE(ERRSV)) {
                 uwsgi_log("[uwsgi-perl error] %s", SvPV_nolen(ERRSV));
@@ -110,14 +101,13 @@ static int coroae_wait_fd_write(int fd, int timeout) {
         XPUSHs(sv_2mortal(newSViv(fd)));
         XPUSHs(sv_2mortal(newSViv(timeout)));
         PUTBACK;
-        call_pv("Coro::AnyEvent::writable", G_SCALAR|G_EVAL);
+        call_pv("Coro::AnyEvent::writable", G_SCALAR);
         SPAGAIN;
         if(SvTRUE(ERRSV)) {
                 uwsgi_log("[uwsgi-perl error] %s", SvPV_nolen(ERRSV));
         }
 	else {
-		SV *p_ret = POPs;	
-		if (SvTRUE(p_ret)) {
+		if (SvTRUE(POPs)) {
 			ret = 1;
 		}
 	}
@@ -146,7 +136,7 @@ XS(XS_coroae_accept_request) {
         }
 
 	for(;;) {
-		int ret = uwsgi.wait_read_hook(wsgi_req->fd, uwsgi.socket_timeout);
+		int ret = uwsgi.wait_read_hook(wsgi_req->fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		wsgi_req->switches++;
 	
 		if (ret <= 0) {
@@ -226,8 +216,8 @@ edge:
         wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
 
         // enter harakiri mode
-        if (uwsgi.harakiri_options.workers > 0) {
-                set_harakiri(uwsgi.harakiri_options.workers);
+        if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+                set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
         }
 
 
@@ -285,7 +275,7 @@ static SV *coroae_add_watcher(int fd, SV *cb) {
         XPUSHs(newRV_inc(cb));
         PUTBACK;
 
-        call_method( "io", G_SCALAR|G_EVAL);
+        call_method( "io", G_SCALAR);
 
         SPAGAIN;
 	if(SvTRUE(ERRSV)) {
@@ -316,7 +306,7 @@ static SV *coroae_condvar_new() {
         XPUSHs(sv_2mortal(newSVpv( "AnyEvent", 8)));
         PUTBACK;
 
-        call_method( "condvar", G_SCALAR|G_EVAL);
+        call_method( "condvar", G_SCALAR);
 
         SPAGAIN;
         if(SvTRUE(ERRSV)) {
@@ -342,7 +332,7 @@ static void coroae_wait_condvar(SV *cv) {
         XPUSHs(cv);
         PUTBACK;
 
-        call_method( "recv", G_DISCARD|G_EVAL);
+        call_method( "recv", G_DISCARD);
 
         SPAGAIN;
         if(SvTRUE(ERRSV)) {
@@ -368,14 +358,25 @@ static void coroae_loop() {
 		exit(1);
 	}
 
-	perl_eval_pv("use Coro;", 1);
-	perl_eval_pv("use AnyEvent;", 1);
-	perl_eval_pv("use Coro::AnyEvent;", 1);
+	perl_eval_pv("use Coro;", 0);
+        if (SvTRUE(ERRSV)) {
+		uwsgi_log("unable to load Coro module\n");
+		exit(1);
+	}
+	perl_eval_pv("use AnyEvent;", 0);
+        if (SvTRUE(ERRSV)) {
+		uwsgi_log("unable to load AnyEvent module\n");
+		exit(1);
+	}
+	perl_eval_pv("use Coro::AnyEvent;", 0);
+        if (SvTRUE(ERRSV)) {
+		uwsgi_log("unable to load Coro::AnyEvent module\n");
+		exit(1);
+	}
 	
 	uwsgi.current_wsgi_req = coroae_current_wsgi_req;
 	uwsgi.wait_write_hook = coroae_wait_fd_write;
         uwsgi.wait_read_hook = coroae_wait_fd_read;
-        uwsgi.wait_milliseconds_hook = coroae_wait_milliseconds;
 
 	I_CORO_API("uwsgi::coroae");
 

plugins/coroae/uwsgiplugin.py

@@ -14,7 +14,7 @@ if not coroapi:
 
 NAME='coroae'
 CFLAGS = os.popen('perl -MExtUtils::Embed -e ccopts').read().rstrip().split()
-CFLAGS += ['-Wno-int-to-pointer-cast', '-Wno-error=format', '-Wno-error=int-to-pointer-cast', '-I%s/Coro' % coroapi]
+CFLAGS += ['-Wno-int-to-pointer-cast', '-Wno-error=int-to-pointer-cast', '-I%s/Coro' % coroapi]
 LDFLAGS = []
 LIBS = []
 

plugins/curl_cron/curl_cron.c

@@ -10,7 +10,7 @@ static void curl_cron_func(struct uwsgi_cron *uc, time_t now) {
 
         curl_easy_setopt(curl, CURLOPT_URL, uc->command);
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, uwsgi.socket_timeout);
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
         // use 1 minute as the cron resolution
         curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60);
         uwsgi_log("[uwsgi-curl-cron] requesting %s\n", uc->command);

plugins/emperor_amqp/amqp.c

@@ -2,6 +2,13 @@
 
 #define AMQP_CONNECTION_HEADER "AMQP\0\0\x09\x01"
 
+#ifdef __BIG_ENDIAN__
+#define ntohll(x) x
+#else
+#define ntohll(x) ( ( (uint64_t)(ntohl( (uint32_t)((x << 32) >> 32) )) << 32) | ntohl( ((uint32_t)(x >> 32)) ) )     
+#endif
+#define htonll(x) ntohll(x)
+
 #define amqp_send(a, b, c) if (send(a, b, c, 0) < 0) { uwsgi_error("send()"); return -1; }
 
 struct amqp_frame_header {
@@ -62,8 +69,13 @@ static char *amqp_get_long(char *ptr, char *watermark, uint32_t *lv) {
 
 static char *amqp_get_longlong(char *ptr, char *watermark, uint64_t *llv) {
 
+        uint64_t tmp_longlong;
+
 	if (ptr+8 > watermark) return NULL;
-        *llv = uwsgi_be64(ptr);
+
+        memcpy(&tmp_longlong, ptr, 8);
+
+        *llv = ntohll(tmp_longlong);
         return ptr+8;
 }
 
@@ -73,29 +85,26 @@ static int amqp_send_ack(int fd, uint64_t delivery_tag) {
 
 	uint32_t size = 4 + 8 + 1;
 
-	struct uwsgi_buffer *ub = uwsgi_buffer_new(64);
+        size = htonl(size);
         // send type and channel
-	if (uwsgi_buffer_append(ub, "\1\0\1", 3)) goto end;
+        amqp_send(fd, "\1\0\1", 3);
         // send size
-	if (uwsgi_buffer_u32be(ub, size)) goto end;
-	// send class 60 method 80
-	if (uwsgi_buffer_append(ub, "\x00\x3C\x00\x50", 4)) goto end;
+        amqp_send(fd, &size, 4);
+
+        // send class 60 method 80
+        amqp_send(fd, "\x00\x3C\x00\x50", 4);
+
 	// set delivery_tag
-	if (uwsgi_buffer_u64be(ub, delivery_tag)) goto end;
-	if (uwsgi_buffer_append(ub, "\0\xCE", 2)) goto end;
+	delivery_tag = htonll(delivery_tag);
+	amqp_send(fd, &delivery_tag, 8);
 
-        // send buffer to socket
-        if (write(fd, ub->buf, ub->pos) < 0) {
-		uwsgi_error("amqp_send_ack()/write()");
-		goto end;
-	}
+        // empty bits
+        amqp_send(fd, "\0", 1);
 
+        // send frame-end
+        amqp_send(fd, "\xCE", 1);
 
-	uwsgi_buffer_destroy(ub);	
 	return 0;
-end:
-	uwsgi_buffer_destroy(ub);
-	return -1;
 }
 
 char *uwsgi_amqp_consume(int fd, uint64_t *msgsize, char **routing_key) {

plugins/emperor_mongodb/emperor_mongodb.cc

@@ -10,10 +10,6 @@ struct uwsgi_emperor_mongodb_state {
 	char *address;
 	char *collection;
 	char *json;
-	char *database;
-	char *username;
-	char *password;
-	char *predigest;
 };
 
 
@@ -24,26 +20,18 @@ extern "C" void uwsgi_imperial_monitor_mongodb(struct uwsgi_emperor_scanner *ues
 	try {
 
 		// requested fields
-        	mongo::BSONObj p = BSON( "name" << 1 << "config" << 1 << "ts" << 1 << "uid" << 1 << "gid" << 1 << "socket" << 1 );
+        	mongo::BSONObj p = BSON( "name" << 1 << "config" << 1 << "ts" << 1 << "uid" << 1 << "gid" << 1 );
 		mongo::BSONObj q = mongo::fromjson(uems->json);
 		// the connection object (will be automatically destroyed at each cycle)
 		mongo::DBClientConnection c;
 		// set the socket timeout
-		c.setSoTimeout(uwsgi.socket_timeout);
+		c.setSoTimeout(uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		// connect
 		c.connect(uems->address);
 
-		if (uems->database && uems->username && uems->password) {
-			std::string err;
-			if (c.auth(uems->database, uems->username, uems->password, err, uems->predigest ? false : true) == false) {
-				uwsgi_log_verbose("[emperor-mongodb] unable to authenticate to db %s: %s\n", uems->database, err.c_str());
-				return;
-			}
-		}
-
 		// run the query
 		std::auto_ptr<mongo::DBClientCursor> cursor = c.query(uems->collection, q, 0, 0, &p);
-		while(cursor.get() && cursor->more() ) {
+		while( cursor->more() ) {
                 	mongo::BSONObj p = cursor->next();
 
 			// checking for an empty string is not required, but we reduce the load
@@ -52,7 +40,6 @@ extern "C" void uwsgi_imperial_monitor_mongodb(struct uwsgi_emperor_scanner *ues
 			if (strlen(name) == 0) continue;
 
 			const char *config = p.getStringField("config");
-			if (strlen(config) == 0) config = NULL;
 
 			time_t vassal_ts = 0;
 			// ts must be a Date object !!!
@@ -74,7 +61,6 @@ extern "C" void uwsgi_imperial_monitor_mongodb(struct uwsgi_emperor_scanner *ues
 			} 
 
 			const char *socket_name = p.getStringField("socket");
-			if (strlen(socket_name) == 0) socket_name = NULL;
 
 			uwsgi_emperor_simple_do(ues, (char *) name, (char *) config, vassal_ts/1000, vassal_uid, vassal_gid, (char *) socket_name);
 		}
@@ -90,7 +76,6 @@ extern "C" void uwsgi_imperial_monitor_mongodb(struct uwsgi_emperor_scanner *ues
 				b.append("name", c_ui->name);
 				mongo::BSONObj q2 = b.obj();
 				cursor = c.query(uems->collection, q2, 0, 0, &p);
-				if (!cursor.get()) return;
 #ifdef UWSGI_DEBUG
 				uwsgi_log("JSON: %s\n", q2.toString().c_str());
 #endif
@@ -136,40 +121,3 @@ done:
         uwsgi_log("[emperor] enabled emperor MongoDB monitor for %s on collection %s\n", uems->address, uems->collection);
 }
 
-// setup a new mongodb imperial monitor (keyval based)
-extern "C" void uwsgi_imperial_monitor_mongodb_init2(struct uwsgi_emperor_scanner *ues) {
-
-        // allocate a new state
-        ues->data = uwsgi_calloc(sizeof(struct uwsgi_emperor_mongodb_state));
-        size_t arg_len = strlen(ues->arg);
-        struct uwsgi_emperor_mongodb_state *uems = (struct uwsgi_emperor_mongodb_state *) ues->data;
-
-        // parse args/ set defaults
-        uems->address = (char *) "127.0.0.1:27017";
-        uems->collection = (char *) "uwsgi.emperor.vassals";
-        uems->json = (char *) "";
-	char *args = NULL;
-        if (arg_len <= 11) goto done;
-	args = ues->arg+11;
-	if (uwsgi_kvlist_parse(args, strlen(args), ',', '=',
-		"addr", &uems->address,
-		"address", &uems->address,
-		"server", &uems->address,
-		"collection", &uems->collection,
-		"coll", &uems->collection,
-		"json", &uems->json,
-		"database", &uems->database,
-		"db", &uems->database,
-		"username", &uems->username,
-		"password", &uems->password,
-		"predigest", &uems->predigest,
-		NULL)) {
-
-		uwsgi_log("[emperor-mongodb] invalid keyval syntax !\n");
-		exit(1);
-	}
-done:
-        uwsgi_log("[emperor] enabled emperor MongoDB monitor for %s on collection %s\n", uems->address, uems->collection);
-}
-
-

plugins/emperor_mongodb/plugin.c

@@ -2,11 +2,9 @@
 
 void uwsgi_imperial_monitor_mongodb(struct uwsgi_emperor_scanner *);
 void uwsgi_imperial_monitor_mongodb_init(struct uwsgi_emperor_scanner *);
-void uwsgi_imperial_monitor_mongodb_init2(struct uwsgi_emperor_scanner *);
 
 void emperor_mongodb_init(void) {
 	uwsgi_register_imperial_monitor("mongodb", uwsgi_imperial_monitor_mongodb_init, uwsgi_imperial_monitor_mongodb);
-	uwsgi_register_imperial_monitor("mongodb2", uwsgi_imperial_monitor_mongodb_init2, uwsgi_imperial_monitor_mongodb);
 }
 
 struct uwsgi_plugin emperor_mongodb_plugin = {

plugins/emperor_zeromq/emperor_zeromq.c

@@ -52,7 +52,9 @@ s.send_multipart(['touch','foo.ini',"[uwsgi]\nsocket=:4142"])
 
 */
 
-#include <uwsgi.h>
+#ifdef UWSGI_ZEROMQ
+
+#include "../../uwsgi.h"
 #include <zmq.h>
 
 extern struct uwsgi_server uwsgi;
@@ -164,7 +166,7 @@ static void uwsgi_imperial_monitor_zeromq_cmd(struct uwsgi_emperor_scanner *ues)
 		}
 	}
 	// destroy an instance
-	else if (!uwsgi_strncmp(ez_cmd, ez_cmd_len, "destroy", 7)) {
+	else if (!uwsgi_strncmp(ez_cmd, ez_cmd_len, "destroy", 6)) {
 		struct uwsgi_instance *ui = emperor_get(name);
 		if (!ui) {
 			uwsgi_log("[emperor-zeromq] unknown instance \"%s\"\n", name);
@@ -213,11 +215,7 @@ static void uwsgi_imperial_monitor_zeromq_event(struct uwsgi_emperor_scanner *ue
 // initialize the zmq PULL socket
 static void uwsgi_imperial_monitor_zeromq_init(struct uwsgi_emperor_scanner *ues) {
 
-	void *context = zmq_init(1);
-	if (!context) {
-		uwsgi_error("uwsgi_imperial_monitor_zeromq_init()/zmq_init()");
-		exit(1);
-	}
+	void *context = uwsgi_zeromq_init();
 	
 	ues->data = zmq_socket(context, ZMQ_PULL);
 	if (!ues->data) {
@@ -258,3 +256,7 @@ struct uwsgi_plugin emperor_zeromq_plugin = {
 	.name = "emperor_zeromq",
 	.on_load = emperor_zeromq_init,
 };
+
+#else
+#error the uWSGI ZeroMQ imperial monitor requires uWSGI zeromq support
+#endif

plugins/emperor_zeromq/uwsgiplugin.py

@@ -2,6 +2,6 @@
 NAME='emperor_zeromq'
 CFLAGS = []
 LDFLAGS = []
-LIBS = ['-lzmq']
+LIBS = []
 
 GCC_LIST = ['emperor_zeromq']

plugins/erlang/erlang.c

@@ -0,0 +1,441 @@
+#include "../../uwsgi.h"
+#include "erlang.h"
+
+extern struct uwsgi_server uwsgi;
+struct uwsgi_erlang uerl;
+
+struct uwsgi_option erlang_options[] = {
+	{"erlang", required_argument, 0, "spawn an erlang c-node", uwsgi_opt_set_str, &uerl.name, UWSGI_OPT_MASTER},
+        {"erlang-cookie", required_argument, 0, "set erlang cookie", uwsgi_opt_set_str, &uerl.cookie, 0},
+	{0, 0, 0, 0, 0, 0, 0},
+};
+
+
+void dump_eterm(ei_x_buff *x) {
+
+	int etype, esize, arity;
+	long long num;
+	char *atom;
+	int i;
+	char *binary;
+	long bin_size;
+	double fnum;
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+        uwsgi_log("etype: %d/%c esize: %d\n", etype, etype, esize);
+
+	switch(etype) {
+		case ERL_SMALL_INTEGER_EXT:		
+		case ERL_INTEGER_EXT:
+		case ERL_SMALL_BIG_EXT:
+		case ERL_LARGE_BIG_EXT:
+			ei_decode_longlong(x->buff, &x->index, &num);
+			uwsgi_log("num: %lu\n", num);
+			break;
+		case ERL_FLOAT_EXT:
+			ei_decode_double(x->buff, &x->index, &fnum);
+			uwsgi_log("float: %f\n", fnum);
+			break;
+		case ERL_STRING_EXT:
+			atom = uwsgi_malloc(esize+1);
+			ei_decode_string(x->buff, &x->index, atom);
+			uwsgi_log("string: %s\n", atom);
+			free(atom);
+			break;
+		case ERL_ATOM_EXT:
+			atom = uwsgi_malloc(esize+1);
+			ei_decode_atom(x->buff, &x->index, atom);
+			uwsgi_log("atom: %s\n", atom);
+			free(atom);
+			break;
+		case ERL_SMALL_TUPLE_EXT:
+		case ERL_LARGE_TUPLE_EXT:
+			ei_decode_tuple_header(x->buff, &x->index, &arity);
+			for(i=0;i<arity;i++) {
+				dump_eterm(x);
+			}
+			break;
+		case ERL_LIST_EXT:
+		case ERL_NIL_EXT:
+			ei_decode_list_header(x->buff, &x->index, &arity);
+			if (arity == 0) {
+				uwsgi_log("nil value\n");
+				break;
+			}
+                        for(i=0;i<arity+1;i++) {
+                                dump_eterm(x);
+                        }
+                        break;
+		case ERL_BINARY_EXT:
+			binary = uwsgi_malloc(esize);
+			ei_decode_binary(x->buff, &x->index, binary, &bin_size);
+			uwsgi_log("binary data of %d bytes\n", bin_size);
+			free(binary);
+			break;
+		default:
+			uwsgi_log("ignored...\n");
+			ei_skip_term(x->buff, &x->index);
+			break;
+			
+			
+			
+	}
+	
+	
+}
+
+void uwsgi_erlang_rpc(int fd, erlang_pid *from, ei_x_buff *x) {
+
+	int etype, esize;
+	int arity;
+
+	char *gen_call;
+	char *module;
+	char *call;
+	char buffer[0xffff];
+
+	char *argv[256] ;
+	uint16_t argvs[256] ;
+	int argc = 0;
+	uint16_t ret;
+	ei_x_buff xr;
+
+	erlang_ref eref;
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("%d %c %c %c\n", etype, etype, ERL_SMALL_TUPLE_EXT, ERL_LARGE_TUPLE_EXT);
+#endif
+	if (etype != ERL_SMALL_TUPLE_EXT && etype != ERL_LARGE_TUPLE_EXT) return;
+
+	ei_decode_tuple_header(x->buff, &x->index, &arity);
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("rpc arity %d\n", arity);
+#endif
+	if (arity != 3) return ;
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+	if (etype != ERL_ATOM_EXT && etype != ERL_STRING_EXT) return ;
+
+	gen_call = uwsgi_malloc(esize);
+
+	if (etype == ERL_ATOM_EXT) {
+                ei_decode_atom(x->buff, &x->index, gen_call);
+        }
+        else {
+                ei_decode_string(x->buff, &x->index, gen_call);
+        }
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("gen call = %s\n", gen_call);
+#endif
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+	
+	if (etype != ERL_SMALL_TUPLE_EXT) return ;
+
+	ei_decode_tuple_header(x->buff, &x->index, &arity);
+	if (arity != 2) return ;
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+	ei_skip_term(x->buff, &x->index);
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+	ei_decode_ref(x->buff, &x->index, &eref);
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+	module = uwsgi_malloc(esize);
+
+	if (etype == ERL_ATOM_EXT) {
+		ei_decode_atom(x->buff, &x->index, module);
+	}
+	else {
+		ei_decode_string(x->buff, &x->index, module);
+	}
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+	if (etype != ERL_SMALL_TUPLE_EXT) return ;
+
+	ei_decode_tuple_header(x->buff, &x->index, &arity);
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("arity: %d\n", arity);
+#endif
+	if (arity != 5) return ;
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+        char *method = uwsgi_malloc(esize);
+
+        if (etype == ERL_ATOM_EXT) {
+                ei_decode_atom(x->buff, &x->index, method);
+        }
+        else {
+                ei_decode_string(x->buff, &x->index, method);
+        }
+
+        if (strcmp(method, "call")) return;
+
+        ei_get_type(x->buff, &x->index, &etype, &esize);
+
+	if (etype != ERL_ATOM_EXT && etype != ERL_STRING_EXT) return ;
+
+	module = uwsgi_malloc(esize);
+
+	if (etype == ERL_ATOM_EXT) {
+		ei_decode_atom(x->buff, &x->index, module);
+	}
+	else {
+		ei_decode_string(x->buff, &x->index, module);
+	}
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+	if (etype != ERL_ATOM_EXT && etype != ERL_STRING_EXT) return ;
+
+	call = uwsgi_malloc(esize);
+
+	if (etype == ERL_ATOM_EXT) {
+		ei_decode_atom(x->buff, &x->index, call);
+	}
+	else {
+		ei_decode_string(x->buff, &x->index, call);
+	}
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("RPC %s %s\n", module, call);
+#endif
+
+	ei_get_type(x->buff, &x->index, &etype, &esize);
+
+	if (etype == ERL_ATOM_EXT) {
+		argc = 1;
+		argv[0] = uwsgi_malloc(esize+1);
+		ei_decode_atom(x->buff, &x->index, argv[0]);	
+		argvs[1] = esize;
+	}
+	else if (etype == ERL_STRING_EXT) {
+		argc = 1;
+		argv[0] = uwsgi_malloc(esize+1);
+		ei_decode_string(x->buff, &x->index, argv[0]);	
+		argvs[1] = esize;
+	}
+
+	ret = uwsgi_rpc(call, argc, argv, argvs, buffer);
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("buffer: %.*s\n", ret, buffer);
+#endif
+
+	ei_x_new_with_version(&xr);
+
+	ei_x_encode_tuple_header(&xr, 2);
+	//ei_x_encode_atom(&xr, "rex");
+	ei_x_encode_ref(&xr, &eref);
+	ei_x_encode_string_len(&xr, buffer, ret);
+
+	uwsgi_log("ei_send to %d %s %d %d %d: %d %d\n", fd, from->node, from->num , from->serial, from->creation, xr.index, ei_send(fd, from, xr.buff, xr.index));
+	//uwsgi_log("ei_send to %d %s %d %d %d: %d %d\n", fd, from->node, from->num , from->serial, from->creation, xr.index, ei_reg_send(&uerl.cnode, fd, "rex", xr.buff, xr.index));
+	
+	
+}
+
+void erlang_loop(int id, void *data) {
+
+	ErlConnect econn;
+	//ErlMessage em;
+	erlang_msg em;
+	int fd;
+
+	int eversion;
+
+	ei_x_buff x, xr;
+
+	ei_x_new(&x); 
+	ei_x_new(&xr); 
+
+	
+	/*
+	int fd0 = ei_connect(&uerl.cnode, "anothernode@maverick64");
+	uwsgi_log("fd0: %d\n", fd0);
+
+	ei_x_encode_list_header(&x, 0);
+
+	ei_rpc_to(&uerl.cnode, fd0, "erlang", "node", x.buff, x.index);
+
+	ei_rpc_from(&uerl.cnode, fd0, 10000, &em, &xr);
+
+	uwsgi_log("From: %s To: %s RegName: %s\n", em.from.node, em.to.node, em.toname);
+
+	xr.index = 0;
+	ei_decode_version(xr.buff, &xr.index, &eversion);
+        uwsgi_log("eversion: %d\n", eversion);
+
+	dump_eterm(&xr);	
+	*/
+
+	for(;;) {
+
+		fd = ei_accept(&uerl.cnode, uerl.fd, &econn);
+
+		if (fd >= 0) {
+
+			for (;;) {
+				if (ei_xreceive_msg(fd, &em, &x) == ERL_MSG) {
+
+					if (em.msgtype == ERL_TICK)
+						continue;
+
+					uwsgi_log("[erlang] message From: %s To (process): %s\n", em.from.node, em.toname);
+
+
+					
+					x.index = 0;
+					ei_decode_version(x.buff, &x.index, &eversion);
+#ifdef UWSGI_DEBUG
+					uwsgi_log("eversion: %d\n", eversion);
+#endif
+
+					if (!strcmp(em.toname, "rex")) {
+						uwsgi_erlang_rpc(fd, &em.from, &x);
+					}
+					else {
+						struct uwsgi_erlang_process *uep = uerl.uep;
+						while(uep) {
+							if (!strcmp(uep->name, em.toname)) {
+								if (uep->plugin) {
+									uep->plugin(uep->func, &x);	
+								}
+								break;
+							}
+							uep = uep->next;
+						}
+
+						if (!uep) {
+							uwsgi_log("!!! unregistered erlang process requested, dumping it !!!\n");
+							dump_eterm(&x);
+						}
+					}
+					
+					
+
+/*
+
+					if (em.msgtype) {
+						dump_erl_obj(em.msg);
+						erl_free_compound(em.msg);
+					}
+					if (em.to) {
+						uwsgi_log("*** TO ***\n");
+						dump_erl_obj(em.to);
+						erl_free_compound(em.to);
+					}
+
+					if (em.from) {
+						uwsgi_log("*** FROM ***\n");
+						dump_erl_obj(em.from);
+						erl_free_compound(em.from);
+					}
+*/
+
+				}
+				else {
+					break;
+				}
+			}
+
+			close(fd);
+
+		}
+	}
+}
+
+int erlang_init() {
+
+	char *host;
+	struct sockaddr_in sin;
+	socklen_t slen = sizeof(struct sockaddr_in);
+	char *ip = NULL;
+	char *nodename;
+	struct in_addr addr;
+
+        uerl.lock = uwsgi_lock_init("erlang");
+
+        if (uerl.name) {
+
+
+		host = strchr(uerl.name, '@');
+
+		if (!host) {
+			if (ei_connect_init(&uerl.cnode, uerl.name, uerl.cookie, 0) < 0) {
+				uwsgi_log("unable to initialize erlang connection\n");
+				exit(1);
+			}
+		}
+		else {
+			nodename = uwsgi_concat2n(uerl.name, host-uerl.name, "",0);
+			ip = uwsgi_resolve_ip(host+1);
+			if (ip) {
+#ifdef UWSGI_DEBUG
+				uwsgi_log("ip: %s\n", ip);
+#endif
+				addr.s_addr = inet_addr(ip);
+				if (ei_connect_xinit(&uerl.cnode, host+1, nodename, uerl.name, &addr, uerl.cookie, 0) < 0) {
+					uwsgi_log("unable to initialize erlang connection\n");
+					exit(1);
+				}
+			}
+			else {
+				if (ei_connect_init(&uerl.cnode, nodename, uerl.cookie, 0) < 0) {
+					uwsgi_log("unable to initialize erlang connection\n");
+					exit(1);
+				}
+			}
+			free(nodename);
+		}
+
+		if (ip) {
+			uerl.fd = bind_to_tcp(ip, uwsgi.listen_queue, NULL);
+		}
+		else {
+			uerl.fd = bind_to_tcp("", uwsgi.listen_queue, NULL);
+		}
+
+		if (uerl.fd < 0) {
+			exit(1);
+		}
+
+        	if (getsockname(uerl.fd, (struct sockaddr *) &sin, &slen)) {
+                	uwsgi_error("getsockname()");
+			exit(1);
+        	}
+
+		if (ei_publish(&uerl.cnode, ntohs(sin.sin_port)) < 0) {
+                	uwsgi_log( "*** unable to subscribe with EPMD ***\n");
+			exit(1);
+		}
+
+		uwsgi_log("Erlang C-Node %s registered on port %d\n", ei_thisnodename(&uerl.cnode), ntohs(sin.sin_port));
+
+	
+                if (register_gateway("uWSGI erlang c-node", erlang_loop, NULL) == NULL) {
+                        uwsgi_log("unable to register the erlang gateway\n");
+                        exit(1);
+                }
+
+        }
+
+        return 0;
+}
+
+struct uwsgi_plugin erlang_plugin = {
+
+	.name = "erlang",
+        .options = erlang_options,
+        .init = erlang_init,
+};
+

plugins/erlang/erlang.h

@@ -0,0 +1,24 @@
+#include <ei.h>
+
+struct uwsgi_erlang_process {
+	
+	char name[0xff];
+	void (*plugin)(void *, ei_x_buff *);
+	void *func;
+
+	struct uwsgi_erlang_process *next;
+};
+
+struct uwsgi_erlang {
+
+        ei_cnode cnode;
+        char *name;
+        char *cookie;
+
+        int fd;
+
+	void *lock;
+
+	struct uwsgi_erlang_process *uep;
+};
+