paste_loader: allow specifying alternative section name to load.

lua_plugin: protected and unprotected __tostring

.gitignore

@@ -4,8 +4,25 @@
 *.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
+
+/build/
+/dist/
+/uWSGI.egg-info/

.travis.yml

@@ -13,15 +13,15 @@ script:
   - echo -e "\n\n>>> Building python27 plugin"
   - /usr/bin/python2.7 -V
   - /usr/bin/python2.7 uwsgiconfig.py --plugin plugins/python base python27
-  - echo -e "\n\n>>> Building python31 plugin"
-  - /usr/bin/python3.1 -V
-  - /usr/bin/python3.1 uwsgiconfig.py --plugin plugins/python base python31
   - echo -e "\n\n>>> Building python32 plugin"
   - /usr/bin/python3.2 -V
   - /usr/bin/python3.2 uwsgiconfig.py --plugin plugins/python base python32
   - echo -e "\n\n>>> Building python33 plugin"
   - /usr/bin/python3.3 -V
   - /usr/bin/python3.3 uwsgiconfig.py --plugin plugins/python base python33
+  - echo -e "\n\n>>> Building python34 plugin"
+  - /usr/bin/python3.4 -V
+  - /usr/bin/python3.4 uwsgiconfig.py --plugin plugins/python base python34
   - echo -e "\n\n>>> Building rack 1.8.7 plugin"
   - /usr/bin/ruby1.8 -v
   - UWSGICONFIG_RUBYPATH=/usr/bin/ruby1.8 /usr/bin/python uwsgiconfig.py --plugin plugins/rack base rack187
@@ -36,9 +36,8 @@ script:
   - ./tests/travis.sh
 
 before_install:
-  - sudo add-apt-repository -y ppa:fkrull/deadsnakes
   - sudo apt-get update -qq
-  - sudo apt-get install -qqyf python2.6-dev python2.7-dev python3.1-dev python3.2-dev python3.3-dev rubygems1.8 ruby1.8-dev ruby1.9.1-dev
+  - sudo apt-get install -qqyf rubygems1.8 ruby1.8-dev ruby1.9.1-dev
   - sudo apt-get install -qqyf libxml2-dev libpcre3-dev libcap2-dev
   - sudo apt-get install -qqyf curl
 

CONTRIBUTORS

@@ -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, Unbit, <riccardo@unbit.it>
+Riccardo Magliocchetti
 Yann Malet, Lincoln Loop
 Simon Litchfield
 Masahiro Honma, <hiratara@cpan.org>
@@ -22,3 +22,15 @@ Aarni Koskela
 C Anthony Risinger
 Stephen Pierce
 Mingli Yuan
+Natanael Copa
+Roberto Leandrini
+Ryan Petrello
+Danila Shtan <danila@shtan.ru>
+Ævar Arnfjörð Bjarmason
+Yu Zhao (getcwd)
+Mathieu Dupuy
+Mike Kaplinskiy
+Adriano Di Luzio (adriano@unbit.it)
+James Raspass
+Curtis Maloney
+Vladimir Didenko

LICENSE

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

Makefile

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

README

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

apache2/mod_proxy_uwsgi.c

@@ -2,7 +2,7 @@
         
 *** mod_proxy_uwsgi ***
 
-Copyright 2009-2013 Unbit S.a.s. <info@unbit.it>
+Copyright 2009-2014 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,14 +67,19 @@ static int uwsgi_canon(request_rec *r, char *url)
     }
     url += sizeof(UWSGI_SCHEME); /* Keep slashes */
 
-    err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);
-    if (err) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+    // 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,
                       "error parsing URL %s: %s", url, err);
-        return HTTP_BAD_REQUEST;
+            return HTTP_BAD_REQUEST;
+        }
+	apr_snprintf(sport, sizeof(sport), ":%u", port);
     }
-
-    apr_snprintf(sport, sizeof(sport), ":%u", port);
 
     if (ap_strchr(host, ':')) { /* if literal IPv6 address */
         host = apr_pstrcat(r->pool, "[", host, "]", NULL);
@@ -253,6 +258,43 @@ 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
 
 
@@ -263,6 +305,7 @@ 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;
@@ -274,6 +317,7 @@ 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);
 
@@ -321,12 +365,13 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
                 ap_set_content_type(r, apr_pstrdup(r->pool, buf));
             }
 	
-	for(;;) {
+	int finish = 0;
+	while(!finish) {
 		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) {
@@ -342,21 +387,46 @@ 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;
-		ap_pass_brigade(r->output_filters, bb);
+
+		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;
+		}
+
 		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);
 
-    return OK;
+	if (c->aborted || backend_broke) {
+        	return DONE;
+        }
+
+	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-2013 Unbit S.a.s. <info@unbit.it>
+Copyright 2009-2014 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

attach.py

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

buildconf/all.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-main_plugin = python,gevent,psgi,lua,php,rack,jvm,jwsgi,ring,mono,transformation_toupper,coroae,v8,cgi,xslt,webdav,ssi,ldap
+main_plugin = python,gevent,psgi,lua,php,rack,jvm,jwsgi,ring,mono,transformation_toupper,coroae,v8,cgi,xslt,webdav,ssi,ldap,gccgo,rados,pypy,zabbix,curl_cron,tornado,tuntap,pty,mongrel2,alarm_curl,router_radius,airbrake,gridfs
 inherit = base

buildconf/asyncio.ini

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

buildconf/base.ini

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

buildconf/coverity.ini

@@ -1,4 +1,3 @@
 [uwsgi]
-# pypy,jvm,ring,jwsgi
-main_plugin = erlang,psgi,rack,lua,python,gevent,php,cgi,mono,pyerl,go
+main_plugin = psgi,rack,lua,python,gevent,php,cgi,gccgo,glusterfs,pty,xslt,msgpack,geoip,v8,pam,ldap,mono,jvm,ring,jwsgi,servlet,rados,coroae,pypy,airbrake,alarm_curl,alarm_xmpp,asyncio,cheaper_backlog2,clock_monotonic,clock_realtime,cplusplus,curl_cron,dumbloop,dummy,echo,emperor_amqp,emperor_pg,emperor_zeromq,example,exception_log,fiber,forkptyrouter,graylog2,legion_cache_fetch,libffi,logcrypto,libtcc,logpipe,logzmq,matheval,notfound,pyuwsgi,rbthreads,router_access,router_radius,router_spnego,router_xmldir,sqlite3,ssi,stats_pusher_file,stats_pusher_statsd,systemd_logger,tornado,transformation_toupper,tuntap,webdav,xattr,zabbix
 inherit = base

buildconf/default.ini

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

buildconf/gccgo.ini

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

buildconf/glusterfs.ini

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

buildconf/go.ini

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

buildconf/minimal.ini

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

buildconf/plonly.ini

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

buildconf/ppa.ini

@@ -1,15 +1,12 @@
 [uwsgi]
-xml = true
-yaml = true
+xml = libxml2
+yaml = libyaml
 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/pyonly.ini

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

buildconf/pypyonly.ini

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

buildconf/rados.ini

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

buildconf/rbonly.ini

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

buildconf/ruby2.ini

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

buildconf/servlet.ini

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

buildconf/unbit.ini

@@ -1,15 +1,12 @@
 [uwsgi]
-xml = true
-yaml = true
+xml = expat
+yaml = embedded
 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

@@ -0,0 +1,29 @@
+[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 =

buildconf/v8.ini

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

contrib/graphite_uwsgi.py

@@ -15,6 +15,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 CARBON_SERVER = "127.0.0.1:2003"
 
+
 def update_carbon(signum):
     # connect to the carbon server
     carbon_fd = uwsgi.connect(CARBON_SERVER)

contrib/pypy/uwsgi_pypy_greenlets.py

@@ -12,13 +12,15 @@ import greenlet
 
 uwsgi_pypy_greenlets = {}
 
+
 def uwsgi_pypy_greenlet_wrapper():
     lib.async_schedule_to_req_green()
 
+
 @ffi.callback("void()")
 def uwsgi_pypy_greenlet_schedule():
     id = lib.uwsgi.wsgi_req.async_id
-    modifier1 = lib.uwsgi.wsgi_req.uh.modifier1;
+    modifier1 = lib.uwsgi.wsgi_req.uh.modifier1
 
     # generate a new greenlet
     if not lib.uwsgi.wsgi_req.suspended:
@@ -36,10 +38,11 @@ def uwsgi_pypy_greenlet_schedule():
     if lib.uwsgi.p[modifier1].resume:
         lib.uwsgi.p[modifier1].resume(ffi.NULL)
 
+
 @ffi.callback("void(struct wsgi_request *)")
 def uwsgi_pypy_greenlet_switch(wsgi_req):
-    id = wsgi_req.async_id
-    modifier1 = wsgi_req.uh.modifier1;
+    wsgi_req.async_id
+    modifier1 = wsgi_req.uh.modifier1
 
     # this is called in the current greenlet
     if lib.uwsgi.p[modifier1].suspend:
@@ -54,7 +57,7 @@ def uwsgi_pypy_greenlet_switch(wsgi_req):
     # update current running greenlet
     lib.uwsgi.wsgi_req = wsgi_req
 
-if lib.uwsgi.async <= 1:
+if lib.uwsgi.async < 1:
     raise Exception("pypy greenlets require async mode !!!")
 lib.uwsgi.schedule_to_main = uwsgi_pypy_greenlet_switch
 lib.uwsgi.schedule_to_req = uwsgi_pypy_greenlet_schedule

contrib/pyuwsgi.py

@@ -11,7 +11,7 @@ uwsgi_args = []
 for arg in sys.argv[2:]:
     uwsgi_args.append(arg)
 
-#pyuwsgi.run('welcome.ini')
+# pyuwsgi.run('welcome.ini')
 pyuwsgi.run(uwsgi_args)
 
 # if you are here uWSGI has been reloaded

contrib/runuwsgi.py

@@ -4,6 +4,7 @@ from django.conf import settings
 import os
 import sys
 
+
 class Command(BaseCommand):
     help = "Runs this project as a uWSGI application. Requires the uwsgi binary in system path."
 
@@ -12,10 +13,10 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         for arg in args:
-            k,v = arg.split('=')
+            k, v = arg.split('=')
             if k == 'http':
                 if self.http_port:
-                   self.http_port = v
+                    self.http_port = v
             elif k == 'socket':
                 self.http_port = None
                 self.socket_addr = v
@@ -40,8 +41,8 @@ class Command(BaseCommand):
         elif self.socket_addr:
             os.environ['UWSGI_SOCKET'] = self.socket_addr
 
-	# map admin static files
-	os.environ['UWSGI_STATIC_MAP'] = '%s=%s' % (settings.ADMIN_MEDIA_PREFIX, os.path.join(django.__path__[0], 'contrib', 'admin', 'media'))
+        # map admin static files
+        os.environ['UWSGI_STATIC_MAP'] = '%s=%s' % (settings.ADMIN_MEDIA_PREFIX, os.path.join(django.__path__[0], 'contrib', 'admin', 'media'))
         # remove sockets/pidfile at exit
         os.environ['UWSGI_VACUUM'] = '1'
         # retrieve/set the PythonHome

contrib/spoolqueue/producer.py

@@ -1,11 +1,10 @@
 from tasksconsumer import enqueue
 
+
 def application(env, sr):
 
-    sr('200 OK', [('Content-Type','text/html')])
+    sr('200 OK', [('Content-Type', 'text/html')])
 
     enqueue(queue='fast', pippo='pluto')
 
     return "Task enqueued"
-
-

contrib/spoolqueue/tasks.py

@@ -1,9 +1,11 @@
-from tasksconsumer import *
+from tasksconsumer import queueconsumer
+
 
 @queueconsumer('fast', 4)
 def fast_queue(arguments):
     print "fast", arguments
 
+
 @queueconsumer('slow')
 def slow_queue(arguments):
     print "foobar", arguments

contrib/spoolqueue/tasksconsumer.py

@@ -1,35 +1,36 @@
-from uwsgidecorators import *
+from uwsgidecorators import spool
 import Queue
 from threading import Thread
 
 queues = {}
 
+
 class queueconsumer(object):
 
     def __init__(self, name, num=1, **kwargs):
         self.name = name
-	self.num = num
+        self.num = num
         self.queue = Queue.Queue()
-	self.threads = []
-	self.func = None
-	queues[self.name] = self
-
+        self.threads = []
+        self.func = None
+        queues[self.name] = self
 
     @staticmethod
     def consumer(self):
         while True:
-	    req = self.queue.get()
+            req = self.queue.get()
             print req
-	    self.func(req)
-	    self.queue.task_done()
+            self.func(req)
+            self.queue.task_done()
 
     def __call__(self, f):
         self.func = f
-	for i in range(self.num):
-	    t = Thread(target=self.consumer,args=(self,))	
-	    self.threads.append(t)
-	    t.daemon = True
-	    t.start()
+        for i in range(self.num):
+            t = Thread(target=self.consumer, args=(self,))
+            self.threads.append(t)
+            t.daemon = True
+            t.start()
+
 
 @spool
 def spooler_enqueuer(arguments):

contrib/twuwsgi.py

@@ -1,22 +1,22 @@
 from twisted.internet import defer, protocol, reactor
 from twisted.protocols import basic
-from twisted.web2 import server, http, resource, responsecode, stream, channel
-from twisted.application import service, strports
+from twisted.web2 import http, resource, responsecode, stream
 
 import struct
 
 
 class uWSGIClientResource(resource.LeafResource):
 
-    def __init__(self,app='', port=3030, host='localhost'):
+    def __init__(self, app='', port=3030, host='localhost'):
         resource.LeafResource.__init__(self)
         self.host = host
         self.port = port
-	self.app = app
-    
+        self.app = app
+
     def renderHTTP(self, request):
         return uWSGI(request, self.app, self.host, self.port)
 
+
 def uWSGI(request, app, host, port):
     if request.stream.length is None:
         return http.Response(responsecode.LENGTH_REQUIRED)
@@ -25,60 +25,59 @@ def uWSGI(request, app, host, port):
     factory = uWSGIClientProtocolFactory(request)
     reactor.connectTCP(host, port, factory)
     return factory.deferred
-    
+
+
 class uWSGIClientProtocol(basic.LineReceiver):
-    
+
     def __init__(self, request, deferred):
         self.request = request
         self.deferred = deferred
         self.stream = stream.ProducerStream()
         self.response = http.Response(stream=self.stream)
-	self.status_parsed = None
+        self.status_parsed = None
 
-    def build_uwsgi_var(self,key,value):
-	return struct.pack('<H',len(key)) + key + struct.pack('<H',len(value)) + value
+    def build_uwsgi_var(self, key, value):
+        return struct.pack('<H', len(key)) + key + struct.pack('<H', len(value)) + value
 
     def connectionMade(self):
-	print self.request.__dict__
-	# reset response parser
-	self.status_parsed = None
-	# build header and vars
-	vars = ''
+        print(self.request.__dict__)
+        # reset response parser
+        self.status_parsed = None
+        # build header and vars
+        vars = ''
 
-	if self.request.stream.length:
-        	vars += self.build_uwsgi_var('CONTENT_LENGTH',str(self.request.stream.length))
+        if self.request.stream.length:
+                vars += self.build_uwsgi_var('CONTENT_LENGTH', str(self.request.stream.length))
 
-	for hkey, hval in self.request.headers.getAllRawHeaders():
-		# use a list, probably it will be extended
-		if hkey.lower() not in ('content-type'):
-			vars += self.build_uwsgi_var('HTTP_'+hkey.upper().replace('-','_'),','.join(hval))
-		else:
-			vars += self.build_uwsgi_var(hkey.upper().replace('-','_'),','.join(hval))
-		
+        for hkey, hval in self.request.headers.getAllRawHeaders():
+                # use a list, probably it will be extended
+                if hkey.lower() not in ('content-type'):
+                        vars += self.build_uwsgi_var('HTTP_' + hkey.upper().replace('-', '_'), ','.join(hval))
+                else:
+                        vars += self.build_uwsgi_var(hkey.upper().replace('-', '_'), ','.join(hval))
 
-	vars += self.build_uwsgi_var('REQUEST_METHOD', self.request.method)
-	vars += self.build_uwsgi_var('SCRIPT_NAME', self.request.uwsgi_app)
-	vars += self.build_uwsgi_var('PATH_INFO', self.request.path[len(self.request.uwsgi_app):])
-	vars += self.build_uwsgi_var('QUERY_STRING', self.request.querystring)
-	vars += self.build_uwsgi_var('SERVER_NAME', self.request.host)
-	vars += self.build_uwsgi_var('SERVER_PORT', str(self.request.port))
-	vars += self.build_uwsgi_var('SERVER_PROTOCOL', self.request.scheme.upper()+'/'+str(self.request.clientproto[0]) +'.'+str(self.request.clientproto[1]))
+        vars += self.build_uwsgi_var('REQUEST_METHOD', self.request.method)
+        vars += self.build_uwsgi_var('SCRIPT_NAME', self.request.uwsgi_app)
+        vars += self.build_uwsgi_var('PATH_INFO', self.request.path[len(self.request.uwsgi_app):])
+        vars += self.build_uwsgi_var('QUERY_STRING', self.request.querystring)
+        vars += self.build_uwsgi_var('SERVER_NAME', self.request.host)
+        vars += self.build_uwsgi_var('SERVER_PORT', str(self.request.port))
+        vars += self.build_uwsgi_var('SERVER_PROTOCOL', self.request.scheme.upper() + '/' + str(self.request.clientproto[0]) + '.' + str(self.request.clientproto[1]))
 
-	vars += self.build_uwsgi_var('REQUEST_URI', self.request.uri)
-	vars += self.build_uwsgi_var('REMOTE_ADDR', self.request.remoteAddr.host)
+        vars += self.build_uwsgi_var('REQUEST_URI', self.request.uri)
+        vars += self.build_uwsgi_var('REMOTE_ADDR', self.request.remoteAddr.host)
 
+        self.transport.write(struct.pack('<BHB', 0, len(vars), 0))
+        self.transport.write(vars)
 
-	self.transport.write(struct.pack('<BHB',0, len(vars),0))
-	self.transport.write(vars)
-
-	# send request data
+        # send request data
         stream.StreamProducer(self.request.stream).beginProducing(self.transport)
-        
+
     def lineReceived(self, line):
-	if self.status_parsed is None:
-		self.response.code = line.split(' ',2)[1]	
-		self.status_parsed = True
-		return
+        if self.status_parsed is None:
+                self.response.code = line.split(' ', 2)[1]
+                self.status_parsed = True
+                return
 
         # end of headers
         if line == '':
@@ -87,33 +86,33 @@ class uWSGIClientProtocol(basic.LineReceiver):
             self.response = None
             return
 
-        name, value = line.split(':',1)
+        name, value = line.split(':', 1)
         value = value.strip()
 
         self.response.headers.addRawHeader(name, value)
-        
+
     def rawDataReceived(self, data):
         self.stream.write(data)
-        
+
     def connectionLost(self, reason):
         self.stream.finish()
-    
-    
+
+
 class uWSGIClientProtocolFactory(protocol.ClientFactory):
 
     protocol = uWSGIClientProtocol
-    noisy = False # Make Factory shut up
-    
+    noisy = False  # Make Factory shut up
+
     def __init__(self, request):
         self.request = request
         self.deferred = defer.Deferred()
-        
+
     def buildProtocol(self, addr):
         return self.protocol(self.request, self.deferred)
-        
+
     def clientConnectionFailed(self, connector, reason):
         self.sendFailureResponse(reason)
-        
+
     def sendFailureResponse(self, reason):
         response = http.Response(code=responsecode.BAD_GATEWAY, stream=str(reason.value))
         self.deferred.callback(response)

contrib/uwsgi-cache-monitor.py

@@ -6,6 +6,7 @@ import time
 import sys
 from optparse import OptionParser
 
+
 class Cache:
 
     def __init__(self, filename, cache_slots, block_size=65536, sample_sleep=1):
@@ -41,7 +42,7 @@ class Cache:
         fields = struct.unpack_from('@HHIQQQQQ2048c', buf)
         key = array.array('c', fields[8:self.key_size+8]).tostring().rstrip('\x00')
 
-        if [x for x in key if x!= '\x00']:
+        if [x for x in key if x != '\x00']:
             buf = self.store_read_item_block(position)
             value = array.array('c', buf).tostring().rstrip('\x00')
         else:
@@ -55,7 +56,7 @@ class Cache:
         if self.sample_sleep:
             time.sleep(self.sample_sleep)
         return data
- 
+
     def update_stats(self, data):
         # data is a list of (position, key, value, len(value)) tuples
         items = len([1 for x in data if x[3] > 0])
@@ -68,54 +69,75 @@ class Cache:
         self.samples += 1
         block_sizes = sum([x[3] for x in data])
         self.block_sizes += block_sizes
-        self.history.append({'full': full, 'empty': empty, 'data': data, \
-            'items': items, 'block_sizes': block_sizes})
+        self.history.append({
+            'full': full,
+            'empty': empty,
+            'data': data,
+            'items': items,
+            'block_sizes': block_sizes
+        })
 
     def dump(self):
         return {
             'samples': self.samples,
             'history': self.history,
             'cache_slots': self.cache_slots,
-            'sample_sleep': self.sample_sleep, 
+            'sample_sleep': self.sample_sleep,
             'cache_empty': self.cache_empty,
             'cache_full': self.cache_full,
             'cache_items': self.cache_items,
             'block_sizes': self.block_sizes,
-         }
+        }
 
     def show_dump(self):
         d = self.dump()
-        print
-        print "Recorded %d samples (%d second(s) sleep between samples)" % \
-            (d['samples'], d['sample_sleep'])
-        print "Cache empty %d times, full %d times, %.2f items on average" % \
-            (d['cache_empty'], d['cache_full'], d['cache_items'] / d['samples'])
-        print "Block size average size: %d bytes" % \
-            (d['block_sizes'] / d['cache_items'] * 8)
-        print "Data in cache average: %d bytes" % \
-            (d['block_sizes'] / d['samples'] * 8)
+        print()
+        print("Recorded %d samples (%d second(s) sleep between samples)" % (
+            d['samples'],
+            d['sample_sleep']
+        ))
+        print("Cache empty %d times, full %d times, %.2f items on average" % (
+            d['cache_empty'],
+            d['cache_full'],
+            d['cache_items'] / d['samples']
+        ))
+        print("Block size average size: %d bytes" % (
+            d['block_sizes'] / d['cache_items'] * 8
+        ))
+        print("Data in cache average: %d bytes" % (
+            d['block_sizes'] / d['samples'] * 8
+        ))
+
 
 def main(options):
     cache = Cache(options.cache_store, options.cache_slots, options.block_size,
-        options.sleep_time)
-    print "Recording..."
+                  options.sleep_time)
+    print("Recording...")
     while True:
         try:
-            data = cache.read()
+            cache.read()
         except KeyboardInterrupt:
             cache.show_dump()
             sys.exit(0)
 
 if __name__ == '__main__':
     parser = OptionParser()
-    parser.add_option("-s", "--cache-slots", dest="cache_slots", type="int",
-        help="Slots available in the cache, uwsgi cache option")
-    parser.add_option("-c", "--cache-store", dest="cache_store", default="uwsgi.cache",
-        help="The filename of the cache store, uwsgi cache-store option. Default: uwsgi.cache")
-    parser.add_option("-b", "--block-size", dest="block_size", default=65536, type="int",
-        help="The size of the cache block, uwsgi cache-blocksize option. Default: 65536")
-    parser.add_option("-t", "--sleep-time", dest="sleep_time", default=1, type="int",
-        help="The time to sleep between each sample. Default: 1")
+    parser.add_option(
+        "-s", "--cache-slots", dest="cache_slots", type="int",
+        help="Slots available in the cache, uwsgi cache option"
+    )
+    parser.add_option(
+        "-c", "--cache-store", dest="cache_store", default="uwsgi.cache",
+        help="The filename of the cache store, uwsgi cache-store option. Default: uwsgi.cache"
+    )
+    parser.add_option(
+        "-b", "--block-size", dest="block_size", default=65536, type="int",
+        help="The size of the cache block, uwsgi cache-blocksize option. Default: 65536"
+    )
+    parser.add_option(
+        "-t", "--sleep-time", dest="sleep_time", default=1, type="int",
+        help="The time to sleep between each sample. Default: 1"
+    )
 
     (options, args) = parser.parse_args()
     if not options.cache_slots:

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_alarm("] %s %.*s\n", uai->arg, len, msg);
+			uwsgi_log_verbose("ALARM: %s %.*s\n", uai->arg, len, msg);
 		}
 		else {
-			uwsgi_log_alarm("] %.*s\n", len, msg);
+			uwsgi_log_verbose("ALARM: %.*s\n", len, msg);
 		}
 	}
 	else {
 		if (uai->arg && strlen(uai->arg) > 0) {
-			uwsgi_log_alarm("] %s %.*s", uai->arg, len, msg);
+			uwsgi_log_verbose("ALARM: %s %.*s", uai->arg, len, msg);
 		}
 		else {
-			uwsgi_log_alarm("] %.*s", len, msg);
+			uwsgi_log_verbose("ALARM: %.*s", len, msg);
 		}
 	}
 }
@@ -171,6 +171,7 @@ static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
 
 	ual = uwsgi_calloc(sizeof(struct uwsgi_alarm_log));
 	if (uwsgi_regexp_build(regexp, &ual->pattern, &ual->pattern_extra)) {
+		free(ual);
 		return -1;
 	}
 	ual->negate = negate;
@@ -184,8 +185,8 @@ static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
 
 	// map instances to the log
 	char *list = uwsgi_str(alarms);
-	char *p = strtok(list, ",");
-	while (p) {
+	char *p, *ctx = NULL;
+	uwsgi_foreach_token(list, ",", p, ctx) {
 		struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(p);
 		if (!uai) {
 			free(list);
@@ -205,7 +206,6 @@ static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
 		else {
 			ual->alarms = uall;
 		}
-		p = strtok(NULL, ",");
 	}
 	free(list);
 	return 0;
@@ -364,6 +364,19 @@ 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) {
@@ -373,7 +386,14 @@ 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) {
-				uwsgi_alarm_log_run(ual, msg, len);
+				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;
+				}
 			}
 			else {
 				break;
@@ -398,18 +418,6 @@ 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;
@@ -417,16 +425,7 @@ 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;
 
-	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()");
-	}
+	uwsgi_alarm_trigger_uai(uai, msg, len);
 }
 
 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,31 +4,30 @@ 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 in this list
+	1) the runqueue, cores ready to be run are appended to 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 aftert he specified number of seconds (unless an event cancel it)
+	3) the timeout value, if set, the current core will timeout after the specified number of seconds (unless an event cancels it)
 
 
-	IMPORTANT: this is not a callback based engine !!!
+	IMPORTANT: this is not a callback-based engine !!!
 
 */
 
 // this is called whenever a new connection is ready, but there are no cores to handle it
 void uwsgi_async_queue_is_full(time_t now) {
-	if (now > uwsgi.async_queue_is_full) {
+	if (now > uwsgi.async_queue_is_full && uwsgi.async_warn_if_queue_full) {
 		uwsgi_log_verbose("[DANGER] async queue is full !!!\n");
 		uwsgi.async_queue_is_full = now;
 	}
 }
 
 void uwsgi_async_init() {
-	int i;
 
 	uwsgi.async_queue = event_queue_init();
 
@@ -40,16 +39,9 @@ void uwsgi_async_init() {
 
 	uwsgi.rb_async_timeouts = uwsgi_init_rb_timer();
 
-	// 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;
+	// 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);
 
 }
 
@@ -159,7 +151,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 teh request
+			// reset the request
 			async_reset_request(wsgi_req);
 			// push it in the runqueue
 			runqueue_push(wsgi_req);
@@ -173,6 +165,11 @@ 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 < 1 || !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)
@@ -224,8 +221,47 @@ 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 < 1 || !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) {
@@ -236,6 +272,11 @@ 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 < 1 || !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)
@@ -295,9 +336,8 @@ void async_schedule_to_req(void) {
 	// a trick to avoid calling routes again
 	uwsgi.wsgi_req->is_routing = 1;
 #endif
-        if (uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req) <= UWSGI_OK) {
-		goto end;
-	}
+	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.schedule_to_main) {
         	uwsgi.schedule_to_main(uwsgi.wsgi_req);
@@ -308,34 +348,65 @@ 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(uwsgi.wsgi_req) == UWSGI_ROUTE_BREAK) {
+        if (uwsgi_apply_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
                 goto end;
         }
 #endif
         for(;;) {
-                if (uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req) <= UWSGI_OK) {
+		wsgi_req->async_status = uwsgi.p[wsgi_req->uh->modifier1]->request(wsgi_req);
+                if (wsgi_req->async_status <= UWSGI_OK) {
                         break;
                 }
-                uwsgi.wsgi_req->switches++;
+                wsgi_req->switches++;
+		if (uwsgi.schedule_fix) {
+			uwsgi.schedule_fix(wsgi_req);
+		}
                 // switch after each yield
-                uwsgi.schedule_to_main(uwsgi.wsgi_req);
+		if (uwsgi.schedule_to_main)
+                	uwsgi.schedule_to_main(wsgi_req);
         }
 
 #ifdef UWSGI_ROUTING
 end:
 #endif
-        async_reset_request(uwsgi.wsgi_req);
-        uwsgi_close_request(uwsgi.wsgi_req);
-        uwsgi.wsgi_req->async_status = UWSGI_OK;
+	// 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;
 }
 
 void async_loop() {
 
-	if (uwsgi.async < 2) {
+	if (uwsgi.async < 1) {
 		uwsgi_log("the async loop engine requires async mode (--async <n>)\n");
 		exit(1);
 	}
@@ -353,10 +424,14 @@ 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);
@@ -368,7 +443,7 @@ void async_loop() {
 		uwsgi.schedule_to_req = async_schedule_to_req;
 
 	if (!uwsgi.schedule_to_main) {
-		uwsgi_log("*** WARNING *** async mode without coroutine/greenthread engine loaded !!!\n");
+		uwsgi_log("*** DANGER *** async mode without coroutine/greenthread engine loaded !!!\n");
 	}
 
 	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
@@ -406,7 +481,12 @@ void async_loop() {
 
 			// signals are executed in the main stack... in the future we could have dedicated stacks for them
 			if (uwsgi.signal_socket > -1 && (interesting_fd == uwsgi.signal_socket || interesting_fd == uwsgi.my_signal_socket)) {
-				uwsgi_receive_signal(interesting_fd, "worker", uwsgi.mywid);
+				uwsgi.wsgi_req = find_first_available_wsgi_req();
+                                if (uwsgi.wsgi_req == NULL) {
+                                	uwsgi_async_queue_is_full((time_t)now);
+                                        continue; 
+                                }
+				uwsgi_receive_signal(uwsgi.wsgi_req, interesting_fd, "worker", uwsgi.mywid);
 				continue;
 			}
 
@@ -465,7 +545,8 @@ 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
+						// put request in the runqueue (set it as UWSGI_OK to signal the first run)
+						uwsgi.wsgi_req->async_status = UWSGI_OK;
 						runqueue_push(uwsgi.wsgi_req);
 						continue;
 					}
@@ -475,7 +556,7 @@ void async_loop() {
 						continue;
 					}
 					// re-add timer
-					async_add_timeout(uwsgi.wsgi_req, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+					async_add_timeout(uwsgi.wsgi_req, uwsgi.socket_timeout);
 					continue;
 				}
 
@@ -511,19 +592,11 @@ void async_loop() {
 			uwsgi.wsgi_req->switches++;
 
 			// request ended ?
-			if (uwsgi.wsgi_req->async_status <= UWSGI_OK) {
+			if (uwsgi.wsgi_req->async_status <= UWSGI_OK ||
+				uwsgi.wsgi_req->waiting_fds || uwsgi.wsgi_req->async_timeout) {
 				// 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

@@ -3,6 +3,9 @@
 extern struct uwsgi_server uwsgi;
 
 struct uwsgi_buffer *uwsgi_buffer_new(size_t len) {
+#ifdef UWSGI_DEBUG_BUFFER
+	uwsgi_log("[uwsgi-buffer] allocating a new buffer of %llu\n", (unsigned long long) len);
+#endif
 	struct uwsgi_buffer *ub = uwsgi_calloc(sizeof(struct uwsgi_buffer));
 
 	if (len) {
@@ -61,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);
@@ -71,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);
@@ -125,7 +128,16 @@ int uwsgi_buffer_append_json(struct uwsgi_buffer *ub, char *buf, size_t len) {
 	// need to escape \ and "
 	size_t i;
 	for(i=0;i<len;i++) {
-		if (buf[i] == '"') {
+		if (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 (uwsgi_buffer_append(ub, "\\\"", 2)) return -1;
 		}
 		else if (buf[i] == '\\') {
@@ -138,6 +150,32 @@ int uwsgi_buffer_append_json(struct uwsgi_buffer *ub, char *buf, size_t len) {
 	return 0;
 }
 
+int uwsgi_buffer_append_xml(struct uwsgi_buffer *ub, char *buf, size_t len) {
+        // need to escape \ and "
+        size_t i;
+        for(i=0;i<len;i++) {
+                if (buf[i] == '"') {
+                        if (uwsgi_buffer_append(ub, "&quot;", 6)) return -1;
+                }
+                else if (buf[i] == '\'') {
+                        if (uwsgi_buffer_append(ub, "&apos;", 6)) return -1;
+                }
+                else if (buf[i] == '<') {
+                        if (uwsgi_buffer_append(ub, "&lt;", 4)) return -1;
+                }
+                else if (buf[i] == '>') {
+                        if (uwsgi_buffer_append(ub, "&gt;", 4)) return -1;
+                }
+                else if (buf[i] == '&') {
+                        if (uwsgi_buffer_append(ub, "&amp;", 5)) return -1;
+                }
+                else {
+                        if (uwsgi_buffer_append(ub, buf+i, 1)) return -1;
+                }
+        }
+        return 0;
+}
+
 int uwsgi_buffer_u16le(struct uwsgi_buffer *ub, uint16_t num) {
 	uint8_t buf[2];
 	buf[0] = (uint8_t) (num & 0xff);
@@ -169,6 +207,16 @@ int uwsgi_buffer_u32be(struct uwsgi_buffer *ub, uint32_t num) {
         return uwsgi_buffer_append(ub, (char *) buf, 4);
 }
 
+int uwsgi_buffer_f32be(struct uwsgi_buffer *ub, float num) {
+        uint8_t buf[4];
+	uint32_t *pnum = (uint32_t *) &num;
+        buf[3] = (uint8_t) (*pnum & 0xff);
+        buf[2] = (uint8_t) ((*pnum >> 8) & 0xff);
+        buf[1] = (uint8_t) ((*pnum >> 16) & 0xff);
+        buf[0] = (uint8_t) ((*pnum >> 24) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 4);
+}
+
 int uwsgi_buffer_u32le(struct uwsgi_buffer *ub, uint32_t num) {
         uint8_t buf[4];
         buf[0] = (uint8_t) (num & 0xff);
@@ -191,6 +239,33 @@ 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];
+	uint64_t *pnum = (uint64_t *) &num;
+        buf[7] = (uint8_t) (*pnum & 0xff);
+        buf[6] = (uint8_t) ((*pnum >> 8) & 0xff);
+        buf[5] = (uint8_t) ((*pnum >> 16) & 0xff);
+        buf[4] = (uint8_t) ((*pnum >> 24) & 0xff);
+        buf[3] = (uint8_t) ((*pnum >> 32) & 0xff);
+        buf[2] = (uint8_t) ((*pnum >> 40) & 0xff);
+        buf[1] = (uint8_t) ((*pnum >> 48) & 0xff);
+        buf[0] = (uint8_t) ((*pnum >> 56) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 8);
+}
 
 int uwsgi_buffer_append_ipv4(struct uwsgi_buffer *ub, void *addr) {
 	char ip[INET_ADDRSTRLEN];
@@ -205,7 +280,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);
@@ -228,7 +303,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;
@@ -240,7 +315,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;
@@ -270,6 +345,13 @@ int uwsgi_buffer_append_base64(struct uwsgi_buffer *ub, char *s, size_t len) {
 
 
 void uwsgi_buffer_destroy(struct uwsgi_buffer *ub) {
+#ifdef UWSGI_DEBUG_BUFFER
+	uwsgi_log("[uwsgi-buffer] destroying buffer of %llu bytes\n", (unsigned long long) ub->len);
+	if (ub->freed) {
+		uwsgi_log("[uwsgi-buffer][BUG] buffer at %p already destroyed !!!\n", ub);
+	}
+	ub->freed = 1;
+#endif
 	if (ub->buf)
 		free(ub->buf);
 	free(ub);
@@ -293,7 +375,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.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+		int ret = uwsgi_waitfd_write(fd, uwsgi.socket_timeout);
 		if (ret > 0) {
 			ssize_t len = write(fd, ptr, remains);
 			if (len > 0) {
@@ -362,3 +444,10 @@ void uwsgi_buffer_map(struct uwsgi_buffer *ub, char *buf, size_t len) {
 	ub->pos = len;
 	ub->len = len;
 }
+
+int uwsgi_buffer_httpdate(struct uwsgi_buffer *ub, time_t t) {
+	char http_last_modified[49];
+        int size = uwsgi_http_date(t, http_last_modified);
+	if (size <= 0) return -1;
+	return uwsgi_buffer_append(ub, http_last_modified, size);
+}

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.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
+	if (timeout == 0) timeout = uwsgi.socket_timeout;
 
 	int ret = -1;
 
@@ -84,7 +84,7 @@ static ssize_t uwsgi_chunked_readline(struct wsgi_request *wsgi_req) {
 */
 
 char *uwsgi_chunked_read(struct wsgi_request *wsgi_req, size_t *len, int timeout, int nb) {
-	char *ret;
+
 	if (!wsgi_req->chunked_input_buf) {
 		wsgi_req->chunked_input_buf = uwsgi_buffer_new(uwsgi.page_size);
 		wsgi_req->chunked_input_buf->limit = uwsgi.chunked_input_limit;
@@ -96,14 +96,18 @@ char *uwsgi_chunked_read(struct wsgi_request *wsgi_req, size_t *len, int timeout
 		return wsgi_req->chunked_input_buf->buf;
 	}
 
+	if (wsgi_req->chunked_input_decapitate > 0) {
+		if (uwsgi_buffer_decapitate(wsgi_req->chunked_input_buf, wsgi_req->chunked_input_decapitate)) return NULL;
+		wsgi_req->chunked_input_decapitate = 0;
+	}
+
 	for(;;) {
 		if (wsgi_req->chunked_input_need > 0 || wsgi_req->chunked_input_buf->pos == 0) {
-			if (uwsgi_buffer_fix(wsgi_req->chunked_input_buf, uwsgi.page_size)) return NULL;
+			if (uwsgi_buffer_ensure(wsgi_req->chunked_input_buf, UMAX((uint64_t)uwsgi.page_size, wsgi_req->chunked_input_need))) return NULL;
 			ssize_t rlen = uwsgi_chunked_input_recv(wsgi_req, timeout, nb);	
 			if (rlen <= 0) return NULL;
 			// update buffer position
 			wsgi_req->chunked_input_buf->pos += rlen;
-
 			if (wsgi_req->chunked_input_need > 0) {
 				if ((size_t)rlen > wsgi_req->chunked_input_need) {
 					wsgi_req->chunked_input_need = 0;
@@ -122,6 +126,7 @@ char *uwsgi_chunked_read(struct wsgi_request *wsgi_req, size_t *len, int timeout
 				case 0:
 					wsgi_req->chunked_input_chunk_len = uwsgi_chunked_readline(wsgi_req);
 					if (wsgi_req->chunked_input_chunk_len == -2) {
+						wsgi_req->chunked_input_need++;
 						break;
 					}
 					else if (wsgi_req->chunked_input_chunk_len < 0) {
@@ -139,19 +144,17 @@ char *uwsgi_chunked_read(struct wsgi_request *wsgi_req, size_t *len, int timeout
 						break;
 					}
 					*len = wsgi_req->chunked_input_chunk_len;
-					ret = wsgi_req->chunked_input_buf->buf;
-					if (uwsgi_buffer_decapitate(wsgi_req->chunked_input_buf, wsgi_req->chunked_input_chunk_len+2)) return NULL;
-					return ret;
+					wsgi_req->chunked_input_decapitate = wsgi_req->chunked_input_chunk_len+2;
+					return wsgi_req->chunked_input_buf->buf;
 				case 1:
 					if ((size_t)(wsgi_req->chunked_input_chunk_len+2) > wsgi_req->chunked_input_buf->pos) {
                                                 wsgi_req->chunked_input_need = (wsgi_req->chunked_input_chunk_len+2) - wsgi_req->chunked_input_buf->pos;
 						break;
                                         }	
 					*len = wsgi_req->chunked_input_chunk_len;
-                                        ret = wsgi_req->chunked_input_buf->buf;
-                                        if (uwsgi_buffer_decapitate(wsgi_req->chunked_input_buf, wsgi_req->chunked_input_chunk_len+2)) return NULL;
+					wsgi_req->chunked_input_decapitate = wsgi_req->chunked_input_chunk_len+2;
 					wsgi_req->chunked_input_parser_status = 0;
-                                        return ret;
+                                        return wsgi_req->chunked_input_buf->buf;
 					
 			}
 		}

core/clock.c

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

@@ -31,3 +31,824 @@ struct uwsgi_configurator *uwsgi_register_configurator(char *name, void (*func)(
 
         return uc;
 }
+
+int uwsgi_logic_opt_if_exists(char *key, char *value) {
+
+        if (uwsgi_file_exists(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_exists(char *key, char *value) {
+
+        if (!uwsgi_file_exists(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+int uwsgi_logic_opt_for(char *key, char *value) {
+
+        char *p, *ctx = NULL;
+	uwsgi_foreach_token(uwsgi.logic_opt_data, " ", p, ctx) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+        }
+
+        return 1;
+}
+
+int uwsgi_logic_opt_for_glob(char *key, char *value) {
+
+        glob_t g;
+        int i;
+        if (glob(uwsgi.logic_opt_data, GLOB_MARK | GLOB_NOCHECK, NULL, &g)) {
+                uwsgi_error("uwsgi_logic_opt_for_glob()");
+                return 0;
+        }
+
+        for (i = 0; i < (int) g.gl_pathc; i++) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", g.gl_pathv[i]), 0);
+        }
+
+        globfree(&g);
+
+        return 1;
+}
+
+int uwsgi_logic_opt_for_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);
+        int i;
+        char str_num[11];
+
+        for (i = 1; i <= num; i++) {
+                int ret = uwsgi_num2str2(i, str_num);
+                // security check
+                if (ret < 0 || ret > 11) {
+                        exit(1);
+                }
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", str_num), 0);
+        }
+
+        return 1;
+}
+
+
+int uwsgi_logic_opt_if_opt(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = uwsgi_get_exported_opt(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (strcmp(equal + 1, p))
+                                return 0;
+                }
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+int uwsgi_logic_opt_if_not_opt(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = uwsgi_get_exported_opt(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (!strcmp(equal + 1, p))
+                                return 0;
+                }
+                else {
+                        return 0;
+                }
+        }
+
+        add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+        return 1;
+}
+
+
+
+int uwsgi_logic_opt_if_env(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = getenv(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (strcmp(equal + 1, p))
+                                return 0;
+                }
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+int uwsgi_logic_opt_if_not_env(char *key, char *value) {
+
+        // check for env-value syntax
+        char *equal = strchr(uwsgi.logic_opt_data, '=');
+        if (equal)
+                *equal = 0;
+
+        char *p = getenv(uwsgi.logic_opt_data);
+        if (equal)
+                *equal = '=';
+
+        if (p) {
+                if (equal) {
+                        if (!strcmp(equal + 1, p))
+                                return 0;
+                }
+                else {
+                        return 0;
+                }
+        }
+
+        add_exported_option(key, uwsgi_substitute(value, "%(_)", p), 0);
+        return 1;
+}
+
+int uwsgi_logic_opt_if_reload(char *key, char *value) {
+        if (uwsgi.is_a_reload) {
+                add_exported_option(key, value, 0);
+                return 1;
+        }
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_reload(char *key, char *value) {
+        if (!uwsgi.is_a_reload) {
+                add_exported_option(key, value, 0);
+                return 1;
+        }
+        return 0;
+}
+
+int uwsgi_logic_opt_if_file(char *key, char *value) {
+
+        if (uwsgi_is_file(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_file(char *key, char *value) {
+
+        if (!uwsgi_is_file(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_dir(char *key, char *value) {
+
+        if (uwsgi_is_dir(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_dir(char *key, char *value) {
+
+        if (!uwsgi_is_dir(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+
+
+int uwsgi_logic_opt_if_plugin(char *key, char *value) {
+
+        if (plugin_already_loaded(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_logic_opt_if_not_plugin(char *key, char *value) {
+
+        if (!plugin_already_loaded(uwsgi.logic_opt_data)) {
+                add_exported_option(key, uwsgi_substitute(value, "%(_)", uwsgi.logic_opt_data), 0);
+                return 1;
+        }
+
+        return 0;
+}
+
+int uwsgi_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;
+        int count = 0;
+
+        while ((aopt = uopt)) {
+                if (!aopt->name)
+                        break;
+                count++;
+                uopt++;
+        }
+
+        return count;
+}
+
+int uwsgi_opt_exists(char *name) {
+	struct uwsgi_option *op = uwsgi.options;
+	while (op->name) {
+		if (!strcmp(name, op->name)) return 1;
+		op++;
+	}
+	return 0;	
+}
+
+/*
+	avoid loops here !!!
+*/
+struct uwsgi_option *uwsgi_opt_get(char *name) {
+        struct uwsgi_option *op;
+	int round = 0;
+retry:
+	round++;
+	if (round > 2) goto end;
+	op = uwsgi.options;
+
+        while (op->name) {
+                if (!strcmp(name, op->name)) {
+                        return op;
+                }
+                op++;
+        }
+
+	if (uwsgi.autoload) {
+		if (uwsgi_try_autoload(name)) goto retry;
+	}
+
+end:
+	if (uwsgi.strict) {
+                uwsgi_log("[strict-mode] unknown config directive: %s\n", name);
+                exit(1);
+        }
+
+        return NULL;
+}
+
+
+
+void add_exported_option(char *key, char *value, int configured) {
+	add_exported_option_do(key, value, configured, 0);
+}
+
+void add_exported_option_do(char *key, char *value, int configured, int placeholder_only) {
+
+	struct uwsgi_string_list *blacklist = uwsgi.blacklist;
+	struct uwsgi_string_list *whitelist = uwsgi.whitelist;
+
+	while (blacklist) {
+		if (!strcmp(key, blacklist->value)) {
+			uwsgi_log("uWSGI error: forbidden option \"%s\" (by blacklist)\n", key);
+			exit(1);
+		}
+		blacklist = blacklist->next;
+	}
+
+	if (whitelist) {
+		int allowed = 0;
+		while (whitelist) {
+			if (!strcmp(key, whitelist->value)) {
+				allowed = 1;
+				break;
+			}
+			whitelist = whitelist->next;
+		}
+		if (!allowed) {
+			uwsgi_log("uWSGI error: forbidden option \"%s\" (by whitelist)\n", key);
+			exit(1);
+		}
+	}
+
+	if (uwsgi.blacklist_context) {
+		if (uwsgi_list_has_str(uwsgi.blacklist_context, key)) {
+			uwsgi_log("uWSGI error: forbidden option \"%s\" (by blacklist)\n", key);
+			exit(1);
+		}
+	}
+
+	if (uwsgi.whitelist_context) {
+                if (!uwsgi_list_has_str(uwsgi.whitelist_context, key)) {
+                        uwsgi_log("uWSGI error: forbidden option \"%s\" (by whitelist)\n", key);
+                        exit(1);
+                }
+        }
+
+	if (uwsgi.logic_opt_running)
+		goto add;
+
+	if (!strcmp(key, "end") || !strcmp(key, "endfor") || !strcmp(key, "endif")
+		|| !strcmp(key, "end-if") || !strcmp(key, "end-for")) {
+		if (uwsgi.logic_opt_data) {
+			free(uwsgi.logic_opt_data);
+		}
+		uwsgi.logic_opt = NULL;
+		uwsgi.logic_opt_arg = NULL;
+		uwsgi.logic_opt_cycles = 0;
+		uwsgi.logic_opt_data = NULL;
+	}
+
+	if (uwsgi.logic_opt) {
+		if (uwsgi.logic_opt_data) {
+			free(uwsgi.logic_opt_data);
+		}
+		uwsgi.logic_opt_data = uwsgi_str(uwsgi.logic_opt_arg);
+		uwsgi.logic_opt_cycles++;
+		uwsgi.logic_opt_running = 1;
+		uwsgi.logic_opt(key, value);
+		uwsgi.logic_opt_running = 0;
+		return;
+	}
+
+add:
+
+	if (!uwsgi.exported_opts) {
+		uwsgi.exported_opts = uwsgi_malloc(sizeof(struct uwsgi_opt *));
+	}
+	else {
+		uwsgi.exported_opts = realloc(uwsgi.exported_opts, sizeof(struct uwsgi_opt *) * (uwsgi.exported_opts_cnt + 1));
+		if (!uwsgi.exported_opts) {
+			uwsgi_error("realloc()");
+			exit(1);
+		}
+	}
+
+	int id = uwsgi.exported_opts_cnt;
+	uwsgi.exported_opts[id] = uwsgi_malloc(sizeof(struct uwsgi_opt));
+	uwsgi.exported_opts[id]->key = key;
+	uwsgi.exported_opts[id]->value = value;
+	uwsgi.exported_opts[id]->configured = configured;
+	uwsgi.exported_opts_cnt++;
+	uwsgi.dirty_config = 1;
+
+	if (placeholder_only) {
+		if (uwsgi_opt_exists(key)) {
+			uwsgi_log("you cannot use %s as a placeholder, it is already available as an option\n");
+			exit(1);
+		}
+		uwsgi.exported_opts[id]->configured = 1;
+		return;
+	}
+
+	struct uwsgi_option *op = uwsgi_opt_get(key);
+	if (op) {
+		// requires master ?
+		if (op->flags & UWSGI_OPT_MASTER) {
+			uwsgi.master_process = 1;
+		}
+		// requires log_master ?
+		if (op->flags & UWSGI_OPT_LOG_MASTER) {
+			uwsgi.master_process = 1;
+			uwsgi.log_master = 1;
+		}
+		if (op->flags & UWSGI_OPT_REQ_LOG_MASTER) {
+			uwsgi.master_process = 1;
+			uwsgi.log_master = 1;
+			uwsgi.req_log_master = 1;
+		}
+		// requires threads ?
+		if (op->flags & UWSGI_OPT_THREADS) {
+			uwsgi.has_threads = 1;
+		}
+		// requires cheaper mode ?
+		if (op->flags & UWSGI_OPT_CHEAPER) {
+			uwsgi.cheaper = 1;
+		}
+		// requires virtualhosting ?
+		if (op->flags & UWSGI_OPT_VHOST) {
+			uwsgi.vhost = 1;
+		}
+		// requires memusage ?
+		if (op->flags & UWSGI_OPT_MEMORY) {
+			uwsgi.force_get_memusage = 1;
+		}
+		// requires auto procname ?
+		if (op->flags & UWSGI_OPT_PROCNAME) {
+			uwsgi.auto_procname = 1;
+		}
+		// requires lazy ?
+		if (op->flags & UWSGI_OPT_LAZY) {
+			uwsgi.lazy = 1;
+		}
+		// requires no_initial ?
+		if (op->flags & UWSGI_OPT_NO_INITIAL) {
+			uwsgi.no_initial_output = 1;
+		}
+		// requires no_server ?
+		if (op->flags & UWSGI_OPT_NO_SERVER) {
+			uwsgi.no_server = 1;
+		}
+		// requires post_buffering ?
+		if (op->flags & UWSGI_OPT_POST_BUFFERING) {
+			if (!uwsgi.post_buffering)
+				uwsgi.post_buffering = 4096;
+		}
+		// requires building mime dict ?
+		if (op->flags & UWSGI_OPT_MIME) {
+			uwsgi.build_mime_dict = 1;
+		}
+		// 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);
+			uwsgi.exported_opts[id]->configured = 1;
+		}
+	}
+}
+
+void uwsgi_fallback_config() {
+	if (uwsgi.fallback_config && uwsgi.last_exit_code == 1) {
+		uwsgi_log_verbose("!!! %s (pid: %d) exited with status %d !!!\n", uwsgi.binary_path, (int) getpid(), uwsgi.last_exit_code);
+		uwsgi_log_verbose("!!! Fallback config to %s !!!\n", uwsgi.fallback_config);
+		char *argv[3];
+		argv[0] = uwsgi.binary_path;
+		argv[1] = uwsgi.fallback_config;
+		argv[2] = NULL;
+        	execvp(uwsgi.binary_path, argv);
+        	uwsgi_error("execvp()");
+        	// never here
+	}
+}
+
+int uwsgi_manage_opt(char *key, char *value) {
+
+        struct uwsgi_option *op = uwsgi_opt_get(key);
+	if (op) {
+        	op->func(key, value, op->data);
+                return 1;
+        }
+        return 0;
+
+}
+
+void uwsgi_configure() {
+
+        int i;
+
+        // and now apply the remaining configs
+restart:
+        for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
+                if (uwsgi.exported_opts[i]->configured)
+                        continue;
+                uwsgi.dirty_config = 0;
+                uwsgi.exported_opts[i]->configured = uwsgi_manage_opt(uwsgi.exported_opts[i]->key, uwsgi.exported_opts[i]->value);
+		// some option could cause a dirty config tree
+                if (uwsgi.dirty_config)
+                        goto restart;
+        }
+
+}
+
+
+void uwsgi_opt_custom(char *key, char *value, void *data ) {
+        struct uwsgi_custom_option *uco = (struct uwsgi_custom_option *)data;
+        size_t i, count = 1;
+        size_t value_len = 0;
+        if (value)
+                value_len = strlen(value);
+        off_t pos = 0;
+        char **opt_argv;
+        char *tmp_val = NULL, *p = NULL;
+
+        // now count the number of args
+        for (i = 0; i < value_len; i++) {
+                if (value[i] == ' ') {
+                        count++;
+                }
+        }
+
+        // allocate a tmp array
+        opt_argv = uwsgi_calloc(sizeof(char *) * count);
+        //make a copy of the value;
+        if (value_len > 0) {
+                tmp_val = uwsgi_str(value);
+                // fill the array of options
+                char *p, *ctx = NULL;
+                uwsgi_foreach_token(tmp_val, " ", p, ctx) {
+                        opt_argv[pos] = p;
+                        pos++;
+                }
+        }
+        else {
+                // no argument specified
+                opt_argv[0] = "";
+        }
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("found custom option %s with %d args\n", key, count);
+#endif
+
+        // now make a copy of the option template
+        char *tmp_opt = uwsgi_str(uco->value);
+        // split it
+        char *ctx = NULL;
+        uwsgi_foreach_token(tmp_opt, ";", p, ctx) {
+                char *equal = strchr(p, '=');
+                if (!equal)
+                        goto clear;
+                *equal = '\0';
+
+                // build the key
+                char *new_key = uwsgi_str(p);
+                for (i = 0; i < count; i++) {
+                        char *old_key = new_key;
+                        char *tmp_num = uwsgi_num2str(i + 1);
+                        char *placeholder = uwsgi_concat2((char *) "$", tmp_num);
+                        free(tmp_num);
+                        new_key = uwsgi_substitute(old_key, placeholder, opt_argv[i]);
+                        if (new_key != old_key)
+                                free(old_key);
+                        free(placeholder);
+                }
+
+                // build the value
+                char *new_value = uwsgi_str(equal + 1);
+                for (i = 0; i < count; i++) {
+                        char *old_value = new_value;
+                        char *tmp_num = uwsgi_num2str(i + 1);
+                        char *placeholder = uwsgi_concat2((char *) "$", tmp_num);
+                        free(tmp_num);
+                        new_value = uwsgi_substitute(old_value, placeholder, opt_argv[i]);
+                        if (new_value != old_value)
+                                free(old_value);
+                        free(placeholder);
+                }
+                // ignore return value here
+                uwsgi_manage_opt(new_key, new_value);
+        }
+
+clear:
+        free(tmp_val);
+        free(tmp_opt);
+        free(opt_argv);
+
+}
+
+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 kind of daemons (read: external applications) that can be managed
+	There are 3 kinds 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 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
+		- 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
 	3) smart daemons without daemonization
-		same as 2, but the daemonization and pidfile creation is managed by uWSGI
+		same as 2, but the daemonization and pidfile creation are 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, SIGTERM);
+						kill(-(ud->pid), ud->stop_signal);
 					}
 					else {
 						// pid already died
@@ -77,8 +77,14 @@ void uwsgi_daemons_smart_check() {
 				else {
 					ud->pidfile_checks++;
 					if (ud->pidfile_checks >= (unsigned int) ud->freq) {
-						uwsgi_log("[uwsgi-daemons] found changed pidfile for \"%s\" (old_pid: %d new_pid: %d)\n", ud->command, (int) ud->pid, (int) checked_pid);
-						uwsgi_spawn_daemon(ud);
+						if (!ud->has_daemonized) {
+							uwsgi_log_verbose("[uwsgi-daemons] \"%s\" (pid: %d) did not daemonize !!!\n", ud->command, (int) ud->pid);
+							ud->pidfile_checks = 0;
+						}
+						else {
+							uwsgi_log("[uwsgi-daemons] found changed pidfile for \"%s\" (old_pid: %d new_pid: %d)\n", ud->command, (int) ud->pid, (int) checked_pid);
+							uwsgi_spawn_daemon(ud);
+						}
 					}
 				}
 			}
@@ -99,10 +105,20 @@ void uwsgi_daemons_smart_check() {
 int uwsgi_daemon_check_pid_death(pid_t diedpid) {
 	struct uwsgi_daemon *ud = uwsgi.daemons;
 	while (ud) {
-		if (ud->pid == diedpid && !ud->pidfile) {
-			uwsgi_log("daemon \"%s\" (pid: %d) annihilated\n", ud->command, (int) diedpid);
-			ud->pid = -1;
-			return -1;
+		if (ud->pid == diedpid) {
+			if (!ud->pidfile) {
+				uwsgi_log("daemon \"%s\" (pid: %d) annihilated\n", ud->command, (int) diedpid);
+				ud->pid = -1;
+				return -1;
+			}
+			else {
+				if (!ud->has_daemonized) {
+					ud->has_daemonized = 1;
+				}
+				else {
+					uwsgi_log("[uwsgi-daemons] BUG !!! daemon \"%s\" has already daemonized !!!\n", ud->command);
+				}
+			}
 		}
 		ud = ud->next;
 	}
@@ -123,6 +139,10 @@ int uwsgi_daemon_check_pid_reload(pid_t diedpid) {
 		}
 #endif
 		if (ud->pid == diedpid && !ud->pidfile) {
+			if (ud->control) {
+				gracefully_kill_them_all(0);
+				return 0;
+			}
 			uwsgi_spawn_daemon(ud);
 			return 1;
 		}
@@ -212,15 +232,22 @@ 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 gracefully stop daemon, kill it if it won't die
-			// if mercy is not set than wait up to 3 seconds
+			// try to stop daemon gracefully, kill it if it won't die
+			// if mercy is not set then wait up to 3 seconds
 			time_t timeout = uwsgi_now() + (uwsgi.reload_mercy ? uwsgi.reload_mercy : 3);
+			int waitpid_status;
 			while (!kill(ud->pid, 0)) {
-				kill(-ud->pid, SIGTERM);
+				if (uwsgi_instance_is_reloading && ud->reload_signal > 0) {
+					kill(-(ud->pid), ud->reload_signal);
+				}
+				else {
+					kill(-(ud->pid), ud->stop_signal);
+				}
 				sleep(1);
+				waitpid(ud->pid, &waitpid_status, WNOHANG);
 				if (uwsgi_now() >= timeout) {
-					uwsgi_log("[uwsgi-daemons] daemon did not died in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command);
-					kill(-ud->pid, SIGKILL);
+					uwsgi_log("[uwsgi-daemons] daemon did not die in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command);
+					kill(-(ud->pid), SIGKILL);
 					break;
 				}
 			}
@@ -231,17 +258,19 @@ void uwsgi_detach_daemons() {
 	}
 }
 
+static int daemon_spawn(void *);
 
 void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 
 	// skip unregistered daemons
 	if (!ud->registered) return;
 
-	int devnull = -1;
-	int throttle = 0;
+	ud->throttle = 0;
 
 	if (uwsgi.current_time - ud->last_spawn <= 3) {
-		throttle = ud->respawns - (uwsgi.current_time - ud->last_spawn);
+		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;
 	}
 
 	pid_t pid = uwsgi_fork("uWSGI external daemon");
@@ -251,6 +280,7 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 	}
 
 	if (pid > 0) {
+		ud->has_daemonized = 0;
 		ud->pid = pid;
 		ud->status = 1;
 		ud->pidfile_checks = 0;
@@ -267,9 +297,74 @@ 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 = fork();
+			pid_t pid = fork();
 			if (pid < 0) {
 				uwsgi_error("fork()");
 				exit(1);
@@ -280,20 +375,9 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 			uwsgi_write_pidfile(ud->pidfile);
 		}
 
-		if (!uwsgi.daemons_honour_stdin) {
+		if (!uwsgi.daemons_honour_stdin && !ud->honour_stdin) {
 			// /dev/null will became stdin
-			devnull = open("/dev/null", O_RDONLY);
-			if (devnull < 0) {
-				uwsgi_error("/dev/null open()");
-				exit(1);
-			}
-			if (devnull != 0) {
-				if (dup2(devnull, 0) < 0) {
-					uwsgi_error("dup2()");
-					exit(1);
-				}
-				close(devnull);
-			}
+			uwsgi_remap_fd(0, "/dev/null");
 		}
 
 		if (setsid() < 0) {
@@ -302,7 +386,7 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 		}
 
 		if (!ud->pidfile) {
-#ifdef __linux__
+#ifdef PR_SET_PDEATHSIG
 			if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0)) {
 				uwsgi_error("prctl()");
 			}
@@ -310,20 +394,17 @@ void uwsgi_spawn_daemon(struct uwsgi_daemon *ud) {
 		}
 
 
-		if (throttle) {
-			uwsgi_log("[uwsgi-daemons] throttling \"%s\" for %d seconds\n", ud->command, throttle);
-			sleep(throttle);
+		if (ud->throttle) {
+			uwsgi_log("[uwsgi-daemons] throttling \"%s\" for %d seconds\n", ud->command, ud->throttle);
+			sleep((unsigned int) ud->throttle);
 		}
 
-		uwsgi_log("[uwsgi-daemons] %sspawning \"%s\"\n", ud->respawns > 0 ? "re" : "", ud->command);
+		uwsgi_log("[uwsgi-daemons] %sspawning \"%s\" (uid: %d gid: %d)\n", ud->respawns > 0 ? "re" : "", ud->command, (int) getuid(), (int) getgid());
 		uwsgi_exec_command_with_args(ud->command);
 		uwsgi_log("[uwsgi-daemons] unable to spawn \"%s\"\n", ud->command);
 
 		// never here;
 		exit(1);
-	}
-
-	return;
 }
 
 
@@ -334,6 +415,8 @@ 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);
 
@@ -372,7 +455,7 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	}
 
 	if (!uwsgi_ud) {
-		uwsgi.daemons = uwsgi_malloc(sizeof(struct uwsgi_daemon));
+		uwsgi.daemons = uwsgi_calloc(sizeof(struct uwsgi_daemon));
 		uwsgi_ud = uwsgi.daemons;
 	}
 	else {
@@ -381,7 +464,7 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 			uwsgi_ud = uwsgi_ud->next;
 		}
 
-		uwsgi_ud = uwsgi_malloc(sizeof(struct uwsgi_daemon));
+		uwsgi_ud = uwsgi_calloc(sizeof(struct uwsgi_daemon));
 		old_ud->next = uwsgi_ud;
 	}
 
@@ -395,6 +478,12 @@ void uwsgi_opt_add_daemon(char *opt, char *value, void *none) {
 	uwsgi_ud->last_spawn = 0;
 	uwsgi_ud->daemonize = daemonize;
 	uwsgi_ud->pidfile = pidfile;
+	uwsgi_ud->control = 0;
+	uwsgi_ud->stop_signal = stop_signal;
+	uwsgi_ud->reload_signal = reload_signal;
+	if (!strcmp(opt, "attach-control-daemon")) {
+		uwsgi_ud->control = 1;
+	}
 #ifdef UWSGI_SSL
 	uwsgi_ud->legion = legion;
 #endif
@@ -402,3 +491,108 @@ 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,9 +1,30 @@
 #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);
 }
 
@@ -11,6 +32,7 @@ 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);
 }
@@ -18,10 +40,19 @@ 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) {
-			uwsgi_error("port_getn()");
-			return -1;
-		}
-		return 0;
+		if (errno == ETIME) return 0;
+                if (errno != EINTR) {
+                        uwsgi_error("port_getn()");
+                }
+                return -1;
 	}
 
 	uint_t i;
@@ -452,6 +452,7 @@ 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) {
@@ -947,7 +948,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 {
@@ -1231,6 +1232,8 @@ 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
@@ -1241,6 +1244,10 @@ 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/exceptions.c

@@ -46,7 +46,7 @@ extern struct uwsgi_server uwsgi;
 
 struct uwsgi_buffer *uwsgi_exception_handler_object(struct wsgi_request *wsgi_req) {
 	struct uwsgi_buffer *ub = uwsgi_buffer_new(4096);
-	if (uwsgi_buffer_append_keyval(ub, "vars", 4, wsgi_req->buffer,wsgi_req->uh->pktsize)) goto error;
+	if (uwsgi_buffer_append_keyval(ub, "vars", 4, wsgi_req->buffer, wsgi_req->len)) goto error;
 	if (uwsgi.p[wsgi_req->uh->modifier1]->backtrace) {
                 struct uwsgi_buffer *bt = uwsgi.p[wsgi_req->uh->modifier1]->backtrace(wsgi_req);
 		if (bt) {
@@ -280,7 +280,7 @@ notavail4:
 
         if (uwsgi_buffer_append(ub, "\n\n", 2)) goto error;
 
-	if (uwsgi_hooked_parse(wsgi_req->buffer, wsgi_req->uh->pktsize, append_vars_to_ubuf, ub)) {
+	if (uwsgi_hooked_parse(wsgi_req->buffer, wsgi_req->len, append_vars_to_ubuf, ub)) {
 		goto error;
 	}
 
@@ -464,6 +464,7 @@ void uwsgi_exception_setup_handlers() {
 
 	struct uwsgi_string_list *usl = uwsgi.exception_handlers_instance;
 	while(usl) {
+		// do not free handler !!!
 		char *handler = uwsgi_str(usl->value);
 		char *colon = strchr(handler, ':');
 		if (colon) {
@@ -472,10 +473,8 @@ void uwsgi_exception_setup_handlers() {
 		struct uwsgi_exception_handler *ueh = uwsgi_exception_handler_by_name(handler);
 		if (!ueh) {
 			uwsgi_log("unable to find exception handler: %s\n", handler);
-			free(handler);
 			exit(1);
 		}
-		free(handler);
 
 		struct uwsgi_exception_handler_instance *uehi = uwsgi_calloc(sizeof(struct uwsgi_exception_handler_instance));
 		uehi->handler = ueh;

core/fifo.c

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

core/fork_server.c

@@ -0,0 +1,227 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+on connection retrieve the uid,gid and pid of the connecting process, in addition to up to 3
+file descriptors (emperor pipe, emperor pipe_config, on_demand socket dup()'ed to 0)
+
+if authorized, double fork, get the pid of the second child and exit()
+its parent (this will force the Emperor to became its subreaper).
+
+from now on, we can consider the new child as a full-featured vassal
+
+*/
+
+#define VASSAL_HAS_CONFIG 0x02
+#define VASSAL_HAS_ON_DEMAND 0x04
+
+static void parse_argv_hook(uint16_t item, char *value, uint16_t vlen, void *data) {
+	struct uwsgi_string_list **usl = (struct uwsgi_string_list **) data;
+	uwsgi_string_new_list(usl, uwsgi_concat2n(value, vlen, "", 0));
+}
+
+
+void uwsgi_fork_server(char *socket) {
+	// map fd 0 to /dev/null to avoid mess
+	uwsgi_remap_fd(0, "/dev/null");
+
+	int fd = bind_to_unix(socket, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
+	if (fd < 0) exit(1);
+
+	// automatically receive credentials (TODO make something useful with them, like checking the pid is from the Emperor)
+	if (uwsgi_socket_passcred(fd)) exit(1);
+
+	// initialize the event queue
+	int eq = event_queue_init();
+	if (uwsgi.has_emperor) {
+		event_queue_add_fd_read(eq, uwsgi.emperor_fd);
+	}
+	event_queue_add_fd_read(eq, fd);
+
+	// now start waiting for connections
+	for(;;) {
+		int interesting_fd = -1;
+		int rlen = event_queue_wait(eq, -1, &interesting_fd);
+		if (rlen <= 0) continue;
+		if (uwsgi.has_emperor && interesting_fd == uwsgi.emperor_fd) {
+			char byte;
+        		ssize_t rlen = read(uwsgi.emperor_fd, &byte, 1);
+        		if (rlen > 0) {
+                		uwsgi_log_verbose("received message %d from emperor\n", byte);
+			}
+			exit(0);
+		}
+		if (interesting_fd != fd) continue;
+		struct sockaddr_un client_src;
+        	socklen_t client_src_len = 0;
+        	int client_fd = accept(fd, (struct sockaddr *) &client_src, &client_src_len);
+        	if (client_fd < 0) {
+                	uwsgi_error("uwsgi_fork_server()/accept()");
+			continue;
+        	}
+		char hbuf[4];
+		pid_t ppid = -1;
+		uid_t uid = -1;
+		gid_t gid = -1;
+		int fds_count = 8;
+		size_t remains = 4;
+		// we can receive upto 8 fds (generally from 1 to 3)
+		int fds[8];
+		// we only read 4 bytes header
+		ssize_t len = uwsgi_recv_cred_and_fds(client_fd, hbuf, remains, &ppid, &uid, &gid, fds, &fds_count);
+		uwsgi_log_verbose("[uwsgi-fork-server] connection from pid: %d uid: %d gid:%d fds:%d\n", ppid, uid, gid, fds_count);
+		if (len <= 0 || fds_count < 1) {
+			uwsgi_error("uwsgi_fork_server()/recvmsg()");
+			goto end;
+		}
+		remains -= len;
+	
+		if (uwsgi_read_nb(client_fd, hbuf + (4-remains), remains, uwsgi.socket_timeout)) {
+			uwsgi_error("uwsgi_fork_server()/uwsgi_read_nb()");
+			goto end;
+		}
+
+		struct uwsgi_header *uh = (struct uwsgi_header *) hbuf;
+		// this memory area must be freed in the right place !!!
+		char *body_argv = uwsgi_malloc(uh->_pktsize);
+		if (uwsgi_read_nb(client_fd, body_argv, uh->_pktsize, uwsgi.socket_timeout)) {
+			free(body_argv);
+                        uwsgi_error("uwsgi_fork_server()/uwsgi_read_nb()");
+                        goto end;
+                }
+
+		pid_t pid = fork();
+		if (pid < 0) {
+			free(body_argv);
+			int i;
+			for(i=0;i<fds_count;i++) close(fds[i]);
+			// error on fork()
+			uwsgi_error("uwsgi_fork_server()/fork()");
+			goto end;		
+		}
+		else if (pid > 0) {
+			free(body_argv);
+			// close inherited decriptors 
+			int i;
+			for(i=0;i<fds_count;i++) close(fds[i]);
+			// wait for child death...
+			waitpid(pid, NULL, 0);
+			goto end;
+		}
+		else {
+			// close Emperor channels
+			// we do not close others file desctiptor as lot
+			// of funny tricks could be accomplished with them
+			if (uwsgi.has_emperor) {
+				close(uwsgi.emperor_fd);
+				if (uwsgi.emperor_fd_config > -1) close(uwsgi.emperor_fd_config);
+			}
+			
+			// set EMPEROR_FD and FD_CONFIG env vars	
+			char *uef = uwsgi_num2str(fds[0]);
+        		if (setenv("UWSGI_EMPEROR_FD", uef, 1)) {
+                		uwsgi_error("uwsgi_fork_server()/setenv()");
+                		exit(1);
+        		}
+        		free(uef);
+
+			int pipe_config = -1;
+			int on_demand = -1;
+
+			if (uh->modifier2 & VASSAL_HAS_CONFIG && fds_count > 1) {
+				pipe_config = fds[1];	
+				char *uef = uwsgi_num2str(pipe_config);
+				if (setenv("UWSGI_EMPEROR_FD_CONFIG", uef, 1)) {
+                                	uwsgi_error("uwsgi_fork_server()/setenv()");
+                                	exit(1);
+                        	}
+                        	free(uef);
+			}
+
+			if (uh->modifier2 & VASSAL_HAS_ON_DEMAND && fds_count > 1) {
+				if (pipe_config > -1) {
+					if (fds_count > 2) {
+						on_demand = fds[2];
+					}
+				}
+				else {
+					on_demand = fds[1];
+				}
+			}
+			// dup the on_demand socket to 0 and close it
+			if (on_demand > -1) {
+				if (dup2(on_demand, 0) < 0) {
+					uwsgi_error("uwsgi_fork_server()/dup2()");
+					exit(1);
+				}
+				close(on_demand);
+			}
+
+			// now fork again and die
+			pid_t new_pid = fork();
+			if (new_pid < 0) {
+                        	uwsgi_error("uwsgi_fork_server()/fork()");
+				exit(1);
+			}
+			else if (new_pid > 0) {
+				exit(0);
+			}
+			else {
+				// send the pid to the client_fd and close it
+				struct uwsgi_buffer *ub = uwsgi_buffer_new(uwsgi.page_size);
+				// leave space for header
+				ub->pos = 4;
+				if (uwsgi_buffer_append_keynum(ub, "pid", 3, getpid())) exit(1); 
+				// fix uwsgi header
+        			if (uwsgi_buffer_set_uh(ub, 35, 0)) goto end;
+				// send_pid()
+				if (uwsgi_write_nb(client_fd, ub->buf, ub->pos, uwsgi.socket_timeout)) exit(1);
+				close(client_fd);
+				uwsgi_log("double fork() and reparenting successfull (new pid: %d)\n", getpid());
+				uwsgi_buffer_destroy(ub);
+
+
+				// now parse the uwsgi packet array and build the argv
+				struct uwsgi_string_list *usl = NULL, *usl_argv = NULL;
+				uwsgi_hooked_parse_array(body_argv, uh->_pktsize, parse_argv_hook, &usl_argv);
+				free(body_argv);
+
+				// build new argc/argv
+				uwsgi.new_argc = 0;
+				size_t procname_len = 1;
+				uwsgi_foreach(usl, usl_argv) {
+					uwsgi.new_argc++;
+					procname_len += usl->len + 1;
+				}
+
+				char *new_procname = uwsgi_calloc(procname_len);
+				
+				uwsgi.new_argv = uwsgi_calloc(sizeof(char *) * (uwsgi.new_argc + 1));
+				int counter = 0;
+				uwsgi_foreach(usl, usl_argv) {
+					uwsgi.new_argv[counter] = usl->value;
+					strcat(new_procname, usl->value);
+					strcat(new_procname, " ");
+					counter++;
+				}
+				// fix process name
+				uwsgi_set_processname(new_procname);
+				free(new_procname);
+				// this is the only step required to have a consistent environment
+				uwsgi.fork_socket = NULL;
+				// this avoids the process to re-exec itself
+				uwsgi.exit_on_reload = 1;
+				// fixup the Emperor communication
+				uwsgi_check_emperor();
+				// continue with uWSGI startup
+				return;
+			}
+		}	
+
+end:
+		close(client_fd);
+		
+	}
+}

core/fsmon.c

@@ -0,0 +1,182 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_INOTIFY
+#ifndef OBSOLETE_LINUX_KERNEL
+#include <sys/inotify.h>
+#endif
+#endif
+
+static int fsmon_add(struct uwsgi_fsmon *fs) {
+#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()");
+			return -1;
+		}
+		if (event_queue_add_fd_read(uwsgi.master_queue, inotify_fd)) {
+			uwsgi_error("fsmon_add()/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);
+	if (wd < 0) {
+		uwsgi_error("fsmon_add()/inotify_add_watch()");
+		return -1;
+	}
+	fs->fd = inotify_fd;
+	fs->id = 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;
+	}
+
+	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;
+	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) {
+	uwsgi_block_signal(SIGQUIT);
+	reap_them_all(0);
+	uwsgi_unblock_signal(SIGQUIT);
+}
+
+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;
+		}
+		*space = 0;
+		uwsgi_register_fsmon(copy, fsmon_signal, space + 1);
+	}
+
+	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;
+	}
+
+#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;
+	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;
+	}
+	free(ie);
+#endif
+#endif
+	return found_fs;
+}
+
+int uwsgi_fsmon_event(int interesting_fd) {
+
+	struct uwsgi_fsmon *fs = uwsgi_fsmon_ack(interesting_fd);
+	if (!fs)
+		return 0;
+
+	uwsgi_log_verbose("[uwsgi-fsmon] detected event on \"%s\"\n", fs->path);
+	fs->func(fs);
+	return 1;
+}

core/gateway.c

@@ -29,6 +29,8 @@ 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)) {
@@ -41,7 +43,7 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop) (int, void *), v
 	uwsgi_socket_nb(ug->internal_subscription_pipe[0]);
 	uwsgi_socket_nb(ug->internal_subscription_pipe[1]);
 
-	if (!uwsgi.master_process)
+	if (!uwsgi.master_process && !uwsgi.force_gateway)
 		gateway_respawn(ushared->gateways_cnt);
 
 	ushared->gateways_cnt++;
@@ -70,6 +72,7 @@ void gateway_respawn(int id) {
 
 	if (gw_pid == 0) {
 		uwsgi_fixup_fds(0, 0, ug);
+		uwsgi_close_all_unshared_sockets();
 		if (uwsgi.master_as_root)
 			uwsgi_as_root();
 #ifdef __linux__
@@ -89,6 +92,24 @@ 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
-uint32_t murmur2_hash(char *key, uint64_t keylen) {
+static uint32_t murmur2_hash(char *key, uint64_t keylen) {
 
 	uint32_t  h, k;
 	uint8_t *ukey = (uint8_t *) key;
@@ -56,6 +56,23 @@ 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;
@@ -90,4 +107,7 @@ 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

@@ -0,0 +1,819 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	advanced (pluggable) hooks
+
+	they are executed before the other hooks, and can be extended by plugins
+
+	if a plugin tries to register an hook with a name already available in the list, its function
+	will be overridden
+
+*/
+
+struct uwsgi_hook *uwsgi_hook_by_name(char *name) {
+	struct uwsgi_hook *uh = uwsgi.hooks;
+	while(uh) {
+		if (!strcmp(uh->name, name)) {
+			return uh;
+		}
+		uh = uh->next;
+	}
+	return NULL;
+}
+
+void uwsgi_register_hook(char *name, int (*func)(char *)) {
+	struct uwsgi_hook *old_uh = NULL, *uh = uwsgi.hooks;
+        while(uh) {
+                if (!strcmp(uh->name, name)) {
+                        uh->func = func;
+			return;
+                }
+		old_uh = uh;
+		uh = uh->next;
+        }
+
+	uh = uwsgi_calloc(sizeof(struct uwsgi_hook));
+	uh->name = name;
+	uh->func = func;
+
+	if (old_uh) {
+		old_uh->next = uh;
+	}
+	else {
+		uwsgi.hooks = uh;
+	}
+}
+
+static int uwsgi_hook_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) {
+		uwsgi_error("uwsgi_hook_chdir()");
+	}
+	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) {
+        	uwsgi_log("command \"%s\" exited with non-zero code: %d\n", arg, ret);
+        }
+	return ret;
+}
+
+static int uwsgi_hook_safeexec(char *arg) {
+        int ret = uwsgi_run_command_and_wait(NULL, arg);
+        if (ret != 0) {
+                uwsgi_log("command \"%s\" exited with non-zero code: %d\n", arg, ret);
+        }
+        return 0;
+}
+
+static int uwsgi_hook_exit(char *arg) {
+	int exit_code = 0;
+	if (strlen(arg) > 1) {
+		exit_code = atoi(arg);
+	}
+	exit(exit_code);
+}
+
+static int uwsgi_hook_print(char *arg) {
+	char *line = uwsgi_concat2(arg, "\n");
+	uwsgi_log(line);
+	free(line);
+	return 0;
+}
+
+static int uwsgi_hook_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;
+}
+
+
+#if defined(UWSGI_SUNOS_EXTERN_SETHOSTNAME)
+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_unix_signal(char *arg) {
+	char *space = strchr(arg, ' ');
+	if (!space) {
+		uwsgi_log("invalid unix_signal syntax, must be <signum> <func>\n");
+		return -1;
+	}
+	*space = 0;
+	int signum = atoi(arg);
+	*space = ' ';
+	void (*func)(int) = dlsym(RTLD_DEFAULT, space+1);
+	if (!func) {
+		uwsgi_log("unable to find function \"%s\"\n", space+1);
+		return -1;
+	}
+	uwsgi_unix_signal(signum, func);
+	return 0;
+}
+
+
+static int uwsgi_hook_callint(char *arg) {
+        char *space = strchr(arg, ' ');
+        if (space) {
+                *space = 0;
+                int num = atoi(space+1);
+                void (*func)(int) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                	uwsgi_log("unable to call function \"%s(%d)\"\n", arg, num);
+                        *space = ' ';
+                        return -1;
+		}
+                *space = ' ';
+                func(num);
+        }
+        else {
+                void (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                        uwsgi_log("unable to call function \"%s\"\n", arg);
+                        return -1;
+                }
+                func();
+        }
+        return 0;
+}
+
+
+static int uwsgi_hook_call(char *arg) {
+	char *space = strchr(arg, ' ');
+	if (space) {
+		*space = 0;
+		void (*func)(char *) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                	uwsgi_log("unable to call function \"%s(%s)\"\n", arg, space + 1);
+			*space = ' ';
+			return -1;
+		}
+		*space = ' ';
+                func(space + 1);
+	}
+	else {
+		void (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                	uwsgi_log("unable to call function \"%s\"\n", arg);
+			return -1;
+		}
+                func();
+	}
+	return 0;
+}
+
+static int uwsgi_hook_callintret(char *arg) {
+        char *space = strchr(arg, ' ');
+        if (space) {
+                *space = 0;
+                int num = atoi(space+1);
+                int (*func)(int) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                        uwsgi_log("unable to call function \"%s(%d)\"\n", arg, num);
+                        *space = ' ';
+                        return -1;
+                }
+                *space = ' ';
+                return func(num);
+        }
+        int (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+        if (!func) {
+        	uwsgi_log("unable to call function \"%s\"\n", arg);
+                return -1;
+        }
+	return func();
+}
+
+
+static int uwsgi_hook_callret(char *arg) {
+        char *space = strchr(arg, ' ');
+        if (space) {
+                *space = 0;
+                int (*func)(char *) = dlsym(RTLD_DEFAULT, arg);
+                if (!func) {
+                        uwsgi_log("unable to call function \"%s(%s)\"\n", arg, space + 1);
+                        *space = ' ';
+                        return -1;
+                }
+                *space = ' ';
+                return func(space + 1);
+        }
+        int (*func)(void) = dlsym(RTLD_DEFAULT, arg);
+        if (!func) {
+        	uwsgi_log("unable to call function \"%s\"\n", arg);
+                return -1;
+        }
+        return func();
+}
+
+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;
+}
+
+static int uwsgi_hook_wait_for_fs(char *arg) {
+	return uwsgi_wait_for_fs(arg, 0);
+}
+
+static int uwsgi_hook_wait_for_file(char *arg) {
+	return uwsgi_wait_for_fs(arg, 1);
+}
+
+static int uwsgi_hook_wait_for_dir(char *arg) {
+	return uwsgi_wait_for_fs(arg, 2);
+}
+
+static int uwsgi_hook_wait_for_socket(char *arg) {
+	return uwsgi_wait_for_socket(arg);
+}
+
+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("safeexec", uwsgi_hook_safeexec);
+
+	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);
+
+	uwsgi_register_hook("call", uwsgi_hook_call);
+	uwsgi_register_hook("callret", uwsgi_hook_callret);
+
+	uwsgi_register_hook("callint", uwsgi_hook_callint);
+	uwsgi_register_hook("callintret", uwsgi_hook_callintret);
+
+	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);
+
+	uwsgi_register_hook("wait_for_fs", uwsgi_hook_wait_for_fs);
+	uwsgi_register_hook("wait_for_file", uwsgi_hook_wait_for_file);
+	uwsgi_register_hook("wait_for_dir", uwsgi_hook_wait_for_dir);
+
+	uwsgi_register_hook("wait_for_socket", uwsgi_hook_wait_for_socket);
+
+	uwsgi_register_hook("unix_signal", uwsgi_hook_unix_signal);
+
+	// for testing
+	uwsgi_register_hook("exit", uwsgi_hook_exit);
+	uwsgi_register_hook("print", uwsgi_hook_print);
+	uwsgi_register_hook("log", uwsgi_hook_print);
+}
+
+int uwsgi_hooks_run_and_return(struct uwsgi_string_list *l, char *phase, char *context, int fatal) {
+	int final_ret = 0;
+	struct uwsgi_string_list *usl = NULL;
+	if (context) {
+		if (setenv("UWSGI_HOOK_CONTEXT", context, 1)) {
+			uwsgi_error("uwsgi_hooks_run_and_return()/setenv()");
+			return -1;
+		}
+	}
+        uwsgi_foreach(usl, l) {
+                char *colon = strchr(usl->value, ':');
+                if (!colon) {
+                        uwsgi_log("invalid hook syntax, must be hook:args\n");
+                        exit(1);
+                }
+                *colon = 0;
+                int private = 0;
+                char *action = usl->value;
+                // private hook ?
+                if (action[0] == '!') {
+                        action++;
+                        private = 1;
+                }
+                struct uwsgi_hook *uh = uwsgi_hook_by_name(action);
+                if (!uh) {
+                        uwsgi_log("hook action not found: %s\n", action);
+                        exit(1);
+                }
+                *colon = ':';
+
+                if (private) {
+                        uwsgi_log("running --- PRIVATE HOOK --- (%s)...\n", phase);
+                }
+                else {
+                        uwsgi_log("running \"%s\" (%s)...\n", usl->value, phase);
+                }
+
+                int ret = uh->func(colon+1);
+		if (ret != 0) {
+			if (fatal) {
+				if (context) {
+					unsetenv("UWSGI_HOOK_CONTEXT");
+				}
+				return ret;
+			}
+			final_ret = ret;
+		}
+        }
+
+	if (context) {
+		unsetenv("UWSGI_HOOK_CONTEXT");
+	}
+
+	return final_ret;
+}
+
+void uwsgi_hooks_run(struct uwsgi_string_list *l, char *phase, int fatal) {
+	int ret = uwsgi_hooks_run_and_return(l, phase, NULL, fatal);
+	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);
+	}
+}
+
+#if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL)
+/*
+this is a special hook, allowing the Emperor to enter a vassal
+namespace and call hooks in its namespace context.
+*/
+void uwsgi_hooks_setns_run(struct uwsgi_string_list *l, pid_t pid, uid_t uid, gid_t gid) {
+	int (*u_setns) (int, int) = (int (*)(int, int)) dlsym(RTLD_DEFAULT, "setns");
+        if (!u_setns) {
+                uwsgi_log("your system misses setns() syscall !!!\n");
+		return;
+        }
+
+	struct uwsgi_string_list *usl = NULL;
+	uwsgi_foreach(usl, l) {
+		// fist of all fork() the current process
+		pid_t new_pid = fork();
+		if (new_pid > 0) {
+			// wait for its death
+			int status;
+			if (waitpid(new_pid, &status, 0) < 0) {
+				uwsgi_error("uwsgi_hooks_setns_run()/waitpid()");
+			}
+		}
+		else if (new_pid == 0) {
+			// from now on, freeing memory is useless
+			// now split args to know which namespaces to join
+			char *action = strchr(usl->value, ' ');
+			if (!action) {
+				uwsgi_log("invalid setns hook syntax, must be \"namespaces_list action:...\"\n");
+				exit(1);
+			}
+			char *pidstr = uwsgi_num2str(pid);
+			char *uidstr = uwsgi_num2str(uid);
+			char *gidstr = uwsgi_num2str(gid);
+
+			char *namespaces = uwsgi_concat2n(usl->value, action-usl->value, "", 0);
+        		char *p, *ctx = NULL;
+        		uwsgi_foreach_token(namespaces, ",", p, ctx) {
+				char *procfile = uwsgi_concat4("/proc/", pidstr, "/ns/", p);
+				int fd = open(procfile, O_RDONLY);
+				if (fd < 0) {
+					uwsgi_error_open(procfile);
+					exit(1);
+				}
+				if (u_setns(fd, 0) < 0){
+					uwsgi_error("uwsgi_hooks_setns_run()/setns()");
+					exit(1);
+				}
+				close(fd);
+				free(procfile);
+                	}
+
+			if (setenv("UWSGI_VASSAL_PID", pidstr, 1)) {
+				uwsgi_error("uwsgi_hooks_setns_run()/setenv()");
+				exit(1);
+			}
+
+			if (setenv("UWSGI_VASSAL_UID", uidstr, 1)) {
+				uwsgi_error("uwsgi_hooks_setns_run()/setenv()");
+				exit(1);
+			}
+
+			if (setenv("UWSGI_VASSAL_GID", gidstr, 1)) {
+				uwsgi_error("uwsgi_hooks_setns_run()/setenv()");
+				exit(1);
+			}
+
+			// now run the action and then exit
+			action++;
+			char *colon = strchr(action, ':');
+			if (!colon) {
+				uwsgi_log("invalid hook syntax must be action:arg\n");
+				exit(1);
+			}
+			*colon = 0;
+			struct uwsgi_hook *uh = uwsgi_hook_by_name(action);
+                	if (!uh) {
+                        	uwsgi_log("hook action not found: %s\n", action);
+                        	exit(1);
+                	}
+                	*colon = ':';
+
+                        uwsgi_log("running \"%s\" (setns)...\n", usl->value);
+                	exit(uh->func(colon+1));
+		}
+		else {
+			uwsgi_error("uwsgi_hooks_setns_run()/fork()");
+		}
+	}
+}
+#endif

core/ini.c

@@ -9,7 +9,7 @@ extern struct uwsgi_server uwsgi;
 
 static char *last_file = NULL;
 
-void ini_rstrip(char *line) {
+static void ini_rstrip(char *line) {
 
 	off_t i;
 
@@ -22,7 +22,7 @@ void ini_rstrip(char *line) {
 	}
 }
 
-char *ini_lstrip(char *line) {
+static char *ini_lstrip(char *line) {
 
 	off_t i;
 	char *ptr = line;
@@ -38,7 +38,7 @@ char *ini_lstrip(char *line) {
 	return ptr;
 }
 
-char *ini_get_key(char *key) {
+static char *ini_get_key(char *key) {
 
 	off_t i;
 	char *ptr = key;
@@ -54,7 +54,7 @@ char *ini_get_key(char *key) {
 	return ptr;
 }
 
-char *ini_get_line(char *ini, size_t size) {
+static char *ini_get_line(char *ini, size_t size) {
 
 	size_t i;
 	char *ptr = ini;
@@ -171,5 +171,58 @@ void uwsgi_ini_config(char *file, char *magic_table[]) {
 		colon[0] = ':';
 	}
 
+}
 
+void uwsgi_emperor_ini_attrs(char *filename, char *section_asked, struct uwsgi_dyn_dict **attrs) {
+	if (!section_asked) section_asked = "emperor";
+
+	char *ini = uwsgi_simple_file_read(filename);
+	if (!ini) return;
+
+	char *orig_ini = ini;
+
+	size_t len = strlen(ini);
+	char *section = "";
+	char *key, *val, *ini_line;
+
+	while (len) {
+                ini_line = ini_get_line(ini, len);
+                if (ini_line == NULL) {
+                        break;
+                }
+                // skip empty line
+                key = ini_lstrip(ini);
+                ini_rstrip(key);
+                if (key[0] != 0) {
+                        if (key[0] == '[') {
+                                section = key + 1;
+                                section[strlen(section) - 1] = 0;
+                        }
+                        else if (key[0] == ';' || key[0] == '#') {
+                                // this is a comment
+                        }
+                        else {
+                                // val is always valid, but (obviously) can be ignored
+                                val = ini_get_key(key);
+
+                                if (!strcmp(section, section_asked)) {
+                                        ini_rstrip(key);
+					struct uwsgi_string_list *usl = uwsgi_string_list_has_item(uwsgi.emperor_collect_attributes, key, strlen(key));
+					if (usl) {
+                                        	val = ini_lstrip(val);
+                                        	ini_rstrip(val);
+						char *value = uwsgi_str(val);
+                                        	uwsgi_dyn_dict_new(attrs, usl->value, usl->len, value, strlen(value));
+					}
+                                }
+                        }
+                }
+
+
+                len -= (ini_line - ini);
+                ini += (ini_line - ini);
+
+        }
+	
+	free(orig_ini);
 }

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,6 +51,7 @@ struct http_status_codes hsc[] = {
         {"503", "Service Unavailable"},
         {"504", "Gateway Timeout"},
         {"505", "HTTP Version Not Supported"},
+        {"509", "Bandwidth Limit Exceeded"},
         {"", NULL},
 };
 
@@ -60,6 +61,8 @@ struct http_status_codes hsc[] = {
 void uwsgi_init_default() {
 
 	uwsgi.cpus = 1;
+	uwsgi.new_argc = -1;
+	uwsgi.binary_argc = 1;
 
 	uwsgi.backtrace_depth = 64;
 	uwsgi.max_apps = 64;
@@ -72,13 +75,15 @@ void uwsgi_init_default() {
 
 	uwsgi.stats_pusher_default_freq = 3;
 
-	uwsgi.original_log_fd = -1;
+	uwsgi.original_log_fd = 2;
 
 	uwsgi.emperor_fd_config = -1;
+	uwsgi.emperor_fd_proxy = -1;
 	// default emperor scan frequency
 	uwsgi.emperor_freq = 3;
 	uwsgi.emperor_throttle = 1000;
 	uwsgi.emperor_heartbeat = 30;
+	uwsgi.emperor_curse_tolerance = 30;
 	// max 3 minutes throttling
 	uwsgi.emperor_max_throttle = 1000 * 180;
 	uwsgi.emperor_pid = -1;
@@ -102,25 +107,28 @@ void uwsgi_init_default() {
 
 	uwsgi.forkbomb_delay = 2;
 
-	uwsgi.async = 1;
+	uwsgi.async = 0;
+	uwsgi.async_warn_if_queue_full = 1;
 	uwsgi.listen_queue = 100;
 
 	uwsgi.cheaper_overload = 3;
+	uwsgi.cheaper_idle = 10;
 
 	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.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] = 4;
-	uwsgi.shared->options[UWSGI_OPTION_LOGGING] = 1;
+	uwsgi.socket_timeout = 4;
+	uwsgi.logging_options.enabled = 1;
 
 	// a workers hould be running for at least 10 seconds
-	uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME] = 10;
+	uwsgi.min_worker_lifetime = 10;
 
-	uwsgi.shared->spooler_frequency = 30;
+	uwsgi.spooler_frequency = 30;
 
 	uwsgi.shared->spooler_signal_pipe[0] = -1;
 	uwsgi.shared->spooler_signal_pipe[1] = -1;
@@ -167,11 +175,21 @@ 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();
 	
 	// 1 MB default limit
 	uwsgi.chunked_input_limit = 1024*1024;
+
+	// clear reforked status
+	uwsgi.master_is_reforked = 0;
+
+	uwsgi.master_fifo_fd = -1;
+	uwsgi_master_fifo_prepare();
+
+	uwsgi.notify_socket_fd = -1;
 }
 
 void uwsgi_setup_reload() {
@@ -185,7 +203,7 @@ void uwsgi_setup_reload() {
 		uwsgi.reloads++;
 		//convert reloads to string
 		int rlen = snprintf(env_reload_buf, 10, "%u", uwsgi.reloads);
-		if (rlen > 0) {
+		if (rlen > 0 && rlen < 10) {
 			env_reload_buf[rlen] = 0;
 			if (setenv("UWSGI_RELOADS", env_reload_buf, 1)) {
 				uwsgi_error("setenv()");
@@ -216,21 +234,19 @@ void uwsgi_autoload_plugins_by_name(char *argv_zero) {
 		p = original_proc_name;
 	p = strstr(p, "uwsgi_");
 	if (p != NULL) {
-		plugins_requested = strtok(uwsgi_str(p + 6), "_");
-		while (plugins_requested) {
+		char *ctx = NULL;
+		uwsgi_foreach_token(uwsgi_str(p + 6), "_", plugins_requested, ctx) {
 			uwsgi_log("[uwsgi] implicit plugin requested %s\n", plugins_requested);
 			uwsgi_load_plugin(-1, plugins_requested, NULL);
-			plugins_requested = strtok(NULL, "_");
 		}
 	}
 
 	plugins_requested = getenv("UWSGI_PLUGINS");
 	if (plugins_requested) {
 		plugins_requested = uwsgi_concat2(plugins_requested, "");
-		char *p = strtok(plugins_requested, ",");
-		while (p != NULL) {
+		char *p, *ctx = NULL;
+		uwsgi_foreach_token(plugins_requested, ",", p, ctx) {
 			uwsgi_load_plugin(-1, p, NULL);
-			p = strtok(NULL, ",");
 		}
 	}
 
@@ -240,9 +256,42 @@ void uwsgi_commandline_config() {
 	int i;
 
 	uwsgi.option_index = -1;
+	// required in case we want to call getopt_long from the beginning
+	optind = 0;
+
+	int argc = uwsgi.argc;
+	char **argv = uwsgi.argv;
+
+	// we might want to ignore some arguments not meant for us
+	char binary_argv0_pretty[256] = {'\0'};
+	char *binary_argv0_actual = NULL;
+
+	if (uwsgi.new_argc > -1 && uwsgi.new_argv) {
+		argc = uwsgi.new_argc;
+		argv = uwsgi.new_argv;
+	}
+
+	if (uwsgi.binary_argc > 1 && argc >= uwsgi.binary_argc) {
+		char *pretty = (char *)binary_argv0_pretty;
+		strncat(pretty, argv[0], 255);
+
+		for (i = 1; i < uwsgi.binary_argc; i++) {
+			if (strlen(pretty) + 1 + strlen(argv[i]) + 1 > 256)
+				break;
+
+			strcat(pretty, " ");
+			strcat(pretty, argv[i]);
+		}
+
+		argc -= uwsgi.binary_argc - 1;
+		argv += uwsgi.binary_argc - 1;
+
+		binary_argv0_actual = argv[0];
+		argv[0] = (char *)binary_argv0_pretty;
+	}
 
 	char *optname;
-	while ((i = getopt_long(uwsgi.argc, uwsgi.argv, uwsgi.short_options, uwsgi.long_options, &uwsgi.option_index)) != -1) {
+	while ((i = getopt_long(argc, argv, uwsgi.short_options, uwsgi.long_options, &uwsgi.option_index)) != -1) {
 
 		if (i == '?') {
 			uwsgi_log("getopt_long() error\n");
@@ -263,14 +312,16 @@ void uwsgi_commandline_config() {
 		add_exported_option(optname, optarg, 0);
 	}
 
+	if (binary_argv0_actual != NULL)
+		argv[0] = binary_argv0_actual;
 
 #ifdef UWSGI_DEBUG
 	uwsgi_log("optind:%d argc:%d\n", optind, uwsgi.argc);
 #endif
 
-	if (optind < uwsgi.argc) {
-		for (i = optind; i < uwsgi.argc; i++) {
-			char *lazy = uwsgi.argv[i];
+	if (optind < argc) {
+		for (i = optind; i < argc; i++) {
+			char *lazy = argv[i];
 			if (lazy[0] != '[') {
 				uwsgi_opt_load(NULL, lazy, NULL);
 				// manage magic mountpoint
@@ -339,7 +390,6 @@ 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);
@@ -357,6 +407,7 @@ void uwsgi_setup_workers() {
 #ifdef UWSGI_ROUTING
 	uwsgi_fixup_routes(uwsgi.routes);
 	uwsgi_fixup_routes(uwsgi.error_routes);
+	uwsgi_fixup_routes(uwsgi.response_routes);
 	uwsgi_fixup_routes(uwsgi.final_routes);
 #endif
 
@@ -387,13 +438,16 @@ pid_t uwsgi_daemonize2() {
 		uwsgi_write_pidfile(uwsgi.pidfile2);
 	}
 
+	if (uwsgi.log_master) 
+		uwsgi_setup_log_master();
+
 	return uwsgi.mypid;
 }
 
 // fix/check related options
 void sanitize_args() {
 
-        if (uwsgi.async > 1) {
+        if (uwsgi.async > 0) {
                 uwsgi.cores = uwsgi.async;
         }
 
@@ -402,7 +456,7 @@ void sanitize_args() {
                 uwsgi.cores = uwsgi.threads;
         }
 
-        if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
+        if (uwsgi.harakiri_options.workers > 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");
                 }
@@ -438,17 +492,35 @@ void sanitize_args() {
 		}
         }
 
-        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]) {
+	if (uwsgi.max_worker_lifetime > 0 && uwsgi.min_worker_lifetime >= uwsgi.max_worker_lifetime) {
 		uwsgi_log("invalid min-worker-lifetime value (%d), must be lower than max-worker-lifetime (%d)\n",
-			uwsgi.shared->options[UWSGI_OPTION_MIN_WORKER_LIFETIME], uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME]);
+			uwsgi.min_worker_lifetime, uwsgi.max_worker_lifetime);
 		exit(1);
 	}
 
+	if (uwsgi.cheaper_rss_limit_soft && uwsgi.logging_options.memory_report != 1 && uwsgi.force_get_memusage != 1) {
+		uwsgi_log("enabling cheaper-rss-limit-soft requires enabling also memory-report\n");
+		exit(1);
+	}
+	if (uwsgi.cheaper_rss_limit_hard && !uwsgi.cheaper_rss_limit_soft) {
+		uwsgi_log("enabling cheaper-rss-limit-hard requires setting also cheaper-rss-limit-soft\n");
+		exit(1);
+	}
+	if ( uwsgi.cheaper_rss_limit_hard && uwsgi.cheaper_rss_limit_hard <= uwsgi.cheaper_rss_limit_soft) {
+		uwsgi_log("cheaper-rss-limit-hard value must be higher than cheaper-rss-limit-soft value\n");
+		exit(1);
+	}
+
+	if (uwsgi.evil_reload_on_rss || uwsgi.evil_reload_on_as) {
+		if (!uwsgi.mem_collector_freq) uwsgi.mem_collector_freq = 3;
+	}
+
+	/* here we try to choose if thunder lock is a good thing */
+#ifdef UNBIT
+	if (uwsgi.numproc > 1 && !uwsgi.map_socket) {
+		uwsgi.use_thunder_lock = 1;
+	}
+#endif
 }
 
 const char *uwsgi_http_status_msg(char *status, uint16_t *len) {

core/json.c

@@ -4,13 +4,207 @@
 
 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;
@@ -106,6 +300,9 @@ void uwsgi_json_config(char *file, char *magic_table[]) {
 		config_iter = json_object_iter_next(config, config_iter);
 	}
 
+	if (colon) colon[0] = ':';
+
 }
 
 #endif
+#endif

core/legion.c

@@ -79,6 +79,9 @@ void uwsgi_parse_legion(char *key, uint16_t keylen, char *value, uint16_t vallen
 		ul->scroll = value;
 		ul->scroll_len = vallen;
 	}
+	else if (!uwsgi_strncmp(key, keylen, "dead", 4)) {
+		ul->dead = 1;
+	}
 }
 
 // this function is called when a node is added or removed (heavy locking is needed)
@@ -274,8 +277,9 @@ static void legions_check_nodes_step2() {
 			memcpy(best_uuid, node->uuid, 36);
 		}
 		// go on if i am not an arbiter
-		else if (ul->valor > 0) {
-			// no potential Lord is available, i will propose myself
+		// no potential Lord is available, i will propose myself
+		// but only if i am not suspended...
+		else if (ul->valor > 0 && uwsgi_now() > ul->suspended_til) {
 			best_valor = ul->valor;
 			memcpy(best_uuid, ul->uuid, 36);
 			i_am_the_best = 1;
@@ -334,13 +338,20 @@ 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;
 					}
@@ -353,6 +364,7 @@ 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);
@@ -397,7 +409,7 @@ static void legions_check_nodes_step2() {
 			}
 			ul->last_warning = uwsgi_now();
 		}
-
+next:
 		ul = ul->next;
 	}
 }
@@ -493,8 +505,15 @@ 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;
@@ -551,7 +570,7 @@ static void *legion_loop(void *foobar) {
 
 			d_len += d2_len;
 
-			if (d_len != uh->pktsize) {
+			if (d_len != uh->_pktsize) {
 				uwsgi_log("[uwsgi-legion] invalid packet size\n");
 				continue;
 			}
@@ -588,6 +607,8 @@ 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);
@@ -611,6 +632,14 @@ static void *legion_loop(void *foobar) {
 					usl = usl->next;
 				}
 			}
+			// remove node announcing death
+			else if (legion_msg.dead) {
+				uwsgi_log("[uwsgi-legion] %s: %.*s valor: %llu uuid: %.*s announced its death to Legion %s\n", node->valor > 0 ? "node" : "arbiter", node->name_len, node->name, node->valor, 36, node->uuid, ul->legion);
+                                uwsgi_wlock(ul->lock);
+                                uwsgi_legion_remove_node(ul, node);
+                                uwsgi_rwunlock(ul->lock);
+				continue;
+			}
 
 			node->last_seen = uwsgi_now();
 			node->lord_valor = legion_msg.lord_valor;
@@ -637,7 +666,12 @@ int uwsgi_legion_action_call(char *phase, struct uwsgi_legion *ul, struct uwsgi_
 		return -1;
 	}
 
-	uwsgi_log("[uwsgi-legion] (phase: %s legion: %s) calling %s\n", phase, ul->legion, usl->value);
+	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);
+	}
 	return ula->func(ul, usl->value + usl->custom);
 }
 
@@ -656,6 +690,18 @@ 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;
 
@@ -664,8 +710,10 @@ 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;
@@ -725,13 +773,19 @@ 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, uwsgi_now()))
+	if (uwsgi_buffer_append_keynum(ub, "unix", 4, now))
 		goto err;
 	if (uwsgi_buffer_append_keynum(ub, "lord", 4, ul->i_am_the_lord ? ul->i_am_the_lord : 0))
 		goto err;
@@ -752,10 +806,13 @@ int uwsgi_legion_announce(struct uwsgi_legion *ul) {
 		if (uwsgi_buffer_append_keyval(ub, "scroll", 6, ul->scroll, ul->scroll_len))
                 	goto err;
 	}
-#ifdef UWSGI_UUID
-#endif
 
-	unsigned char *encrypted = uwsgi_malloc(ub->pos + 4 + EVP_MAX_BLOCK_LENGTH);
+	if (ul->dead) {
+		if (uwsgi_buffer_append_keyval(ub, "dead", 4, "1", 1))
+                	goto err;
+	}
+
+	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;
@@ -794,6 +851,7 @@ int uwsgi_legion_announce(struct uwsgi_legion *ul) {
 	return 0;
 err:
 	uwsgi_buffer_destroy(ub);
+	free(encrypted);
 	return -1;
 }
 
@@ -810,6 +868,7 @@ 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) {
@@ -1098,10 +1157,11 @@ struct uwsgi_legion_action *uwsgi_legion_action_get(char *name) {
 	return NULL;
 }
 
-void uwsgi_legion_action_register(char *name, int (*func) (struct uwsgi_legion *, char *)) {
-	if (uwsgi_legion_action_get(name)) {
+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) {
 		uwsgi_log("[uwsgi-legion] action \"%s\" is already registered !!!\n", name);
-		return;
+		return found_ula;
 	}
 
 	struct uwsgi_legion_action *old_ula = NULL, *ula = uwsgi.legion_actions;
@@ -1120,8 +1180,18 @@ void uwsgi_legion_action_register(char *name, int (*func) (struct uwsgi_legion *
 	else {
 		uwsgi.legion_actions = ula;
 	}
+
+	return ula;
 }
 
+void uwsgi_legion_announce_death(void) {
+	struct uwsgi_legion *legion = uwsgi.legions;
+        while (legion) {
+                legion->dead = 1;
+                uwsgi_legion_announce(legion);
+                legion = legion->next;
+        }
+}
 
 void uwsgi_legion_atexit(void) {
 	struct uwsgi_legion *legion = uwsgi.legions;
@@ -1140,6 +1210,10 @@ 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();
 }
 
 int uwsgi_legion_i_am_the_lord(char *name) {

core/lock.c

@@ -94,12 +94,12 @@ retry:
 #ifndef PTHREAD_MUTEX_ROBUST
 #define PTHREAD_MUTEX_ROBUST PTHREAD_MUTEX_ROBUST_NP
 #endif
-	if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) {
-		uwsgi_log("unable to set PTHREAD_PRIO_INHERIT\n");
-		exit(1);
-	}
 	if (uwsgi_pthread_robust_mutexes_enabled) {
-		if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST)) {
+		if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) {
+			uwsgi_log("unable to set PTHREAD_PRIO_INHERIT\n");
+			exit(1);
+		}
+		if (pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST)) {
 			uwsgi_log("unable to make the mutex 'robust'\n");
 			exit(1);
 		}
@@ -161,7 +161,7 @@ void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
 #ifdef EOWNERDEAD
 	if (pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr) == EOWNERDEAD) {
 		uwsgi_log("[deadlock-detector] a process holding a robust mutex died. recovering...\n");
-		pthread_mutex_consistent_np((pthread_mutex_t *) uli->lock_ptr);
+		pthread_mutex_consistent((pthread_mutex_t *) uli->lock_ptr);
 	}
 #else
 	pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr);
@@ -476,6 +476,20 @@ void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) {
 
 #endif
 
+#ifdef __RUMP__
+int semctl(int _0, int _1, int _2, ...) {
+	return 0;
+}
+int semget(key_t _0, int _1, int _2) {
+	return 0;
+}
+int semop(int _0, struct sembuf * _1, size_t _2) {
+	return 0;
+}
+#undef UWSGI_LOCK_ENGINE_NAME
+#define UWSGI_LOCK_ENGINE_NAME "fake"
+#endif
+
 struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 
 	// used by ftok
@@ -493,7 +507,7 @@ struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 	if (uwsgi.ftok) {
 		myKey = ftok(uwsgi.ftok, counter);
 		if (myKey < 0) {
-			uwsgi_error("ftok()");
+			uwsgi_error("uwsgi_lock_ipcsem_init()/ftok()");
 			exit(1);
 		}
 		counter++;
@@ -504,7 +518,7 @@ struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 	}
 
 	if (semid < 0) {
-		uwsgi_error("semget()");
+		uwsgi_error("uwsgi_lock_ipcsem_init()/semget()");
 		exit(1);
 	}
 	// do this now, to allows triggering of atexit hook in case of problems
@@ -512,7 +526,7 @@ struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
 
 	semu.val = 1;
 	if (semctl(semid, 0, SETVAL, semu)) {
-		uwsgi_error("semctl()");
+		uwsgi_error("uwsgi_lock_ipcsem_init()/semctl()");
 		exit(1);
 	}
 
@@ -532,7 +546,13 @@ void uwsgi_lock_ipcsem(struct uwsgi_lock_item *uli) {
 retry:
 	if (semop(semid, &sb, 1)) {
 		if (errno == EINTR) goto retry; 
-		uwsgi_error("semop()");
+		uwsgi_error("uwsgi_lock_ipcsem()/semop()");
+#ifdef EIDRM
+		if (errno == EIDRM) {
+			exit(UWSGI_BRUTAL_RELOAD_CODE);
+		}
+#endif
+		exit(1);
 	}
 }
 
@@ -549,7 +569,13 @@ void uwsgi_unlock_ipcsem(struct uwsgi_lock_item *uli) {
 retry:
 	if (semop(semid, &sb, 1)) {
 		if (errno == EINTR) goto retry; 
-		uwsgi_error("semop()");
+		uwsgi_error("uwsgi_unlock_ipcsem()/semop()");
+#ifdef EIDRM
+		if (errno == EIDRM) {
+			exit(UWSGI_BRUTAL_RELOAD_CODE);
+		}
+#endif
+		exit(1);
 	}
 
 }
@@ -574,6 +600,8 @@ pid_t uwsgi_lock_ipcsem_check(struct uwsgi_lock_item *uli) {
 
 void uwsgi_ipcsem_clear(void) {
 
+	if (uwsgi.persistent_ipcsem) return;
+
 	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
 
 	if (!uwsgi.workers)
@@ -594,12 +622,27 @@ clear:
 
 #ifdef UWSGI_DEBUG
 	uwsgi_log("removing sysvipc semaphores...\n");
+#endif
+#ifdef GETPID
+	while (uli) {
+		int semid = 0;
+		memcpy(&semid, uli->lock_ptr, sizeof(int));
+		int ret = semctl(semid, 0, GETPID);
+		if (ret > 0) {
+			if (ret != (int) getpid() && !kill((pid_t) ret, 0)) {
+				uwsgi_log("found ipcsem mapped to alive pid %d. skipping ipcsem removal.\n", ret);
+				return;
+			}
+		}
+		uli = uli->next;
+	}
+	uli = uwsgi.registered_locks;
 #endif
 	while (uli) {
 		int semid = 0;
 		memcpy(&semid, uli->lock_ptr, sizeof(int));
 		if (semctl(semid, 0, IPC_RMID)) {
-			uwsgi_error("semctl()");
+			uwsgi_error("uwsgi_ipcsem_clear()/semctl()");
 		}
 		uli = uli->next;
 	}
@@ -610,6 +653,33 @@ pid_t uwsgi_rwlock_ipcsem_check(struct uwsgi_lock_item *uli) {
 	return uwsgi_lock_ipcsem_check(uli);
 }
 
+#ifdef UNBIT
+/*
+	Unbit-specific workaround for robust-mutexes
+*/
+void *uwsgi_robust_mutexes_watchdog_loop(void *arg) {
+	for(;;) {
+		uwsgi_lock(uwsgi.the_thunder_lock);
+		uwsgi_unlock(uwsgi.the_thunder_lock);
+		sleep(1);
+	}
+	return NULL;
+}
+void uwsgi_robust_mutexes_watchdog() {
+	pthread_t tid;
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+        // 32K should be more than enough...
+        pthread_attr_setstacksize(&attr, 32 * 1024);
+
+        if (pthread_create(&tid, &attr, uwsgi_robust_mutexes_watchdog_loop, NULL)) {
+                uwsgi_error("uwsgi_robust_mutexes_watchdog()/pthread_create()");
+		exit(1);
+        }
+}
+
+#endif
 
 void uwsgi_setup_locking() {
 
@@ -689,6 +759,14 @@ ready:
 	if (uwsgi.use_thunder_lock) {
 		// process shared thunder lock
 		uwsgi.the_thunder_lock = uwsgi_lock_init("thunder");	
+#ifdef UNBIT
+		// we have a serious bug on Unbit (and very probably on older libc)
+		// when all of the workers die in the same moment the pthread robust mutes is left
+		// in inconsistent state and we have no way to recover
+		// we span a thread in the master constantly ensuring the lock is ok
+		// for now we apply it only for Unbit (where thunder-lock is automatically enabled)
+		uwsgi_robust_mutexes_watchdog();		
+#endif
 	}
 
 	uwsgi.rpc_table_lock = uwsgi_lock_init("rpc");

core/master.c

@@ -2,14 +2,66 @@
 
 extern struct uwsgi_server uwsgi;
 
-void uwsgi_restore_auto_snapshot(int signum) {
+static void master_check_processes() {
 
-	if (uwsgi.workers[1].snapshot > 0) {
-		uwsgi.restore_snapshot = 1;
+	// run the function, only if required
+	if (!uwsgi.die_on_no_workers) return;
+
+	int alive_processes = 0;
+	int dead_processes = 0;
+
+	int i;
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].pid > 0) {
+			alive_processes++;
+		}
+		else {
+			dead_processes++;
+		}
 	}
-	else {
-		uwsgi_log("[WARNING] no snapshot available\n");
+
+	if (uwsgi.die_on_no_workers) {
+		if (!alive_processes) {
+			uwsgi_log_verbose("no more processes running, auto-killing ...\n");
+			exit(1);
+			// never here;
+		}
 	}
+}
+
+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;
+			}
+		}
+
+	}
+
+	ushared->busy_workers = busy_workers;
+	ushared->idle_workers = idle_workers;
 
 }
 
@@ -32,24 +84,25 @@ 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, uwsgi.wsgi_req->buffer, uwsgi.buffer_size, 0, (struct sockaddr *) &udp_client, &udp_len);
+	ssize_t rlen = recvfrom(udp_fd, buf, 4096, 0, (struct sockaddr *) &udp_client, &udp_len);
 
 	if (rlen < 0) {
-		uwsgi_error("recvfrom()");
+		uwsgi_error("uwsgi_master_manage_udp()/recvfrom()");
 	}
 	else if (rlen > 0) {
 
 		memset(udp_client_addr, 0, 16);
 		if (inet_ntop(AF_INET, &udp_client.sin_addr.s_addr, udp_client_addr, 16)) {
-			if (uwsgi.wsgi_req->buffer[0] == UWSGI_MODIFIER_MULTICAST_ANNOUNCE) {
+			if (buf[0] == UWSGI_MODIFIER_MULTICAST_ANNOUNCE) {
 			}
-			else if (uwsgi.wsgi_req->buffer[0] == 0x30 && uwsgi.snmp) {
-				manage_snmp(udp_fd, (uint8_t *) uwsgi.wsgi_req->buffer, rlen, &udp_client);
+			else if (buf[0] == 0x30 && uwsgi.snmp) {
+				manage_snmp(udp_fd, (uint8_t *) buf, rlen, &udp_client);
 			}
 			else {
 
@@ -57,7 +110,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, uwsgi.wsgi_req->buffer, rlen)) {
+						if (uwsgi.p[i]->manage_udp(udp_client_addr, udp_client.sin_port, buf, rlen)) {
 							udp_managed = 1;
 							break;
 						}
@@ -66,74 +119,17 @@ 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, uwsgi.wsgi_req->buffer);
+					uwsgi_log("[udp:%s:%d] %.*s", udp_client_addr, ntohs(udp_client.sin_port), (int) rlen, buf);
 				}
 			}
 		}
 		else {
-			uwsgi_error("inet_ntop()");
+			uwsgi_error("uwsgi_master_manage_udp()/inet_ntop()");
 		}
 
 	}
 }
 
-void uwsgi_master_manage_emperor() {
-	char byte;
-	ssize_t rlen = read(uwsgi.emperor_fd, &byte, 1);
-	if (rlen > 0) {
-		uwsgi_log_verbose("received message %d from emperor\n", byte);
-		// remove me
-		if (byte == 0) {
-			close(uwsgi.emperor_fd);
-			if (!uwsgi.status.brutally_reloading)
-				kill_them_all(0);
-		}
-		// reload me
-		else if (byte == 1) {
-			// un-lazy the stack to trigger a real reload
-			uwsgi.lazy = 0;
-			uwsgi_block_signal(SIGHUP);
-			grace_them_all(0);
-			uwsgi_unblock_signal(SIGHUP);
-		}
-	}
-	else {
-		uwsgi_log("lost connection with my emperor !!!\n");
-		close(uwsgi.emperor_fd);
-		if (!uwsgi.status.brutally_reloading)
-			kill_them_all(0);
-		sleep(2);
-		exit(1);
-	}
-
-}
-
-
-void uwsgi_master_restore_snapshot() {
-	int i, waitpid_status;
-	uwsgi_log("[snapshot] restoring workers...\n");
-	for (i = 1; i <= uwsgi.numproc; i++) {
-		if (uwsgi.workers[i].pid == 0)
-			continue;
-		kill(uwsgi.workers[i].pid, SIGKILL);
-		if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
-			uwsgi_error("waitpid()");
-		}
-		if (uwsgi.auto_snapshot > 0 && i > uwsgi.auto_snapshot) {
-			uwsgi.workers[i].pid = 0;
-			uwsgi.workers[i].snapshot = 0;
-		}
-		else {
-			uwsgi.workers[i].pid = uwsgi.workers[i].snapshot;
-			uwsgi.workers[i].snapshot = 0;
-			kill(uwsgi.workers[i].pid, SIGURG);
-			uwsgi_log("Restored uWSGI worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
-		}
-	}
-
-	uwsgi.restore_snapshot = 0;
-}
-
 void suspend_resume_them_all(int signum) {
 
 	int i;
@@ -176,6 +172,15 @@ 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);
+			}
+		}
+	}
 }
 
 
@@ -209,53 +214,34 @@ void expire_rb_timeouts(struct uwsgi_rbtree *tree) {
 	}
 }
 
-int uwsgi_get_tcp_info(int fd) {
+static void get_tcp_info(struct uwsgi_socket *uwsgi_sock) {
 
 #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, &uwsgi.shared->ti, &tis)) {
+	if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &ti, &tis)) {
 
 		// checks for older kernels
 #if defined(__linux__)
-		if (!uwsgi.shared->ti.tcpi_sacked) {
+		if (!ti.tcpi_sacked) {
 #elif defined(__FreeBSD__)
-		if (!uwsgi.shared->ti.__tcpi_sacked) {
+		if (!ti.__tcpi_sacked) {
 #endif
-                        return 0;
-                }
+			return;
+		}
 
 #if defined(__linux__)
-		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.tcpi_unacked;
-		uwsgi.shared->max_load = (uint64_t) uwsgi.shared->ti.tcpi_sacked;
+		uwsgi_sock->queue = (uint64_t) ti.tcpi_unacked;
+		uwsgi_sock->max_queue = (uint64_t) ti.tcpi_sacked;
 #elif defined(__FreeBSD__)
-		uwsgi.shared->load = (uint64_t) uwsgi.shared->ti.__tcpi_unacked;
-		uwsgi.shared->max_load = (uint64_t) uwsgi.shared->ti.__tcpi_sacked;
+		uwsgi_sock->queue = (uint64_t) ti.__tcpi_unacked;
+		uwsgi_sock->max_queue = (uint64_t) 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;
+#endif
 }
 
 
@@ -268,25 +254,79 @@ int uwsgi_get_tcp_info(int fd) {
 
 #ifdef SIOBKLGQ
 
-int get_linux_unbit_SIOBKLGQ(int fd) {
+static void get_linux_unbit_SIOBKLGQ(struct uwsgi_socket *uwsgi_sock) {
 
+	int fd = uwsgi_sock->fd;
 	int queue = 0;
 	if (ioctl(fd, SIOBKLGQ, &queue) >= 0) {
-		uwsgi.shared->load = queue;
-		uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = queue;
-		if (queue >= uwsgi.listen_queue) {
-			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, queue, uwsgi.listen_queue);
-			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
-		}
-		return queue;
+		uwsgi_sock->queue = (uint64_t) queue;
+		uwsgi_sock->max_queue = (uint64_t) uwsgi.listen_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) {
 
@@ -306,7 +346,6 @@ int master_loop(char **argv, char **environ) {
 	struct uwsgi_rb_timer *min_timeout;
 	struct uwsgi_rbtree *rb_timers = uwsgi_init_rb_timer();
 
-
 	if (uwsgi.procname_master) {
 		uwsgi_set_processname(uwsgi.procname_master);
 	}
@@ -322,19 +361,12 @@ int master_loop(char **argv, char **environ) {
 
 	uwsgi_unix_signal(SIGTSTP, suspend_resume_them_all);
 	uwsgi_unix_signal(SIGHUP, grace_them_all);
-	if (uwsgi.die_on_term) {
-		uwsgi_unix_signal(SIGTERM, kill_them_all);
-		uwsgi_unix_signal(SIGQUIT, reap_them_all);
-	}
-	else {
-		uwsgi_unix_signal(SIGTERM, reap_them_all);
-		uwsgi_unix_signal(SIGQUIT, kill_them_all);
-	}
+
+	uwsgi_unix_signal(SIGTERM, kill_them_all);
+	uwsgi_unix_signal(SIGQUIT, reap_them_all);
+
 	uwsgi_unix_signal(SIGINT, kill_them_all);
 	uwsgi_unix_signal(SIGUSR1, stats);
-	if (uwsgi.auto_snapshot) {
-		uwsgi_unix_signal(SIGURG, uwsgi_restore_auto_snapshot);
-	}
 
 	atexit(uwsgi_master_cleanup_hooks);
 
@@ -346,6 +378,17 @@ int master_loop(char **argv, char **environ) {
 #endif
 	event_queue_add_fd_read(uwsgi.master_queue, uwsgi.shared->worker_signal_pipe[0]);
 
+	if (uwsgi.master_fifo) {
+		uwsgi.master_fifo_fd = uwsgi_master_fifo();
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.master_fifo_fd);
+	}
+
+	if (uwsgi.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]);
 	}
@@ -374,6 +417,9 @@ int master_loop(char **argv, char **environ) {
 #ifdef UWSGI_SSL
 	uwsgi_start_legions();
 #endif
+	uwsgi_metrics_start_collector();
+
+	uwsgi_add_reload_fds();
 
 	uwsgi_cache_start_sweepers();
 	uwsgi_cache_start_sync_servers();
@@ -381,9 +427,32 @@ int master_loop(char **argv, char **environ) {
 	uwsgi.wsgi_req->buffer = uwsgi.workers[0].cores[0].buffer;
 
 	if (uwsgi.has_emperor) {
-		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd);
+		if (uwsgi.emperor_proxy) {
+			uwsgi.emperor_fd_proxy = bind_to_unix(uwsgi.emperor_proxy, uwsgi.listen_queue, 0, 0);
+			if (uwsgi.emperor_fd_proxy < 0) exit(1);
+			if (chmod(uwsgi.emperor_proxy, S_IRUSR|S_IWUSR)) {
+				uwsgi_error("[emperor-proxy] chmod()");
+				exit(1);
+			}
+			event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd_proxy);
+		}
+		else {
+			event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd);
+		}
 	}
 
+#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);
@@ -391,7 +460,7 @@ int master_loop(char **argv, char **environ) {
 	}
 
 	if (uwsgi.stats) {
-		char *tcp_port = strchr(uwsgi.stats, ':');
+		char *tcp_port = strrchr(uwsgi.stats, ':');
 		if (tcp_port) {
 			// disable deferred accept for this socket
 			int current_defer_accept = uwsgi.no_defer_accept;
@@ -475,7 +544,7 @@ int master_loop(char **argv, char **environ) {
 	uwsgi_check_touches(uwsgi.touch_gracefully_stop);
 	// update exec touches
 	struct uwsgi_string_list *usl = uwsgi.touch_exec;
-	while(usl) {
+	while (usl) {
 		char *space = strchr(usl->value, ' ');
 		if (space) {
 			*space = 0;
@@ -487,16 +556,59 @@ int master_loop(char **argv, char **environ) {
 	uwsgi_check_touches(uwsgi.touch_exec);
 	// update signal touches
 	usl = uwsgi.touch_signal;
-        while(usl) {
-                char *space = strchr(usl->value, ' ');
-                if (space) {
+	while (usl) {
+		char *space = strchr(usl->value, ' ');
+		if (space) {
+			*space = 0;
+			usl->len = strlen(usl->value);
+			usl->custom_ptr = space + 1;
+		}
+		usl = usl->next;
+	}
+	uwsgi_check_touches(uwsgi.touch_signal);
+	// 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);
-                        usl->custom_ptr = space + 1;
+			uwsgi_string_new_list((struct uwsgi_string_list **)&usl->custom_ptr, space+1);
                 }
-                usl = usl->next;
+	}
+	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 = ' ';
         }
-        uwsgi_check_touches(uwsgi.touch_signal);
 
 	// setup cheaper algos (can be stacked)
 	uwsgi.cheaper_algo = uwsgi_cheaper_algo_spare;
@@ -519,6 +631,7 @@ 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);
@@ -551,27 +664,19 @@ 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())
 				return 0;
 		}
 
+		// spooler cheap management
+		if (uwsgi.spooler_cheap) {
+			if ((uwsgi.master_cycles % uwsgi.spooler_frequency) == 0) {
+				uwsgi_spooler_cheap_check();
+			}
+		}
+
 
 		// check if someone is dead
 		diedpid = waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
@@ -594,9 +699,11 @@ int master_loop(char **argv, char **environ) {
 		if (diedpid == 0) {
 
 			/* all processes ok, doing status scan after N seconds */
-			check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
-			if (!check_interval)
+			check_interval = uwsgi.master_interval;
+			if (!check_interval) {
 				check_interval = 1;
+				uwsgi.master_interval = 1;
+			}
 
 
 			// add unregistered file monitors
@@ -631,14 +738,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 == NULL) {
-					check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
-				}
-				else {
-					check_interval = min_timeout->value - uwsgi_now();
-					if (check_interval <= 0) {
+				if (min_timeout) {
+					int delta = min_timeout->value - uwsgi_now();
+					if (delta <= 0) {
 						expire_rb_timeouts(rb_timers);
-						check_interval = 0;
+					}
+					// if the timer expires before the check_interval, override it
+					else if (delta < check_interval) {
+						check_interval = delta;
 					}
 				}
 			}
@@ -652,6 +759,11 @@ int master_loop(char **argv, char **environ) {
 				}
 			}
 
+			// update load counter
+			uwsgi_update_load_counters();
+
+			master_check_processes();
+
 
 			// check uwsgi-cron table
 			if (ushared->cron_cnt) {
@@ -691,34 +803,26 @@ int master_loop(char **argv, char **environ) {
 			// check for idle
 			uwsgi_master_check_idle();
 
-			check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
-			if (!check_interval)
+			check_interval = uwsgi.master_interval;
+			if (!check_interval) {
 				check_interval = 1;
-
-
-			// get listen_queue status
-			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
-			while (uwsgi_sock) {
-				if (uwsgi_sock->family == AF_INET) {
-					uwsgi_sock->queue = uwsgi_get_tcp_info(uwsgi_sock->fd);
-				}
-#ifdef __linux__
-#ifdef SIOBKLGQ
-				else if (uwsgi_sock->family == AF_UNIX) {
-					uwsgi_sock->queue = get_linux_unbit_SIOBKLGQ(uwsgi_sock->fd);
-				}
-#endif
-#endif
-				uwsgi_sock = uwsgi_sock->next;
+				uwsgi.master_interval = 1;
 			}
 
-			// check if some worker has to die (harakiri, evil checks...)
-			uwsgi_master_check_workers_deadline();
 
-			uwsgi_master_check_gateways_deadline();
-			uwsgi_master_check_mules_deadline();
-			uwsgi_master_check_spoolers_deadline();
-			uwsgi_master_check_crons_deadline();
+			// 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++;
+
+			// this could trigger a complete exit...
+			uwsgi_master_check_mountpoints();
 
 #ifdef __linux__
 #ifdef MADV_MERGEABLE
@@ -729,7 +833,7 @@ int master_loop(char **argv, char **environ) {
 #endif
 
 			// resubscribe every 10 cycles by default
-			if (( (uwsgi.subscriptions || uwsgi.subscriptions2) && ((uwsgi.master_cycles % uwsgi.subscribe_freq) == 0 || uwsgi.master_cycles == 1)) && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
+			if (((uwsgi.subscriptions || uwsgi.subscriptions2) && ((uwsgi.master_cycles % uwsgi.subscribe_freq) == 0 || uwsgi.master_cycles == 1)) && !uwsgi_instance_is_reloading && !uwsgi_instance_is_dying && !uwsgi.workers[0].suspended) {
 				uwsgi_subscribe_all(0, 0);
 			}
 
@@ -753,42 +857,63 @@ int master_loop(char **argv, char **environ) {
 				}
 				touched = uwsgi_check_touches(uwsgi.touch_workers_reload);
 				if (touched) {
-                                        uwsgi_log_verbose("*** %s has been touched... workers reload !!! ***\n", touched);
-					uwsgi_block_signal(SIGHUP);
-					for(i=1;i<=uwsgi.numproc;i++) {
-						if (uwsgi.workers[i].pid > 0) {
-							uwsgi_curse(i, SIGHUP);
-						}
-					}
-					uwsgi_unblock_signal(SIGHUP);
-                                        continue;
-                                }
+					uwsgi_log_verbose("*** %s has been touched... workers reload !!! ***\n", touched);
+					uwsgi_reload_workers();
+					continue;
+				}
 				touched = uwsgi_check_touches(uwsgi.touch_chain_reload);
 				if (touched) {
 					if (uwsgi.status.chain_reloading == 0) {
-                                        	uwsgi_log_verbose("*** %s has been touched... chain reload !!! ***\n", touched);
+						uwsgi_log_verbose("*** %s has been touched... chain reload !!! ***\n", touched);
 						uwsgi.status.chain_reloading = 1;
 					}
 					else {
-                                        	uwsgi_log_verbose("*** %s has been touched... but chain reload is already running ***\n", touched);
+						uwsgi_log_verbose("*** %s has been touched... but chain reload is already running ***\n", touched);
 					}
 				}
 
 				// be sure to run it as the last touch check
 				touched = uwsgi_check_touches(uwsgi.touch_exec);
 				if (touched) {
-					if (uwsgi_run_command( touched , NULL, -1) >= 0) {
+					if (uwsgi_run_command(touched, NULL, -1) >= 0) {
 						uwsgi_log_verbose("[uwsgi-touch-exec] running %s\n", touched);
 					}
 				}
 				touched = uwsgi_check_touches(uwsgi.touch_signal);
-                                if (touched) {
+				if (touched) {
 					uint8_t signum = atoi(touched);
 					uwsgi_route_signal(signum);
-                                        uwsgi_log_verbose("[uwsgi-touch-signal] raising %u\n", signum);
-                                }
+					uwsgi_log_verbose("[uwsgi-touch-signal] raising %u\n", signum);
+				}
+
+				// 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;
 
 		}
@@ -803,12 +928,18 @@ int master_loop(char **argv, char **environ) {
 		// reload gateways and daemons only on normal workflow (+outworld status)
 		if (!uwsgi_instance_is_reloading && !uwsgi_instance_is_dying) {
 
-			if (uwsgi_master_check_emperor_death(diedpid)) continue;
-			if (uwsgi_master_check_spoolers_death(diedpid)) continue;
-			if (uwsgi_master_check_mules_death(diedpid)) continue;
-			if (uwsgi_master_check_gateways_death(diedpid)) continue;
-			if (uwsgi_master_check_daemons_death(diedpid)) continue;
-			if (uwsgi_master_check_cron_death(diedpid)) continue;
+			if (uwsgi_master_check_emperor_death(diedpid))
+				continue;
+			if (uwsgi_master_check_spoolers_death(diedpid))
+				continue;
+			if (uwsgi_master_check_mules_death(diedpid))
+				continue;
+			if (uwsgi_master_check_gateways_death(diedpid))
+				continue;
+			if (uwsgi_master_check_daemons_death(diedpid))
+				continue;
+			if (uwsgi_master_check_cron_death(diedpid))
+				continue;
 		}
 
 
@@ -837,6 +968,7 @@ 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;
 				}
 			}
@@ -868,13 +1000,16 @@ next:
 		// ok a worker died...
 		uwsgi.workers[thewid].pid = 0;
 		// only to be safe :P
-		uwsgi.workers[thewid].harakiri = 0;
+		for(i=0;i<uwsgi.cores;i++) {
+			uwsgi.workers[thewid].cores[i].harakiri = 0;
+		}
 
 		// ok, if we are reloading or dying, just continue the master loop
 		// as soon as all of the workers have pid == 0, the action (exit, or reload) is triggered
 		if (uwsgi_instance_is_reloading || uwsgi_instance_is_dying) {
-			if (!uwsgi.workers[thewid].cursed_at) uwsgi.workers[thewid].cursed_at = uwsgi_now();
-			uwsgi_log("worker %d buried after %d seconds\n", thewid, (int) (uwsgi_now()-uwsgi.workers[thewid].cursed_at));
+			if (!uwsgi.workers[thewid].cursed_at)
+				uwsgi.workers[thewid].cursed_at = uwsgi_now();
+			uwsgi_log("worker %d buried after %d seconds\n", thewid, (int) (uwsgi_now() - uwsgi.workers[thewid].cursed_at));
 			uwsgi.workers[thewid].cursed_at = 0;
 			continue;
 		}
@@ -883,6 +1018,11 @@ 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);
@@ -893,6 +1033,15 @@ next:
 		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_QUIET_CODE) {
 			// noop
 		}
+		else if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_BRUTAL_RELOAD_CODE) {
+			uwsgi_log("!!! inconsistent state reported by worker %d (pid: %d) !!!\n", thewid, (int) diedpid);
+			reap_them_all(0);
+			continue;
+		}
+		else if (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));
@@ -947,3 +1096,34 @@ next:
 
 	// never here
 }
+
+void uwsgi_reload_workers() {
+	int i;
+	uwsgi_block_signal(SIGHUP);
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid > 0) {
+			uwsgi_curse(i, SIGHUP);
+		}
+	}
+	uwsgi_unblock_signal(SIGHUP);
+}
+
+void uwsgi_chain_reload() {
+	if (!uwsgi.status.chain_reloading) {
+		uwsgi_log_verbose("chain reload starting...\n");
+		uwsgi.status.chain_reloading = 1;
+	}
+	else {
+		uwsgi_log_verbose("chain reload already running...\n");
+	}
+}
+
+void uwsgi_brutally_reload_workers() {
+	int i;
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid > 0) {
+			uwsgi_log_verbose("killing worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
+			uwsgi_curse(i, SIGINT);
+		}
+	}
+}

core/master_checks.c

@@ -25,6 +25,11 @@ 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;
@@ -34,19 +39,51 @@ int uwsgi_master_check_reload(char **argv) {
 
 // check for chain reload
 void uwsgi_master_check_chain() {
+	static time_t last_check = 0;
+
 	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) {
+				time_t now = uwsgi_now();
+				if (now != last_check) {
+					uwsgi_log_verbose("chain is still waiting for worker %d...\n", uwsgi.status.chain_reloading-1);
+					last_check = now;
+				}
+				return;
+			}
+		}
+	}
+
+	// if all the processes are recycled, the chain is over
 	if (uwsgi.status.chain_reloading > uwsgi.numproc) {
 		uwsgi.status.chain_reloading = 0;
                 uwsgi_log_verbose("chain reloading complete\n");
+		return;
 	}
-	int i;
+
 	uwsgi_block_signal(SIGHUP);
-	for(i=1;i<=uwsgi.numproc;i++) {
-		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.workers[i].cursed_at == 0 && i == uwsgi.status.chain_reloading) {
-			uwsgi_curse(i, SIGHUP);
+	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);
+			}
 			break;
 		}
-	}
+		else {
+			uwsgi.status.chain_reloading++;
+		}
+        }
 	uwsgi_unblock_signal(SIGHUP);
 }
 
@@ -107,11 +144,29 @@ 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);
 		uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
@@ -120,19 +175,28 @@ void uwsgi_master_check_idle() {
 
 }
 
-void uwsgi_master_check_workers_deadline() {
-	int i;
+int uwsgi_master_check_workers_deadline() {
+	int i,j;
+	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);
+		for(j=0;j<uwsgi.cores;j++) {
+			/* first check for harakiri */
+			if (uwsgi.workers[i].cores[j].harakiri > 0) {
+				if (uwsgi.workers[i].cores[j].harakiri < (time_t) uwsgi.current_time) {
+					uwsgi_log_verbose("HARAKIRI triggered by worker %d core %d !!!\n", i, j);
+					trigger_harakiri(i);
+					ret = 1;
+					break;
+				}
 			}
-		}
-		/* then user-defined harakiri */
-		if (uwsgi.workers[i].user_harakiri > 0) {
-			if (uwsgi.workers[i].user_harakiri < (time_t) uwsgi.current_time) {
-				trigger_harakiri(i);
+			/* then user-defined harakiri */
+			if (uwsgi.workers[i].cores[j].user_harakiri > 0) {
+				uwsgi_log_verbose("HARAKIRI (user) triggered by worker %d core %d !!!\n", i, j);
+				if (uwsgi.workers[i].cores[j].user_harakiri < (time_t) uwsgi.current_time) {
+					trigger_harakiri(i);
+					ret = 1;
+					break;
+				}
 			}
 		}
 		// then for evil memory checkers
@@ -141,6 +205,7 @@ void 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) {
@@ -148,15 +213,17 @@ void 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.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] > 0) {
+		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cheaped == 0 && uwsgi.max_worker_lifetime > 0) {
 			uint64_t lifetime = uwsgi_now() - uwsgi.workers[i].last_spawn;
-			if (lifetime > uwsgi.shared->options[UWSGI_OPTION_MAX_WORKER_LIFETIME] && uwsgi.workers[i].manage_next_request == 1) {
+			if (lifetime > uwsgi.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;
 			}
 		}
 
@@ -165,29 +232,32 @@ void uwsgi_master_check_workers_deadline() {
 	}
 
 
-
+	return ret;
 }
 
 
-void uwsgi_master_check_gateways_deadline() {
+int 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;
 }
 
-void uwsgi_master_check_mules_deadline() {
+int uwsgi_master_check_mules_deadline() {
 	int i;
+	int ret = 0;
 
 	for (i = 0; i < uwsgi.mules_cnt; i++) {
 		if (uwsgi.mules[i].harakiri > 0) {
@@ -195,6 +265,7 @@ void 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
@@ -203,26 +274,32 @@ void 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;
 }
 
-void uwsgi_master_check_spoolers_deadline() {
+int uwsgi_master_check_spoolers_deadline() {
+	int ret = 0;
 	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;
 }
 
 
@@ -231,9 +308,15 @@ int uwsgi_master_check_spoolers_death(int diedpid) {
 	struct uwsgi_spooler *uspool = uwsgi.spoolers;
 	while (uspool) {
 		if (uspool->pid > 0 && diedpid == uspool->pid) {
-			uwsgi_log("OOOPS the spooler is no more...trying respawn...\n");
-			uspool->respawned++;
-			uspool->pid = spooler_start(uspool);
+			if (uwsgi.spooler_cheap) {
+				uwsgi_log_verbose("spooler %s ended\n", uspool->dir);
+				uspool->pid = 0;
+			}
+			else {
+				uwsgi_log("OOOPS the spooler is no more...trying respawn...\n");
+				uspool->respawned++;
+				uspool->pid = spooler_start(uspool);
+			}
 			return -1;
 		}
 		uspool = uspool->next;
@@ -283,6 +366,7 @@ 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;
@@ -305,14 +389,28 @@ int uwsgi_master_check_cron_death(int diedpid) {
 	return 0;
 }
 
-void uwsgi_master_check_crons_deadline() {
+int uwsgi_master_check_crons_deadline() {
+	int ret = 0;
 	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() {
+	struct uwsgi_string_list *usl;
+	uwsgi_foreach(usl, uwsgi.mountpoints_check) {
+		if (uwsgi_check_mountpoint(usl->value)) {
+			uwsgi_log_verbose("mountpoint %s failed, triggering detonation...\n", usl->value);
+			uwsgi_nuclear_blast();
+			//never here
+			exit(1);
+		}
+	}
+}

core/master_events.c

@@ -18,6 +18,14 @@ int uwsgi_master_manage_events(int interesting_fd) {
 		}
 	}
 
+	if (uwsgi.master_fifo_fd > -1 && interesting_fd == uwsgi.master_fifo_fd) {
+		return uwsgi_master_fifo_manage(uwsgi.master_fifo_fd);
+	}
+
+	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) {
@@ -36,12 +44,90 @@ int uwsgi_master_manage_events(int interesting_fd) {
 
 	// emperor event ?
 	if (uwsgi.has_emperor) {
+		if (uwsgi.emperor_fd_proxy > -1 && interesting_fd == uwsgi.emperor_fd_proxy) {
+			uwsgi_master_manage_emperor_proxy(uwsgi.emperor_fd_proxy, uwsgi.emperor_fd, uwsgi.emperor_fd_config, -1);	
+			return 0;
+		}
+
 		if (interesting_fd == uwsgi.emperor_fd) {
 			uwsgi_master_manage_emperor();
 			return 0;
 		}
 	}
 
+#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;
+	}
+
+	// reload on fd
+	if (uwsgi.reload_on_fd) {
+		// custom -> fd
+		// custom2 -> len (optional, default 1)
+		// custom_ptr -> log message (optional)
+		struct uwsgi_string_list *usl = uwsgi.reload_on_fd;
+		while(usl) {
+			if (interesting_fd == (int) usl->custom) {
+				char stack_tmp[8];
+				char *tmp = stack_tmp;
+				if (usl->custom2 > 8) {
+					tmp = uwsgi_malloc(usl->custom2);
+				}
+				if (read(interesting_fd, tmp, usl->custom2) <= 0) {
+					uwsgi_error("[reload-on-fd] read()");
+				}
+				if (usl->custom_ptr) {
+					uwsgi_log_verbose("*** fd %d ready: %s ***\n", interesting_fd, usl->custom_ptr);
+				}
+				else {
+					uwsgi_log_verbose("*** fd %d ready !!! ***\n", interesting_fd);
+				}
+                                uwsgi_block_signal(SIGHUP);
+                                grace_them_all(0);
+                                uwsgi_unblock_signal(SIGHUP);				
+				return 0;
+			}
+			usl = usl->next;
+		}
+	}
+
+	// brutal reload on fd
+        if (uwsgi.brutal_reload_on_fd) {
+                // custom -> fd
+                // custom2 -> len (optional, default 1)
+                // custom_ptr -> log message (optional)
+                struct uwsgi_string_list *usl = uwsgi.brutal_reload_on_fd;
+                while(usl) {
+                        if (interesting_fd == (int) usl->custom) {
+				char stack_tmp[8];
+                                char *tmp = stack_tmp;
+                                if (usl->custom2 > 8) {
+                                        tmp = uwsgi_malloc(usl->custom2);
+                                }
+                                if (read(interesting_fd, tmp, usl->custom2) <= 0) {
+                                        uwsgi_error("[brutal-reload-on-fd] read()");
+                                }
+                                if (usl->custom_ptr) {
+                                        uwsgi_log_verbose("*** fd %d ready: %s ***\n", interesting_fd, usl->custom_ptr);
+                                }
+                                else {
+                                        uwsgi_log_verbose("*** fd %d ready !!! ***\n", interesting_fd);
+                                }
+                                uwsgi_block_signal(SIGQUIT);
+                                reap_them_all(0);
+                                uwsgi_unblock_signal(SIGQUIT);
+                                if (usl->custom2 > 8) free(tmp);
+                                return 0;
+                        }
+                        usl = usl->next;
+                }
+        }
+
 
 	// wakeup from cheap mode ?
 	if (uwsgi.status.is_cheap) {

core/master_utils.c

@@ -24,6 +24,15 @@ 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;
@@ -43,13 +52,6 @@ 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++) {
@@ -60,14 +62,25 @@ void uwsgi_destroy_processes() {
 		}
         }
 
-	// 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);
+	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);
 		}
-        }
+		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);
+	}
 }
 
 
@@ -101,7 +114,7 @@ int uwsgi_calc_cheaper(void) {
 
 	int i;
 	static time_t last_check = 0;
-	int check_interval = uwsgi.shared->options[UWSGI_OPTION_MASTER_INTERVAL];
+	int check_interval = uwsgi.master_interval;
 
 	if (!last_check)
 		last_check = uwsgi_now();
@@ -115,8 +128,52 @@ int uwsgi_calc_cheaper(void) {
 
 	last_check = now;
 
-	int needed_workers = uwsgi.cheaper_algo();
+	int ignore_algo = 0;
+	int needed_workers = 0;
 
+	// first check if memory usage is not exceeded
+	if (uwsgi.cheaper_rss_limit_soft) {
+		unsigned long long total_rss = 0;
+		int i;
+		int active_workers = 0;
+		for(i=1;i<=uwsgi.numproc;i++) {
+			if (!uwsgi.workers[i].cheaped) {
+				total_rss += uwsgi.workers[i].rss_size;
+				active_workers++;
+			}
+		}
+		if (uwsgi.cheaper_rss_limit_hard && active_workers > 1 && total_rss >= uwsgi.cheaper_rss_limit_hard) {
+			uwsgi_log("cheaper hard rss memory limit exceeded, cheap one of %d workers\n", active_workers);
+			needed_workers = -1;
+			ignore_algo = 1;
+		}
+		else if (total_rss >= uwsgi.cheaper_rss_limit_soft) {
+#ifdef UWSGI_DEBUG
+			uwsgi_log("cheaper soft rss memory limit exceeded, can't spawn more workers\n");
+#endif
+			ignore_algo = 1;
+		}
+	}
+
+	// then check for fifo
+	if (uwsgi.cheaper_fifo_delta != 0) {
+		if (!ignore_algo) {
+			needed_workers = uwsgi.cheaper_fifo_delta;
+			ignore_algo = 1;
+		}
+		uwsgi.cheaper_fifo_delta = 0;
+		goto safe;
+	}
+
+	// if cheaper limits wants to change worker count, then skip cheaper algo
+	if (!needed_workers) needed_workers = uwsgi.cheaper_algo(!ignore_algo);
+	// safe check to verify if cheaper algo obeyed ignore_algo value
+	if (ignore_algo && needed_workers > 0) {
+		uwsgi_log("BUG! cheaper algo returned %d but it cannot spawn any worker at this time!\n", needed_workers);
+		needed_workers = 0;
+	}
+
+safe:
 	if (needed_workers > 0) {
 		for (i = 1; i <= uwsgi.numproc; i++) {
 			if (uwsgi.workers[i].cheaped == 1 && uwsgi.workers[i].pid == 0) {
@@ -144,6 +201,8 @@ int uwsgi_calc_cheaper(void) {
 			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);
 		}
@@ -152,12 +211,17 @@ int uwsgi_calc_cheaper(void) {
 	return 1;
 }
 
+// fake algo to allow control with the fifo
+int uwsgi_cheaper_algo_manual(int can_spawn) {
+	return 0;
+}
+
 /*
 
         -- Cheaper, spare algorithm, adapted from old-fashioned spare system --
         
         when all of the workers are busy, the overload_count is incremented.
-        as soon as overload_count is higher than uwsgi.cheaper_overload (--cheaper-overload options)
+        as soon as overload_count reaches to uwsgi.cheaper_overload (--cheaper-overload options)
         at most cheaper_step (default to 1) new workers are spawned.
 
         when at least one worker is free, the overload_count is decremented and the idle_count is incremented.
@@ -187,7 +251,7 @@ int uwsgi_calc_cheaper(void) {
 */
 
 
-int uwsgi_cheaper_algo_spare(void) {
+int uwsgi_cheaper_algo_spare(int can_spawn) {
 
 	int i;
 	static uint64_t overload_count = 0;
@@ -211,7 +275,7 @@ int uwsgi_cheaper_algo_spare(void) {
 healthy:
 
 	// are we overloaded ?
-	if (overload_count > uwsgi.cheaper_overload) {
+	if (can_spawn && overload_count >= uwsgi.cheaper_overload) {
 
 #ifdef UWSGI_DEBUG
 		uwsgi_log("overloaded !!!\n");
@@ -269,6 +333,72 @@ healthy:
 
 }
 
+/*
+	-- Cheaper, spare2 algorithm, for large workload --
+
+	This algorithm is very similar to spare, but more suited for higher workload.
+
+	This algorithm increase workers *before* overloaded, and decrease workers slowly.
+
+	This algorithm uses these options: chaper, cheaper-initial, cheaper-step and cheaper-idle.
+
+	* When number of idle workers is smaller than cheaper count, increase
+	  min(cheaper-step, cheaper - idle workers) workers.
+	* When number of idle workers is larger than cheaper count, increase idle_count.
+		* When idle_count >= cheaper-idle, decrease worker.
+*/
+int uwsgi_cheaper_algo_spare2(int can_spawn) {
+	static int idle_count = 0;
+	int i, idle_workers, busy_workers, cheaped_workers;
+
+	// count the number of idle and busy workers
+	idle_workers = busy_workers = 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) == 1) {
+				busy_workers++;
+			} else {
+				idle_workers++;
+			}
+		}
+	}
+	cheaped_workers = uwsgi.numproc - (idle_workers + busy_workers);
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("cheaper-spare2: idle=%d, busy=%d, cheaped=%d, idle_count=%d\n",
+		idle_workers, busy_workers, cheaped_workers, idle_count);
+#endif
+
+	// should we increase workers?
+	if (idle_workers < uwsgi.cheaper_count) {
+		int spawn;
+		idle_count = 0;
+
+		if (!can_spawn)
+			return 0;
+
+		spawn = uwsgi.cheaper_count - idle_workers;
+		if (spawn > cheaped_workers)
+			spawn = cheaped_workers;
+		if (spawn > uwsgi.cheaper_step)
+			spawn = uwsgi.cheaper_step;
+		return spawn;
+	}
+
+	if (idle_workers == uwsgi.cheaper_count) {
+		idle_count = 0;
+		return 0;
+	}
+
+	// decrease workers
+	idle_count++;
+	if (idle_count < uwsgi.cheaper_idle)
+		return 0;
+
+	idle_count = 0;
+	return -1;
+}
+
 
 /*
 
@@ -279,16 +409,16 @@ healthy:
 
 */
 
-int uwsgi_cheaper_algo_backlog(void) {
+int uwsgi_cheaper_algo_backlog(int can_spawn) {
 
 	int i;
 #ifdef __linux__
-	int backlog = uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS];
+	int backlog = uwsgi.shared->backlog;
 #else
 	int backlog = 0;
 #endif
 
-	if (backlog > (int) uwsgi.cheaper_overload) {
+	if (can_spawn && backlog > (int) uwsgi.cheaper_overload) {
 		// activate the first available worker (taking step into account)
 		int decheaped = 0;
 		// search for cheaped workers
@@ -326,31 +456,49 @@ void uwsgi_reload(char **argv) {
 	int i;
 	int waitpid_status;
 
-	// call a series of waitpid to ensure all processes (gateways, mules and daemons) are dead
-	for (i = 0; i < (ushared->gateways_cnt + uwsgi.daemons_cnt + uwsgi.mules_cnt); i++) {
-		waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
+	if (uwsgi.new_argv) argv = uwsgi.new_argv;
+
+	if (!uwsgi.master_is_reforked) {
+
+		// call a series of waitpid to ensure all processes (gateways, mules and daemons) are dead
+		for (i = 0; i < (ushared->gateways_cnt + uwsgi.daemons_cnt + uwsgi.mules_cnt); i++) {
+			waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
+		}
+
+		// call master cleanup hooks
+		uwsgi_master_cleanup_hooks();
+
+		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");
 	}
 
-	// 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);
+	// 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("binary reloading uWSGI...\n");
 	uwsgi_log("chdir() to %s\n", uwsgi.cwd);
 	if (chdir(uwsgi.cwd)) {
-		uwsgi_error("chdir()");
+		uwsgi_error("uwsgi_reload()/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;
 
@@ -489,9 +637,10 @@ 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]);
 		}
@@ -529,21 +678,41 @@ 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;
+        	}
 	}
 
 
 }
 
 int uwsgi_respawn_worker(int wid) {
-
+	int i;
 	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
 	uwsgi.workers[wid].last_spawn = uwsgi.current_time;
 	// ... and memory/harakiri
-	uwsgi.workers[wid].harakiri = 0;
-	uwsgi.workers[wid].user_harakiri = 0;
+	for(i=0;i<uwsgi.cores;i++) {
+		uwsgi.workers[wid].cores[i].harakiri = 0;
+		uwsgi.workers[wid].cores[i].user_harakiri = 0;
+	}
 	uwsgi.workers[wid].pending_harakiri = 0;
 	uwsgi.workers[wid].rss_size = 0;
 	uwsgi.workers[wid].vsz_size = 0;
@@ -561,8 +730,6 @@ int uwsgi_respawn_worker(int wid) {
 	// this is required for various checks
 	uwsgi.workers[wid].delta_requests = 0;
 
-	int i;
-
 	if (uwsgi.threaded_logger) {
 		pthread_mutex_lock(&uwsgi.threaded_logger_lock);
 	}
@@ -605,6 +772,7 @@ int uwsgi_respawn_worker(int wid) {
 		for(i=0;i<uwsgi.cores;i++) {
 			uwsgi.workers[uwsgi.mywid].cores[i].in_request = 0;
 			memset(&uwsgi.workers[uwsgi.mywid].cores[i].req, 0, sizeof(struct wsgi_request));
+			memset(uwsgi.workers[uwsgi.mywid].cores[i].buffer, 0, sizeof(struct uwsgi_header));
 		}
 
 		uwsgi_fixup_fds(wid, 0, NULL);
@@ -621,6 +789,10 @@ int uwsgi_respawn_worker(int wid) {
 			}
 		}
 
+		if (uwsgi.threaded_logger) {
+			pthread_mutex_unlock(&uwsgi.threaded_logger_lock);
+		}
+
 		return 1;
 	}
 	else if (pid < 1) {
@@ -656,9 +828,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->options[UWSGI_OPTION_BACKLOG_STATUS]))
+	if (uwsgi_stats_keylong_comma(us, "listen_queue", (unsigned long long) uwsgi.shared->backlog))
 		goto end;
-	if (uwsgi_stats_keylong_comma(us, "listen_queue_errors", (unsigned long long) uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]))
+	if (uwsgi_stats_keylong_comma(us, "listen_queue_errors", (unsigned long long) uwsgi.shared->backlog_errors))
 		goto end;
 #endif
 
@@ -699,7 +871,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);
+			char *cmd = uwsgi_malloc((strlen(ud->command)*2)+1);
 			escape_json(ud->command, strlen(ud->command), cmd);
 			if (uwsgi_stats_keyval_comma(us, "cmd", cmd)) {
 				free(cmd);
@@ -816,6 +988,70 @@ 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;
 
@@ -836,6 +1072,9 @@ 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;
 
@@ -871,6 +1110,8 @@ 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))
@@ -957,7 +1198,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;
 			}
@@ -979,6 +1220,8 @@ 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;
 
@@ -1010,6 +1253,9 @@ 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;
 
@@ -1037,9 +1283,12 @@ 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;
@@ -1115,7 +1364,7 @@ struct uwsgi_stats *uwsgi_master_generate_stats() {
 			if (uwsgi_stats_keyslong_comma(us, "week", (long long) ucron->week))
 				goto end;
 
-			char *cmd = uwsgi_malloc(strlen(ucron->command)*2);
+			char *cmd = uwsgi_malloc((strlen(ucron->command)*2)+1);
 			escape_json(ucron->command, strlen(ucron->command), cmd);
 			if (uwsgi_stats_keyval_comma(us, "command", cmd)) {
 				free(cmd);
@@ -1296,7 +1545,7 @@ end:
 	return NULL;
 }
 
-void uwsgi_register_cheaper_algo(char *name, int (*func) (void)) {
+void uwsgi_register_cheaper_algo(char *name, int (*func) (int)) {
 
 	struct uwsgi_cheaper_algo *uca = uwsgi.cheaper_algos;
 
@@ -1327,7 +1576,7 @@ void uwsgi_register_cheaper_algo(char *name, int (*func) (void)) {
 
 void trigger_harakiri(int i) {
 	int j;
-	uwsgi_log("*** HARAKIRI ON WORKER %d (pid: %d, try: %d) ***\n", i, uwsgi.workers[i].pid, uwsgi.workers[i].pending_harakiri + 1);
+	uwsgi_log_verbose("*** 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;
@@ -1375,15 +1624,12 @@ void trigger_harakiri(int i) {
 			}
 		}
 
-		kill(uwsgi.workers[i].pid, SIGUSR2);
-		// allow SIGUSR2 to be delivered
-		sleep(1);
+		uwsgi_dump_worker(i, "HARAKIRI");
 		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
 
 }
 
@@ -1458,3 +1704,237 @@ int uwsgi_cron_task_needs_execution(struct tm *uwsgi_cron_delta, int minute, int
 
 }
 
+static void add_reload_fds(struct uwsgi_string_list *list, char *type) {
+	struct uwsgi_string_list *usl = list;
+	while(usl) {
+		char *strc = uwsgi_str(usl->value);
+		char *space = strchr(strc, ' ');
+		if (space) {
+			*space = 0;
+			usl->custom_ptr = space+1;
+		}
+		char *colon = strchr(strc, ':');
+		if (colon) {
+			*colon = 0;
+			usl->custom2 = strtoul(colon+1, NULL, 10);
+		}
+		usl->custom = strtoul(strc, NULL, 10);
+		if (!usl->custom2) usl->custom2 = 1;
+		event_queue_add_fd_read(uwsgi.master_queue, usl->custom);
+		uwsgi_add_safe_fd(usl->custom);
+		uwsgi_log("added %s reload monitor for fd %d (read size: %llu)\n", type, (int) usl->custom, usl->custom2);
+		usl = usl->next;
+	}
+}
+
+void uwsgi_add_reload_fds() {
+	add_reload_fds(uwsgi.reload_on_fd, "graceful");
+	add_reload_fds(uwsgi.brutal_reload_on_fd, "brutal");
+}
+
+void uwsgi_refork_master() {
+	pid_t pid = fork();
+	if (pid < 0) {
+		uwsgi_error("uwsgi_refork_master()/fork()");
+		return;
+	}
+
+	if (pid > 0) {
+		uwsgi_log_verbose("new master copy spawned with pid %d\n", (int) pid);
+		return;
+	}
+
+	// detach from the old master
+	setsid();
+
+	uwsgi.master_is_reforked = 1;
+	uwsgi_reload(uwsgi.argv);
+	// never here
+	exit(1);
+}
+
+void uwsgi_cheaper_increase() {
+	uwsgi.cheaper_fifo_delta++;
+}
+
+void uwsgi_cheaper_decrease() {
+        uwsgi.cheaper_fifo_delta--;
+}
+
+void uwsgi_go_cheap() {
+	int i;
+	int waitpid_status;
+	if (uwsgi.status.is_cheap) return;
+	uwsgi_log_verbose("going cheap...\n");
+	uwsgi.status.is_cheap = 1;
+                for (i = 1; i <= uwsgi.numproc; i++) {
+                        uwsgi.workers[i].cheaped = 1;
+			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);
+                        kill(uwsgi.workers[i].pid, SIGKILL);
+                        if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+                                if (errno != ECHILD)
+                                        uwsgi_error("uwsgi_go_cheap()/waitpid()");
+                        }
+                }
+                uwsgi_add_sockets_to_queue(uwsgi.master_queue, -1);
+                uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
+}
+
+#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);
+}
+
+/* vim: set ts=8 sts=0 sw=0 noexpandtab : */

core/mount.c

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

core/mule.c

@@ -43,7 +43,7 @@ void uwsgi_mule(int id) {
 #endif
 
 		signal(SIGALRM, SIG_IGN);
-                signal(SIGHUP, SIG_IGN);
+                signal(SIGHUP, end_me);
                 signal(SIGINT, end_me);
                 signal(SIGTERM, end_me);
                 signal(SIGUSR1, SIG_IGN);
@@ -77,6 +77,7 @@ void uwsgi_mule(int id) {
 			}
 		}
 
+		uwsgi_hooks_run(uwsgi.hook_as_mule, "as-mule", 1);
 		uwsgi_mule_run();
 
 	}
@@ -197,7 +198,7 @@ void uwsgi_mule_handler() {
 #ifdef UWSGI_DEBUG
 			uwsgi_log_verbose("master sent signal %d to mule %d\n", uwsgi_signal, uwsgi.muleid);
 #endif
-			if (uwsgi_signal_handler(uwsgi_signal)) {
+			if (uwsgi_signal_handler(NULL, uwsgi_signal)) {
 				uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.muleid);
 			}
 		}
@@ -328,11 +329,13 @@ next:
 		}
 	}
 
-	int ret = poll(mulepoll, count + farms_count, timeout);
-	if (ret <= 0) {
-		uwsgi_error("poll");
+	int ret = -1;
+retry:
+	ret = poll(mulepoll, count + farms_count, timeout);
+	if (ret < 0) {
+		uwsgi_error("uwsgi_mule_get_msg()/poll()");
 	}
-	else {
+	else if (ret > 0 ) {
 		if (mulepoll[0].revents & POLLIN) {
 			len = read(uwsgi.mules[uwsgi.muleid - 1].queue_pipe[1], message, buffer_size);
 		}
@@ -352,14 +355,14 @@ next:
 				if (interesting_fd > -1) {
 					len = read(interesting_fd, &uwsgi_signal, 1);
 					if (len <= 0) {
-						if (len < 0 && (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK)) goto clear;
+						if (uwsgi_is_again()) goto retry;
 						uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
 						end_me(0);
 					}
 #ifdef UWSGI_DEBUG
 					uwsgi_log_verbose("master sent signal %d to mule %d\n", uwsgi_signal, uwsgi.muleid);
 #endif
-					if (uwsgi_signal_handler(uwsgi_signal)) {
+					if (uwsgi_signal_handler(NULL, uwsgi_signal)) {
 						uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.muleid);
 					}
 					// set the error condition
@@ -379,6 +382,7 @@ next:
 	}
 
 	if (len < 0) {
+		if (uwsgi_is_again()) goto retry;
 		uwsgi_error("read()");
 		goto clear;
 	}
@@ -453,8 +457,8 @@ void uwsgi_setup_mules_and_farms() {
 			create_signal_pipe(uwsgi.farms[i].signal_pipe);
 			create_msg_pipe(uwsgi.farms[i].queue_pipe, uwsgi.mule_msg_size);
 
-			char *p = strtok(mules_list, ",");
-			while (p != NULL) {
+			char *p, *ctx = NULL;
+			uwsgi_foreach_token(mules_list, ",", p, ctx) {
 				struct uwsgi_mule *um = get_mule_by_id(atoi(p));
 				if (!um) {
 					uwsgi_log("invalid mule id: %s\n", p);
@@ -462,8 +466,6 @@ void uwsgi_setup_mules_and_farms() {
 				}
 
 				uwsgi_mule_farm_new(&uwsgi.farms[i].mules, um);
-
-				p = strtok(NULL, ",");
 			}
 			uwsgi_log("created farm %d name: %s mules:%s\n", i + 1, uwsgi.farms[i].name, strchr(farm_name->value, ':') + 1);
 

core/notify.c

@@ -1,4 +1,4 @@
-#include "uwsgi.h"
+#include <uwsgi.h>
 
 extern struct uwsgi_server uwsgi;
 
@@ -75,3 +75,39 @@ 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,6 +55,9 @@ 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;
 }
 
@@ -159,6 +162,12 @@ 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);
@@ -197,12 +206,41 @@ 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) {
@@ -237,6 +275,7 @@ 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);
@@ -323,7 +362,7 @@ static int u_offload_sendfile_do(struct uwsgi_thread *ut, struct uwsgi_offload_r
 		if (event_queue_add_fd_write(ut->queue, uor->fd2)) return -1;
 		return 0;
 	}
-#if defined(__linux__) || defined(__sun__)
+#if defined(__linux__) || defined(__sun__) || defined(__GNU_kFreeBSD__)
 	ssize_t len = sendfile(uor->fd2, uor->fd, &uor->pos, 128 * 1024);
 	if (len > 0) {
         	uor->written += len;
@@ -345,7 +384,7 @@ static int u_offload_sendfile_do(struct uwsgi_thread *ut, struct uwsgi_offload_r
 		uwsgi_offload_retry
                 uwsgi_error("u_offload_sendfile_do()");
 	}
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && !defined(NO_SENDFILE)
 	off_t len = 0;
         int ret = sendfile(uor->fd, uor->fd2, uor->pos, &len, NULL, 0);
         // transfer finished
@@ -456,6 +495,13 @@ 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;
@@ -567,6 +613,9 @@ int uwsgi_offload_run(struct wsgi_request *wsgi_req, struct uwsgi_offload_reques
 
         if (uor->takeover) {
                 wsgi_req->fd_closed = 1;
+		// avoid edge-triggered mode
+		if (wsgi_req->socket->retry)
+			wsgi_req->socket->retry[wsgi_req->async_id] = 0;
         }
 
 	if (uwsgi_offload_enqueue(wsgi_req, uor)) {

core/plugins.c

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

core/plugins_builder.c

@@ -0,0 +1,112 @@
+#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) {
+	if (ret <= 0 || ret >= 4096) {
 		return -1;
 	}
 

core/protocol.c

@@ -18,81 +18,6 @@ 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;
@@ -121,10 +46,10 @@ int uwsgi_read_response(int fd, struct uwsgi_header *uh, int timeout, char **buf
 		break;
 	}
 
-	if (buf && uh->pktsize > 0) {
+	if (buf && uh->_pktsize > 0) {
 		if (*buf == NULL)
-			*buf = uwsgi_malloc(uh->pktsize);
-		remains = uh->pktsize;
+			*buf = uwsgi_malloc(uh->_pktsize);
+		remains = uh->_pktsize;
 		ptr = *buf;
 		ret = -1;
 		while (remains > 0) {
@@ -412,6 +337,12 @@ 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;
 }
 
@@ -563,7 +494,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.log_x_forwarded_for && !uwsgi_proto_key("HTTP_X_FORWARDED_FOR", 20)) {
+	if (uwsgi.logging_options.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;
@@ -589,9 +520,33 @@ 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++) {
@@ -609,6 +564,7 @@ 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;
 }
 
 
@@ -622,7 +578,7 @@ int uwsgi_parse_vars(struct wsgi_request *wsgi_req) {
 	struct uwsgi_dyn_dict *udd;
 
 	ptrbuf = buffer;
-	bufferend = ptrbuf + wsgi_req->uh->pktsize;
+	bufferend = ptrbuf + wsgi_req->len;
 	int i;
 
 	/* set an HTTP 500 status as default */
@@ -759,7 +715,7 @@ next:
 	}
 
 	if (uwsgi.manage_script_name) {
-		if (uwsgi_apps_cnt > 0 && wsgi_req->path_info_len > 1 && wsgi_req->path_info_pos != -1) {
+		if (uwsgi_apps_cnt > 0 && wsgi_req->path_info_len >= 1 && wsgi_req->path_info_pos != -1) {
 			// starts with 1 as the 0 app is the default (/) one
 			int best_found = 0;
 			char *orig_path_info = wsgi_req->path_info;
@@ -780,25 +736,40 @@ next:
 			}
 
 			for (i = 0; i < uwsgi_apps_cnt; i++) {
-				//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;
+				char* mountpoint = uwsgi_apps[i].mountpoint;
+				int mountpoint_len = uwsgi_apps[i].mountpoint_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;
-#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);
-#endif
-					}
+				// 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);
+
+				// 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;
+				}
+
+				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;
+#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);
+#endif
 			}
 		}
 	}
@@ -1079,7 +1050,7 @@ char *uwsgi_req_append(struct wsgi_request *wsgi_req, char *key, uint16_t keylen
 		}
 	}
 
-	if ((wsgi_req->uh->pktsize + (2 + keylen + 2 + vallen)) > uwsgi.buffer_size) {
+	if ((wsgi_req->len + (2 + keylen + 2 + vallen)) > uwsgi.buffer_size) {
 		uwsgi_log("not enough buffer space to add %.*s variable, consider increasing it with the --buffer-size option\n", keylen, key);
 		return NULL;
 	}
@@ -1089,7 +1060,7 @@ char *uwsgi_req_append(struct wsgi_request *wsgi_req, char *key, uint16_t keylen
 		return NULL;
 	}
 
-	char *ptr = wsgi_req->buffer + wsgi_req->uh->pktsize;
+	char *ptr = wsgi_req->buffer + wsgi_req->len;
 
 	*ptr++ = (uint8_t) (keylen & 0xff);
 	*ptr++ = (uint8_t) ((keylen >> 8) & 0xff);
@@ -1100,7 +1071,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);
@@ -1110,7 +1081,7 @@ char *uwsgi_req_append(struct wsgi_request *wsgi_req, char *key, uint16_t keylen
         wsgi_req->hvec[wsgi_req->var_cnt].iov_len = vallen;
 	wsgi_req->var_cnt++;
 
-	wsgi_req->uh->pktsize += (2 + keylen + 2 + vallen);
+	wsgi_req->len += (2 + keylen + 2 + vallen);
 
 	return ptr;
 }
@@ -1135,7 +1106,7 @@ int uwsgi_req_append_path_info_with_index(struct wsgi_request *wsgi_req, char *i
 	wsgi_req->path_info_len += need_slash + index_len;
 
 	// 2 + 9 + 2
-	if ((wsgi_req->uh->pktsize + (13 + wsgi_req->path_info_len)) > uwsgi.buffer_size) {
+	if ((wsgi_req->len + (13 + wsgi_req->path_info_len)) > uwsgi.buffer_size) {
                 uwsgi_log("not enough buffer space to transform the PATH_INFO variable, consider increasing it with the --buffer-size option\n");
                 return -1;
         }
@@ -1146,7 +1117,7 @@ int uwsgi_req_append_path_info_with_index(struct wsgi_request *wsgi_req, char *i
         }
 
 	uint16_t keylen = 9;
-	char *ptr = wsgi_req->buffer + wsgi_req->uh->pktsize;
+	char *ptr = wsgi_req->buffer + wsgi_req->len;
 	*ptr++ = (uint8_t) (keylen & 0xff);
         *ptr++ = (uint8_t) ((keylen >> 8) & 0xff);
 
@@ -1167,13 +1138,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->len += 13 + wsgi_req->path_info_len;
 	wsgi_req->path_info = new_path_info;
-	
+
 	return 0;
 }

core/queue.c

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

core/reader.c

@@ -24,6 +24,39 @@ 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.
 */
@@ -32,14 +65,16 @@ 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_error("uwsgi_request_body_seek()/fseek()");
+                        	uwsgi_req_error("uwsgi_request_body_seek()/fseek()");
+				wsgi_req->read_errors++;
                 	}
 			wsgi_req->post_pos = ftell(wsgi_req->post_file);
 			return;
 		}
 
 		if (fseek(wsgi_req->post_file, pos, SEEK_SET)) {
-			uwsgi_error("uwsgi_request_body_seek()/fseek()");
+			uwsgi_req_error("uwsgi_request_body_seek()/fseek()");
+			wsgi_req->read_errors++;
 		}
 		wsgi_req->post_pos = ftell(wsgi_req->post_file);
 		return;
@@ -88,14 +123,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) {
-		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);
+		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);
 		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_error("consume_body_for_readline()/realloc()");
+                		uwsgi_req_error("consume_body_for_readline()/realloc()");
                         	return -1;
                 	}
                 	wsgi_req->post_readline_buf = tmp_buf;
@@ -114,7 +149,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_error("consume_body_for_readline()/fread()");
+			uwsgi_req_error("consume_body_for_readline()/fread()");
 			return -1;
 		}
 		wsgi_req->post_pos += remains;
@@ -140,6 +175,7 @@ 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) {
@@ -147,6 +183,7 @@ static int consume_body_for_readline(struct wsgi_request *wsgi_req) {
 			goto wait;
 		}
 		uwsgi_read_error(remains);
+		wsgi_req->read_errors++;
 		return -1;
 	}
 wait:
@@ -159,6 +196,7 @@ wait:
 			return 0;
 		}
 		uwsgi_read_error(remains);
+		wsgi_req->read_errors++;
                 return -1;
 	}
         // 0 means timeout
@@ -167,6 +205,7 @@ wait:
 		return -1;
         }
 	uwsgi_read_error(remains);
+	wsgi_req->read_errors++;
         return -1;
 }
 
@@ -204,7 +243,8 @@ 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_error("uwsgi_request_body_readline()/malloc()");
+			uwsgi_req_error("uwsgi_request_body_readline()/malloc()");
+			wsgi_req->read_errors++;
 			*rlen = -1;
 			return NULL;
 		}
@@ -217,6 +257,7 @@ 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;
                         }
@@ -272,8 +313,9 @@ 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_error("uwsgi_request_body_read()/realloc()");
+                                	uwsgi_req_error("uwsgi_request_body_read()/realloc()");
                                 	*rlen = -1;
+					wsgi_req->read_errors++;
                                 	return NULL;
                         	}
                         	wsgi_req->post_read_buf = tmp_buf;
@@ -320,7 +362,8 @@ 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_error("uwsgi_request_body_read()/malloc()");
+			uwsgi_req_error("uwsgi_request_body_read()/malloc()");
+			wsgi_req->read_errors++;
 			*rlen = -1;
 			return NULL;
 		}
@@ -331,7 +374,8 @@ 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_error("uwsgi_request_body_read()/realloc()");
+				uwsgi_req_error("uwsgi_request_body_read()/realloc()");
+				wsgi_req->read_errors++;
 				*rlen = -1;
 				return NULL;
 			}
@@ -348,7 +392,8 @@ 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_error("uwsgi_request_body_read()/fread()");
+			uwsgi_req_error("uwsgi_request_body_read()/fread()");
+			wsgi_req->read_errors++;
 			return NULL;
 		}
 		*rlen += remains;
@@ -378,6 +423,7 @@ 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:
@@ -389,6 +435,8 @@ wait:
 				remains -= len;
                         	*rlen += len;
                         	continue;
+			}else if (len < 0 && (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS)) {
+				goto wait;
 			}
 			*rlen = -1;
 			if (len == 0) {
@@ -396,6 +444,7 @@ wait:
 			}
 			else {
 				uwsgi_read_error(remains);
+				wsgi_req->read_errors++;
 			}
 			return NULL;
 		}
@@ -407,6 +456,7 @@ wait:
 		}
 		*rlen = -1;
 		uwsgi_read_error(remains);
+		wsgi_req->read_errors++;
 		return NULL;
 	}
 
@@ -426,8 +476,8 @@ int uwsgi_postbuffer_do_in_mem(struct wsgi_request *wsgi_req) {
         char *ptr = wsgi_req->post_buffering_buf;
 
         while (remains > 0) {
-                if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
-                        inc_harakiri(uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+                if (uwsgi.harakiri_options.workers > 0) {
+                        inc_harakiri(wsgi_req, uwsgi.harakiri_options.workers);
                 }
 
                 ssize_t rlen = wsgi_req->socket->proto_read_body(wsgi_req, ptr, remains);
@@ -445,6 +495,7 @@ int uwsgi_postbuffer_do_in_mem(struct wsgi_request *wsgi_req) {
                                 goto wait;
                         }
 			uwsgi_read_error(remains);
+			wsgi_req->read_errors++;
                         return -1;
                 }
 
@@ -460,6 +511,7 @@ wait:
 		}
                 if (ret < 0) {
 			uwsgi_read_error(remains);
+			wsgi_req->read_errors++;
                         return -1;
                 }
 		uwsgi_read_timeout(remains);
@@ -480,7 +532,8 @@ int uwsgi_postbuffer_do_in_disk(struct wsgi_request *wsgi_req) {
 
         wsgi_req->post_file = uwsgi_tmpfile();
         if (!wsgi_req->post_file) {
-                uwsgi_error("uwsgi_postbuffer_do_in_disk()/uwsgi_tmpfile()");
+                uwsgi_req_error("uwsgi_postbuffer_do_in_disk()/uwsgi_tmpfile()");
+		wsgi_req->read_errors++;
                 return -1;
         }
 
@@ -497,8 +550,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.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
-                        inc_harakiri(uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+                if (uwsgi.harakiri_options.workers > 0) {
+                        inc_harakiri(wsgi_req, uwsgi.harakiri_options.workers);
                 }
 
                 // we use the already available post buffering buffer to read chunks....
@@ -516,6 +569,7 @@ int uwsgi_postbuffer_do_in_disk(struct wsgi_request *wsgi_req) {
                                 goto wait;
                         }
 			uwsgi_read_error(remains);
+			wsgi_req->read_errors++;
                         goto end;
                 }
 
@@ -529,11 +583,13 @@ 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);
@@ -541,7 +597,8 @@ wait:
 
 write:
                 if (fwrite(wsgi_req->post_buffering_buf, rlen, 1, wsgi_req->post_file) != 1) {
-                        uwsgi_error("uwsgi_postbuffer_do_in_disk()/fwrite()");
+                        uwsgi_req_error("uwsgi_postbuffer_do_in_disk()/fwrite()");
+			wsgi_req->read_errors++;
                         goto end;
                 }
 

core/routing.c

@@ -180,6 +180,10 @@ int uwsgi_apply_routes_do(struct uwsgi_route *routes, struct wsgi_request *wsgi_
 		r_goto = &wsgi_req->error_route_goto;
 		r_pc = &wsgi_req->error_route_pc;
 	}
+	else if (routes == uwsgi.response_routes) {
+                r_goto = &wsgi_req->response_route_goto;
+                r_pc = &wsgi_req->response_route_pc;
+        }
 	else if (routes == uwsgi.final_routes) {
 		r_goto = &wsgi_req->final_route_goto;
 		r_pc = &wsgi_req->final_route_pc;
@@ -306,6 +310,21 @@ int uwsgi_apply_error_routes(struct wsgi_request *wsgi_req) {
 	return uwsgi_apply_routes_do(uwsgi.error_routes, wsgi_req, NULL, 0);
 }
 
+int uwsgi_apply_response_routes(struct wsgi_request *wsgi_req) {
+
+
+        if (!uwsgi.response_routes) return 0;
+        if (wsgi_req->response_routes_applied) return 0;
+
+        // do not forget to check it !!!
+        if (wsgi_req->is_response_routing) return 0;
+
+        wsgi_req->is_response_routing = 1;
+
+        int ret = uwsgi_apply_routes_do(uwsgi.response_routes, wsgi_req, NULL, 0);
+	wsgi_req->response_routes_applied = 1;
+	return ret;
+}
 
 static void *uwsgi_route_get_condition_func(char *name) {
 	struct uwsgi_route_condition *urc = uwsgi.route_conditions;
@@ -337,6 +356,9 @@ void uwsgi_opt_add_route(char *opt, char *value, void *foobar) {
 	else if (!uwsgi_starts_with(opt, strlen(opt), "error", 5)) {
                 ur = uwsgi.error_routes;
         }
+	else if (!uwsgi_starts_with(opt, strlen(opt), "response", 8)) {
+                ur = uwsgi.response_routes;
+        }
 	uint64_t pos = 0;
 	while(ur) {
 		old_ur = ur;
@@ -354,6 +376,9 @@ void uwsgi_opt_add_route(char *opt, char *value, void *foobar) {
 		else if (!uwsgi_starts_with(opt, strlen(opt), "error", 5)) {
                         uwsgi.error_routes = ur;
                 }
+		else if (!uwsgi_starts_with(opt, strlen(opt), "response", 8)) {
+                        uwsgi.response_routes = ur;
+                }
 		else {
 			uwsgi.routes = ur;
 		}
@@ -468,7 +493,7 @@ done:
 		r = r->next;
 	}
 
-	uwsgi_log("unable to register route \"%s\"\n", value);
+	uwsgi_log("unable to register route \"%s\". Missing router for: \"%s\"\n", value, command);
 	exit(1);
 }
 
@@ -558,11 +583,126 @@ 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) {
 	if (route->custom > 0) {	
-		set_user_harakiri(route->custom);
+		set_user_harakiri(wsgi_req, route->custom);
 	}
 	return UWSGI_ROUTE_NEXT;
 }
@@ -599,7 +739,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;
         }
@@ -616,6 +756,26 @@ static int uwsgi_router_fixcl(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
+// force content length
+static int transform_forcecl(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)) {
+                wsgi_req->write_errors++;
+                return -1;
+        }
+        // do not check for errors !!!
+        uwsgi_response_add_header_force(wsgi_req, "Content-Length", 14, buf, ret);
+        return 0;
+}
+static int uwsgi_router_forcecl_func(struct wsgi_request *wsgi_req, struct uwsgi_route *route) {
+        uwsgi_add_transformation(wsgi_req, transform_forcecl, NULL);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_forcecl(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_forcecl_func;
+        return 0;
+}
 
 // log route
 static int uwsgi_router_log_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
@@ -701,6 +861,11 @@ static int uwsgi_router_goto_func(struct wsgi_request *wsgi_req, struct uwsgi_ro
 		r_goto = &wsgi_req->final_route_goto;
 		r_pc = &wsgi_req->final_route_pc;
 	}
+	else if (wsgi_req->is_response_routing) {
+                routes = uwsgi.response_routes;
+                r_goto = &wsgi_req->response_route_goto;
+                r_pc = &wsgi_req->response_route_pc;
+        }
 	while(routes) {
 		if (!routes->label) goto next;
 		if (!uwsgi_strncmp(routes->label, routes->label_len, ub->buf, ub->pos)) {
@@ -806,6 +971,45 @@ static int uwsgi_router_remheader(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
+// clearheaders route
+static int uwsgi_router_clearheaders_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+
+	if (uwsgi_response_prepare_headers(wsgi_req, ub->buf, ub->pos)) {
+        	uwsgi_buffer_destroy(ub);
+        	return UWSGI_ROUTE_BREAK;
+	}
+	
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+
+
+static int uwsgi_router_clearheaders(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_clearheaders_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+// 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
@@ -827,7 +1031,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_error("uwsgi_router_chdir_func()/chdir()");
+		uwsgi_req_error("uwsgi_router_chdir_func()/chdir()");
 		uwsgi_buffer_destroy(ub);
 		return UWSGI_ROUTE_BREAK;
 	}
@@ -937,6 +1141,56 @@ static int uwsgi_router_seturi(struct uwsgi_route *ur, char *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);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "DOCUMENT_ROOT", 13, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->document_root = ptr;
+        wsgi_req->document_root_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_setdocroot(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_setdocroot_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+
 // setpathinfo route
 static int uwsgi_router_setpathinfo_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
         char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
@@ -961,6 +1215,72 @@ static int uwsgi_router_setpathinfo(struct uwsgi_route *ur, char *arg) {
         return 0;
 }
 
+// fixpathinfo route
+static int uwsgi_router_fixpathinfo_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+	if (wsgi_req->script_name_len == 0)
+		return UWSGI_ROUTE_NEXT;
+
+        char *ptr = uwsgi_req_append(wsgi_req, "PATH_INFO", 9, wsgi_req->path_info+wsgi_req->script_name_len, wsgi_req->path_info_len - wsgi_req->script_name_len);
+        if (!ptr) {
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->path_info = wsgi_req->path_info+wsgi_req->script_name_len;
+        wsgi_req->path_info_len = wsgi_req->path_info_len - wsgi_req->script_name_len;
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_fixpathinfo(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_fixpathinfo_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+
+// setscheme route
+static int uwsgi_router_setscheme_func(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+        char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        struct uwsgi_buffer *ub = uwsgi_routing_translate(wsgi_req, ur, *subject, *subject_len, ur->data, ur->data_len);
+        if (!ub) return UWSGI_ROUTE_BREAK;
+        char *ptr = uwsgi_req_append(wsgi_req, "UWSGI_SCHEME", 12, ub->buf, ub->pos);
+        if (!ptr) {
+                uwsgi_buffer_destroy(ub);
+                return UWSGI_ROUTE_BREAK;
+        }
+        wsgi_req->scheme = ptr;
+        wsgi_req->scheme_len = ub->pos;
+        uwsgi_buffer_destroy(ub);
+        return UWSGI_ROUTE_NEXT;
+}
+static int uwsgi_router_setscheme(struct uwsgi_route *ur, char *arg) {
+        ur->func = uwsgi_router_setscheme_func;
+        ur->data = arg;
+        ur->data_len = strlen(arg);
+        return 0;
+}
+
+// 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) {
         char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
@@ -1096,10 +1416,21 @@ 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) {
-	uwsgi_response_write_body_do(wsgi_req, route->data, route->data_len);
+	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;
+        }
 	if (route->custom) {
-		uwsgi_response_write_body_do(wsgi_req, "\r\n", 2);
+		if (uwsgi_buffer_append(ub, "\r\n", 2)) {
+			uwsgi_buffer_destroy(ub);
+			return UWSGI_ROUTE_BREAK;
+		}
 	}
+	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) {
@@ -1461,7 +1792,15 @@ 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->load);
+                ret = uwsgi_num2str(uwsgi.shared->backlog);
+                *vallen = strlen(ret);
+        }
+	else if (!uwsgi_strncmp(key, keylen, "rsize", 5)) {
+                ret = uwsgi_64bit2str(wsgi_req->response_size);
+                *vallen = strlen(ret);
+        }
+	else if (!uwsgi_strncmp(key, keylen, "sor", 3)) {
+                ret = uwsgi_64bit2str(wsgi_req->start_of_request);
                 *vallen = strlen(ret);
         }
 
@@ -1474,7 +1813,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;
-		char *ret = uwsgi_get_mime_type(key, keylen, &mime_type_len);
+		ret = uwsgi_get_mime_type(var_value, var_vallen, &mime_type_len);
 		if (ret) *vallen = mime_type_len;
         }
         return ret;
@@ -1500,6 +1839,10 @@ static char *uwsgi_route_var_time(struct wsgi_request *wsgi_req, char *key, uint
                 ret = uwsgi_num2str(uwsgi_now());
                 *vallen = strlen(ret);
         }
+	else if (!uwsgi_strncmp(key, keylen, "micros", 6)) {
+		ret = uwsgi_64bit2str(uwsgi_micros());
+                *vallen = strlen(ret);
+	}
         return ret;
 }
 
@@ -1526,53 +1869,39 @@ 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++;
+static char *uwsgi_route_var_upper(struct wsgi_request *wsgi_req, char *key, uint16_t keylen, uint16_t *vallen) {
+    char *ret = NULL;
+    char *var_value = uwsgi_get_var(wsgi_req, key, keylen, vallen);
+    if (var_value) {
+        ret = uwsgi_malloc((size_t) *vallen);
+        size_t i;
+        for (i = 0; i < *vallen; i++) {
+            ret[i] = toupper((int) var_value[i]);
         }
+    }
+    return ret;
+}
 
-	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;
+static char *uwsgi_route_var_lower(struct wsgi_request *wsgi_req, char *key, uint16_t keylen, uint16_t *vallen) {
+    char *ret = NULL;
+    char *var_value = uwsgi_get_var(wsgi_req, key, keylen, vallen);
+    if (var_value) {
+        ret = uwsgi_malloc((size_t) *vallen);
+        size_t i;
+        for (i = 0; i < *vallen; i++) {
+            ret[i] = tolower((int) var_value[i]);
+        }
+    }
+    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);
@@ -1581,6 +1910,9 @@ void uwsgi_register_embedded_routers() {
         uwsgi_register_router("addheader", uwsgi_router_addheader);
         uwsgi_register_router("delheader", uwsgi_router_remheader);
         uwsgi_register_router("remheader", uwsgi_router_remheader);
+        uwsgi_register_router("clearheaders", uwsgi_router_clearheaders);
+        uwsgi_register_router("resetheaders", uwsgi_router_clearheaders);
+        uwsgi_register_router("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);
@@ -1592,12 +1924,25 @@ 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("fixpathinfo", uwsgi_router_fixpathinfo);
+        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);
+        uwsgi_register_router("forcecl", uwsgi_router_forcecl);
 
         uwsgi_register_router("harakiri", uwsgi_router_harakiri);
 
@@ -1639,15 +1984,15 @@ 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;
 
         urv = uwsgi_register_route_var("hex", uwsgi_route_var_hex);
 	urv->need_free = 1;
+    urv = uwsgi_register_route_var("upper", uwsgi_route_var_upper);
+    urv->need_free = 1;
+    urv = uwsgi_register_route_var("lower", uwsgi_route_var_lower);
+    urv->need_free = 1;
 }
 
 struct uwsgi_router *uwsgi_register_router(char *name, int (*func) (struct uwsgi_route *, char *)) {
@@ -1699,6 +2044,7 @@ struct uwsgi_route_condition *uwsgi_register_route_condition(char *name, int (*f
 }
 
 void uwsgi_routing_dump() {
+	struct uwsgi_string_list *usl = NULL;
 	struct uwsgi_route *routes = uwsgi.routes;
 	if (!routes) goto next;
 	uwsgi_log("*** dumping internal routing table ***\n");
@@ -1733,8 +2079,25 @@ next:
         }
         uwsgi_log("*** end of the internal error routing table ***\n");
 next2:
+	routes = uwsgi.response_routes;
+        if (!routes) goto next3;
+        uwsgi_log("*** dumping internal response routing table ***\n");
+        while(routes) {
+                if (routes->label) {
+                        uwsgi_log("[rule: %llu] label: %s\n", (unsigned long long ) routes->pos, routes->label);
+                }
+                else if (!routes->subject_str && !routes->if_func) {
+                        uwsgi_log("[rule: %llu] action: %s\n", (unsigned long long ) routes->pos, routes->action);
+                }
+                else {
+                        uwsgi_log("[rule: %llu] subject: %s %s: %s%s action: %s\n", (unsigned long long ) routes->pos, routes->subject_str, routes->if_func ? "func" : "regexp", routes->if_negate ? "!" : "", routes->regexp, routes->action);
+                }
+                routes = routes->next;
+        }
+        uwsgi_log("*** end of the internal response routing table ***\n");
+next3:
 	routes = uwsgi.final_routes;
-	if (!routes) return;
+	if (!routes) goto next4;
         uwsgi_log("*** dumping internal final routing table ***\n");
         while(routes) {
                 if (routes->label) {
@@ -1749,5 +2112,34 @@ next2:
                 routes = routes->next;
         }
         uwsgi_log("*** end of the internal final routing table ***\n");
+
+next4:
+	uwsgi_foreach(usl, uwsgi.collect_headers) {
+		char *space = strchr(usl->value, ' ');
+		if (!space) {
+			uwsgi_log("invalid collect header syntax, must be <header> <var>\n");
+			exit(1);
+		}
+		*space = 0;
+		usl->custom = strlen(usl->value);
+		*space = ' ';
+		usl->custom_ptr = space+1;
+		usl->custom2 = strlen(space+1);
+		uwsgi_log("collecting header %.*s to var %s\n", usl->custom, usl->value, usl->custom_ptr);
+	}
+
+	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

@@ -7,6 +7,11 @@ int uwsgi_register_rpc(char *name, struct uwsgi_plugin *plugin, uint8_t args, vo
 	struct uwsgi_rpc *urpc;
 	int ret = -1;
 
+	if (!uwsgi.workers || !uwsgi.shared || !uwsgi.rpc_table_lock) {
+		uwsgi_log("RPC subsystem still not initialized\n");
+		return -1;
+	}
+
 	if (uwsgi.mywid == 0 && uwsgi.workers[0].pid != uwsgi.mypid) {
 		uwsgi_log("only the master and the workers can register RPC functions\n");
 		return -1;
@@ -59,11 +64,11 @@ already:
 	return ret;
 }
 
-uint16_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], char *output) {
+uint64_t uwsgi_rpc(char *name, uint8_t argc, char *argv[], uint16_t argvs[], char **output) {
 
 	struct uwsgi_rpc *urpc = NULL;
 	uint64_t i;
-	uint16_t ret = 0;
+	uint64_t ret = 0;
 
 	int pos = (uwsgi.mywid * uwsgi.rpc_max);
 
@@ -85,8 +90,15 @@ uint16_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;
 
-char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t argvs[], uint16_t * len) {
+	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) {
 
 	uint8_t i;
 	uint16_t ulen;
@@ -97,9 +109,14 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
 
 	if (node == NULL || !strcmp(node, "")) {
 		// allocate the whole buffer
-		buffer = uwsgi_malloc(UMAX16);
-		*len = uwsgi_rpc(func, argc, argv, argvs, buffer);
-		return 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;
 	}
 
 
@@ -109,7 +126,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.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+	int ret = uwsgi.wait_write_hook(fd, uwsgi.socket_timeout);
 	if (ret <= 0) {
 		close(fd);
 		return NULL;
@@ -128,7 +145,7 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
 	// set the uwsgi header
 	uh = (struct uwsgi_header *) buffer;
 	uh->modifier1 = 173;
-	uh->pktsize = buffer_size;
+	uh->_pktsize = buffer_size;
 	uh->modifier2 = 0;
 
 	// add func to the array
@@ -147,26 +164,47 @@ char *uwsgi_do_rpc(char *node, char *func, uint8_t argc, char *argv[], uint16_t
 		bufptr += ulen;
 	}
 
-	// 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])) {
+	// 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)) {
 		goto error;
 	}
 
 	// ok time to wait for the response in non blocking way
 	size_t rlen = buffer_size+4;
-	if (uwsgi_read_with_realloc(fd, &buffer, &rlen, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
+	uint8_t modifier2 = 0;
+	if (uwsgi_read_with_realloc(fd, &buffer, &rlen, uwsgi.socket_timeout, NULL, &modifier2)) {
 		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 error;
+		goto error2;
 	}
 	return buffer;
 
 error:
 	close(fd);
+error2:
 	free(buffer);
 	return NULL;
 

core/sendfile.c

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

core/sharedarea.c

@@ -0,0 +1,423 @@
+#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 / (size_t) uwsgi.page_size;
+        if (len % (size_t) 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((size_t)uwsgi.page_size * (size_t)(pages + 1));
+	uwsgi.sharedareas[id]->area = ((char *) uwsgi.sharedareas[id]) + (size_t) uwsgi.page_size;
+	uwsgi.sharedareas[id]->id = id;
+	uwsgi.sharedareas[id]->fd = -1;
+	uwsgi.sharedareas[id]->pages = pages;
+	uwsgi.sharedareas[id]->max_pos = ((size_t)uwsgi.page_size * (size_t)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 / (size_t) uwsgi.page_size;
+	if (len % (size_t) 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 / (size_t) uwsgi.page_size;
+        	if (len % (size_t) 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

@@ -2,7 +2,7 @@
 
 extern struct uwsgi_server uwsgi;
 
-int uwsgi_signal_handler(uint8_t sig) {
+int uwsgi_signal_handler(struct wsgi_request *wsgi_req, uint8_t sig) {
 
 	struct uwsgi_signal_entry *use = NULL;
 
@@ -41,34 +41,34 @@ int uwsgi_signal_handler(uint8_t sig) {
 
 	// set harakiri here (if required and if i am a worker)
 
-	if (uwsgi.mywid > 0) {
+	if (uwsgi.mywid > 0 && wsgi_req) {
 		uwsgi.workers[uwsgi.mywid].sig = 1;
 		uwsgi.workers[uwsgi.mywid].signum = sig;
 		uwsgi.workers[uwsgi.mywid].signals++;
-		if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
-			set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
+		if (uwsgi.harakiri_options.workers > 0) {
+			set_harakiri(wsgi_req, uwsgi.harakiri_options.workers);
 		}
 	}
 	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.shared->options[UWSGI_OPTION_MULE_HARAKIRI] > 0) {
-			set_mule_harakiri(uwsgi.shared->options[UWSGI_OPTION_MULE_HARAKIRI]);
+		if (uwsgi.harakiri_options.mules > 0) {
+			set_mule_harakiri(uwsgi.harakiri_options.mules);
 		}
 	}
 	else if (uwsgi.i_am_a_spooler && (getpid() == uwsgi.i_am_a_spooler->pid)) {
-		if (uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
-			set_spooler_harakiri(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI]);
+		if (uwsgi.harakiri_options.spoolers > 0) {
+			set_spooler_harakiri(uwsgi.harakiri_options.spoolers);
 		}
 	}
 
 	int ret = uwsgi.p[use->modifier1]->signal_handler(sig, use->handler);
 
-	if (uwsgi.mywid > 0) {
+	if (uwsgi.mywid > 0 && wsgi_req) {
 		uwsgi.workers[uwsgi.mywid].sig = 0;
-		if (uwsgi.workers[uwsgi.mywid].harakiri > 0) {
-			set_harakiri(0);
+		if (uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].harakiri > 0) {
+			set_harakiri(wsgi_req, 0);
 		}
 	}
 	else if (uwsgi.muleid > 0) {
@@ -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.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+		if (uwsgi.harakiri_options.spoolers > 0) {
 			set_spooler_harakiri(0);
 		}
 	}
@@ -266,23 +266,25 @@ int uwsgi_remote_signal_send(char *addr, uint8_t sig) {
 	struct uwsgi_header uh;
 
 	uh.modifier1 = 110;
-	uh.pktsize = 0;
+	uh._pktsize = 0;
 	uh.modifier2 = sig;
 
-	int fd = uwsgi_connect(addr, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
-	if (fd < 0)
-		return -1;
+        int fd = uwsgi_connect(addr, 0, 1);
+        if (fd < 0) return -1;
 
-	if (write(fd, (char *) &uh, 4) != 4) {
-		uwsgi_error("uwsgi_remote_signal_send()");
-		close(fd);
-		return -1;
-	}
+        // wait for connection
+        if (uwsgi.wait_write_hook(fd, uwsgi.socket_timeout) <= 0) goto end;
 
-	int ret = uwsgi_read_response(fd, &uh, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], NULL);
+        if (uwsgi_write_true_nb(fd, (char *) &uh, 4, uwsgi.socket_timeout)) goto end;
 
+	if (uwsgi_read_whole_true_nb(fd, (char *) &uh, 4, uwsgi.socket_timeout)) goto end;
 	close(fd);
-	return ret;
+
+	return uh.modifier2;
+
+end:
+	close(fd);
+	return -1;
 
 }
 
@@ -301,8 +303,10 @@ 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;
 
 }
@@ -327,6 +331,16 @@ 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);
@@ -401,7 +415,7 @@ void uwsgi_route_signal(uint8_t sig) {
 
 }
 
-int uwsgi_signal_wait(int signum) {
+int uwsgi_signal_wait(struct wsgi_request *wsgi_req, int signum) {
 
 	int wait_for_specific_signal = 0;
 	uint8_t uwsgi_signal = 0;
@@ -426,7 +440,7 @@ cycle:
 				uwsgi_error("read()");
 			}
 			else {
-				(void) uwsgi_signal_handler(uwsgi_signal);
+				(void) uwsgi_signal_handler(wsgi_req, uwsgi_signal);
 				if (wait_for_specific_signal) {
 					if (signum != uwsgi_signal)
 						goto cycle;
@@ -439,7 +453,7 @@ cycle:
 				uwsgi_error("read()");
 			}
 			else {
-				(void) uwsgi_signal_handler(uwsgi_signal);
+				(void) uwsgi_signal_handler(wsgi_req, uwsgi_signal);
 				if (wait_for_specific_signal) {
 					if (signum != uwsgi_signal)
 						goto cycle;
@@ -453,8 +467,7 @@ cycle:
 	return received_signal;
 }
 
-void uwsgi_receive_signal(int fd, char *name, int id) {
-
+int uwsgi_receive_signal(struct wsgi_request *wsgi_req, int fd, char *name, int id) {
 	uint8_t uwsgi_signal;
 
 	ssize_t ret = read(fd, &uwsgi_signal, 1);
@@ -470,16 +483,18 @@ void uwsgi_receive_signal(int fd, char *name, int id) {
 #ifdef UWSGI_DEBUG
 		uwsgi_log_verbose("master sent signal %d to %s %d\n", uwsgi_signal, name, id);
 #endif
-		if (uwsgi_signal_handler(uwsgi_signal)) {
+		if (uwsgi_signal_handler(wsgi_req, uwsgi_signal)) {
 			uwsgi_log_verbose("error managing signal %d on %s %d\n", uwsgi_signal, name, id);
 		}
+		return 1;
 	}
 
-	return;
+	return 0;
 
 destroy:
 	// better to kill the whole worker...
-	uwsgi_log_verbose("uWSGI %s %d screams: UAAAAAAH my master disconnected: i will kill myself !!!\n", name, id);
+	uwsgi_log_verbose("uWSGI %s %d screams: UAAAAAAH my master disconnected: I will kill myself!!!\n", name, id);
 	end_me(0);
-
+	// never here
+	return 0;
 }

core/snmp.c

@@ -23,6 +23,7 @@ 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) {
 
@@ -71,7 +72,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 python vm using uwsgi.snmp_community or with --snmp-community arg)
+	// check for community string (this must be set from the api using uwsgi.snmp_community or with --snmp-community arg)
 	if (*ptr != SNMP_STRING)
 		return;
 	ptr++;
@@ -196,7 +197,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++;
 
@@ -208,21 +209,33 @@ void manage_snmp(int fd, uint8_t * buffer, int size, struct sockaddr_in *client_
 
 	oid_part[0] = *ptr;
 
-	if (oid_part[0] != 1 && oid_part[0] != 2)
-		return;
-	ptr++;
+	// old-style SNMP metrics
+	if (oid_part[0] == 1 || oid_part[0] == 2) {
+		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;
+		// 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);
+	}
 
-	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) {
@@ -292,6 +305,7 @@ 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
 
@@ -303,6 +317,7 @@ 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;
@@ -352,6 +367,32 @@ 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,6 +6,22 @@ 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);
@@ -35,6 +51,8 @@ char *uwsgi_getsockname(int fd) {
 
 	if (!getsockname(fd, gsa.sa, &socket_type_len)) {
 		if (gsa.sa->sa_family == AF_UNIX) {
+			// unnamed socket ?
+			if (socket_type_len == sizeof(sa_family_t)) return "";
 			if (usa.sa_un.sun_path[0] == 0) {
 				return uwsgi_concat2("@", usa.sa_un.sun_path + 1);
 			}
@@ -60,21 +78,69 @@ char *uwsgi_getsockname(int fd) {
 	return NULL;
 }
 
-int bind_to_unix_dgram(char *socket_name) {
-
-	int serverfd;
-	struct sockaddr_un *uws_addr;
-	socklen_t len;
-
-	serverfd = socket(AF_UNIX, SOCK_DGRAM, 0);
+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;
+
 	if (unlink(socket_name) != 0 && errno != ENOENT) {
-		uwsgi_error("unlink()");
+		uwsgi_error("error removing unix socket, unlink()");
 	}
 
 	uws_addr = uwsgi_calloc(sizeof(struct sockaddr_un));
@@ -124,15 +190,14 @@ int bind_to_unix(char *socket_name, int listen_queue, int chmod_socket, int abst
 	}
 
 	memset(uws_addr, 0, sizeof(struct sockaddr_un));
-	serverfd = socket(AF_UNIX, SOCK_STREAM, 0);
+	serverfd = create_server_socket(AF_UNIX, SOCK_STREAM);
 	if (serverfd < 0) {
-		uwsgi_error("socket()");
-		uwsgi_nuclear_blast();
+		free(uws_addr);
 		return -1;
 	}
 	if (abstract_socket == 0) {
 		if (unlink(socket_name) != 0 && errno != ENOENT) {
-			uwsgi_error("unlink()");
+			uwsgi_error("error removing unix socket, unlink()");
 		}
 	}
 
@@ -140,24 +205,6 @@ 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));
@@ -187,7 +234,6 @@ int bind_to_unix(char *socket_name, int listen_queue, int chmod_socket, int abst
 		return -1;
 	}
 
-
 	if (listen(serverfd, listen_queue) != 0) {
 		uwsgi_error("listen()");
 		uwsgi_nuclear_blast();
@@ -219,7 +265,6 @@ 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;
 
@@ -264,15 +309,8 @@ int bind_to_udp(char *socket_name, int multicast, int broadcast) {
 	}
 
 
-	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()");
-	}
+	serverfd = create_server_socket(AF_INET, SOCK_DGRAM);
+	if (serverfd < 0) return -1;
 
 	if (multicast) {
 		// if multicast is enabled remember to bind to INADDR_ANY
@@ -530,6 +568,7 @@ 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))) {
@@ -542,6 +581,7 @@ char *generate_socket_name(char *socket_name) {
 
 			}
 
+next:
 			ifaf = ifa;
 			ifa = ifaf->ifa_next;
 
@@ -625,7 +665,6 @@ 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);
 
@@ -643,37 +682,9 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 #endif
 
 
-	serverfd = socket(family, SOCK_STREAM, 0);
-	if (serverfd < 0) {
-		uwsgi_error("socket()");
-		uwsgi_nuclear_blast();
-		return -1;
-	}
+	serverfd = create_server_socket(family, SOCK_STREAM);
+	if (serverfd < 0) 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
@@ -701,6 +712,11 @@ int bind_to_tcp(char *socket_name, int listen_queue, char *tcp_port) {
 
 	if (uwsgi.tcp_fast_open) {
 #ifdef TCP_FASTOPEN
+
+    #ifndef SOL_TCP
+    #define SOL_TCP IPPROTO_TCP
+    #endif
+
 		if (setsockopt(serverfd, SOL_TCP, TCP_FASTOPEN, (const void *) &uwsgi.tcp_fast_open, sizeof(int)) < 0) {
 			uwsgi_error("TCP_FASTOPEN setsockopt()");
 		}
@@ -726,7 +742,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.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], sizeof(int))) {
+		if (setsockopt(serverfd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &uwsgi.socket_timeout, sizeof(int))) {
 			uwsgi_error("TCP_DEFER_ACCEPT setsockopt()");
 		}
 		// OSX has no SO_ACCEPTFILTER !!!
@@ -757,15 +773,6 @@ 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();
@@ -1249,10 +1256,20 @@ void uwsgi_add_socket_from_fd(struct uwsgi_socket *uwsgi_sock, int fd) {
 }
 
 void uwsgi_close_all_sockets() {
+        struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+
+        while (uwsgi_sock) {
+                if (uwsgi_sock->bound)
+                        close(uwsgi_sock->fd);
+                uwsgi_sock = uwsgi_sock->next;
+        }
+}
+
+void uwsgi_close_all_unshared_sockets() {
 	struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
 
 	while (uwsgi_sock) {
-		if (uwsgi_sock->bound)
+		if (uwsgi_sock->bound && !uwsgi_sock->shared)
 			close(uwsgi_sock->fd);
 		uwsgi_sock = uwsgi_sock->next;
 	}
@@ -1358,7 +1375,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) {
+		if (uwsgi_sock->fd_threads && async_id > -1 && 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) {
@@ -1645,8 +1662,8 @@ void uwsgi_map_sockets() {
 			}
 			if ((int) uwsgi_str_num(usl->value, colon - usl->value) == uwsgi_get_socket_num(uwsgi_sock)) {
 				enabled = 0;
-				char *p = strtok(colon + 1, ",");
-				while (p != NULL) {
+				char *p, *ctx = NULL;
+				uwsgi_foreach_token(colon + 1, ",", p, ctx) {
 					int w = atoi(p);
 					if (w < 1 || w > uwsgi.numproc) {
 						uwsgi_log("invalid worker num: %d\n", w);
@@ -1657,7 +1674,6 @@ void uwsgi_map_sockets() {
 						uwsgi_log("mapped socket %d (%s) to worker %d\n", uwsgi_get_socket_num(uwsgi_sock), uwsgi_sock->name, uwsgi.mywid);
 						break;
 					}
-					p = strtok(NULL, ",");
 				}
 			}
 
@@ -1666,18 +1682,7 @@ void uwsgi_map_sockets() {
 
 		if (!enabled) {
 			close(uwsgi_sock->fd);
-			int fd = open("/dev/null", O_RDONLY);
-			if (fd < 0) {
-				uwsgi_error_open("/dev/null");
-				exit(1);
-			}
-			if (fd != uwsgi_sock->fd) {
-				if (dup2(fd, uwsgi_sock->fd) < 0) {
-					uwsgi_error("dup2()");
-					exit(1);
-				}
-				close(fd);
-			}
+			uwsgi_remap_fd(uwsgi_sock->fd, "/dev/null");
 			uwsgi_sock->disabled = 1;
 		}
 
@@ -1707,6 +1712,10 @@ void uwsgi_bind_sockets() {
 	while (uwsgi_sock) {
 		if (!uwsgi_sock->bound && !uwsgi_socket_is_already_bound(uwsgi_sock->name)) {
 			char *tcp_port = strrchr(uwsgi_sock->name, ':');
+			int current_defer_accept = uwsgi.no_defer_accept;
+                        if (uwsgi_sock->no_defer) {
+                                uwsgi.no_defer_accept = 1;
+                        }
 			if (tcp_port == NULL) {
 				uwsgi_sock->fd = bind_to_unix(uwsgi_sock->name, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
 				uwsgi_sock->family = AF_UNIX;
@@ -1714,6 +1723,10 @@ void uwsgi_bind_sockets() {
 					uwsgi_chown(uwsgi_sock->name, uwsgi.chown_socket);
 				}
 				uwsgi_log("uwsgi socket %d bound to UNIX address %s fd %d\n", uwsgi_get_socket_num(uwsgi_sock), uwsgi_sock->name, uwsgi_sock->fd);
+				struct stat st;
+				if (uwsgi_sock->name[0] != '@' && !stat(uwsgi_sock->name, &st)) {
+					uwsgi_sock->inode = st.st_ino;
+				}
 			}
 			else {
 #ifdef AF_INET6
@@ -1736,18 +1749,12 @@ void uwsgi_bind_sockets() {
 				uwsgi_log("unable to create server socket on: %s\n", uwsgi_sock->name);
 				exit(1);
 			}
+			uwsgi.no_defer_accept = current_defer_accept;
 		}
 		uwsgi_sock->bound = 1;
 		uwsgi_sock = uwsgi_sock->next;
 	}
 
-
-	if (uwsgi.chown_socket) {
-		if (!uwsgi.master_as_root) {
-			uwsgi_as_root();
-		}
-	}
-
 	int zero_used = 0;
 	uwsgi_sock = uwsgi.sockets;
 	while (uwsgi_sock) {
@@ -1768,6 +1775,24 @@ 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));
@@ -1781,7 +1806,8 @@ void uwsgi_bind_sockets() {
 			int fd = open("/dev/null", O_RDONLY);
 			if (fd < 0) {
 				uwsgi_error_open("/dev/null");
-				exit(1);
+				uwsgi_log("WARNING: unable to remap stdin, /dev/null not available\n");
+				goto stdin_done;
 			}
 			if (fd != 0) {
 				if (dup2(fd, 0) < 0) {
@@ -1799,6 +1825,15 @@ 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) {
@@ -1845,96 +1880,8 @@ void uwsgi_set_sockets_protocols() {
 
 
 setup_proto:
-		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("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;
-		}
+		if (!requested_protocol) requested_protocol = uwsgi.protocol;
+		uwsgi_socket_setup_protocol(uwsgi_sock, requested_protocol);
 nextsock:
 		uwsgi_sock = uwsgi_sock->next;
 	}
@@ -1951,3 +1898,76 @@ void uwsgi_tcp_nodelay(int fd) {
 #endif
 }
 
+int uwsgi_accept(int server_fd) {
+	struct sockaddr_un client_src;
+        memset(&client_src, 0, sizeof(struct sockaddr_un));
+        socklen_t client_src_len = 0;
+#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+        return accept4(server_fd, (struct sockaddr *) &client_src, &client_src_len, SOCK_NONBLOCK);
+#elif defined(__linux__)
+        int client_fd = accept(server_fd, (struct sockaddr *) &client_src, &client_src_len);
+        if (client_fd >= 0) {
+                uwsgi_socket_nb(client_fd);
+        }
+        return client_fd;
+#else
+ 	return accept(server_fd, (struct sockaddr *) &client_src, &client_src_len);
+#endif
+
+
+}
+
+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);
+	uwsgi_register_protocol("http11", uwsgi_proto_http11_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

@@ -1,11 +1,13 @@
 #include "uwsgi.h"
 
+#ifdef __sun__
+#include "strings.h"
+#endif
+
 extern struct uwsgi_server uwsgi;
 
 static void spooler_readdir(struct uwsgi_spooler *, char *dir);
-#ifdef __linux__
 static void spooler_scandir(struct uwsgi_spooler *, char *dir);
-#endif
 static void spooler_manage_task(struct uwsgi_spooler *, char *, char *);
 
 // increment it whenever a signal is raised
@@ -72,12 +74,12 @@ struct uwsgi_spooler *uwsgi_new_spooler(char *dir) {
 }
 
 
-struct uwsgi_spooler *uwsgi_get_spooler_by_name(char *name) {
+struct uwsgi_spooler *uwsgi_get_spooler_by_name(char *name, size_t name_len) {
 
 	struct uwsgi_spooler *uspool = uwsgi.spoolers;
 
 	while (uspool) {
-		if (!strcmp(uspool->dir, name)) {
+		if (!uwsgi_strncmp(uspool->dir, strlen(uspool->dir), name, name_len)) {
 			return uspool;
 		}
 		uspool = uspool->next;
@@ -167,47 +169,125 @@ 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;
+};
 
-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) {
+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) {
 
 	struct timeval tv;
-	int fd;
-	struct uwsgi_header uh;
+	static uint64_t internal_counter = 0;
+	int fd = -1;
+	struct spooler_req sr;
 
+	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) {
-		uspool = uwsgi.spoolers;
+		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;
+		}
 	}
 
 	// 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);
 
-	if (priority) {
-		if (snprintf(filename, 1024, "%s/%s", uspool->dir, priority) <= 0) {
+	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);
 			uwsgi_unlock(uspool->lock);
-			return 0;
+			return NULL;
 		}
 		// no need to check for errors...
 		(void) mkdir(filename, 0777);
 
-		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) {
+		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);
 			uwsgi_unlock(uspool->lock);
-			return 0;
+			return NULL;
 		}
 	}
 	else {
-		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) {
+		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);
 			uwsgi_unlock(uspool->lock);
-			return 0;
+			return NULL;
 		}
 	}
 
 	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 0;
+		return NULL;
 	}
 
 	// now lock the file, it will no be runnable, until the lock is not removed
@@ -215,51 +295,67 @@ int spool_request(struct uwsgi_spooler *uspool, char *filename, int rn, int core
 	// 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 0;
+		return NULL;
 	}
 
+	struct uwsgi_header uh;
 	uh.modifier1 = 17;
 	uh.modifier2 = 0;
-	uh.pktsize = (uint16_t) size;
+	uh._pktsize = (uint16_t) len;
 #ifdef __BIG_ENDIAN__
-	uh.pktsize = uwsgi_swap16(uh.pktsize);
+	uh._pktsize = uwsgi_swap16(uh._pktsize);
 #endif
 
 	if (write(fd, &uh, 4) != 4) {
+		uwsgi_log("[spooler] unable to write header for %s\n", filename);
 		goto clear;
 	}
 
-	if (write(fd, buffer, size) != size) {
+	if (write(fd, buf, len) != (ssize_t) len) {
+		uwsgi_log("[spooler] unable to write args for %s\n", filename);
 		goto clear;
 	}
 
 	if (body && body_len > 0) {
 		if ((size_t) write(fd, body, body_len) != body_len) {
+			uwsgi_log("[spooler] unable to write body for %s\n", filename);
 			goto clear;
 		}
 	}
 
-	if (at > 0) {
+	if (sr.at > 0) {
+#ifdef __UCLIBC__
+		struct timespec ts[2]; 
+		ts[0].tv_sec = sr.at; 
+		ts[0].tv_nsec = 0;
+		ts[1].tv_sec = sr.at;
+		ts[1].tv_nsec = 0; 
+		if (futimens(fd, ts)) {
+			uwsgi_error("uwsgi_spooler_request()/futimens()");	
+		}
+#else
 		struct timeval tv[2];
-		tv[0].tv_sec = at;
+		tv[0].tv_sec = sr.at;
 		tv[0].tv_usec = 0;
-		tv[1].tv_sec = at;
+		tv[1].tv_sec = sr.at;
 		tv[1].tv_usec = 0;
 #ifdef __sun__
 		if (futimesat(fd, NULL, tv)) {
 #else
 		if (futimes(fd, tv)) {
 #endif
-			uwsgi_error("futimes()");
+			uwsgi_error("uwsgi_spooler_request()/futimes()");
 		}
+#endif
 	}
 
 	// here the file will be unlocked too
 	close(fd);
 
 	if (!uwsgi.spooler_quiet)
-		uwsgi_log("[spooler] written %lu bytes to file %s\n", (unsigned long) size + body_len + 4, filename);
+		uwsgi_log("[spooler] written %lu bytes to file %s\n", (unsigned long) len + body_len + 4, filename);
 
 	// and here waiting threads can continue
 	uwsgi_unlock(uspool->lock);
@@ -279,18 +375,19 @@ int spool_request(struct uwsgi_spooler *uspool, char *filename, int rn, int core
 		spoolers = spoolers->next;
 	}
 
-	return 1;
+	return filename;
 
 
 clear:
 	uwsgi_unlock(uspool->lock);
-	uwsgi_error("write()");
+	uwsgi_error("uwsgi_spool_request()/write()");
 	if (unlink(filename)) {
-		uwsgi_error("unlink()");
+		uwsgi_error("uwsgi_spool_request()/unlink()");
 	}
+	free(filename);
 	// unlock the file too
 	close(fd);
-	return 0;
+	return NULL;
 }
 
 
@@ -334,8 +431,9 @@ void spooler(struct uwsgi_spooler *uspool) {
 	// reset the tasks counter
 	uspool->tasks = 0;
 
-	for (;;) {
+	time_t last_task_managed = 0;
 
+	for (;;) {
 
 		if (chdir(uspool->dir)) {
 			uwsgi_error("chdir()");
@@ -343,17 +441,23 @@ void spooler(struct uwsgi_spooler *uspool) {
 		}
 
 		if (uwsgi.spooler_ordered) {
-#ifdef __linux__
 			spooler_scandir(uspool, NULL);
-#else
-			spooler_readdir(uspool, NULL);
-#endif
 		}
 		else {
 			spooler_readdir(uspool, NULL);
 		}
 
-		int timeout = uwsgi.shared->spooler_frequency;
+		// here we check (if in cheap mode), if the spooler has done its job
+		if (uwsgi.spooler_cheap) {
+			if (last_task_managed == uspool->last_task_managed) {
+				uwsgi_log_verbose("cheaping spooler %s ...\n", uspool->dir);
+				exit(0);
+			}
+			last_task_managed = uspool->last_task_managed;
+		}
+
+
+		int timeout = uwsgi.shared->spooler_frequency ? uwsgi.shared->spooler_frequency : uwsgi.spooler_frequency;
 		if (wakeup > 0) {
 			timeout = 0;
 		}
@@ -361,7 +465,15 @@ void spooler(struct uwsgi_spooler *uspool) {
 		if (event_queue_wait(spooler_event_queue, timeout, &interesting_fd) > 0) {
 			if (uwsgi.master_process) {
 				if (interesting_fd == uwsgi.shared->spooler_signal_pipe[1]) {
-					uwsgi_receive_signal(interesting_fd, "spooler", (int) getpid());
+					if (uwsgi_receive_signal(NULL, interesting_fd, "spooler", (int) getpid())) {
+					    if (uwsgi.spooler_signal_as_task) {
+					        uspool->tasks++;
+					        if (uwsgi.spooler_max_tasks > 0 && uspool->tasks >= (uint64_t) uwsgi.spooler_max_tasks) {
+					            uwsgi_log("[spooler %s pid: %d] maximum number of tasks reached (%d) recycling ...\n", uspool->dir, (int) uwsgi.mypid, uwsgi.spooler_max_tasks);
+					            end_me(0);
+					        }
+					    }
+					}
 				}
 			}
 		}
@@ -376,29 +488,31 @@ void spooler(struct uwsgi_spooler *uspool) {
 	}
 }
 
-#ifdef __linux__
 static void spooler_scandir(struct uwsgi_spooler *uspool, char *dir) {
 
 	struct dirent **tasklist;
-	int n;
+	int n, i;
 
 	if (!dir)
 		dir = uspool->dir;
 
-	n = scandir(dir, &tasklist, 0, versionsort);
+#ifdef __NetBSD__
+	n = scandir(dir, &tasklist, NULL, (void *)uwsgi_versionsort);
+#else
+	n = scandir(dir, &tasklist, NULL, uwsgi_versionsort);
+#endif
 	if (n < 0) {
 		uwsgi_error("scandir()");
 		return;
 	}
 
-	while (n--) {
-		spooler_manage_task(uspool, dir, tasklist[n]->d_name);
-		free(tasklist[n]);
+	for (i = 0; i < n; i++) {
+		spooler_manage_task(uspool, dir, tasklist[i]->d_name);
+		free(tasklist[i]);
 	}
 
 	free(tasklist);
 }
-#endif
 
 
 static void spooler_readdir(struct uwsgi_spooler *uspool, char *dir) {
@@ -417,7 +531,7 @@ static void spooler_readdir(struct uwsgi_spooler *uspool, char *dir) {
 		closedir(sdir);
 	}
 	else {
-		uwsgi_error("opendir()");
+		uwsgi_error("spooler_readdir()/opendir()");
 	}
 }
 
@@ -437,6 +551,7 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 
 	if (!strncmp("uwsgi_spoolfile_on_", task, 19) || (uwsgi.spooler_ordered && is_a_number(task))) {
 		struct stat sf_lstat;
+
 		if (lstat(task, &sf_lstat)) {
 			return;
 		}
@@ -446,26 +561,30 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 			return;
 		}
 
-#ifdef __linux__
 		if (S_ISDIR(sf_lstat.st_mode) && uwsgi.spooler_ordered) {
 			if (chdir(task)) {
-				uwsgi_error("chdir()");
+				uwsgi_error("spooler_manage_task()/chdir()");
 				return;
 			}
+#ifdef __UCLIBC__ 
+			char *prio_path = uwsgi_malloc(PATH_MAX);
+			realpath(".", prio_path);		
+#else 
 			char *prio_path = realpath(".", NULL);
+#endif
 			spooler_scandir(uspool, prio_path);
 			free(prio_path);
 			if (chdir(dir)) {
-				uwsgi_error("chdir()");
+				uwsgi_error("spooler_manage_task()/chdir()");
 			}
 			return;
 		}
-#endif
 		if (!S_ISREG(sf_lstat.st_mode)) {
 			return;
 		}
 		if (!access(task, R_OK | W_OK)) {
 
+
 			spool_fd = open(task, O_RDWR);
 
 			if (spool_fd < 0) {
@@ -486,33 +605,34 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 				return;
 			}
 
+
 			ssize_t rlen = uwsgi_protected_read(spool_fd, &uh, 4);
 
 			if (rlen != 4) {
 				// it could be here for broken file or just opened one
 				if (rlen < 0)
-					uwsgi_error("read()");
+					uwsgi_error("spooler_manage_task()/read()");
 				uwsgi_protected_close(spool_fd);
 				return;
 			}
 
 #ifdef __BIG_ENDIAN__
-			uh.pktsize = uwsgi_swap16(uh.pktsize);
+			uh._pktsize = uwsgi_swap16(uh._pktsize);
 #endif
 
-			if (uwsgi_protected_read(spool_fd, spool_buf, uh.pktsize) != uh.pktsize) {
-				uwsgi_error("read()");
+			if (uwsgi_protected_read(spool_fd, spool_buf, uh._pktsize) != uh._pktsize) {
+				uwsgi_error("spooler_manage_task()/read()");
 				destroy_spool(dir, task);
 				uwsgi_protected_close(spool_fd);
 				return;
 			}
 
 			// body available ?
-			if (sf_lstat.st_size > (uh.pktsize + 4)) {
-				body_len = sf_lstat.st_size - (uh.pktsize + 4);
+			if (sf_lstat.st_size > (uh._pktsize + 4)) {
+				body_len = sf_lstat.st_size - (uh._pktsize + 4);
 				body = uwsgi_malloc(body_len);
 				if ((size_t) uwsgi_protected_read(spool_fd, body, body_len) != body_len) {
-					uwsgi_error("read()");
+					uwsgi_error("spooler_manage_task()/read()");
 					destroy_spool(dir, task);
 					uwsgi_protected_close(spool_fd);
 					free(body);
@@ -520,8 +640,10 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 				}
 			}
 
-			// now the task is running and should not be waken up
+			// now the task is running and should not be woken up
 			uspool->running = 1;
+			// this is used in cheap mode for making decision about who must die
+			uspool->last_task_managed = uwsgi_now();
 
 			if (!uwsgi.spooler_quiet)
 				uwsgi_log("[spooler %s pid: %d] managing request %s ...\n", uspool->dir, (int) uwsgi.mypid, task);
@@ -530,7 +652,7 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 			// chdir before running the task (if requested)
 			if (uwsgi.spooler_chdir) {
 				if (chdir(uwsgi.spooler_chdir)) {
-					uwsgi_error("chdir()");
+					uwsgi_error("spooler_manage_task()/chdir()");
 				}
 			}
 
@@ -538,11 +660,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.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
-						set_spooler_harakiri(uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI]);
+					if (uwsgi.harakiri_options.spoolers > 0) {
+						set_spooler_harakiri(uwsgi.harakiri_options.spoolers);
 					}
-					ret = uwsgi.p[i]->spooler(task, spool_buf, uh.pktsize, body, body_len);
-					if (uwsgi.shared->options[UWSGI_OPTION_SPOOLER_HARAKIRI] > 0) {
+					ret = uwsgi.p[i]->spooler(task, spool_buf, uh._pktsize, body, body_len);
+					if (uwsgi.harakiri_options.spoolers > 0) {
 						set_spooler_harakiri(0);
 					}
 					if (ret == 0)
@@ -588,3 +710,35 @@ void spooler_manage_task(struct uwsgi_spooler *uspool, char *dir, char *task) {
 		}
 	}
 }
+
+// this function checks which spooler should be spawned
+void uwsgi_spooler_cheap_check() {
+	struct uwsgi_spooler *uspool = uwsgi.spoolers;
+	char *last_managed = NULL;
+	while(uspool) {
+		// skip already active spoolers
+		if (uspool->pid > 0) goto next; 
+		// spooler dir names (in multiprocess mode, are ordered, so we can use
+		// this trick for avoiding spawning multiple processes for the same dir
+		// in the same cycle
+		if (!last_managed || strcmp(last_managed, uspool->dir)) {
+			// unfortunately, reusing readdir/scandir of the spooler is too dungeorus
+			// as the code is run in the master, let's do a simpler check
+        		struct dirent *dp;
+			DIR *sdir = opendir(uspool->dir);
+			if (!sdir) goto next;
+                	while ((dp = readdir(sdir)) != NULL) {
+				if (strncmp("uwsgi_spoolfile_on_", dp->d_name, 19)) continue;
+				// a uwsgi_spoolfile_on_* file has been found...
+				uspool->respawned++;
+				// spawn a new spooler
+                                uspool->pid = spooler_start(uspool);
+				last_managed = uspool->dir;
+				break;
+			}
+			closedir(sdir);
+		}
+next:
+		uspool = uspool->next;
+	}
+}

core/ssl.c

@@ -30,7 +30,18 @@ void uwsgi_ssl_info_cb(SSL const *ssl, int where, int ret) {
 }
 
 int uwsgi_ssl_verify_callback(int ok, X509_STORE_CTX * x509_store) {
-        return 1;
+        if (!ok && uwsgi.ssl_verbose) {
+                char buf[256];
+                X509 *err_cert;
+                int depth;
+                int err;
+                depth = X509_STORE_CTX_get_error_depth(x509_store);
+                err_cert = X509_STORE_CTX_get_current_cert(x509_store);
+                X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
+                err = X509_STORE_CTX_get_error(x509_store);
+                uwsgi_log("[uwsgi-ssl] client certificate verify error: num=%d:%s:depth=%d:%s\n", err, X509_verify_cert_error_string(err), depth, buf);
+        }
+        return ok;
 }
 
 int uwsgi_ssl_session_new_cb(SSL *ssl, SSL_SESSION *sess) {
@@ -71,7 +82,11 @@ SSL_SESSION *uwsgi_ssl_session_get_cb(SSL *ssl, unsigned char *key, int keylen,
                 }
                 return NULL;
         }
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
         SSL_SESSION *sess = d2i_SSL_SESSION(NULL, (const unsigned char **)&value, valsize);
+#else
+        SSL_SESSION *sess = d2i_SSL_SESSION(NULL, (unsigned char **)&value, valsize);
+#endif
         uwsgi_rwunlock(uwsgi.ssl_sessions_cache->lock);
         return sess;
 }
@@ -91,15 +106,38 @@ 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;
 
-        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;
-        }
+	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;
 
 #ifdef UWSGI_PCRE
         struct uwsgi_regexp_list *url = uwsgi.sni_regexp;
@@ -122,13 +160,12 @@ 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;
 			}
-			usl = uwsgi_ssl_add_sni_item(uwsgi_str((char *)servername), sni_dir_cert, sni_dir_key, uwsgi.sni_dir_ciphers, 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);
 			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:
@@ -136,13 +173,39 @@ 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);
@@ -158,15 +221,35 @@ 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);
-                return NULL;
+               	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;
         }
 
 // this part is based from stud
@@ -175,26 +258,43 @@ 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);
-                        SSL_CTX_set_tmp_ecdh(ctx, ecdh);
-                        EC_KEY_free(ecdh);
+        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);
+        }
 #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) {
@@ -222,19 +322,37 @@ 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);
         }
 
 
@@ -293,6 +411,11 @@ 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);
 
 
@@ -391,6 +514,13 @@ clear:
 }
 
 char *uwsgi_sanitize_cert_filename(char *base, char *key, uint16_t keylen) {
+	// stop at the first slash if mountpoints are involved
+	if (uwsgi.subscription_mountpoints) {
+		char *slash = memchr(key, '/', keylen);
+		if (slash) {
+			keylen = slash - key;
+		}
+	}
         uint16_t i;
         char *filename = uwsgi_concat4n(base, strlen(base), "/", 1, key, keylen, ".pem\0", 5);
 
@@ -507,10 +637,41 @@ 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

@@ -167,6 +167,9 @@ static time_t parse_http_date(char *date, uint16_t len) {
 
 }
 
+time_t uwsgi_parse_http_date(char *buf, uint16_t len) {
+	return parse_http_date(buf, len);
+}
 
 
 int uwsgi_add_expires_type(struct wsgi_request *wsgi_req, char *mime_type, int mime_type_len, struct stat *st) {
@@ -450,33 +453,35 @@ 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) {
-			uwsgi_response_prepare_headers(wsgi_req, "304 Not Modified", 16); 
+			if (uwsgi_response_prepare_headers(wsgi_req, "304 Not Modified", 16))
+				return -1;
 			return uwsgi_response_write_headers_do(wsgi_req);
 		}
 	}
 #ifdef UWSGI_DEBUG
-	uwsgi_log("[uwsgi-fileserve] file %s found\n", real_filename);
+	uwsgi_log("[uwsgi-fileserve] file %s found, mimetype %s\n", real_filename, mime_type);
 #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) {
-        	fsize = wsgi_req->range_to - wsgi_req->range_from;
-                if (fsize > (size_t)st->st_size) {
-                	fsize = st->st_size;
-                }
+	// security check
+        if (wsgi_req->range_from > fsize) {
+                wsgi_req->range_from = 0;
+                wsgi_req->range_to = 0;
         }
 	else {
-        	// reset in case of inconsistent size
-        	if (wsgi_req->range_from > fsize) {
-        		wsgi_req->range_from = 0;
-        		fsize = 0;
-        	}
-		else {
-			fsize -= wsgi_req->range_from;
-		}
+		fsize -= wsgi_req->range_from;
 	}
 
+        if (wsgi_req->range_to) {
+        	fsize = (wsgi_req->range_to - wsgi_req->range_from)+1;
+                if (fsize + wsgi_req->range_from > (size_t) (st->st_size)) {
+                	fsize = st->st_size - wsgi_req->range_from;
+                }
+        }
+
 	// HTTP status
 	if (fsize > 0 && (wsgi_req->range_from || wsgi_req->range_to)) {
 		if (uwsgi_response_prepare_headers(wsgi_req, "206 Partial Content", 19)) return -1;

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.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+		int ret = uwsgi_waitfd_write(client_fd, uwsgi.socket_timeout);
 		if (ret <= 0) {
 			goto end0;
 		}
@@ -440,6 +440,11 @@ 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];
@@ -457,7 +462,8 @@ 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) {
+			if (((uspi->last_run + delta) <= now) || (uspi->needs_retry && (uspi->next_retry <= now))) {
+				if (uspi->needs_retry) uspi->retries++;
 				if (uspi->raw) {
 					uspi->pusher->func(uspi, now, NULL, 0);
 				}
@@ -470,6 +476,17 @@ 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;
@@ -531,72 +548,19 @@ 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);
-	if (uwsgi_stats_str(us, var)) {
+	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)) {
 		us->dirty = 1;
-		free(var);
+		free(escaped_var);
 		return;
 	}
-	free(var);
+	free(escaped_var);
 	if (uwsgi_stats_comma(us)) {
 		us->dirty = 1;
 	}	
@@ -605,14 +569,13 @@ 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 *) uwsgi.workers[0].cores[0].buffer;
-	uint16_t pktsize = uh->pktsize;
+	uint64_t pktsize = uc->req.len;
 	if (!pktsize) return 0;
 	char *dst = uwsgi.workers[0].cores[0].buffer;
 	memcpy(dst, uc->buffer+4, uwsgi.buffer_size);
 	// ok now check if something changed...
 	if (!uc->in_request) return 0;
-	if (uh->pktsize != pktsize) return 0;
+	if (uc->req.len != pktsize) return 0;
 	if (memcmp(dst, uc->buffer+4, uwsgi.buffer_size)) return 0;
 	// nothing changed let's dump vars
 	int ret = uwsgi_hooked_parse(dst, pktsize, stats_dump_var, us);

core/strings.c

@@ -1,5 +1,46 @@
 #include <uwsgi.h>
 
+char *uwsgi_str_split_nget(char *str, size_t len, char what, size_t pos, size_t *rlen) {
+	size_t i;
+	size_t current = 0;
+	char *choosen = str;
+	size_t choosen_len = 0;
+	*rlen = 0;
+	for(i=0;i<len;i++) {
+		if (!choosen) choosen = str + i;
+		if (str[i] == what) {
+			if (current == pos) {
+				if (choosen_len == 0) return NULL;
+				*rlen = choosen_len;
+				return choosen;
+			}
+			current++;
+			choosen = NULL;
+			choosen_len = 0;
+		}
+		else {
+			choosen_len ++;
+		}
+	}
+
+	if (current == pos) {
+		if (choosen_len == 0) return NULL;
+		*rlen = choosen_len;
+		return choosen;
+	}
+
+	return NULL;
+}
+
+size_t uwsgi_str_occurence(char *str, size_t len, char what) {
+	size_t count = 0;
+	size_t i;
+	for(i=0;i<len;i++) {
+		if (str[i] == what) count++;
+	}
+	return count;
+}
+
 // check if a string_list contains an item
 struct uwsgi_string_list *uwsgi_string_list_has_item(struct uwsgi_string_list *list, char *key, size_t keylen) {
         struct uwsgi_string_list *usl = list;
@@ -24,16 +65,9 @@ char *uwsgi_lower(char *str, size_t size) {
         return str;
 }
 
-// check if a string is contained in another one
+// check if a char is contained in a string
 char *uwsgi_str_contains(char *str, int slen, char what) {
-
-        int i;
-        for (i = 0; i < slen; i++) {
-                if (str[i] == what) {
-                        return str + i;
-                }
-        }
-        return NULL;
+        return memchr(str, what, slen);
 }
 
 int uwsgi_contains_n(char *s1, size_t s1_len, char *s2, size_t s2_len) {
@@ -85,15 +119,7 @@ int uwsgi_starts_with(char *src, int slen, char *dst, int dlen) {
 
 // unsized check
 int uwsgi_startswith(char *src, char *what, int wlen) {
-
-        int i;
-
-        for (i = 0; i < wlen; i++) {
-                if (src[i] != what[i])
-                        return -1;
-        }
-
-        return 0;
+        return memcmp(what, src, wlen);
 }
 
 // concatenate strings
@@ -338,3 +364,126 @@ char *uwsgi_cheap_string(char *buf, int len) {
         return buf - 1;
 }
 
+/*
+	status 0: append mode
+	status 1: single quote found
+	status 2: double quote found
+	status 3: backslash found (on 0)
+	status 4: backslash found (on 1)
+	status 5: backslash found (on 2)
+	
+*/
+char ** uwsgi_split_quoted(char *what, size_t what_len, char *sep, size_t *rlen) {
+	size_t i;
+	int status = 0;
+	char *base = uwsgi_concat2n(what, what_len, "", 0);
+	char *item = NULL;
+	char *ptr = NULL;
+	*rlen = 0;
+	char **ret = (char **) uwsgi_malloc(sizeof(char *) * (what_len+1));
+
+	for(i=0;i<what_len;i++) {
+		if (!item) {
+			item = uwsgi_malloc((what_len - i)+1);
+			ptr = item;
+		}
+
+		if (status == 0) {
+			if (base[i] == '\\') {
+				status = 3;
+			}	
+			else if (base[i] == '"') {
+				status = 2;
+			}
+			else if (base[i] == '\'') {
+				status = 1;
+			}
+			else if (strchr(sep, base[i])) {
+				*ptr++= 0;
+				ret[(*rlen)] = item; (*rlen)++;
+				item = NULL;
+			}
+			else {
+				*ptr++= base[i];
+			}
+			continue;
+		}
+
+		// backslash
+		if (status == 3) {
+			*ptr++= base[i];
+			status = 0;
+			continue;
+		}
+
+		// single quote
+		if (status == 1) {
+			if (base[i] == '\\') {
+				status = 4;
+			}
+			else if (base[i] == '\'') {
+				status = 0;
+			}
+			else {
+				*ptr++= base[i];
+			}
+			continue;
+		}
+
+		// double quote
+		if (status == 2) {
+			if (base[i] == '\\') {
+                                status = 5;
+                        }
+                        else if (base[i] == '"') {
+                        	status = 0;
+                        }
+                        else {
+                                *ptr++= base[i];
+                        }
+			continue;
+		}
+
+		// backslash single quote
+                if (status == 4) {
+                        *ptr++= base[i];
+                        status = 1;
+			continue;
+                }
+
+		// backslash double quote
+                if (status == 5) {
+                        *ptr++= base[i];
+                        status = 2;
+			continue;
+                }
+	}
+
+	if (item) {
+		*ptr++= 0;
+		ret[(*rlen)] = item; (*rlen)++;
+	}
+
+	free(base);
+
+	return ret;
+}
+
+char *uwsgi_get_last_char(char *what, char c) {
+	return strrchr(what, c);
+}
+
+// Note by Mathieu Dupuy: memrchr here is better, unfortunately it is not supported
+// everywhere. The only safe option looks checking for Linux :(
+char *uwsgi_get_last_charn(char *what, size_t len, char c) {
+#if defined(__linux__)
+	return memrchr(what, c, len);
+#else
+        while (len--) {
+                if (what[len] == c)
+                        return what + len;
+        }
+        return NULL;
+#endif
+}
+

core/webdav.c

@@ -0,0 +1,110 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+The following functions are useful to implement simil-webdav support in plugins.
+
+Most of them are not fully webdav compliant, but will work on the vast majority of clients.
+
+*/
+
+// a multi-status response (207) will return an xml with a list
+// of <D:response> stanzas
+
+struct uwsgi_buffer *uwsgi_webdav_multistatus_new() {
+	struct uwsgi_buffer *ub = uwsgi_buffer_new(uwsgi.page_size);
+	if (uwsgi_buffer_append(ub, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n", 40)) goto error;
+	if (uwsgi_buffer_append(ub, "<D:multistatus xmlns:D=\"DAV:\">\n", 31)) goto error;
+	return ub;
+error:
+	uwsgi_buffer_destroy(ub);
+	return NULL;
+}
+
+int uwsgi_webdav_multistatus_close(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "</D:multistatus>\n", 17)) return -1;
+	return 0;
+}
+
+int uwsgi_webdav_multistatus_response_new(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "<D:response>\n", 13)) return -1;
+        return 0;
+}
+
+int uwsgi_webdav_multistatus_response_close(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "</D:response>\n", 14)) return -1;
+        return 0;
+}
+
+int uwsgi_webdav_multistatus_propstat_new(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "<D:propstat>\n", 13)) return -1;
+        return 0;
+}
+
+int uwsgi_webdav_multistatus_propstat_close(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "</D:propstat>\n", 14)) return -1;
+        return 0;
+}
+
+int uwsgi_webdav_multistatus_prop_new(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "<D:prop>\n", 9)) return -1;
+        return 0;
+}
+
+int uwsgi_webdav_multistatus_prop_close(struct uwsgi_buffer *ub) {
+	if (uwsgi_buffer_append(ub, "</D:prop>\n", 10)) return -1;
+        return 0;
+}
+
+// shortcut for adding a propfind-response item
+int uwsgi_webdav_propfind_item_add(struct uwsgi_buffer *ub, char *href, uint16_t href_len, uint64_t cl, time_t mtime, char *ctype, uint16_t ctype_len, char *displayname, uint16_t displayname_len, char *etag, uint16_t etag_len) {
+	if (uwsgi_webdav_multistatus_response_new(ub)) return -1;
+	if (uwsgi_buffer_append(ub, "<D:href>", 8)) return -1;
+	if (uwsgi_buffer_append(ub, href, href_len)) return -1;
+	if (uwsgi_buffer_append(ub, "</D:href>\n", 10)) return -1;
+	if (uwsgi_webdav_multistatus_propstat_new(ub)) return -1;
+	if (uwsgi_webdav_multistatus_prop_new(ub)) return -1;
+
+	if (href[href_len-1] == '/') {
+		if (uwsgi_buffer_append(ub, "<D:resourcetype><D:collection/></D:resourcetype>\n", 49)) return -1;
+	}
+	else {
+		// getcontentlength
+		if (uwsgi_buffer_append(ub, "<D:getcontentlength>", 20)) return -1;
+		if (uwsgi_buffer_num64(ub, cl)) return -1;
+		if (uwsgi_buffer_append(ub, "</D:getcontentlength>\n", 22)) return -1;
+	}
+
+	// getlastmodified
+	if (mtime > 0) {
+		if (uwsgi_buffer_append(ub, "<D:getlastmodified>", 19)) return -1;	
+		if (uwsgi_buffer_httpdate(ub, mtime)) return -1;
+		if (uwsgi_buffer_append(ub, "</D:getlastmodified>\n", 21)) return -1;	
+	}
+
+	// displayname
+	if (displayname_len > 0) {
+		if (uwsgi_buffer_append(ub, "<D:displayname>\n", 16)) return -1;
+		if (uwsgi_buffer_append_xml(ub, displayname, displayname_len)) return -1;
+		if (uwsgi_buffer_append(ub, "</D:displayname>\n", 17)) return -1;
+	}
+
+	if (ctype_len > 0) {
+		if (uwsgi_buffer_append(ub, "<D:getcontenttype>", 18)) return -1;
+		if (uwsgi_buffer_append(ub, ctype, ctype_len)) return -1;
+		if (uwsgi_buffer_append(ub, "</D:getcontenttype>\n", 20)) return -1;
+	}
+
+	if (etag_len > 0) {
+		if (uwsgi_buffer_append(ub, "<D:getetag>\n", 12)) return -1;
+		if (uwsgi_buffer_append_xml(ub, etag, etag_len)) return -1;
+		if (uwsgi_buffer_append(ub, "</D:getetag>\n", 13)) return -1;
+	}
+
+	if (uwsgi_webdav_multistatus_prop_close(ub)) return -1;
+	if (uwsgi_webdav_multistatus_propstat_close(ub)) return -1;
+	if (uwsgi_webdav_multistatus_response_close(ub)) return -1;
+	return 0;
+}

core/websockets.c

@@ -1,4 +1,4 @@
-#include "uwsgi.h"
+#include <uwsgi.h>
 
 /*
 
@@ -10,9 +10,19 @@
 
 extern struct uwsgi_server uwsgi;
 
-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;
+#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;
 	if (len < 126) {
 		if (uwsgi_buffer_u8(ub, len)) goto error;
 	}
@@ -29,7 +39,6 @@ static struct uwsgi_buffer *uwsgi_websocket_message(char *msg, size_t len) {
 	return ub;
 
 error:
-	uwsgi_buffer_destroy(ub);
 	return NULL;
 }
 
@@ -54,39 +63,84 @@ 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] no PONG received in %d seconds !!!\n", uwsgi.websockets_pong_tolerance);
+                                uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) no PONG received in %d seconds !!!\n", REQ_DATA, uwsgi.websockets_pong_tolerance);
 				return -1;
 		}
 		return 0;
 	}
-	// pong received, send anther ping
+	// pong received, send another 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) {
-	struct uwsgi_buffer *ub = uwsgi_websocket_message(msg, len);
+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);
 	if (!ub) return -1;
 
-	ssize_t ret = uwsgi_response_write_body_do(wsgi_req, ub->buf, ub->pos);
-	uwsgi_buffer_destroy(ub);
-	return ret;
-	
+	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);
 }
 
 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);
+	ssize_t ret = uwsgi_websocket_send_do(wsgi_req, msg, len, 0x81);
 	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];
@@ -137,7 +191,7 @@ static ssize_t uwsgi_websockets_recv_pkt(struct wsgi_request *wsgi_req, int nb)
 				}
                                 goto wait;
                         }
-                        uwsgi_error("uwsgi_websockets_recv_pkt()");
+                        uwsgi_req_error("uwsgi_websockets_recv_pkt()");
                         return -1;
                 }
 
@@ -149,7 +203,7 @@ wait:
 			if (rlen <= 0) return -1;
 		}
                 if (ret < 0) {
-                        uwsgi_error("uwsgi_websockets_recv_pkt()");
+                        uwsgi_req_error("uwsgi_websockets_recv_pkt()");
 			return -1;
                 }
 		// send unsolicited pong
@@ -202,11 +256,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] BUG error in websocket parser\n");
+						uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) BUG error in websocket parser\n", REQ_DATA);
 						return NULL;
 					}
 					if (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);
+						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);
 						return NULL;
 					}
 					wsgi_req->websocket_phase = 2;
@@ -219,6 +273,7 @@ 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;
@@ -260,7 +315,7 @@ static struct uwsgi_buffer *uwsgi_websocket_recv_do(struct wsgi_request *wsgi_re
 					break;
 				// oops
 				default:
-					uwsgi_log("[uwsgi-websocket] BUG error in websocket parser\n");
+					uwsgi_log("[uwsgi-websocket] \"%.*s %.*s\" (%.*s) BUG error in websocket parser\n", REQ_DATA);
 					return NULL;
 			}
 		}
@@ -315,18 +370,39 @@ 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) {
+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) {
 #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_len > 0) {
+
+	// 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 (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,12 +82,14 @@ 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 (uwsgi_apply_error_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
-		// from now on ignore write body requests...
-		wsgi_req->ignore_body = 1;
-		return -1;
+	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;
 	}
-	wsgi_req->is_error_routing = 0;
 #endif
 	if (status_len <= 4) {
 		char *new_sc = NULL;
@@ -120,6 +122,28 @@ error:
 
 //each protocol has its header generator
 static int uwsgi_response_add_header_do(struct wsgi_request *wsgi_req, char *key, uint16_t key_len, char *value, uint16_t value_len) {
+
+
+	// pull/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)) {
+				wsgi_req->write_errors++ ; return -1;
+			}
+		}
+	}
+
         if (!wsgi_req->headers) {
                 wsgi_req->headers = uwsgi_buffer_new(uwsgi.page_size);
                 wsgi_req->headers->limit = UMAX16;
@@ -166,11 +190,23 @@ 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);
 }
 
-int uwsgi_response_write_headers_do(struct wsgi_request *wsgi_req) {
+static int uwsgi_response_write_headers_do0(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;
+	}
+#endif
+
 	struct uwsgi_string_list *ah = uwsgi.additional_headers;
 	while(ah) {
 		if (uwsgi_response_add_header(wsgi_req, NULL, 0, ah->value, ah->len)) return -1;
@@ -186,11 +222,20 @@ int uwsgi_response_write_headers_do(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_error("uwsgi_response_write_headers_do()");
+                                uwsgi_req_error("uwsgi_response_write_headers_do()");
                         }
 			wsgi_req->write_errors++;
                         return -1;
@@ -198,6 +243,7 @@ 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) {
@@ -215,12 +261,121 @@ 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) {
 
 	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
+
 	// if the transformation chain returns 1, we are in buffering mode
 	if (wsgi_req->transformed_chunk_len == 0 && wsgi_req->transformations) {
 		int t_ret = uwsgi_apply_transformations(wsgi_req, buf, len);
@@ -242,6 +397,9 @@ 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;
@@ -254,10 +412,11 @@ 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_error("uwsgi_response_write_body_do()");
+				uwsgi_req_error("uwsgi_response_write_body_do()");
 			}
 			wsgi_req->write_errors++;
 			return -1;
@@ -265,6 +424,7 @@ 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) {
@@ -281,6 +441,132 @@ 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);	
 }
@@ -313,7 +599,7 @@ sendfile:
 	if (len == 0) {
 		struct stat st;
 		if (fstat(fd, &st)) {
-			uwsgi_error("uwsgi_response_sendfile_do()/fstat()");
+			uwsgi_req_error("uwsgi_response_sendfile_do()/fstat()");
 			wsgi_req->write_errors++;
 			if (can_close) close(fd);
 			return -1;
@@ -331,7 +617,7 @@ sendfile:
 		if (!can_close) {
 			int tmp_fd = dup(fd);
 			if (tmp_fd < 0) {
-				uwsgi_error("uwsgi_response_sendfile_do()/dup()");
+				uwsgi_req_error("uwsgi_response_sendfile_do()/dup()");
 				wsgi_req->write_errors++;
 				return -1;
 			}
@@ -352,10 +638,11 @@ 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_error("uwsgi_response_sendfile_do()");
+                                uwsgi_req_error("uwsgi_response_sendfile_do()");
                         }
 			wsgi_req->write_errors++;
 			if (can_close) close(fd);
@@ -364,6 +651,7 @@ 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++;
@@ -418,10 +706,11 @@ 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_error("uwsgi_simple_write()");
+                                uwsgi_req_error("uwsgi_simple_write()");
                         }
                         wsgi_req->write_errors++;
                         return -1;
@@ -429,6 +718,7 @@ 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) {

core/xmlconf.c

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

core/yaml.c

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

core/zeus.c

@@ -0,0 +1,88 @@
+#include <uwsgi.h>
+
+/*
+
+	*** WORK IN PROGRESS ***
+
+	Zeus mode
+
+	A Zeus instance can load all of the available imperial monitor plugins, but instead of spawning
+	vassals it delegates actions to Emperors connected to it.
+
+	The Zeus instance try to distribute vassals evenly between Emperors.
+
+	Emperors register to one (ore more, maybe...) Zeus instance, passing various informations (like the maximum number
+	of vassals it can manage)
+
+	to spawn a Zeus:
+
+
+	# unencrypted mode
+	uwsgi --zeus 192.168.173.17:4040 --emperor /etc/uwsgi/vassals
+	# crypted mode
+	uwsgi --zeus 192.168.173.17:4040,foobar.crt,foobar.key --emperor /etc/uwsgi/vassals
+	# crypted + authentication mode
+	uwsgi --zeus 192.168.173.17:4040,foobar.crt,foobar.key,clients.pem --emperor /etc/uwsgi/vassals
+
+
+	to connect an Emperor to Zeus
+
+	# unencrypted mode
+	uwsgi --emperor zeus:192.168.173.17:4040
+	# crypted mode
+	uwsgi --emperor zeus-ssl:192.168.173.17:4040
+	# crypted + authentication mode
+	uwsgi --emperor zeus-ssl:192.168.173.17:4040,myself.key
+
+
+	Protocol
+
+	(each message is a basic uwsgi packet: modifier1 pktsize modifier2 payload)
+	
+	modifier2 identifies the type of the message
+
+	0 -> I_AM_ALIVE {node: 'node001', max_vassals: '100', running_vassals: '17'} [ emperor -> zeus ]
+
+	1 -> NEW_VASSAL {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	2 -> ACCEPTED_VASSAL {name: 'foobar.ini'} [ emperor -> zeus ]
+
+        3 -> CONFIG_CHUNK {name: 'foobar.ini', body: '[uwsgi].....'} [ zeus -> the choosen emperor ]
+
+	4 -> CONFIG_END {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	5 -> VASSAL_SPAWNED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+	6 -> VASSAL_REJECTED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+	7 -> VASSAL_RELOAD {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	8 -> VASSAL_UPDATE {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	9 -> VASSAL_DESTROY {name: 'foobar.ini'} [ zeus -> the choosen emperor ]
+
+	10 -> VASSAL_RELOADED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+	11 -> VASSAL_DESTROYED {name: 'foobar.ini'} [the choosen emperor -> zeus]
+
+*/
+
+/*
+	check how many nodes the instace needs (default 1)
+*/
+
+int uwsgi_zeus_spawn_instance(struct uwsgi_instance *ui) {
+	int i, nodes = 1;
+	char *how_many_nodes = vassal_attr_get(ui, "zeus-nodes");
+	if (how_many_nodes) {	
+		nodes = atoi(how_many_nodes);
+	}
+	for(i=0;i<nodes;i++) {
+		// now start analyzing nodes, the one with most
+		// free slots will be used
+
+		// send NEW_VASSAL request to the node,
+		// if it answers with ACCEPTED_VASSAL 
+	}
+	return 0;
+}