prepare for 2.0

More coverity fixes

.gitignore

@@ -0,0 +1,13 @@
+*.o
+*.py[co]
+*.class
+*.jar
+*~
+*.so
+
+/uwsgi
+/uwsgibuild.*
+
+/t/ring/target
+
+core/dot_h.c

.hgtags

@@ -1,23 +0,0 @@
-d3850b52334a91d005b0fe45e1e38ba0997a1fb8 no_server mode
-2d8a617299153ed2efa6ecee7920e9d36c29e0f5 0.9.5beta1
-04722a2d0121080d14a64df097c278860db5ce8a 0.9.5rc1
-820cc64ab296dc4589ef72a33a6b804c22a0430c 0.9.5rc2
-b0db39cfad5ac6d4f00bbb3f9c57cf73206e2afb 0.9.5
-9f8b98ad1dfa51b86b13fa624c65f73523075fc4 0.9.5.1
-a83e7a482e65befcfbb0e24af8cd5d15190acdd7 0.9.6-rc1
-b8f67c6cd0d62f864db9b2b265b4e260ad7d873c 0.9.6-rc2
-35918dd4b3771158b2b57410613ef029e08bbd60 0.9.6
-5f25d1f97f9dde3e391a668c1c610a52a5db8244 0.9.6.1
-ef31fc61ac48018c464f28ebfdf865b96bf83f18 0.9.6.2
-9e100c1f085034396cec586f0c76ad3f9800d1a5 0.9.7-beta1
-ff4111eb8f55b958ec91c70163e10f3372a9b94d 0.9.7-rc1
-eb8aff2926230bb114fb90f67203440a2c534bf1 0.9.7-rc2
-311eef929ec8fd0a5dc8c16531afb7bb42d36d01 0.9.7-rc3
-4b50c04e414f1d9ab8b0b5910aba83d09ac21abb 0.9.7
-d9b9b540f7dce8cb05d2e61ca8b4d75f2ea25f62 0.9.7.1
-d9b9b540f7dce8cb05d2e61ca8b4d75f2ea25f62 0.9.7.1
-0000000000000000000000000000000000000000 0.9.7.1
-0000000000000000000000000000000000000000 0.9.7.1
-486e7760bcbc2191ddb9b4aee6c98dbd5fc4c754 0.9.7.1
-a5f13497b39269621f8f1e56e14d2cc141452e79 0.9.7.2
-d1e57707f6317f134fea7d12f6588d8690f74f3f 0.9.8-rc1

.travis.yml

@@ -0,0 +1,44 @@
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+script:
+  - echo -e "\n\n>>> Building uWSGI binary"
+  - /usr/bin/python uwsgiconfig.py --build travis
+  - echo -e "\n\n>>> Building python26 plugin"
+  - /usr/bin/python2.6 -V
+  - /usr/bin/python2.6 uwsgiconfig.py --plugin plugins/python base python26
+  - 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 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
+  - echo -e "\n\n>>> Building rack 1.9.1 plugin"
+  - /usr/bin/ruby1.9.1 -v
+  - UWSGICONFIG_RUBYPATH=/usr/bin/ruby1.9.1 /usr/bin/python uwsgiconfig.py --plugin plugins/rack base rack191
+  - echo -e "\n\n>>> Building cgi plugin"
+  - /usr/bin/python uwsgiconfig.py --plugin plugins/cgi base
+  - echo -e "\n\n>>> Building dummy plugin"
+  - /usr/bin/python uwsgiconfig.py --plugin plugins/dummy base
+  - echo -e "\n\n>>> Building done, starting tests"
+  - ./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 libxml2-dev libpcre3-dev libcap2-dev
+  - sudo apt-get install -qqyf curl
+

CONTRIBUTORS

@@ -0,0 +1,27 @@
+- 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>
+Yann Malet, Lincoln Loop
+Simon Litchfield
+Masahiro Honma, <hiratara@cpan.org>
+Łukasz Wróblewski <admin@nri.pl>
+Giacomo Bagnoli, Asidev
+Guido Notari, Link I.T. S.p.a.
+Marco Beri, Link I.T. S.p.a.
+Leonid Borisenko
+Cal Leeming, Simplicity Media Ltd
+Luigi Scarso
+Corey Farwell
+Charles Duffy
+Lukas Lalinsky
+Steven Fernandez
+Łukasz Mierzwa
+Roy Marples
+Aarni Koskela
+C Anthony Risinger
+Stephen Pierce
+Mingli Yuan
+Natanael Copa
+Roberto Leandrini
+Ryan Petrello

ChangeLog

@@ -1,394 +0,0 @@
-*** may 2011 ***
-
- * 0.9.8-rc1 [20110514]
-
-- massive code cleanup and refactoring
-- added vassals loyalty concept
-- fixed virtualhosting with dynamic virtualenv
-- fixed reloading on grand-central-dispatch-enabled OSX
-- improved PSGI support with uGreen and async support
-- improved Rack support with complete fiber+async in ruby 1.9
-- support for JSON config files
-- native multi-protocol support (added fastcgi and http)
-- Mongrel2 support
-- support for templates in vassals
-- various threading fixes
-- gcc-4.6 support
-- support for logging via zeromq
-- support for configuration passed via pipe/stdin
-- pythonpath entries are now unlimited
-- socket entries are unlimited
-- pythonpath can be a glob
-- lazy mode added
-- new language-independent profiling subsystem
-- support for configuration stored in a sqlite3 db
-- allow workers to survive to syslogd death (when --log-syslog is used)
-- fix traceback in Python 3.x
-- support for uwsgi signals in threads
-- plugin autoloading
-- graceful reloading for threads
-- new wsgi.input object
-- support for alternative allocators (tcmalloc and jemalloc)
-
-
-*** april 2011 ***
-
- * 0.9.7.2 [20110406]
-
-- new option --touch-reload <file> to reload the stack on <file> modification
---static-map <mountpoint=documentroot> allows to serve static files
-- fixed --post-limit management
-- disallow empty socket names
-- implemented exception_info WSGI support
-- new options --reload-on-as <n> and --reload-on-rss <n> allows
-to recycle workers when their memory usage is higher than <n> MB
-- fixed syslog support (use --log-syslog[=facility] to enable it)
-- improved plugin loading system
-- added support for RabbitMQ as event dispatcher for the Emperor
-- fixed FreeBSD memory report
-- PSGI plugin can be compiled without ithreads
-- various Emperor fixes
-- fixed a regression with setgroups()
-- support for shared sockets (used in jails within network namespaces)
-
-*** march 2011 ***
-
- * 0.9.7.1 [20110326]
-
-- fixed python stackless support
-- added persistence for queue
-- forbid daemonizing in vassal mode
-- modifier1 30 is available again
-- allow python modules to be mapped/aliased via http
-- added --pidfile2 and --logfile-chown
-- added UWSGI_CACHE_GET dynamic variable
-- 304/If-Modified-Since support for --check-static
-- option --check-cache for integrated caching
-- option --map-socket to assign specific workers to socket
-- fixed unix fd passing on older OSX versions
-- fixed post-buffering without pep3333-input
-- fixed python threading without uwsgi cores
-- support for Linux network namespace
-- build with sys.abiflags if necessary
-
-
- * 0.9.7 [20110317]
-
-- fixed psgi compilation on GNU systems
-- improved --pep3333-input
-- better error reporting on failed open/fopen
-- fixed uGreen
-- added greenlet support
-- various solaris fixes
-- new help system
-- updated async support
-- fixed uwsgi.cache_get in python
-
- * 0.9.7-rc3 [20110312]
-
-- added support for persistent cache (--cache-store <filename>)
-- less verbose file monitoring
-- fixed a race condition in emperor startup
-- fixed erlang empty list encoding
-- improved snmp support
-- fixed cache modifier 111 for 3 and 4
-- preliminary cpu-affinity support (Linux only)
-- fixed ldap support
-- auto-configure ldap compilation
-- added --allowed-modifiers (allow only a subset of modifiers)
-- fixed a bug with getopt_long
-
- * 0.9.7-rc2 [20110309]
-
-- added cron-like interface to signal framework
-- improved Linux namespaces support
-- fixed multithreading + --max-requests
-- added support for reference in configuration files
-
- * 0.9.7-rc1 [20110307]
-
-- export %v in emperor mode
-- fixed signal race condition in server reload
-- fixed http router post handling bug
-- added uwsgi.erlang_register_process in pyerl plugin
-- fixed unix socket inherit
-- fixed linux namespace support in recent kernel/gcc
-- ported threading to python 3.2
-- add build date to uWSGI startup info
-- do not allow clustering without defining a socket
-- kill all the gateways/daemons on startup errors
-- fixed vacuum after chdir()
-- fixed gateways reload
-- re-added support for OpenBSD and NetBSD
-- fixed post-buffering in python
-- use erlang binary for python string
-- fixed memory leak in pyerl plugin
-- removed broken log rotation (post-poned)
-- fixed no_argument options in ini and yaml parsing
-
- * 0.9.7-beta1 [20110301]
-
-- fully modular re-design
-- advanced build system with presets
-- threading support
-- emperor mode for massive auto-hosting
-- caching subsystem
-- message queue (even stacked) support
-- improved server reloading system
-- support for Linux Cgroups and Namespaces
-- integrated upload progress
-- Clustering infrastructure via multicast, broadcast or subscriptions
-- support for attaching/monitoring external apps to the master process
-- improved virtualhosting mode
-- extremely improved Python support with better usage of multiple interpreters
-- improved multiple apps support
-- Production ready, evented HTTP router/proxy/load-balancer
-- Production ready, evented uwsgi router/proxy/load-balancer
-- new Erlang stack
-- Internal signal subsystem
-- support for RubyOnRails and Rack apps
-- A huge series of fixes and optimizations
-
-*** february 2011 ***
-
- * 0.9.6.8 [20110207]
-
-- fixed a bug when using --limit-as
-- fixed a erlang buffer initialization
-- added --ignore-sigpipe
-- added --master-as-root
-
-*** january 2011 ***
-
- * 0.9.6.7 [20110130]
-
-- a huge amount of async optimizations and fixes
-- --logdate takes an optional strftime-like value
-- follow $PATH on reloading
-- uwsgi.core is exported in WSGI env
-- uwsgi.log() respect for --logdate
-- initial banner respect for --logdate
-- fixed --post-buffering
-- default listen backlog queue is now 100
-- Python 3 support is no more marked as experimental
-- Python 3.2 support
-- new option --chroot-reload will force a reload of the uWSGI stack after a chroot
-- fixed a typo in INI parsing
-
-*** december 2010 ***
-
- * 0.9.6.6 [20101230]
-
-- support for YAML configuration files
-- backported python module aliasing from 0.9.7-dev
-- better apache2 module (support for SetEnv directive, fixed REQUEST_URI and improved connection handling)
-- uwsgi.post_fork_hook implementation (to execute function after fork()) (thanks George Kollias)
-- option --gid calls setgroups() after setgid() (thanks Jorge Cardona)
-- fixed uGreen compilation (and uGreen is now built by default)
-- fixed timeout and thundering herd problem in async modes (many thanks to Test157 for giving us a good async-test-app)
-- disable TCP_INFO in older Linux kernels (thanks Bo Shi)
-- enable TCP_INFO in FreeBSD (limited usage due to FreeBSD kernel support)
-- fixed static virtualhosting mode using xml files (thanks Guido Notari of Link I.T. spa)
-- new option --close-on-exec (thanks Jean-Baptiste Quenot)
-- use HTTP_HOST var (and fallback to SERVER_NAME) in virtual hosting mode
-- fixed a buffer overflow in automatic socket_name allocation (spotted by Riccardo Magliocchetti)
-- Official support for Nexenta
-
-
-*** september 2010 ***
-
- * 0.9.6.5 [20100929]
-
-- PEP 3333 support
-- fix --pythonpath with --wsgi-file
-- x-wsgiorg.uwsgi.version renamed to uwsgi.version
-
- * 0.9.6.4 [20100925]
-
-- fix a stupid bug in conditional logging backport
-
- * 0.9.6.3 [20100925]
-
-- fix a buffer overflow in .ini parsing (it throws a glibc error on malloc)
-- backport of conditional logging from 0.9.7-dev
-- backport of backlog queue monitor from 0.9.7-dev (only Linux)
-
- * 0.9.6.2 [20100915]
-
-- fix a regression in virtual hosting mode
-- fix pythonpath usage in --ini and --ini-paste
-- new uwsgi packet var: UWSGI_CHDIR
-
- * 0.9.6.1 [20100912]
-
-- print the request uri during SIGPIPE or HARAKIRI
-- added SIGUSR2 support (it will print the current running request, if available)
-- protocol parsing optimization
-- fixed --logto support
-- new --eval option allows inline definition of WSGI script
-- support for defining WSGI script in xml using CDATA
-- allow --pp as --pythonpath shortcut
-- various spooler optimizations and fixes
-- added -O2 optimization by default
-- added uwsgi.is_a_reload commodity function
-- .ini file support fix
-- SNMP agent fix
-- support for subprocesses generated by master
-- fix a regression in SCRIPT_NAME handling
-- Haiku official support
-- gcc 2.95 support
-- dynamic app management optimizations
-- export x-wsgiorg.uwsgi.version in WSGI env
- 
-*** august 2010 ***
-
- * 0.9.6 [20100829]
-
-- better handling of SCRIPT_NAME
-- vacuum option for deleting unix sockets and pidfiles after usage
-- advanced XML configuration
-- new configuration systems: INI files and LDAP
-- embedded HTTP server for development/testing
-- better signal handling
-- PSGI plugin improved
-- usability fixes and new commodities options for root startup
-- grunt processes (detached workers)
-- preliminary integrated virtualhosting mode
-- new option catch-exceptions can redirect python exceptions to your browser
-- logging improvements (--logto and --logdate options)
-- Full PEP 333 compliant usage of wsgi.file_wrapper
-- re-initialize random seed after every fork() [security fix]
-- fix Spooler's usage of stdin
-- export WSGI environment in uwsgi.env (for doing evil things)
-- logsize tracking (uwsgi.logsize) for future embedded log rotation
-
-*** july 2010 ***
- 
- * 0.9.5.4 [20100706]
-	
-*** june 2010 ***
-
- * 0.9.5.3 [20100628]
-
-- fixed linux x86_64 compilation (sorry)
-
- * 0.9.5.2 [20100626] *
-
-- fixed a request parsing bug
-- applied debian fixes
-- fixed multiple interpreter sys.argv
-- improved --chmod-socket
-- fixed uid 0 SIGHUP
-- updated nginx and apache modules
-- updated PSGI, lua and example plugin
-- fixed --pyargv with python 3.x
-- improved plugin build system
-
-*** may 2010 ***
-
- * 0.9.5.1 [20100519] *
-
-- fixed paste support
-- added a new modifier (22)
-- full support for configuration via environment variables
-- nginx_string option in nginx module
-- fix for harakiri without master
-- backported unladen swallow support for 0.9.6-dev
-- fixed address space limit detection via getrlimit()
-- http body buffering implementation
-- added --prio option (to set priority)
-- added --post-limit to limit the size of uploads
-- added --logto option to allow udp logging without daemonizing
-- applied Gentoo's packagers fixes for build system
-
- * 0.9.5 [20100501] *
-
-- hook based request/modifier management
-- plugin support via dlopen
-- on-the-fly management flag
-- integrated proxy
-- logging via udp
-- improved spooler for cron-like apps
-- async support
-- green thread platform (uGreen) on top of the async mode
-- transparent Erlang integration
-- embedded snmp agent
-- nagios mode
-- improved python 3.x support
-- improved xml configuration
-- new build system
-- address space usage limiting
-- lot of portability fixes
-- lot of optimizations and code refactoring
-
-
-*** april 2010 ***
-
- * Fourth Maintenance release [20100427] *
-
-- backported non-yielding app optimization from 0.9.5
-- backported udp logging from 0.9.5
-- backported uwsgi_error() from 0.9.5 (no more dumb perror())
-- fix a rare (but possible) segmentation fault
-- added --version
-- updated apache2 module
-
-*** march 2010 ***
-
- * Third Maintenance release [20100310] *
-
-- fix sendfile on 64bit
-- include setup.py
-
-*** february 2010 ***
- * Maintenance release *
-
-- better support for NetBSD
-- threading fix for FreeBSD
-- sendfile portability fixes 
-- new makefiles
-- example app for testing static file serving
-- fixes for ROCK_SOLID mode
-
-*** january 2010 ***
-
-- Integrated Spooler
-- better error management
-- long options
-- clustering functions
-- experimental lighttpd module
-- official support for OpenBSD and OpenSolaris
-- FastFuncs
-- new functions for embedded module
-- reliable harakiri
-- better Makefiles
-- python threads support in master process
-- proper timeout handling in apache2 module
-- endianess fixes all over the place
-- paste support
-- Django app for managing and monitoring the uWSGI server
-- options for changin uid/gid and chrooting when run by root
-- lot of bugfixes and optimizations
-
-*** 20091129 Version 0.9.3 ***
-
-- Nginx 0.7.x module
-- configuration via python module
-- support (non-standard) for Python 3.x
-- Twisted client resource adapter
-- graceful restart of worker processes and hot-plug substitution/upgrade of the uWSGI server
-- shared memory area to share data between workers/processes
-- Tomcat handler
-- support for virtualenv
-- tons of bugfixes and optimizations
-
-*** 20090829 Version 0.9.2 ***
-
-- TCP support
-- configurable internal timeout (socket/poll)
-- Cherokee handler
-- code refactoring
-- Makefiles
-- customizable harakiri handler (put an harakiri(environ, start_response) function in your wsgi script)
-- limit requests per worker
-- a lot of bugfix and optimizations

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,2 +1,16 @@
+PYTHON := python
+
 all:
-	python uwsgiconfig.py --build
+	$(PYTHON) uwsgiconfig.py --build $(PROFILE)
+
+clean:
+	$(PYTHON) uwsgiconfig.py --clean
+
+check:
+	$(PYTHON) uwsgiconfig.py --check
+
+plugin.%:
+	$(PYTHON) uwsgiconfig.py --plugin plugins/$* $(PROFILE)
+
+%:
+	$(PYTHON) uwsgiconfig.py --build $@

Makefile.Py24

@@ -1,2 +0,0 @@
-all:
-	python2.4 uwsgiconfig.py --build

Makefile.Py25

@@ -1,2 +0,0 @@
-all:
-	python2.5 uwsgiconfig.py --build

Makefile.Py26

@@ -1,2 +0,0 @@
-all:
-	python2.6 uwsgiconfig.py --build

Makefile.Py27

@@ -1,2 +0,0 @@
-all:
-	python2.7 uwsgiconfig.py --build

Makefile.Py30

@@ -1,2 +0,0 @@
-all:
-	python3.0 uwsgiconfig.py --build

Makefile.Py31

@@ -1,2 +0,0 @@
-all:
-	python3.1 uwsgiconfig.py --build

Makefile.Py32

@@ -1,2 +0,0 @@
-all:
-	python3.2 uwsgiconfig.py --build

Makefile.PyLua

@@ -1,2 +0,0 @@
-all:
-	python uwsgiconfig.py --build pylua

README

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

apache2/mod_Ruwsgi.c

@@ -160,20 +160,35 @@ static int uwsgi_map_location(request_rec *r)
 	return DECLINED;
 }
 
-static void log_err(const char *file, int line, request_rec *r,
+
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+static void log_err(const char *file, int line, int ami, request_rec *r,
 		apr_status_t status, const char *msg)
 {
+	ap_log_rerror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, status, r, "uwsgi: %s", msg);
+#else
+static void log_err(const char *file, int line, request_rec *r,
+                apr_status_t status, const char *msg)
+{
+
 	ap_log_rerror(file, line, APLOG_ERR, status, r, "uwsgi: %s", msg);
+#endif
 }
 
-static void log_debug(const char *file, int line, request_rec *r, const
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+static void log_debug(const char *file, int line, int ami, request_rec *r, const
 		char *msg)
 {
 	/*
 	   ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
 	   ap_log_rerror(file, line, APLOG_WARNING, APR_SUCCESS, r, "uwsgi: %s", msg);
 	   */
+	ap_log_rerror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, APR_SUCCESS, r, "uwsgi: %s", msg);
+#else
+static void log_debug(const char *file, int line, request_rec *r, const
+		char *msg) {
 	ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, "uwsgi: %s", msg);
+#endif
 }
 
 /* buffered socket implementation (buckets are overkill) */
@@ -412,7 +427,11 @@ send_headers(request_rec *r, struct sockbuff *s)
 	apr_table_t *t;
 	apr_status_t rv = 0;
 	apr_port_t  port = 0;
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	GET_PORT(port, r->useragent_addr);
+#else
 	GET_PORT(port, r->connection->remote_addr);
+#endif
 	uwsgi_cfg *cfg = our_dconfig(r);
 
 	log_debug(APLOG_MARK,r, "sending headers");
@@ -430,7 +449,11 @@ send_headers(request_rec *r, struct sockbuff *s)
 
 	add_header(t, "REQUEST_METHOD", (char *) r->method);
 	add_header(t, "QUERY_STRING", r->args ? r->args : "");
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	add_header(t, "SERVER_SOFTWARE", ap_get_server_description());
+#else
 	add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
+#endif
 	add_header(t, "SERVER_ADMIN", r->server->server_admin);
 	add_header(t, "SERVER_NAME", (char *) ap_get_server_name(r));
 	add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)));
@@ -438,7 +461,11 @@ send_headers(request_rec *r, struct sockbuff *s)
 	add_header(t, "SERVER_PROTOCOL", r->protocol);
 
 	add_header(t, "REQUEST_URI", original_uri(r));
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	add_header(t, "REMOTE_ADDR", r->useragent_ip);
+#else
 	add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
+#endif
 	add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
 	add_header(t, "REMOTE_USER", r->user);
 	add_header(t, "DOCUMENT_ROOT", (char *) ap_document_root(r));

apache2/mod_proxy_uwsgi.c

@@ -0,0 +1,464 @@
+/*
+        
+*** mod_proxy_uwsgi ***
+
+Copyright 2009-2013 Unbit S.a.s. <info@unbit.it>
+     
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+To build:
+
+apxs2 -i -c mod_proxy_uwsgi.c
+
+To use:
+
+LoadModule proxy_uwsgi_module /usr/lib/apache2/modules/mod_proxy_uwsgi.so
+ProxyPass / uwsgi://127.0.0.1:3031/
+
+Docs:
+
+http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
+
+*/
+#define APR_WANT_MEMFUNC
+#define APR_WANT_STRFUNC
+#include "apr_strings.h"
+#include "apr_hooks.h"
+#include "apr_optional_hooks.h"
+#include "apr_buckets.h"
+
+#include "httpd.h"
+#include "http_config.h"
+#include "http_log.h"
+#include "http_protocol.h"
+#include "http_request.h"
+#include "util_script.h"
+
+#include "mod_proxy.h"
+
+
+#define UWSGI_SCHEME "uwsgi"
+#define UWSGI_DEFAULT_PORT 3031
+
+module AP_MODULE_DECLARE_DATA proxy_uwsgi_module;
+
+
+static int uwsgi_canon(request_rec *r, char *url)
+{
+    char *host, sport[sizeof(":65535")];
+    const char *err, *path;
+    apr_port_t port = UWSGI_DEFAULT_PORT;
+
+    if (strncasecmp(url, UWSGI_SCHEME "://", sizeof(UWSGI_SCHEME) + 2)) {
+        return DECLINED;
+    }
+    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,
+                      "error parsing URL %s: %s", url, err);
+        return HTTP_BAD_REQUEST;
+    }
+
+    apr_snprintf(sport, sizeof(sport), ":%u", port);
+
+    if (ap_strchr(host, ':')) { /* if literal IPv6 address */
+        host = apr_pstrcat(r->pool, "[", host, "]", NULL);
+    }
+
+    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
+                             r->proxyreq);
+    if (!path) {
+        return HTTP_BAD_REQUEST;
+    }
+
+    r->filename = apr_pstrcat(r->pool, "proxy:" UWSGI_SCHEME "://", host, sport, "/",
+                              path, NULL);
+
+    return OK;
+}
+
+
+static int uwsgi_send(proxy_conn_rec *conn, const char *buf, apr_size_t length,
+                   request_rec *r)
+{
+    apr_status_t rv;
+    apr_size_t written;
+
+    while (length > 0) {
+        written = length;
+        if ((rv = apr_socket_send(conn->sock, buf, &written)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "sending data to %s:%u failed",
+                          conn->hostname, conn->port);
+            return HTTP_SERVICE_UNAVAILABLE;
+        }
+
+        /* count for stats */
+        conn->worker->s->transferred += written;
+        buf += written;
+        length -= written;
+    }
+
+    return OK;
+}
+
+
+/*
+ * Send uwsgi header block
+ */
+static int uwsgi_send_headers(request_rec *r, proxy_conn_rec *conn)
+{
+    char *buf, *ptr;
+
+    const apr_array_header_t *env_table;
+    const apr_table_entry_t *env;
+
+    int j;
+
+    apr_size_t headerlen = 4;
+    uint16_t pktsize, keylen, vallen;
+
+    ap_add_common_vars(r);
+    ap_add_cgi_vars(r);
+
+    // this is not a security problem (in Linux) as uWSGI destroy the env memory area readable in /proc
+    // and generally if you host untrusted apps in your server and allows them to read others uid /proc/<pid>
+    // files you have higher problems...
+    const char *auth = apr_table_get(r->headers_in, "Authorization");
+    if (auth) {
+        apr_table_setn(r->subprocess_env, "HTTP_AUTHORIZATION", auth); 
+    }
+
+    const char *script_name = apr_table_get(r->subprocess_env, "SCRIPT_NAME");
+    const char *path_info = apr_table_get(r->subprocess_env, "PATH_INFO");
+
+    if (script_name && path_info) {
+        if (strcmp(path_info, "/")) {
+            apr_table_set(r->subprocess_env, "SCRIPT_NAME", apr_pstrndup(r->pool, script_name, strlen(script_name)-strlen(path_info)));
+	}
+        else {
+            if (!strcmp(script_name, "/")) {
+                apr_table_set(r->subprocess_env, "SCRIPT_NAME", "");
+            }
+        }
+    }
+
+    env_table = apr_table_elts(r->subprocess_env);
+    env = (apr_table_entry_t *)env_table->elts;
+
+    for (j = 0; j < env_table->nelts; ++j) {
+        headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val) ;
+    }
+
+    ptr = buf = apr_palloc(r->pool, headerlen);
+
+    ptr+=4;
+
+    for (j = 0; j < env_table->nelts; ++j) {
+	keylen = strlen(env[j].key);
+	*ptr++= (uint8_t) (keylen & 0xff);
+	*ptr++= (uint8_t) ((keylen >> 8)  & 0xff);
+	memcpy(ptr, env[j].key, keylen) ; ptr+=keylen;
+
+	vallen = strlen(env[j].val);
+	*ptr++= (uint8_t) (vallen & 0xff);
+	*ptr++= (uint8_t) ((vallen >> 8)  & 0xff);
+	memcpy(ptr, env[j].val, vallen) ; ptr+=vallen;
+    }
+
+    pktsize = headerlen-4;
+
+    buf[0] = 0;
+    buf[1] = (uint8_t) (pktsize & 0xff);
+    buf[2] = (uint8_t) ((pktsize >> 8) & 0xff);
+    buf[3] = 0;
+
+    return uwsgi_send(conn, buf, headerlen, r);
+}
+
+
+static int uwsgi_send_body(request_rec *r, proxy_conn_rec *conn)
+{
+    if (ap_should_client_block(r)) {
+        char *buf = apr_palloc(r->pool, AP_IOBUFSIZE);
+        int status;
+        apr_size_t readlen;
+
+        readlen = ap_get_client_block(r, buf, AP_IOBUFSIZE);
+        while (readlen > 0) {
+            status = uwsgi_send(conn, buf, readlen, r);
+            if (status != OK) {
+                return HTTP_SERVICE_UNAVAILABLE;
+            }
+            readlen = ap_get_client_block(r, buf, AP_IOBUFSIZE);
+        }
+        if (readlen == -1) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                          "receiving request body failed");
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
+    }
+
+    return OK;
+}
+
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+static request_rec *ap_proxy_make_fake_req(conn_rec *c, request_rec *r)
+{
+    apr_pool_t *pool;
+    request_rec *rp;
+
+    apr_pool_create(&pool, c->pool);
+
+    rp = apr_pcalloc(pool, sizeof(*r));
+
+    rp->pool            = pool;
+    rp->status          = HTTP_OK;
+
+    rp->headers_in      = apr_table_make(pool, 50);
+    rp->subprocess_env  = apr_table_make(pool, 50);
+    rp->headers_out     = apr_table_make(pool, 12);
+    rp->err_headers_out = apr_table_make(pool, 5);
+    rp->notes           = apr_table_make(pool, 5);
+
+    rp->server = r->server;
+    rp->log = r->log;
+    rp->proxyreq = r->proxyreq;
+    rp->request_time = r->request_time;
+    rp->connection      = c;
+    rp->output_filters  = c->output_filters;
+    rp->input_filters   = c->input_filters;
+    rp->proto_output_filters  = c->output_filters;
+    rp->proto_input_filters   = c->input_filters;
+    rp->useragent_ip = c->client_ip;
+    rp->useragent_addr = c->client_addr;
+
+    rp->request_config  = ap_create_request_config(pool);
+    proxy_run_create_req(r, rp);
+
+    return rp;
+}
+#endif
+
+
+static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_conf *conf)
+{
+
+	char buffer[HUGE_STRING_LEN];
+	const char *buf;
+	char *value, *end;
+	int len;
+	apr_status_t rc;
+	conn_rec *c = r->connection;
+	apr_off_t readbytes;
+	apr_status_t rv;
+	apr_bucket *e;
+	apr_read_type_e mode = APR_NONBLOCK_READ;
+
+	request_rec *rp = ap_proxy_make_fake_req(backend->connection, r);
+	rp->proxyreq = PROXYREQ_RESPONSE;
+
+	apr_bucket_brigade *bb = apr_brigade_create(r->pool, c->bucket_alloc);
+
+	len = ap_getline(buffer, sizeof(buffer), rp, 1);
+
+	if (len <= 0) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	backend->worker->s->read += len;
+
+	if (!apr_date_checkmask(buffer, "HTTP/#.# ###*") || len >= sizeof(buffer)-1) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+        char keepchar = buffer[12];
+        buffer[12] = '\0';
+        r->status = atoi(&buffer[9]);
+
+        if (keepchar != '\0') {
+                buffer[12] = keepchar;
+        } else {
+                /* 2616 requires the space in Status-Line; the origin
+                 * server may have sent one but ap_rgetline_core will
+                 * have stripped it. */
+                buffer[12] = ' ';
+                buffer[13] = '\0';
+            }
+        r->status_line = apr_pstrdup(r->pool, &buffer[9]);
+
+		// start parsing headers;
+		while ((len = ap_getline(buffer, sizeof(buffer), rp, 1)) > 0) {
+			value = strchr(buffer, ':');
+			// invalid header skip
+			if (!value) continue;
+			*value = '\0';
+        		++value;
+        		while (apr_isspace(*value)) ++value; 
+        		for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end) *end = '\0';
+			apr_table_add(r->headers_out, buffer, value);
+		}
+
+
+	if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
+                ap_set_content_type(r, apr_pstrdup(r->pool, buf));
+            }
+	
+	for(;;) {
+		rv = ap_get_brigade(rp->input_filters, bb,
+                                        AP_MODE_READBYTES, mode,
+                                        conf->io_buffer_size);
+		if (APR_STATUS_IS_EAGAIN(rv)
+                        || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb))) {
+			e = apr_bucket_flush_create(c->bucket_alloc);
+			APR_BRIGADE_INSERT_TAIL(bb, e);
+			if (ap_pass_brigade(r->output_filters, bb) || c->aborted) {
+				break;
+			}
+			apr_brigade_cleanup(bb);
+			mode = APR_BLOCK_READ;
+			continue;
+		}
+		else if (rv == APR_EOF) {
+			break;
+		}
+		else if (rv != APR_SUCCESS) {
+			ap_proxy_backend_broke(r, bb);
+			ap_pass_brigade(r->output_filters, bb);
+		}
+
+		mode = APR_NONBLOCK_READ;
+		apr_brigade_length(bb, 0, &readbytes);
+		backend->worker->s->read += readbytes;
+		ap_pass_brigade(r->output_filters, bb);
+		apr_brigade_cleanup(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;
+}
+
+static int uwsgi_handler(request_rec *r, proxy_worker *worker,
+                        proxy_server_conf *conf, char *url,
+                        const char *proxyname, apr_port_t proxyport)
+{
+    int status;
+    proxy_conn_rec *backend = NULL;
+    apr_pool_t *p = r->pool;
+    apr_uri_t *uri = apr_palloc(r->pool, sizeof(*uri));
+    char server_portstr[32];
+
+    if (strncasecmp(url, UWSGI_SCHEME "://", sizeof(UWSGI_SCHEME) + 2)) {
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                      "declining URL %s", url);
+        return DECLINED;
+    }
+
+    // ADD PATH_INFO
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+    size_t w_len = strlen(worker->s->name);
+#else
+    size_t w_len = strlen(worker->name);
+#endif
+    char *u_path_info = r->filename + 6 + w_len;
+    int delta = 0;
+    if (u_path_info[0] != '/') {
+        delta = 1;
+    }
+    int decode_status = ap_unescape_url(url+w_len-delta);
+    if (decode_status) {
+       ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "unable to decode uri: %s",
+                      url+w_len-delta);
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+    apr_table_add(r->subprocess_env, "PATH_INFO", url+w_len-delta);
+
+
+    /* Create space for state information */
+    status = ap_proxy_acquire_connection(UWSGI_SCHEME, &backend, worker,
+                                         r->server);
+    if (status != OK) {
+        goto cleanup;
+    }
+    backend->is_ssl = 0;
+
+    /* Step One: Determine Who To Connect To */
+    status = ap_proxy_determine_connection(p, r, conf, worker, backend,
+                                           uri, &url, proxyname, proxyport,
+                                           server_portstr, sizeof(server_portstr));
+    if (status != OK) {
+        goto cleanup;
+    }
+
+
+    /* Step Two: Make the Connection */
+    if (ap_proxy_connect_backend(UWSGI_SCHEME, backend, worker, r->server)) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "failed to make connection to backend: %s:%u",
+                      backend->hostname, backend->port);
+        status = HTTP_SERVICE_UNAVAILABLE;
+        goto cleanup;
+    }
+
+    /* Step Three: Create conn_rec */
+    if (!backend->connection) {
+	if ((status = ap_proxy_connection_create(UWSGI_SCHEME, backend,
+						r->connection, r->server)) != OK)
+		goto cleanup;
+    }
+
+    /* Step Four: Process the Request */
+    if (   ((status = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK)
+        || ((status = uwsgi_send_headers(r, backend)) != OK)
+        || ((status = uwsgi_send_body(r, backend)) != OK)
+        || ((status = uwsgi_response(r, backend, conf)) != OK)) {
+        goto cleanup;
+    }
+
+cleanup:
+    if (backend) {
+        backend->close = 1; /* always close the socket */
+        ap_proxy_release_connection(UWSGI_SCHEME, backend, r->server);
+    }
+    return status;
+}
+
+
+static void register_hooks(apr_pool_t *p)
+{
+    proxy_hook_scheme_handler(uwsgi_handler, NULL, NULL, APR_HOOK_FIRST);
+    proxy_hook_canon_handler(uwsgi_canon, NULL, NULL, APR_HOOK_FIRST);
+}
+
+
+module AP_MODULE_DECLARE_DATA proxy_uwsgi_module = {
+    STANDARD20_MODULE_STUFF,
+    NULL,		/* create per-directory config structure */
+    NULL,		/* merge per-directory config structures */
+    NULL,		/* create per-server config structure */
+    NULL,		/* merge per-server config structures */
+    NULL,		/* command table */
+    register_hooks	/* register hooks */
+};

apache2/mod_uwsgi.c

@@ -2,7 +2,7 @@
         
 *** uWSGI/mod_uwsgi ***
 
-Copyright 2009-2010 Unbit S.a.s. <info@unbit.it>
+Copyright 2009-2013 Unbit S.a.s. <info@unbit.it>
      
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -37,11 +37,18 @@ LoadModule uwsgi_module <path_of_apache_modules>/mod_uwsgi.so
 
 */
 
+#include <unistd.h>
+#include <ctype.h>
 #include "apr_strings.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include "httpd.h"
 #include "http_core.h"
+#include "http_protocol.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "util_script.h"
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -51,7 +58,6 @@ LoadModule uwsgi_module <path_of_apache_modules>/mod_uwsgi.so
 #include <fcntl.h>
 
 
-#define MAX_VARS 64
 #define DEFAULT_SOCK "/tmp/uwsgi.sock"
 
 typedef struct {
@@ -73,6 +79,8 @@ typedef struct {
 	char script_name[256];
 	char scheme[9];
 	int cgi_mode ;
+	int max_vars;
+	int empty_remote_user;
 } uwsgi_cfg;
 
 module AP_MODULE_DECLARE_DATA uwsgi_module;
@@ -83,8 +91,18 @@ static uint16_t uwsgi_swap16(uint16_t x) {
 }
 #endif
 
-static int uwsgi_add_var(struct iovec *vec, int i, char *key, char *value, uint16_t *pkt_size) {
+static int uwsgi_add_var(struct iovec *vec, int i, request_rec *r, char *key, char *value, uint16_t *pkt_size) {
 
+	uwsgi_cfg *c = ap_get_module_config(r->per_dir_config, &uwsgi_module);
+
+#if APR_IS_BIGENDIAN
+	if (i+6 > c->max_vars) {
+#else
+	if (i+4 > c->max_vars) {
+#endif
+		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: max number of uwsgi variables reached. consider increasing it with uWSGImaxVars directive");
+		return i;
+	}
 
 #if APR_IS_BIGENDIAN
 	char *ptr;
@@ -150,6 +168,9 @@ static void *uwsgi_server_config(apr_pool_t *p, server_rec *s) {
 	c->modifier1 = 0 ;
 	c->modifier2 = 0 ;
 	c->cgi_mode = 0 ;
+	c->max_vars = 128;
+	c->script_name[0] = 0;
+	c->empty_remote_user = 1;
 
 	return c;
 }
@@ -164,6 +185,14 @@ static void *uwsgi_dir_config(apr_pool_t *p, char *dir) {
 	c->modifier1 = 0 ;
 	c->modifier2 = 0 ;
 	c->cgi_mode = 0 ;
+	c->max_vars = 128;
+	c->empty_remote_user = 1;
+	c->script_name[0] = 0;
+	if (dir) {
+		if (strcmp(dir, "/")) {
+			strncpy(c->script_name, dir, 255);
+		}
+	}
 
 	return c;
 }
@@ -243,11 +272,8 @@ static int uwsgi_handler(request_rec *r) {
 
 	uwsgi_cfg *c = ap_get_module_config(r->per_dir_config, &uwsgi_module);
 
-#if APR_IS_BIGENDIAN
-	struct iovec uwsgi_vars[(MAX_VARS*6)+1] ;
-#else
-	struct iovec uwsgi_vars[(MAX_VARS*4)+1] ;
-#endif
+	struct iovec *uwsgi_vars;
+
 	int vecptr = 1 ;
 	char pkt_header[4];
 	uint16_t pkt_size = 0;
@@ -315,68 +341,62 @@ static int uwsgi_handler(request_rec *r) {
 	}
 
 
+#if APR_IS_BIGENDIAN
+        uwsgi_vars = malloc(sizeof(struct iovec) * (c->max_vars*6)+1);
+#else
+        uwsgi_vars = malloc(sizeof(struct iovec) * (c->max_vars*4)+1);
+#endif
 		
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REQUEST_METHOD", (char *) r->method, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "QUERY_STRING", r->args ? r->args : "", &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_NAME", (char *) ap_get_server_name(r), &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)), &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_PROTOCOL", r->protocol, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REQUEST_URI", r->unparsed_uri, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REMOTE_ADDR", r->connection->remote_ip, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REMOTE_USER", r->user ? r->user : "", &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REQUEST_METHOD", (char *) r->method, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "QUERY_STRING", r->args ? r->args : "", &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_NAME", (char *) ap_get_server_name(r), &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)), &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_PROTOCOL", r->protocol, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REQUEST_URI", r->unparsed_uri, &pkt_size) ;
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_ADDR", r->useragent_ip, &pkt_size) ;
+#else
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_ADDR", r->connection->remote_ip, &pkt_size) ;
+#endif
+
+	// 
 	if (r->user) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "AUTH_TYPE", (char *) ap_auth_type(r), &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_USER", r->user, &pkt_size) ;
 	}
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "DOCUMENT_ROOT", (char *) ap_document_root(r), &pkt_size) ;
+	else if (c->empty_remote_user) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_USER", "", &pkt_size) ;
+	}
+
+	if (ap_auth_type(r) != NULL) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "AUTH_TYPE", (char *) ap_auth_type(r), &pkt_size) ;
+	}
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "DOCUMENT_ROOT", (char *) ap_document_root(r), &pkt_size) ;
 
 	if (c->scheme[0] != 0) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "UWSGI_SCHEME", c->scheme, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "UWSGI_SCHEME", c->scheme, &pkt_size) ;
 	}
 
-	if (c->script_name[0] == '/') {
-		if (c->script_name[1] == 0) {
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", "", &pkt_size) ;
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri, &pkt_size) ;
-		}
-		else {
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", c->script_name, &pkt_size) ;
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri+strlen(c->script_name), &pkt_size) ;
-		}
+	// SCRIPT_NAME = "/" is like SCRIPT_NAME = ""
+	if (c->script_name[0] != 0 && !(c->script_name[0] == '/' && c->script_name[1] == 0)) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SCRIPT_NAME", c->script_name, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "PATH_INFO", r->uri+strlen(c->script_name), &pkt_size) ;
 	}
 	else {
-		if (r->path_info) {
-			if (strlen(r->path_info) <= 0) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", "", &pkt_size) ;
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri, &pkt_size) ;
-			}
-			else {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", apr_pstrndup(r->pool, r->uri, (strlen(r->uri) - strlen(r->path_info) )) , &pkt_size) ;
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->path_info, &pkt_size) ;
-			}
-		}
-		else {
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SCRIPT_NAME", "", &pkt_size) ;
-			vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "PATH_INFO", r->uri, &pkt_size) ;
-		}
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SCRIPT_NAME", "", &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "PATH_INFO", r->uri, &pkt_size) ;
 	}
 
 
 	headers = apr_table_elts(r->headers_in);
 	h = (apr_table_entry_t *) headers->elts;
 
-	// check for max vars (a bit ugly)
-	cnt = headers->nelts ;
-	if (cnt + 11 > MAX_VARS) {
-		cnt = MAX_VARS -11;
-	}
-
-	for(i=0;i< cnt;i++) {
+	for(i=0;i< headers->nelts;i++) {
 		if (h[i].key){
 			if (!strcasecmp(h[i].key, "Content-Type")) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "CONTENT_TYPE", h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "CONTENT_TYPE", h[i].val, &pkt_size) ;
 			}
 			else if (!strcasecmp(h[i].key, "Content-Length")) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "CONTENT_LENGTH", h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "CONTENT_LENGTH", h[i].val, &pkt_size) ;
 			}
 			else {
 				penv = apr_pstrcat(r->pool, "HTTP_", h[i].key, NULL);
@@ -388,7 +408,7 @@ static int uwsgi_handler(request_rec *r) {
 						*cp = toupper(*cp);
 					}
 				}
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, penv, h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, penv, h[i].val, &pkt_size) ;
 			}
 		}
 	}
@@ -397,7 +417,7 @@ static int uwsgi_handler(request_rec *r) {
 	headers = apr_table_elts(r->subprocess_env);
 	h = (apr_table_entry_t*) headers->elts;
 	for (i = 0; i < headers->nelts; ++i) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, h[i].key, h[i].val, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, h[i].key, h[i].val, &pkt_size) ;
 	}	
 	
 
@@ -418,11 +438,13 @@ static int uwsgi_handler(request_rec *r) {
 	if (cnt < 0) {
 		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: writev() %s", strerror(errno));
 		close(uwsgi_poll.fd);
+		free(uwsgi_vars);
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 	else if (cnt != pkt_size+4) {
 		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: writev() returned wrong size");
 		close(uwsgi_poll.fd);
+		free(uwsgi_vars);
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 
@@ -434,6 +456,7 @@ static int uwsgi_handler(request_rec *r) {
 			if (cnt < 0) {
 				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: read() client block failed !");
 				close(uwsgi_poll.fd);
+				free(uwsgi_vars);
 				return HTTP_INTERNAL_SERVER_ERROR;
 			}
 		}
@@ -458,6 +481,7 @@ static int uwsgi_handler(request_rec *r) {
 		if (cnt == 0) {
 			ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() timeout");
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 		else if (cnt > 0) {
@@ -467,6 +491,7 @@ static int uwsgi_handler(request_rec *r) {
 					if (errno != ECONNRESET) {
 						ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() %s", strerror(errno));
 						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
 						return HTTP_INTERNAL_SERVER_ERROR;
 					}
 					else {
@@ -489,9 +514,25 @@ static int uwsgi_handler(request_rec *r) {
 					if (r->connection->aborted) { 
 						close(uwsgi_poll.fd);
 						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
 						return HTTP_INTERNAL_SERVER_ERROR;
 					}
-					apr_brigade_write(bb, NULL, NULL, buf, cnt);
+					if (!c->cgi_mode) {
+						b = apr_bucket_transient_create(buf, cnt, r->connection->bucket_alloc);
+						APR_BRIGADE_INSERT_TAIL(bb, b);
+						b = apr_bucket_flush_create(r->connection->bucket_alloc);
+						APR_BRIGADE_INSERT_TAIL(bb, b);
+						if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
+							close(uwsgi_poll.fd);
+							apr_brigade_destroy(bb);
+							free(uwsgi_vars);
+							return HTTP_INTERNAL_SERVER_ERROR;
+						}
+						apr_brigade_cleanup(bb);
+					}
+					else {
+						apr_brigade_write(bb, NULL, NULL, buf, cnt);
+					}
 				}
 				else {
 					// EOF
@@ -508,6 +549,7 @@ static int uwsgi_handler(request_rec *r) {
 			ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: poll() %s", strerror(errno));
 			close(uwsgi_poll.fd);
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 	}
@@ -521,6 +563,7 @@ static int uwsgi_handler(request_rec *r) {
 
 	if (!c->cgi_mode) {
 		if (uwsgi_http_status_read == 0) {
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 	}
@@ -528,11 +571,13 @@ static int uwsgi_handler(request_rec *r) {
 
 		if (hret = ap_scan_script_header_err_brigade(r, bb, NULL)) {
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return hret;
 		}
 	}
 
 
+	free(uwsgi_vars);
 	return ap_pass_brigade(r->output_filters, bb) ;
 }
 
@@ -564,6 +609,22 @@ static const char * cmd_uwsgi_force_wsgi_scheme(cmd_parms *cmd, void *cfg, const
 
 }
 
+static const char *cmd_uwsgi_max_vars(cmd_parms *cmd, void *cfg, const char *value) {
+	uwsgi_cfg *c ;
+        int val ;
+
+        if (cfg) {
+                c = cfg ;
+        }
+        else {
+                c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
+        }
+
+        c->max_vars = atoi(value);
+
+        return NULL;
+}
+
 static const char * cmd_uwsgi_modifier1(cmd_parms *cmd, void *cfg, const char *value) {
 
         uwsgi_cfg *c ;
@@ -598,7 +659,7 @@ static const char * cmd_uwsgi_force_cgi_mode(cmd_parms *cmd, void *cfg, const ch
                 c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
         }
 
-	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value)) {
+	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value) || !strcmp("true", value)) {
 		c->cgi_mode = 1 ;
 	}
 
@@ -699,6 +760,28 @@ static const char * cmd_uwsgi_socket(cmd_parms *cmd, void *cfg, const char *path
 	return NULL ;
 }
 
+static const char * cmd_uwsgi_empty_remote_user(cmd_parms *cmd, void *cfg, const char *value) {
+
+	uwsgi_cfg *c ;
+
+	if (cfg) {
+		c = cfg ;
+	}
+	else {
+		c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
+	}
+
+	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value) || !strcmp("true", value)) {
+		c->empty_remote_user = 1;
+	}
+	else {
+		c->empty_remote_user = 0;
+	}
+
+	return NULL ;
+
+}
+
 static const command_rec uwsgi_cmds[] = {
 	AP_INIT_TAKE12("uWSGIsocket", cmd_uwsgi_socket, NULL, RSRC_CONF|ACCESS_CONF, "Absolute path and optional timeout in seconds of uwsgi server socket"),	
 	AP_INIT_TAKE1("uWSGIsocket2", cmd_uwsgi_socket2, NULL, RSRC_CONF|ACCESS_CONF, "Absolute path of failover uwsgi server socket"),	
@@ -707,6 +790,8 @@ static const command_rec uwsgi_cmds[] = {
 	AP_INIT_TAKE1("uWSGIforceScriptName", cmd_uwsgi_force_script_name, NULL, ACCESS_CONF, "Fix for PATH_INFO/SCRIPT_NAME when the location has filesystem correspondence"),	
 	AP_INIT_TAKE1("uWSGIforceCGImode", cmd_uwsgi_force_cgi_mode, NULL, ACCESS_CONF, "Force uWSGI CGI mode for perfect integration with apache filter"),	
 	AP_INIT_TAKE1("uWSGIforceWSGIscheme", cmd_uwsgi_force_wsgi_scheme, NULL, ACCESS_CONF, "Force the WSGI scheme var (set by default to \"http\")"),	
+	AP_INIT_TAKE1("uWSGIemptyRemoteUser", cmd_uwsgi_empty_remote_user, NULL, ACCESS_CONF, "Always include REMOTE_USER in the environment, even with an empty value (default true)"),
+	AP_INIT_TAKE1("uWSGImaxVars", cmd_uwsgi_max_vars, NULL, ACCESS_CONF, "Set the maximum allowed number of uwsgi variables (default 128)"),	
 	{NULL}
 };
 

async.c

@@ -1,426 +0,0 @@
-#include "uwsgi.h"
-
-extern struct uwsgi_server uwsgi;
-
-struct wsgi_request *find_wsgi_req_proto_by_fd(int fd) {
-	return uwsgi.async_proto_fd_table[fd];
-}
-
-struct wsgi_request *find_wsgi_req_by_fd(int fd) {
-	return uwsgi.async_waiting_fd_table[fd];
-}
-
-void runqueue_remove(struct uwsgi_async_request *u_request) {
-
-	struct uwsgi_async_request *parent = u_request->prev;
-	struct uwsgi_async_request *child = u_request->next;
-	
-        if (parent) {
-        	parent->next = child;
-        }
-        if (child) {
-        	child->prev = parent;
-        }
-
-        if (parent == NULL) {
-        	uwsgi.async_runqueue = child;
-        }
-
-	if (u_request == uwsgi.async_runqueue_last) {
-		uwsgi.async_runqueue_last = parent;
-	}
-
-        free(u_request);
-
-	uwsgi.async_runqueue_cnt--;
-}
-
-void runqueue_push(struct wsgi_request *wsgi_req) {
-
-	struct uwsgi_async_request *uar;
-
-	if (uwsgi.async_runqueue == NULL) {
-        	// empty runqueue, create a new one
-        	uwsgi.async_runqueue = uwsgi_malloc(sizeof(struct uwsgi_async_request));
-        	uwsgi.async_runqueue->next = NULL;
-        	uwsgi.async_runqueue->prev = NULL;
-        	uwsgi.async_runqueue->wsgi_req = wsgi_req;
-        	uwsgi.async_runqueue_last = uwsgi.async_runqueue;
-        }
-        else {
-		uar = uwsgi_malloc(sizeof(struct uwsgi_async_request));
-        	uar->prev = uwsgi.async_runqueue_last;
-        	uar->next = NULL;
-        	uar->wsgi_req = wsgi_req;
-        	uwsgi.async_runqueue_last->next = uar;
-        	uwsgi.async_runqueue_last = uar;
-        }
-
-	uwsgi.async_runqueue_cnt++;
-
-}
-
-struct wsgi_request *find_first_available_wsgi_req() {
-
-	struct wsgi_request *wsgi_req;
-
-	if (uwsgi.async_queue_unused_ptr < 0) {
-		return NULL;
-	}
-
-	wsgi_req = uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr];
-	uwsgi.async_queue_unused_ptr--;
-	return wsgi_req;
-}
-
-void async_expire_timeouts() {
-
-	struct wsgi_request *wsgi_req;
-	time_t current_time = time(NULL);
-	struct uwsgi_async_fd *uaf = NULL, *current_uaf;
-
-	struct uwsgi_rb_timer *urbt;
-
-        for(;;) {
-
-                urbt = uwsgi_min_rb_timer(uwsgi.rb_async_timeouts);
-
-                if (urbt == NULL) return;
-
-                if (urbt->key <= current_time) {
-                        wsgi_req = (struct wsgi_request *) urbt->data;
-			// timeout expired
-			wsgi_req->async_timed_out = 1;
-			rb_erase(&wsgi_req->async_timeout->rbt, uwsgi.rb_async_timeouts);
-			free(wsgi_req->async_timeout);
-			wsgi_req->async_timeout = NULL;
-			uaf = wsgi_req->waiting_fds;
-			// remove fds from monitoring (no problem modifying the queue here, as the function is executed only when there are no fd ready)
-			while(uaf) {
-				event_queue_del_fd(uwsgi.async_queue, uaf->fd, uaf->event);
-				uwsgi.async_waiting_fd_table[uaf->fd] = NULL;
-				current_uaf = uaf;
-				uaf = current_uaf->next;
-				free(current_uaf);
-			}
-			wsgi_req->waiting_fds = NULL;
-			// put th request in the runqueue
-			runqueue_push(wsgi_req);
-                        continue;
-                }
-
-                break;
-        }
-
-}
-
-void async_add_fd_read(struct wsgi_request *wsgi_req, int fd, int timeout) {
-
-	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
-
-	if (fd < 0) return ;
-
-	// find first slot
-	while(uad) {
-		last_uad = uad;
-		uad = uad->next;
-	}
-
-	uad = uwsgi_malloc(sizeof(struct uwsgi_async_fd));
-	uad->fd = fd;
-	uad->event = event_queue_read();
-	uad->prev = last_uad;
-	uad->next = NULL;
-
-	if (last_uad) {
-		last_uad->next = uad;
-	}
-	else {
-		wsgi_req->waiting_fds = uad;
-	}
-
-	if (timeout > 0) {
-		async_add_timeout(wsgi_req, timeout);
-	}
-	uwsgi.async_waiting_fd_table[fd] = wsgi_req;
-	event_queue_add_fd_read(uwsgi.async_queue, fd);
-	
-}
-
-void async_add_timeout(struct wsgi_request *wsgi_req, int timeout) {
-
-	if (timeout > 0 && wsgi_req->async_timeout == NULL) {
-        	wsgi_req->async_timeout = uwsgi_add_rb_timer(uwsgi.rb_async_timeouts, time(NULL)+timeout, wsgi_req);
-        }
-
-}
-
-void async_add_fd_write(struct wsgi_request *wsgi_req, int fd, int timeout) {
-
-        struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
-
-	if (fd < 0) return ;
-
-        // find first slot
-        while(uad) {
-                last_uad = uad;
-                uad = uad->next;
-        }
-
-        uad = uwsgi_malloc(sizeof(struct uwsgi_async_fd));
-        uad->fd = fd;
-	uad->event = event_queue_write();
-        uad->prev = last_uad;
-        uad->next = NULL;
-
-        if (last_uad) {
-                last_uad->next = uad;
-        }
-        else {
-                wsgi_req->waiting_fds = uad;
-        }
-
-	if (timeout > 0) {
-		async_add_timeout(wsgi_req, timeout);
-	}
-
-	uwsgi.async_waiting_fd_table[fd] = wsgi_req;
-        event_queue_add_fd_write(uwsgi.async_queue, fd);
-
-}
-
-void async_schedule_to_req(void) {
-	uwsgi.wsgi_req->async_status = uwsgi.p[uwsgi.wsgi_req->uh.modifier1]->request(uwsgi.wsgi_req);
-}
-
-void *async_loop(void *arg1) {
-
-	struct uwsgi_async_fd *tmp_uaf;
-	int interesting_fd, i;
-	struct uwsgi_rb_timer *min_timeout;
-	int timeout;
-	int is_a_new_connection;
-	int proto_parser_status;
-
-	static struct uwsgi_async_request *current_request = NULL, *next_async_request = NULL;
-
-	void *events = event_queue_alloc(64);
-	struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
-
-	uwsgi.async_runqueue = NULL;
-	uwsgi.async_runqueue_cnt = 0;
-
-	// set a default request manager
-        if (!uwsgi.schedule_to_req) uwsgi.schedule_to_req = async_schedule_to_req;
-
-	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
-
-		if (uwsgi.async_runqueue_cnt) {
-			timeout = 0;
-		}
-		else {
-			min_timeout = uwsgi_min_rb_timer(uwsgi.rb_async_timeouts);
-			if (uwsgi.async_runqueue_cnt) {
-                        	timeout = 0;
-			}
-                	if (min_timeout) {
-                        	timeout = min_timeout->key - time(NULL);
-                        	if (timeout <= 0) {
-                                	async_expire_timeouts();
-                                	timeout = 0;
-                        	}
-			}
-			else {
-				timeout = -1;
-			}
-                }
-
-		uwsgi.async_nevents = event_queue_wait_multi(uwsgi.async_queue, timeout, events, 64);
-
-		// timeout ???
-		if (uwsgi.async_nevents == 0) {
-                	async_expire_timeouts();
-		}
-
-
-		for(i=0;i<uwsgi.async_nevents;i++) {
-			// manage events
-			interesting_fd = event_queue_interesting_fd(events, i);
-
-			is_a_new_connection = 0;
-
-			// new request coming in ?
-
-			uwsgi_sock = uwsgi.sockets;
-			while(uwsgi_sock) {
-
-				if (interesting_fd == uwsgi_sock->fd) {
-
-					is_a_new_connection = 1;	
-
-					uwsgi.wsgi_req = find_first_available_wsgi_req();
-					if (uwsgi.wsgi_req == NULL) {
-						uwsgi_log("async queue is full !!!\n");
-						break;;
-					}
-
-					wsgi_req_setup(uwsgi.wsgi_req, uwsgi.wsgi_req->async_id, uwsgi_sock );
-					if (wsgi_req_simple_accept(uwsgi.wsgi_req, interesting_fd)) {
-#ifdef UWSGI_EVENT_USE_PORT
-                                		event_queue_add_fd_read(uwsgi.async_queue, interesting_fd);
-#endif
-						uwsgi.async_queue_unused_ptr++;
-						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
-						break;
-					}
-#ifdef UWSGI_EVENT_USE_PORT
-                                	event_queue_add_fd_read(uwsgi.async_queue, interesting_fd);
-#endif
-
-// on linux we do not need to reset the socket to blocking state
-#ifndef __linux__
-					if (uwsgi.numproc > 1) {
-	                                	/* re-set blocking socket */
-	                                	if (fcntl(uwsgi.wsgi_req->poll.fd, F_SETFL, uwsgi_sock->arg) < 0) {
-	                                        	uwsgi_error("fcntl()");
-							uwsgi.async_queue_unused_ptr++;
-							uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
-	                                		break;
-						}
-					}
-#endif
-
-					if (wsgi_req_async_recv(uwsgi.wsgi_req)) {
-						uwsgi.async_queue_unused_ptr++;
-						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
-						break;
-					}
-
-					if (uwsgi.wsgi_req->do_not_add_to_async_queue) {
-						runqueue_push(uwsgi.wsgi_req);
-					}
-
-					break;
-				}
-
-				uwsgi_sock = uwsgi_sock->next;
-			}
-
-			if (!is_a_new_connection) {
-				// proto event
-				uwsgi.wsgi_req = find_wsgi_req_proto_by_fd(interesting_fd);
-				if (uwsgi.wsgi_req) {
-					proto_parser_status = uwsgi.wsgi_req->socket->proto(uwsgi.wsgi_req);
-					// reset timeout
-					rb_erase(&uwsgi.wsgi_req->async_timeout->rbt, uwsgi.rb_async_timeouts);
-					free(uwsgi.wsgi_req->async_timeout);
-					uwsgi.wsgi_req->async_timeout = NULL;
-					// parsing complete
-					if (!proto_parser_status) {
-						// remove fd from event poll and fd proto table	
-						event_queue_del_fd(uwsgi.async_queue, interesting_fd, event_queue_read());
-						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
-						// put request in the runqueue
-						runqueue_push(uwsgi.wsgi_req);
-						continue;
-					}
-					else if (proto_parser_status == -1) {
-						uwsgi_log("error parsing request\n");
-						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
-						close(interesting_fd);
-						continue;
-					}
-					// re-add timer
-					async_add_timeout(uwsgi.wsgi_req, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
-					continue;
-				}
-
-				// app event
-				uwsgi.wsgi_req = find_wsgi_req_by_fd(interesting_fd);
-				// unknown fd, remove it (for safety)
-				if (uwsgi.wsgi_req == NULL) {
-					close(interesting_fd);
-					continue;
-				}
-
-				// remove all the fd monitors and timeout
-				while(uwsgi.wsgi_req->waiting_fds) {
-#ifndef UWSGI_EVENT_USE_PORT
-                                        event_queue_del_fd(uwsgi.async_queue, uwsgi.wsgi_req->waiting_fds->fd, uwsgi.wsgi_req->waiting_fds->event);
-#endif
-                                        tmp_uaf = uwsgi.wsgi_req->waiting_fds;
-                                        uwsgi.async_waiting_fd_table[tmp_uaf->fd] = NULL;
-                                        uwsgi.wsgi_req->waiting_fds = tmp_uaf->next;
-                                        free(tmp_uaf);
-                                }
-				uwsgi.wsgi_req->waiting_fds = NULL;
-                                if (uwsgi.wsgi_req->async_timeout) {
-                                        rb_erase(&uwsgi.wsgi_req->async_timeout->rbt, uwsgi.rb_async_timeouts);
-                                        free(uwsgi.wsgi_req->async_timeout);
-                                        uwsgi.wsgi_req->async_timeout = NULL;
-                                }	
-
-				uwsgi.wsgi_req->async_ready_fd = 1;
-				uwsgi.wsgi_req->async_last_ready_fd = interesting_fd;
-
-				// put the request in the runqueue again
-				runqueue_push(uwsgi.wsgi_req);
-			}
-		}
-
-		// event queue managed, give cpu to runqueue
-		if (!current_request)
-			current_request = uwsgi.async_runqueue;
-
-		if (uwsgi.async_runqueue_cnt) {
-
-			uwsgi.wsgi_req = current_request->wsgi_req;
-
-			uwsgi.schedule_to_req();
-			uwsgi.wsgi_req->switches++;
-
-			next_async_request = current_request->next;
-			// request ended ?
-			if (uwsgi.wsgi_req->async_status <= UWSGI_OK) {
-				// remove all the monitored fds and timeout
-				while(uwsgi.wsgi_req->waiting_fds) {
-#ifndef UWSGI_EVENT_USE_PORT
-					event_queue_del_fd(uwsgi.async_queue, uwsgi.wsgi_req->waiting_fds->fd, uwsgi.wsgi_req->waiting_fds->event);
-#endif
-					tmp_uaf = uwsgi.wsgi_req->waiting_fds;
-					uwsgi.async_waiting_fd_table[tmp_uaf->fd] = NULL;
-					uwsgi.wsgi_req->waiting_fds = tmp_uaf->next;
-					free(tmp_uaf);
-				}
-				uwsgi.wsgi_req->waiting_fds = NULL;
-				if (uwsgi.wsgi_req->async_timeout) {
-					rb_erase(&uwsgi.wsgi_req->async_timeout->rbt, uwsgi.rb_async_timeouts);
-                        		free(uwsgi.wsgi_req->async_timeout);
-                        		uwsgi.wsgi_req->async_timeout = NULL;
-				}
-
-				// remove from the list
-				runqueue_remove(current_request);
-
-				uwsgi_close_request(uwsgi.wsgi_req);
-
-				// 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 suspended list	
-				runqueue_remove(current_request);
-			}
-
-			current_request = next_async_request;
-
-		}
-
-
-	}
-
-	return NULL;
-
-}

attach.py

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

bin/uwsgi

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+cmd = File.expand_path "#{File.dirname(__FILE__)}/../ext/uwsgi/uwsgi.ruby"
+
+exec(cmd, *ARGV)

buildconf/all.ini

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

buildconf/base.ini

@@ -0,0 +1,29 @@
+[uwsgi]
+xml = auto
+yaml = true
+json = auto
+ssl = auto
+pcre = auto
+routing = auto
+debug = false
+unbit = false
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter, router_static, sslrouter, spooler, cheaper_busyness, symcall, transformation_tofile, transformation_gzip, transformation_chunked, transformation_offload, router_memcached, router_redis, router_hash, router_expires, router_metrics, transformation_template, stats_pusher_socket
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

buildconf/cgi.ini

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

buildconf/core.ini

@@ -1,3 +1,4 @@
 [uwsgi]
-inherit = default
+main_plugin =
+inherit = base
 embedded_plugins = null

buildconf/coroae.ini

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

buildconf/coverity.ini

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

buildconf/default.ini

@@ -1,38 +1,4 @@
 [uwsgi]
-xml = true
-ini = true
-yaml = true
-json = auto
-sqlite3 = auto
-zeromq = auto
-snmp = true
-sctp = false
-spooler = true
-embedded = true
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = auto
-pcre = auto
+main_plugin = python,gevent
+inherit = base
 debug = false
-unbit = false
-xml_implementation = libxml2
-yaml_implementation = auto
-malloc_implementation = libc
-plugins =
-bin_name = uwsgi
-plugin_dir = .
-embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-[python]
-paste = true
-web3 = true

buildconf/django.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+main_plugin = python
+inherit = base
+embed_files = bootstrap3.py,django.zip,djapp.zip

buildconf/embedded.ini

@@ -0,0 +1,5 @@
+[uwsgi]
+main_plugin = python
+inherit = base
+
+embed_files = embedme.py,uwsgidecorators.py

buildconf/erlang.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = +,erlang
+main_plugin = erlang
+inherit = base

buildconf/gccgo.ini

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

buildconf/gevent.ini

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

buildconf/glusterfs.ini

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

buildconf/gridfs.ini

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

buildconf/jwsgi.ini

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

buildconf/lib.ini

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

buildconf/lua.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = lua
+main_plugin = lua
+inherit = base

buildconf/luap.ini

@@ -1,3 +1,4 @@
 [uwsgi]
-inherit = default
+main_plugin = 
+inherit = base
 plugins = lua

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/modular.ini

@@ -1,5 +1,5 @@
 [uwsgi]
-inherit = default
+inherit = base
 plugins = python, ping, rack, psgi, cache, http, fastrouter
 plugin_dir = plugins
 embedded_plugins = null

buildconf/mono.ini

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

buildconf/nolang.ini

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

buildconf/package.ini

@@ -1,4 +1,4 @@
 [uwsgi]
-inherit = default
+inherit = base
 plugin_dir = /usr/lib/uwsgi
-embedded_plugins = null
+embedded_plugins =

buildconf/php.ini

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

buildconf/plonly.ini

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

buildconf/ppa.ini

@@ -0,0 +1,29 @@
+[uwsgi]
+xml = libxml2
+yaml = libyaml
+json = true
+ssl = true
+pcre = true
+routing = true
+debug = false
+unbit = false
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = /usr/lib/libuwsgi.so
+append_version = ubuntu
+plugin_dir = /usr/lib/uwsgi
+embedded_plugins =
+as_shared_library = true
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

buildconf/psgi.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = psgi
+main_plugin = psgi
+inherit = base

buildconf/pyerl.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = +,erlang,pyerl
+main_plugin = python,erlang,pyerl
+inherit = base 

buildconf/pylua.ini

@@ -1,7 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = +,lua
-
-[python]
-paste = true
-web3 = true
+main_plugin = python,lua
+inherit = base

buildconf/pyonly.ini

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

buildconf/pypy.ini

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

buildconf/pypyonly.ini

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

buildconf/pyrb.ini

@@ -1,31 +0,0 @@
-[uwsgi]
-xml = true
-ini = true
-snmp = true
-sctp = false
-erlang = false
-spooler = true
-embedded = true
-udp = true
-multicast = true
-threading = true
-sendfile = true
-proxy = true
-minterpreters = true
-async = true
-http = true
-evdis = false
-ldap = false
-routing = false
-stackless = false
-debug = false
-unbit = false
-xml_implementation = libxml2
-plugins =
-bin_name = uwsgi
-plugin_dir = .
-embedded_plugins = python, ping, nagios, rack
-
-[python]
-paste = true
-web3 = true

buildconf/pyring.ini

@@ -0,0 +1,6 @@
+[uwsgi]
+main_plugin = python,gevent
+inherit = base
+plugins = jvm,ring
+plugin_dir = .
+

buildconf/pyuwsgi.ini

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

buildconf/rack.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-inherit = default
-embedded_plugins = rack, ping, nagios, rpc
+main_plugin = rack
+inherit = base

buildconf/rackp.ini

@@ -1,30 +0,0 @@
-[uwsgi]
-xml = true
-ini = true
-yaml = true
-snmp = true
-sctp = false
-erlang = false
-spooler = false
-embedded = false
-udp = true
-multicast = false
-threading = true
-sendfile = true
-nagios = true
-proxy = true
-minterpreters = true
-async = true
-ugreen = false
-http = true
-evdis = false
-ldap = false
-routing = false
-stackless = false
-debug = false
-unbit = false
-xml_implementation = libxml2
-plugins = rack
-bin_name = uwsgi
-plugin_dir = .
-embedded_plugins =

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/ring.ini

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

buildconf/ruby2.ini

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

buildconf/servlet.ini

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

buildconf/travis.ini

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

buildconf/unbit.ini

@@ -1,23 +1,29 @@
 [uwsgi]
-xml = true
-ini = true
-yaml = true
-snmp = false
-sctp = false
-spooler = true
-embedded = true
-udp = true
-multicast = false
-threading = true
-sendfile = true
-nagios = false
-minterpreters = true
-async = true
-ldap = true
+xml = expat
+yaml = embedded
+json = false
+ssl = true
+pcre = true
+routing = true
 debug = false
 unbit = true
-xml_implementation = libxml2
+malloc_implementation = libc
+extras =
 plugins =
-bin_name = /opt/unbit/bin/uwsgi
-plugin_dir = /opt/unbit/uwsgi_plugins
+bin_name = /opt/unbit/uwsgi19/lib/libuwsgi.so
+append_version = unbit
+plugin_dir = /opt/unbit/uwsgi19/plugins
 embedded_plugins =
+as_shared_library = true
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =

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

cache.c

@@ -1,580 +0,0 @@
-#include "uwsgi.h"
-
-extern struct uwsgi_server uwsgi;
-
-void uwsgi_init_cache() {
-	int i;
-
-	if (!uwsgi.cache_blocksize)
-                        uwsgi.cache_blocksize = UMAX16;
-
-                if (uwsgi.cache_blocksize % uwsgi.page_size != 0) {
-                        uwsgi_log("invalid cache blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) uwsgi.cache_blocksize, uwsgi.page_size);
-                        exit(1);
-                }
-
-                uwsgi.cache_hashtable = (uint64_t *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-                if (!uwsgi.cache_hashtable) {
-                        uwsgi_error("mmap()");
-                        exit(1);
-                }
-
-                memset(uwsgi.cache_hashtable, 0, sizeof(uint64_t) * UMAX16);
-
-                uwsgi.cache_unused_stack = (uint64_t *) mmap(NULL, sizeof(uint64_t) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-                if (!uwsgi.cache_unused_stack) {
-                        uwsgi_error("mmap()");
-                        exit(1);
-                }
-
-                memset(uwsgi.cache_unused_stack, 0, sizeof(uint64_t) * uwsgi.cache_max_items);
-
-                // the first cache item is always zero
-                uwsgi.shared->cache_first_available_item = 1;
-                uwsgi.shared->cache_unused_stack_ptr = 0;
-
-                //uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-                if (uwsgi.cache_store) {
-                        uwsgi.cache_filesize = (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items);
-                        int cache_fd;
-                        struct stat cst;
-
-                        if (stat(uwsgi.cache_store, &cst)) {
-                                uwsgi_log("creating a new cache store file: %s\n", uwsgi.cache_store);
-                                cache_fd = open(uwsgi.cache_store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
-                                if (cache_fd >= 0) {
-                                        // fill the caching store
-                                        if (ftruncate(cache_fd, uwsgi.cache_filesize)) {
-                                                uwsgi_log("ftruncate()");
-                                                exit(1);
-                                        }
-                                }
-                        }
-                        else {
-                                if ((size_t) cst.st_size != uwsgi.cache_filesize || !S_ISREG(cst.st_mode)) {
-                                        uwsgi_log("invalid cache store file. Please remove it or fix cache blocksize/items to match its size\n");
-                                        exit(1);
-                                }
-                                cache_fd = open(uwsgi.cache_store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
-                                uwsgi_log("recovered cache from backing store file: %s\n", uwsgi.cache_store);
-                        }
-
-                        if (cache_fd < 0) {
-                                uwsgi_error_open(uwsgi.cache_store);
-                                exit(1);
-                        }
-                        uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, uwsgi.cache_filesize, PROT_READ | PROT_WRITE, MAP_SHARED, cache_fd, 0);
-                        uwsgi_cache_fix();
-
-                }
-                else {
-                        uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-                        for (i = 0; i < (int) uwsgi.cache_max_items; i++) {
-                                memset(&uwsgi.cache_items[i], 0, sizeof(struct uwsgi_cache_item));
-                        }
-                }
-                if (!uwsgi.cache_items) {
-                        uwsgi_error("mmap()");
-                        exit(1);
-                }
-
-                /*
-                   uwsgi.cache = mmap(NULL, uwsgi.cache_blocksize * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-                   if (!uwsgi.cache) {
-                   uwsgi_error("mmap()");
-                   exit(1);
-                   }
-                 */
-
-                uwsgi.cache = ((void *) uwsgi.cache_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items);
-
-                uwsgi.cache_lock = uwsgi_mmap_shared_rwlock();
-                uwsgi_rwlock_init(uwsgi.cache_lock);
-
-                uwsgi_log("*** Cache subsystem initialized: %dMB preallocated ***\n", ((sizeof(uint64_t) * UMAX16) + (sizeof(uint64_t) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items)) / (1024 * 1024));
-}
-
-struct uwsgi_subscriber_name *uwsgi_get_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
-
-	uint64_t ovl;
-	struct uwsgi_subscriber *usub;
-	struct uwsgi_subscriber_name *ret = NULL;
-	
-	usub = (struct uwsgi_subscriber *) uwsgi_dict_get(udict, key, keylen, &ovl);
-
-	if (usub == NULL || !ovl) return NULL;
-
-	if (!usub->nodes) return NULL;
-
-	if (usub && ovl) {
-		ret = &usub->names[usub->current];
-		// dead node
-		if (ret->len == 0) {
-			if (usub->current == usub->nodes-1) {
-				usub->nodes--;
-			}
-			// retry with another node (if available)
-			if (usub->nodes > 0) {
-				usub->current++;
-				if (usub->current >= usub->nodes) usub->current = 0;
-				return uwsgi_get_subscriber(udict, key, keylen);
-			}
-		}
-
-		if (usub->nodes > 1) {
-			usub->current++;
-			if (usub->current >= usub->nodes) usub->current = 0;
-		}
-
-	}
-
-	return ret;
-}
-
-void uwsgi_add_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen, char *address, uint64_t address_len) {
-
-	char *ptr;
-	uint64_t vallen = 0;
-	struct uwsgi_subscriber *usub, nusub;
-	int found = 0;
-	int i;
-	
-	ptr = uwsgi_dict_get(udict, key, keylen, &vallen);
-	if (ptr && vallen) {
-		usub = (struct uwsgi_subscriber *) ptr;
-		for(i=0;i<(int)usub->nodes;i++) {
-			if (!uwsgi_strncmp(usub->names[i].name, usub->names[i].len, address, address_len)) {
-				found = 1;
-				break;
-			}
-		}
-		if (!found) {
-			found = usub->nodes;
-			// check for unallocated slot
-			for(i=0;i<(int)usub->nodes;i++) {
-				if (usub->names[i].len == 0) {
-					found = i;
-					break;
-				}
-			}
-			usub->names[found].len = address_len;
-			memcpy(usub->names[found].name, address, address_len);
-			if (found == (int) usub->nodes) {
-				usub->nodes++;
-			}
-		}
-		return;
-	}
-	else {
-		nusub.nodes = 1;
-		nusub.current = 0;
-		memcpy(nusub.names[0].name, address, address_len);
-		uwsgi_dict_set(udict, key, keylen, (char *) &nusub, sizeof(struct uwsgi_subscriber));
-	}
-
-}
-
-struct uwsgi_dict *uwsgi_dict_create(uint64_t items, uint64_t blocksize) {
-
-	int i;
-
-	struct uwsgi_dict *udict = (struct uwsgi_dict *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-	if (!udict) {
-        	uwsgi_error("mmap()");
-                exit(1);
-	}
-
-	if (!blocksize) blocksize = 4096;
-
-        if (blocksize % uwsgi.page_size != 0) {
-        	uwsgi_log("invalid shared dictionary blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) udict->blocksize, uwsgi.page_size);
-        	exit(1);
-	}
-
-	udict->blocksize = blocksize;
-	udict->max_items = items;
-
-        udict->hashtable = (uint64_t *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->hashtable) {
-        	uwsgi_error("mmap()");
-                exit(1);
-	}
-
-        memset(udict->hashtable, 0, sizeof(uint64_t) * UMAX16);
-
-        udict->unused_stack = (uint64_t *) mmap(NULL, sizeof(uint64_t) * udict->max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->unused_stack) {
-        	uwsgi_error("mmap()");
-                exit(1);
-	}
-
-        memset(udict->unused_stack, 0, sizeof(uint64_t) * udict->max_items);
-
-        udict->items = (struct uwsgi_dict_item *) mmap(NULL, sizeof(struct uwsgi_dict_item) * udict->max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->items) {
-        	uwsgi_error("mmap()");
-                exit(1);
-        }
-
-        udict->data = mmap(NULL, udict->blocksize * udict->max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        if (!udict->data) {
-        	uwsgi_error("mmap()");
-                exit(1);
-        }
-
-        for(i=0;i< (int) udict->max_items;i++) {
-        	memset(&udict->items[i], 0, sizeof(struct uwsgi_dict_item));
-        }
-
-        udict->first_available_item = 1;
-        udict->unused_stack_ptr = 0;
-
-        udict->lock = uwsgi_mmap_shared_lock();
-        uwsgi_lock_init(udict->lock);
-
-	return udict;
-}
-
-uint32_t djb33x_hash(char *key, int keylen) {
-
-	register uint32_t hash = 5381;
-	int i;
-
-	for(i=0;i<keylen;i++) {
-		hash = ((hash << 5) + hash) ^ key[i];
-	}
-
-	return hash;
-}
-
-
-inline uint64_t uwsgi_dict_get_index(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
-
-        uint32_t hash = djb33x_hash(key, keylen);
-
-        int hash_key = hash % 0xffff;
-
-        uint64_t slot = udict->hashtable[hash_key];
-
-        struct uwsgi_dict_item *udi;
-
-        udi = &udict->items[slot];
-
-        // first round
-        if (udi->djbhash != hash) goto cycle;
-        if (udi->keysize != keylen) goto cycle;
-        if (memcmp(udi->key, key, keylen)) goto cycle;
-
-        return slot;
-
-cycle:
-        while(udi->next) {
-                slot = udi->next;
-                udi = &udict->items[slot];
-                if (udi->djbhash != hash) continue;
-                if (udi->keysize != keylen) continue;
-                if (!memcmp(udi->key, key, keylen)) return slot;
-        }
-
-        return 0;
-}
-
-char *uwsgi_dict_get(struct uwsgi_dict *udict, char *key, uint16_t keylen, uint64_t *valsize) {
-
-        uint64_t index = uwsgi_dict_get_index(udict, key, keylen);
-
-        if (index) {
-                *valsize = udict->items[index].valsize;
-                udict->items[index].hits++;
-                return udict->data+(index*udict->blocksize);
-        }
-
-        return NULL;
-}
-
-int uwsgi_dict_del(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
-
-        uint64_t index = 0;
-        struct uwsgi_dict_item *udi;
-        int ret = -1;
-
-        index = uwsgi_dict_get_index(udict, key, keylen);
-        if (index) {
-                udi = &udict->items[index] ;
-                udi->keysize = 0;
-                udi->valsize = 0;
-                udict->unused_stack_ptr++;
-                udict->unused_stack[udict->unused_stack_ptr] = index;
-                // try to return to initial condition...
-                if (index == udict->first_available_item-1) {
-                        udict->first_available_item--;
-                }
-                ret = 0;
-                // relink collisioned entry
-                if (udi->prev) {
-                        udict->items[udi->prev].next = udi->next;
-                }
-                if (udi->next) {
-                        udict->items[udi->next].prev = udi->prev;
-                }
-                if (!udi->prev && !udi->next) {
-                        // reset hashtable entry
-                        udict->hashtable[udi->djbhash % 0xffff] = 0;
-                }
-                udi->djbhash = 0;
-                udi->prev = 0;
-                udi->next = 0;
-        }
-
-        return ret;
-}
-
-
-
-inline uint64_t uwsgi_cache_get_index(char *key, uint16_t keylen) {
-
-	uint32_t hash = djb33x_hash(key, keylen);
-	
-	int hash_key = hash % 0xffff;
-
-	uint64_t slot = uwsgi.cache_hashtable[hash_key];
-
-	struct uwsgi_cache_item *uci;
-
-	//uwsgi_log("found slot %d for key %d\n", slot, hash_key);
-
-	uci = &uwsgi.cache_items[slot];
-
-	// first round
-	if (uci->djbhash != hash) goto cycle;
-	if (uci->keysize != keylen) goto cycle;
-	if (memcmp(uci->key, key, keylen)) goto cycle;
-
-	return slot;
-
-cycle:
-	while(uci->next) {
-		slot = uci->next;
-		uci = &uwsgi.cache_items[slot];
-		if (uci->djbhash != hash) continue;
-		if (uci->keysize != keylen) continue;
-		if (!memcmp(uci->key, key, keylen)) return slot;
-	}
-
-	return 0;
-}
-
-uint32_t uwsgi_cache_exists(char *key, uint16_t keylen) {
-
-	return uwsgi_cache_get_index(key, keylen);
-}
-
-char *uwsgi_cache_get(char *key, uint16_t keylen, uint64_t *valsize) {
-
-	uint64_t index = uwsgi_cache_get_index(key, keylen);
-
-	if (index) {
-		if (uwsgi.cache_items[index].flags & UWSGI_CACHE_FLAG_UNGETTABLE) return NULL;
-		*valsize = uwsgi.cache_items[index].valsize;
-		uwsgi.cache_items[index].hits++;
-		return uwsgi.cache+(index*uwsgi.cache_blocksize);
-	}
-
-	return NULL;
-}
-
-int uwsgi_cache_del(char *key, uint16_t keylen) {
-
-	uint64_t index = 0;
-	struct uwsgi_cache_item *uci;
-	int ret = -1;
-
-	index = uwsgi_cache_get_index(key, keylen);
-	if (index) {
-		uci = &uwsgi.cache_items[index] ;
-		uci->keysize = 0;
-		uci->valsize = 0;
-		uwsgi.shared->cache_unused_stack_ptr++;
-		uwsgi.cache_unused_stack[uwsgi.shared->cache_unused_stack_ptr] = index;
-		// try to return to initial condition...
-		if (index == uwsgi.shared->cache_first_available_item-1) {
-			uwsgi.shared->cache_first_available_item--;
-			//uwsgi_log("FACI: %llu STACK PTR: %llu\n", (unsigned long long) uwsgi.shared->cache_first_available_item, (unsigned long long) uwsgi.shared->cache_unused_stack_ptr);
-		}
-		ret = 0;
-		// relink collisioned entry
-		if (uci->prev) {
-			uwsgi.cache_items[uci->prev].next = uci->next;	
-		}
-		if (uci->next) {
-			uwsgi.cache_items[uci->next].prev = uci->prev;	
-		}
-		if (!uci->prev && !uci->next) {
-			// reset hashtable entry
-			//uwsgi_log("!!! resetted hashtable entry !!!\n");
-			uwsgi.cache_hashtable[uci->djbhash % 0xffff] = 0;
-		}
-		uci->djbhash = 0;
-		uci->prev = 0;
-		uci->next = 0;
-	}
-
-	return ret;
-}
-
-void uwsgi_cache_fix() {
-
-	uint64_t i;
-
-	for(i=0;i< uwsgi.cache_max_items;i++) {
-		// valid record ?
-		if (uwsgi.cache_items[i].keysize) {
-			if (!uwsgi.cache_items[i].prev) {
-				// put value in hash_table
-				uwsgi.cache_hashtable[ uwsgi.cache_items[i].djbhash % 0xffff] = i;
-			}
-		}
-		else {
-			// put this record in unused stack
-			uwsgi.shared->cache_first_available_item = i;
-			uwsgi.shared->cache_unused_stack_ptr++;
-			uwsgi.cache_unused_stack[uwsgi.shared->cache_unused_stack_ptr] = i;
-		}
-	}
-}
-
-int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint64_t vallen, uint64_t expires, uint16_t flags) {
-
-	uint64_t index = 0, last_index = 0 ;
-
-	struct uwsgi_cache_item *uci, *ucii;
-
-	int ret = -1;
-	int slot;
-
-	if (!keylen || !vallen) return -1;
-
-	if (keylen > UWSGI_CACHE_MAX_KEY_SIZE) return -1;	
-
-	if (uwsgi.shared->cache_first_available_item >= uwsgi.cache_max_items && !uwsgi.shared->cache_unused_stack_ptr) {
-		uwsgi_log("*** DANGER cache is FULL !!! ***\n");
-		goto end;
-	}
-
-	//uwsgi_log("putting cache data in key %.*s %d\n", keylen, key, vallen);
-	index = uwsgi_cache_get_index(key, keylen);
-	if (!index) {
-		if (uwsgi.shared->cache_unused_stack_ptr) {
-			//uwsgi_log("!!! REUSING CACHE SLOT !!! (faci: %llu)\n", (unsigned long long) uwsgi.shared->cache_first_available_item);
-			index = uwsgi.cache_unused_stack[uwsgi.shared->cache_unused_stack_ptr];
-			uwsgi.shared->cache_unused_stack_ptr--;
-		}
-		else {
-			index = uwsgi.shared->cache_first_available_item;	
-			if (uwsgi.shared->cache_first_available_item < uwsgi.cache_max_items) {
-				uwsgi.shared->cache_first_available_item++;
-			}
-		}
-		uci = &uwsgi.cache_items[index] ;
-		if (expires) expires += time(NULL);
-		uci->expires = expires;
-		uci->djbhash = djb33x_hash(key, keylen);
-		uci->hits = 0;
-		uci->flags = flags;
-		memcpy(uci->key, key, keylen);
-		memcpy(uwsgi.cache+(index*uwsgi.cache_blocksize), val, vallen);
-
-		// set this as late as possibile (to reduce races risk)
-
-		uci->valsize = vallen;
-		uci->keysize = keylen;	
-		ret = 0;
-		// now put the value in the 16bit hashtable
-		slot = uci->djbhash % 0xffff;
-
-		if (uwsgi.cache_hashtable[slot] == 0) {
-			uwsgi.cache_hashtable[slot] = index;
-		}
-		else {
-			//uwsgi_log("HASH COLLISION !!!!\n");
-			// append to first available next
-			last_index = uwsgi.cache_hashtable[slot];
-			ucii = &uwsgi.cache_items[ last_index ];
-			while(ucii->next) {
-				last_index = ucii->next;
-				ucii = &uwsgi.cache_items[ last_index ];
-			}
-			ucii->next = index;
-			uci->prev = last_index;
-		}
-	}
-
-end:
-	return ret;
-	
-}
-
-int uwsgi_dict_set(struct uwsgi_dict *udict, char *key, uint16_t keylen, char *val, uint64_t vallen) {
-
-        uint64_t index = 0, last_index = 0 ;
-
-        struct uwsgi_dict_item *udi, *udii;
-
-        int ret = -1;
-        int slot;
-
-        if (!keylen || !vallen) return -1;
-
-        if (keylen > UWSGI_CACHE_MAX_KEY_SIZE) return -1;
-
-        if (udict->first_available_item >= udict->max_items && !udict->unused_stack_ptr) {
-                uwsgi_log("*** DANGER dictionary %p is FULL !!! ***\n", udict);
-                goto end;
-        }
-
-        index = uwsgi_dict_get_index(udict, key, keylen);
-        if (!index) {
-                if (udict->unused_stack_ptr) {
-                        index = udict->unused_stack[udict->unused_stack_ptr];
-                        udict->unused_stack_ptr--;
-                }
-                else {
-                        index = udict->first_available_item;
-                        if (udict->first_available_item < udict->max_items) {
-                                udict->first_available_item++;
-                        }
-                }
-                udi = &udict->items[index] ;
-                udi->djbhash = djb33x_hash(key, keylen);
-                udi->hits = 0;
-                memcpy(udi->key, key, keylen);
-                memcpy(udict->data+(index*udict->blocksize), val, vallen);
-
-                // set this as late as possibile (to reduce races risk)
-
-                udi->valsize = vallen;
-                udi->keysize = keylen;
-                ret = 0;
-                // now put the value in the 16bit hashtable
-                slot = udi->djbhash % 0xffff;
-
-                if (udict->hashtable[slot] == 0) {
-                        udict->hashtable[slot] = index;
-                }
-                else {
-                        // append to first available next
-                        last_index = udict->hashtable[slot];
-                        udii = &udict->items[ last_index ];
-                        while(udii->next) {
-                                last_index = udii->next;
-                                udii = &udict->items[ last_index ];
-                        }
-                        udii->next = index;
-                        udi->prev = last_index;
-                }
-        }
-
-end:
-        return ret;
-
-}

cherokee/README

@@ -1 +0,0 @@
-the uwsgi handler is included in the official Cherokee distribution

contrib/binder.pl

@@ -0,0 +1,15 @@
+use POSIX;
+use IO::Socket::INET;
+use IO::Socket::INET6;
+use IO::Socket::UNIX;
+
+my $s = IO::Socket::INET->new(LocalAddr => '127.0.0.1', LocalPort => 1717, Proto => 'tcp', Reuse => 1);
+my $s2 = IO::Socket::INET->new(LocalAddr => '127.0.0.1', LocalPort => 3022, Proto => 'tcp', Reuse => 1);
+my $s3 = IO::Socket::INET6->new(LocalAddr => '::', LocalPort => 3017, Proto => 'tcp', Reuse => 1);
+my $s4 = IO::Socket::UNIX->new(Local => '/tmp/u.sock', Listen => 1);
+
+dup2($s->fileno, 17);
+dup2($s2->fileno, 22);
+dup2($s3->fileno, 30);
+dup2($s4->fileno, 0);
+exec './uwsgi','-M', '--socket','fd://17', '--http-socket','fd://22', '--socket','fd://30','--stats',':5001';

contrib/centos_init_script

@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# uwsgi - Use uwsgi to run python and wsgi web apps.
+#
+# chkconfig: - 85 15
+# description: Use uwsgi to run python and wsgi web apps.
+# processname: uwsgi
+
+# author: Roman Vasilyev
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+PATH=/opt/uwsgi:/sbin:/bin:/usr/sbin:/usr/bin
+prog=/usr/sbin/uwsgi
+
+OWNER=nginx
+
+NAME=uwsgi
+DESC=uwsgi
+
+#DAEMON_OPTS="-s 127.0.0.1:9001 -M 4 -t 30 -A 4 -p 4 -d /var/log/uwsgi.log --pidfile /var/run/$NAME.pid --pythonpath $PYTHONPATH --module $MODULE"
+DAEMON_OPTS="-s 127.0.0.1:9001 -M 4 -t 30 -A 4 -p 16 -b 32768 -d /var/log/$NAME.log --pidfile /var/run/$NAME.pid --uid $OWNER"
+
+[ -f /etc/sysconfig/uwsgi ] && . /etc/sysconfig/uwsgi
+
+lockfile=/var/lock/subsys/uwsgi
+
+start () {
+  echo -n "Starting $DESC: "
+  daemon $prog $DAEMON_OPTS
+  retval=$?
+  echo
+  [ $retval -eq 0 ] && touch $lockfile
+  return $retval
+}
+
+stop () {
+  echo -n "Stopping $DESC: "
+  killproc $prog
+  retval=$?
+  echo
+  [ $retval -eq 0 ] && rm -f $lockfile
+  return $retval
+}
+
+reload () {
+  echo "Reloading $NAME" 
+  killproc $prog -HUP
+  RETVAL=$?
+  echo
+}
+
+force-reload () {
+  echo "Reloading $NAME" 
+  killproc $prog -TERM
+  RETVAL=$?
+  echo
+}
+
+restart () {
+    stop
+    start
+}
+
+rh_status () {
+  status $prog
+}
+
+rh_status_q() {
+  rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+  start)
+    rh_status_q && exit 0
+    $1
+    ;;
+  stop)
+    rh_status_q || exit 0
+    $1
+    ;;
+  restart|force-reload)
+    $1
+    ;;
+  reload)
+    rh_status_q || exit 7
+    $1
+    ;;
+  status)
+    rh_status
+    ;;
+  *)  
+    echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2
+    exit 2
+    ;;
+  esac
+  exit 0
+

contrib/cgi_python.c

@@ -0,0 +1,53 @@
+#include <Python.h>
+
+void uwsgi_cgi_load_python() {
+
+	Py_Initialize();
+}
+
+void uwsgi_cgi_run_python(char *filename) {
+
+	char **e, *p;
+        PyObject *k, *env_value;
+
+	FILE *fp = fopen(filename, "r");
+
+	PySys_SetArgv(1, &filename);
+
+	PyObject *os_module = PyImport_ImportModule("os");
+        if (os_module) {
+       		PyObject *os_module_dict = PyModule_GetDict(os_module);
+        	PyObject *py_environ = PyDict_GetItemString(os_module_dict, "environ");
+                if (py_environ) {
+                	for (e = environ; *e != NULL; e++) {
+                        	p = strchr(*e, '=');
+                                if (p == NULL) continue;
+
+                                k = PyString_FromStringAndSize(*e, (int)(p-*e));
+                                if (k == NULL) {
+                                	PyErr_Print();
+                                        continue;
+                                }
+
+                                env_value = PyString_FromString(p+1);
+                                if (env_value == NULL) {
+                                	PyErr_Print();
+                                        Py_DECREF(k);
+                                        continue;
+                                }
+
+                                if (PyObject_SetItem(py_environ, k, env_value)) {
+                                	PyErr_Print();
+                                }
+
+                                Py_DECREF(k);
+                                Py_DECREF(env_value);
+
+                        }
+
+                }
+        }
+
+
+	PyRun_AnyFileEx(fp, filename, 1);
+}

contrib/cryptologger.rb

@@ -0,0 +1,24 @@
+require 'socket'
+require 'openssl'
+
+secret = 'ciaociao'
+iv = ''
+address = '127.0.0.1'
+port  = 1717
+algo = 'bf-cbc'
+
+s = UDPSocket.new
+s.bind(address, port)
+cipher = OpenSSL::Cipher.new(algo)
+cipher.decrypt
+cipher.key = secret + ("\0" * (cipher.key_len - secret.length))
+cipher.iv = iv + ("0" * (cipher.iv_len - iv.length))
+
+loop do
+  msg, sender = s.recvfrom(8192)
+  cipher.reset
+  begin
+    puts cipher.update(msg) + cipher.final
+  rescue
+  end
+end

contrib/emperormon.ru

@@ -0,0 +1,114 @@
+require 'sinatra'
+require 'socket'
+require 'json'
+
+module EmperorStats
+  def self.uwsgi_get_stats(server)
+    parts = server.split(':')
+    if parts.length > 1
+      s = TCPSocket.open(parts[0], parts[1])
+    else
+      s = UNIXSocket.open(server)
+    end
+    return JSON.parse(s.read())
+  end
+end
+
+template = <<eof
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title><%=@title%></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="unbit">
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+    </style>
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+  </head>
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#"><%=@title%></a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+      <hr/>
+      <h1>Emperor: <%=@stats['emperor']%></h1>
+      <hr/>
+
+      <div class="row">
+              <div class="span8">
+                  <table class="table table-striped table-bordered">
+                    <thead>
+                      <tr>
+                        <th>name</th><th>pid</th><th>first run</th>
+                        <th>last respawn</th>
+                        <th>last heartbeat</th>
+                        <th>loyal</th>
+                        <th>respawns</th>
+			<% if @stats['emperor_tyrant'] == 1 %>
+                        <th>uid</th>
+                        <th>gid</th>
+			<% end %>
+                     </tr>
+                    </thead>
+          <% for vassal in @stats['vassals'] %>
+			<tr>
+				<td><%=vassal['id']%></td>
+				<td><%=vassal['pid']%></td>
+				<td><%=Time.at(vassal['first_run']).strftime("%d %b %Y %H:%M:%S")%></td>
+				<td><%=Time.at(vassal['last_run']).strftime("%d %b %Y %H:%M:%S")%></td>
+				<td><% if vassal['last_heartbeat'] > 0 %><%=Time.at(vassal['last_heartbeat']).strftime("%d %b %Y %H:%M:%S")%><% end %></td>
+				<td><% if vassal['loyal'] > 0 %><%=Time.at(vassal['last_loyal']).strftime("%d %b %Y %H:%M:%S")%><% end %></td>
+				<td><%=vassal['respawns']%></td>
+				<% if @stats['emperor_tyrant'] == 1 %>
+					<td><%=vassal['uid']%></td>
+					<td><%=vassal['gid']%></td>
+				<% end %>
+			</tr>
+          <% end %>
+                  </table>
+              </div>
+
+
+		<div class="span4">
+			<h3>blacklist</h3>
+			<table class="table table-striped table-bordered">
+				<thead>
+					<tr><th>name</th><th>throttle</th></tr>
+					<% for bli in @stats['blacklist'] %>
+						<tr>
+							<td><%=bli['id']%></td>
+							<td><%=bli['throttle_level']%></td>
+						</tr>
+					<% end %>
+				</thead>
+			</table>
+		</div>
+      </div>
+
+
+
+    <script src="http://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
+    <script src="http://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+  </body>
+</html>
+eof
+
+get '/' do
+  @stats = EmperorStats::uwsgi_get_stats(ENV['EMPEROR']) 
+  @title = 'uWSGI Emperor monitor'
+  erb template
+end
+
+run Sinatra::Application

contrib/fdconf.pl

@@ -0,0 +1,7 @@
+use POSIX;
+
+open CONFIG,'welcome.ini';
+
+dup2(fileno(CONFIG), 17);
+
+exec './uwsgi','--ini','fd://17';

contrib/launchd/it.unbit.uwsgi.emperor.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>Label</key>
+        <string>it.unbit.uwsgi.emperor</string>
+	<key>ProgramArguments</key>
+        <array>
+        	<string>/Users/roberta/uwsgi/uwsgi</string>
+                <string>--emperor</string>
+		<string>/Users/*/Library/uwsgi/*.{xml,ini,yml,yaml,js}</string>
+	</array>
+</dict>
+</plist>

contrib/launchd/it.unbit.uwsgi.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>Label</key>
+        <string>it.unbit.uwsgi</string>
+	<key>ProgramArguments</key>
+        <array>
+        	<string>/Users/roberta/uwsgi/uwsgi</string>
+                <string>--socket</string>
+		<string>:3032</string>
+		<string>--module</string>
+		<string>welcome</string>
+		<string>--master</string>
+		<string>--die-on-term</string>
+	</array>
+</dict>
+</plist>

contrib/loadapp.pl

@@ -0,0 +1,15 @@
+use IO::Socket::INET;
+
+my $s = IO::Socket::INET->new(PeerAddr => '127.0.0.1', PeerPort => $ARGV[0]);
+
+my $mountpoint = $ARGV[1];
+my $app = $ARGV[2];
+
+my $uwsgi_appid = pack('v', length('UWSGI_APPID')).'UWSGI_APPID'.pack('v', length($mountpoint)).$mountpoint;
+my $uwsgi_script = pack('v', length('UWSGI_SCRIPT')).'UWSGI_SCRIPT'.pack('v', length($app)).$app;
+
+$s->send(pack('CvC', 5, length($uwsgi_appid.$uwsgi_script),0).$uwsgi_appid.$uwsgi_script);
+
+while((my $cnt = $s->recv(my $buf, 4096))> 0) {
+	print $buf;
+}

contrib/pypy/uwsgi_pypy_greenlets.py

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

contrib/pyuwsgi.py

@@ -0,0 +1,18 @@
+import sys
+import os
+import pyuwsgi
+
+orig_args = sys.argv
+orig_executable = sys.executable
+orig_args.insert(0, orig_executable)
+
+uwsgi_args = []
+
+for arg in sys.argv[2:]:
+    uwsgi_args.append(arg)
+
+#pyuwsgi.run('welcome.ini')
+pyuwsgi.run(uwsgi_args)
+
+# if you are here uWSGI has been reloaded
+os.execv(orig_executable, orig_args)

contrib/securesubscribe.pl

@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+
+use Crypt::OpenSSL::RSA;
+use IO::Socket::INET;
+
+open PK,$ARGV[3];
+my @lines = <PK>;
+close PK;
+
+$rsa_priv = Crypt::OpenSSL::RSA->new_private_key(join('',@lines));
+
+my %items = {};
+
+$items{'key'} = $ARGV[1];
+$items{'address'} = $ARGV[2];
+
+my $uwsgi_pkt = '';
+
+foreach(keys %items) {
+	$uwsgi_pkt .= pack('v', length($_)).$_.pack('v', length($items{$_})).$items{$_};	
+}
+
+my $unix_check = time();
+
+$uwsgi_pkt .= pack('v', 4).'unix'.pack('v', length($unix_check)).$unix_check;
+
+my $signature = $rsa_priv->sign($uwsgi_pkt);
+
+$uwsgi_pkt .= pack('v', 4).'sign'.pack('v', length($signature)).$signature;
+
+
+my $udp = new IO::Socket::INET(PeerAddr => $ARGV[0], Proto => 'udp');
+
+$udp->send(pack('CvC', 224, length($uwsgi_pkt), 0).$uwsgi_pkt);
+
+print ''.(length($uwsgi_pkt)+4).' bytes sent to '.$ARGV[0]."\n";

contrib/spoolqueue/producer.py

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

contrib/spoolqueue/tasks.py

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

contrib/spoolqueue/tasksconsumer.py

@@ -0,0 +1,44 @@
+from uwsgidecorators import *
+import Queue
+from threading import Thread
+
+queues = {}
+
+class queueconsumer(object):
+
+    def __init__(self, name, num=1, **kwargs):
+        self.name = name
+	self.num = num
+        self.queue = Queue.Queue()
+	self.threads = []
+	self.func = None
+	queues[self.name] = self
+
+
+    @staticmethod
+    def consumer(self):
+        while True:
+	    req = self.queue.get()
+            print req
+	    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()
+
+@spool
+def spooler_enqueuer(arguments):
+    if 'queue' in arguments:
+        queue = arguments['queue']
+        queues[queue].queue.put(arguments)
+    else:
+        raise Exception("You have to specify a queue name")
+
+
+def enqueue(*args, **kwargs):
+    return spooler_enqueuer.spool(*args, **kwargs)

contrib/subscribe.pl

@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+
+use IO::Socket::INET;
+
+my %items = {};
+
+$items{'key'} = $ARGV[1];
+$items{'address'} = $ARGV[2];
+
+my $uwsgi_pkt = '';
+
+foreach(keys %items) {
+	$uwsgi_pkt .= pack('v', length($_)).$_.pack('v', length($items{$_})).$items{$_};	
+}
+
+my $udp = new IO::Socket::INET(PeerAddr => $ARGV[0], Proto => 'udp');
+
+$udp->send(pack('CvC', 224, length($uwsgi_pkt), 0).$uwsgi_pkt);
+
+print ''.(length($uwsgi_pkt)+4).' bytes sent to '.$ARGV[0]."\n";

contrib/upstart/emperor.conf

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

contrib/upstart/uwsgi.conf

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

contrib/upython

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+COMMAND=./uwsgi
+CONFIG_FILE=
+
+
+FIRST=0
+
+for ARG in $@;do
+  if [ $FIRST -eq 0 ];then
+    FIRST=1
+  else
+    ARGS="$ARGS $ARG"
+  fi
+done
+
+export UWSGI_INHERIT=CONFIG_FILE
+export UWSGI_PYRUN=$1
+export UWSGI_PYARGV=$ARGS
+
+exec $COMMAND

contrib/urack.rb

@@ -1,5 +1,9 @@
 require 'rubygems'
 require 'socket'
+begin
+        require 'bundler/setup'
+rescue LoadError
+end
 require 'rack'
 require 'rack/content_length'
 require 'rack/rewindable_input'

contrib/uwsgi-cache-monitor.py

@@ -0,0 +1,123 @@
+import mmap
+import os
+import struct
+import array
+import time
+import sys
+from optparse import OptionParser
+
+class Cache:
+
+    def __init__(self, filename, cache_slots, block_size=65536, sample_sleep=1):
+
+        self.block_size = block_size
+        self.cache_slots = cache_slots
+
+        self.key_size = 2048
+        self.item_size = 2 + 2 + 4 + 8 + 8 + 8 + 8 + 8 + self.key_size
+        self.block_size_start = self.item_size * self.cache_slots
+
+        fd = os.open(filename, os.O_RDONLY)
+        self.cache_store = mmap.mmap(fd, 0, mmap.MAP_SHARED, mmap.PROT_READ)
+
+        self.sample_sleep = sample_sleep
+        self.samples = 0
+        self.history = []
+        self.cache_full = 0
+        self.cache_empty = 0
+        self.cache_items = 0
+        self.block_sizes = 0
+
+    def store_read_item_block(self, position):
+        pos = self.cache_store.tell()
+        # uwsgi cache stores cache entries first and then the blocks
+        self.cache_store.seek(self.block_size_start + (position * self.block_size))
+        buf = self.cache_store.read(self.block_size)
+        self.cache_store.seek(pos)
+        return buf
+
+    def store_read_item(self, position):
+        buf = self.cache_store.read(self.item_size)
+        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']:
+            buf = self.store_read_item_block(position)
+            value = array.array('c', buf).tostring().rstrip('\x00')
+        else:
+            value = ''
+        return (position, key, value, len(value))
+
+    def read(self):
+        data = [self.store_read_item(i) for i in range(self.cache_slots)]
+        self.cache_store.seek(0)
+        self.update_stats(data)
+        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])
+        self.cache_items += items
+        full, empty = items == self.cache_slots, items == 0
+        if full:
+            self.cache_full += 1
+        if empty:
+            self.cache_empty += 1
+        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})
+
+    def dump(self):
+        return {
+            'samples': self.samples,
+            'history': self.history,
+            'cache_slots': self.cache_slots,
+            '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)
+
+def main(options):
+    cache = Cache(options.cache_store, options.cache_slots, options.block_size,
+        options.sleep_time)
+    print "Recording..."
+    while True:
+        try:
+            data = 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")
+
+    (options, args) = parser.parse_args()
+    if not options.cache_slots:
+        parser.error('Option -s / --cache-slots is mandatory')
+    main(options)

contrib/uwsgisubscribers.ru

@@ -0,0 +1,96 @@
+require 'sinatra'
+require 'socket'
+require 'json'
+
+module USubscribers
+  def self.uwsgi_get_stats(server)
+    parts = server.split(':')
+      if parts.length > 1
+        s = TCPSocket.open(parts[0], parts[1])
+      else
+        s = UNIXSocket.open(server)
+      end
+      return JSON.parse(s.read())
+  end
+end
+
+template = <<eof
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title><%=@title%></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="unbit">
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+    </style>
+    <link href="http://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+  </head>
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#"><%=@title%></a>
+        </div>
+      </div>
+    </div>
+
+    <% for server in @servers.keys %>
+    <div class="container">
+      <hr/>
+      <h1>SubscriptionServer: <%=server%></h1>
+      <hr/>
+
+      <div class="row">
+          <% for pool in @servers[server] %>
+              <div class="span6">
+                  <h3><%=pool['key']%> (<%=pool['hits']%> hits)</h3>
+                  <table class="table table-striped table-bordered">
+                    <thead>
+                      <tr>
+                        <th>node</th><th>load</th><th>requests</th>
+                        <th>last check</th>
+                        <th>fail count</th>
+                     </tr>
+                    </thead>
+                    <% for node in pool['nodes'] %>
+                      <tr>
+                        <td><%=node['name']%></td><td><%=node['load']%></td><td><%=node['requests']%></td>
+                        <td><%=Time.at(node['last_check']).strftime("%d-%m-%Y %H:%M:%S")%></td>
+                        <td><%=node['failcnt']%></td>
+                      </tr>
+                    <% end %>
+                  </table>
+              </div>
+          <% end %>
+      </div>
+
+    </div> 
+
+    <% end %>
+
+    <script src="http://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
+    <script src="http://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+  </body>
+</html>
+eof
+
+get '/' do
+  @servers = {}
+  for server in ENV['U_SERVERS'].split(',')
+    stats = USubscribers::uwsgi_get_stats(server) 
+    if stats
+      @servers[server] = stats['subscriptions']
+    end
+  end
+  @title = 'uWSGI subscriptions viewer'
+  erb template
+end
+
+run Sinatra::Application

contrib/xinetd_uwsgi

@@ -0,0 +1,14 @@
+service uwsgi
+{
+        disable         = no
+        id              = uwsgi-000
+        type            = UNLISTED
+        socket_type     = stream
+        server          = /root/uwsgi/uwsgi
+        server_args     = --chdir /root/uwsgi/ --module welcome --logto /tmp/uwsgi.log
+        port            = 3031
+        bind            = 127.0.0.1
+        user            = root
+        wait            = yes
+}
+

core/alarm.c

@@ -0,0 +1,470 @@
+#include "../uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+// generate a uwsgi signal on alarm
+void uwsgi_alarm_init_signal(struct uwsgi_alarm_instance *uai) {
+	uai->data8 = atoi(uai->arg);
+}
+
+void uwsgi_alarm_func_signal(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	uwsgi_route_signal(uai->data8);
+}
+
+// simply log an alarm
+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);
+		}
+		else {
+			uwsgi_log_alarm("] %.*s\n", len, msg);
+		}
+	}
+	else {
+		if (uai->arg && strlen(uai->arg) > 0) {
+			uwsgi_log_alarm("] %s %.*s", uai->arg, len, msg);
+		}
+		else {
+			uwsgi_log_alarm("] %.*s", len, msg);
+		}
+	}
+}
+
+// run a command on alarm
+void uwsgi_alarm_init_cmd(struct uwsgi_alarm_instance *uai) {
+	uai->data_ptr = uai->arg;
+}
+
+void uwsgi_alarm_func_cmd(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	int pipe[2];
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipe)) {
+		return;
+	}
+	uwsgi_socket_nb(pipe[0]);
+	uwsgi_socket_nb(pipe[1]);
+	if (write(pipe[1], msg, len) != (ssize_t) len) {
+		close(pipe[0]);
+		close(pipe[1]);
+		return;
+	}
+	uwsgi_run_command(uai->data_ptr, pipe, -1);
+	close(pipe[0]);
+	close(pipe[1]);
+}
+
+// pass the log line to a mule
+
+void uwsgi_alarm_init_mule(struct uwsgi_alarm_instance *uai) {
+	uai->data32 = atoi(uai->arg);
+	if (uai->data32 > (uint32_t) uwsgi.mules_cnt) {
+		uwsgi_log_alarm("] invalid mule_id (%d mules available), fallback to 0\n", uwsgi.mules_cnt);
+		uai->data32 = 0;
+	}
+}
+
+void uwsgi_alarm_func_mule(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	// skip if mules are not available
+	if (uwsgi.mules_cnt == 0)
+		return;
+	int fd = uwsgi.shared->mule_queue_pipe[0];
+	if (uai->data32 > 0) {
+		int mule_id = uai->data32 - 1;
+		fd = uwsgi.mules[mule_id].queue_pipe[0];
+	}
+	mule_send_msg(fd, msg, len);
+}
+
+
+// register a new alarm
+void uwsgi_register_alarm(char *name, void (*init) (struct uwsgi_alarm_instance *), void (*func) (struct uwsgi_alarm_instance *, char *, size_t)) {
+	struct uwsgi_alarm *old_ua = NULL, *ua = uwsgi.alarms;
+	while (ua) {
+		// skip already initialized alarms
+		if (!strcmp(ua->name, name)) {
+			return;
+		}
+		old_ua = ua;
+		ua = ua->next;
+	}
+
+	ua = uwsgi_calloc(sizeof(struct uwsgi_alarm));
+	ua->name = name;
+	ua->init = init;
+	ua->func = func;
+
+	if (old_ua) {
+		old_ua->next = ua;
+	}
+	else {
+		uwsgi.alarms = ua;
+	}
+}
+
+// register embedded alarms
+void uwsgi_register_embedded_alarms() {
+	uwsgi_register_alarm("signal", uwsgi_alarm_init_signal, uwsgi_alarm_func_signal);
+	uwsgi_register_alarm("cmd", uwsgi_alarm_init_cmd, uwsgi_alarm_func_cmd);
+	uwsgi_register_alarm("mule", uwsgi_alarm_init_mule, uwsgi_alarm_func_mule);
+	uwsgi_register_alarm("log", uwsgi_alarm_init_log, uwsgi_alarm_func_log);
+}
+
+static int uwsgi_alarm_add(char *name, char *plugin, char *arg) {
+	struct uwsgi_alarm *ua = uwsgi.alarms;
+	while (ua) {
+		if (!strcmp(ua->name, plugin)) {
+			break;
+		}
+		ua = ua->next;
+	}
+
+	if (!ua)
+		return -1;
+
+	struct uwsgi_alarm_instance *old_uai = NULL, *uai = uwsgi.alarm_instances;
+	while (uai) {
+		old_uai = uai;
+		uai = uai->next;
+	}
+
+	uai = uwsgi_calloc(sizeof(struct uwsgi_alarm_instance));
+	uai->name = name;
+	uai->alarm = ua;
+	uai->arg = arg;
+	uai->last_msg = uwsgi_malloc(uwsgi.log_master_bufsize);
+
+	if (old_uai) {
+		old_uai->next = uai;
+	}
+	else {
+		uwsgi.alarm_instances = uai;
+	}
+
+	ua->init(uai);
+	return 0;
+}
+
+// get an alarm instance by its name
+static struct uwsgi_alarm_instance *uwsgi_alarm_get_instance(char *name) {
+	struct uwsgi_alarm_instance *uai = uwsgi.alarm_instances;
+	while (uai) {
+		if (!strcmp(name, uai->name)) {
+			return uai;
+		}
+		uai = uai->next;
+	}
+	return NULL;
+}
+
+
+#ifdef UWSGI_PCRE
+static int uwsgi_alarm_log_add(char *alarms, char *regexp, int negate) {
+
+	struct uwsgi_alarm_log *old_ual = NULL, *ual = uwsgi.alarm_logs;
+	while (ual) {
+		old_ual = ual;
+		ual = ual->next;
+	}
+
+	ual = uwsgi_calloc(sizeof(struct uwsgi_alarm_log));
+	if (uwsgi_regexp_build(regexp, &ual->pattern, &ual->pattern_extra)) {
+		return -1;
+	}
+	ual->negate = negate;
+
+	if (old_ual) {
+		old_ual->next = ual;
+	}
+	else {
+		uwsgi.alarm_logs = ual;
+	}
+
+	// map instances to the log
+	char *list = uwsgi_str(alarms);
+	char *p, *ctx = NULL;
+	uwsgi_foreach_token(list, ",", p, ctx) {
+		struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(p);
+		if (!uai) {
+			free(list);
+			return -1;
+		}
+		struct uwsgi_alarm_ll *old_uall = NULL, *uall = ual->alarms;
+		while (uall) {
+			old_uall = uall;
+			uall = uall->next;
+		}
+
+		uall = uwsgi_calloc(sizeof(struct uwsgi_alarm_ll));
+		uall->alarm = uai;
+		if (old_uall) {
+			old_uall->next = uall;
+		}
+		else {
+			ual->alarms = uall;
+		}
+	}
+	free(list);
+	return 0;
+}
+#endif
+
+static void uwsgi_alarm_thread_loop(struct uwsgi_thread *ut) {
+	// add uwsgi_alarm_fd;
+	struct uwsgi_alarm_fd *uafd = uwsgi.alarm_fds;
+	while(uafd) {
+		event_queue_add_fd_read(ut->queue, uafd->fd);
+		uafd = uafd->next;
+	}
+	char *buf = uwsgi_malloc(uwsgi.alarm_msg_size + sizeof(long));
+	for (;;) {
+		int interesting_fd = -1;
+                int ret = event_queue_wait(ut->queue, -1, &interesting_fd);
+		if (ret > 0) {
+			if (interesting_fd == ut->pipe[1]) {
+				ssize_t len = read(ut->pipe[1], buf, uwsgi.alarm_msg_size + sizeof(long));
+				if (len > (ssize_t)(sizeof(long) + 1)) {
+					size_t msg_size = len - sizeof(long);
+					char *msg = buf + sizeof(long);
+					long ptr = 0;
+					memcpy(&ptr, buf, sizeof(long));
+					struct uwsgi_alarm_instance *uai = (struct uwsgi_alarm_instance *) ptr;
+					if (!uai)
+						break;
+					uwsgi_alarm_run(uai, msg, msg_size);
+				}
+			}
+			// check for alarm_fd
+			else {
+				uafd = uwsgi.alarm_fds;
+				int fd_read = 0;
+				while(uafd) {
+					if (interesting_fd == uafd->fd) {
+						if (fd_read) goto raise;	
+						size_t remains = uafd->buf_len;
+						while(remains) {
+							ssize_t len = read(uafd->fd, uafd->buf + (uafd->buf_len-remains), remains);
+							if (len <= 0) {
+								uwsgi_error("[uwsgi-alarm-fd]/read()");
+								uwsgi_log("[uwsgi-alarm-fd] i will stop monitoring fd %d\n", uafd->fd);
+								event_queue_del_fd(ut->queue, uafd->fd, event_queue_read());
+								break;
+							}
+							remains-=len;
+						}
+						fd_read = 1;
+raise:
+						uwsgi_alarm_run(uafd->alarm, uafd->msg, uafd->msg_len);
+					}
+					uafd = uafd->next;
+				}
+			}
+		}
+	}
+	free(buf);
+}
+
+// initialize alarms, instances and log regexps
+void uwsgi_alarms_init() {
+
+	if (!uwsgi.master_process) return;
+
+	// first of all, create instance of alarms
+	struct uwsgi_string_list *usl = uwsgi.alarm_list;
+	while (usl) {
+		char *line = uwsgi_str(usl->value);
+		char *space = strchr(line, ' ');
+		if (!space) {
+			uwsgi_log("invalid alarm syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*space = 0;
+		char *plugin = space + 1;
+		char *colon = strchr(plugin, ':');
+		if (!colon) {
+			uwsgi_log("invalid alarm syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*colon = 0;
+		char *arg = colon + 1;
+		// here the alarm is mapped to a name and initialized
+		if (uwsgi_alarm_add(line, plugin, arg)) {
+			uwsgi_log("invalid alarm: %s\n", usl->value);
+			exit(1);
+		}
+		usl = usl->next;
+	}
+
+	if (!uwsgi.alarm_instances) return;
+
+	// map alarm file descriptors
+	usl = uwsgi.alarm_fd_list;
+	while(usl) {
+		char *space0 = strchr(usl->value, ' ');
+		if (!space0) {
+			uwsgi_log("invalid alarm-fd syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*space0 = 0;
+		size_t buf_len = 1;
+		char *space1 = strchr(space0+1, ' ');
+		if (!space1) {
+			uwsgi_log("invalid alarm-fd syntax: %s\n", usl->value);
+                        exit(1);
+		}
+
+		char *colon = strchr(space0+1, ':');
+		if (colon) {
+			buf_len = strtoul(colon+1, NULL, 10);
+			*colon = 0;
+		}
+		int fd = atoi(space0+1);
+		uwsgi_add_alarm_fd(fd, usl->value, buf_len, space1+1, strlen(space1+1));
+		*space0 = ' ';
+		*space1 = ' ';
+		if (colon) {
+			*colon = ':';
+		}
+		usl = usl->next;
+	}
+
+#ifdef UWSGI_PCRE
+	// then map log-alarm
+	usl = uwsgi.alarm_logs_list;
+	while (usl) {
+		char *line = uwsgi_str(usl->value);
+		char *space = strchr(line, ' ');
+		if (!space) {
+			uwsgi_log("invalid log-alarm syntax: %s\n", usl->value);
+			exit(1);
+		}
+		*space = 0;
+		char *regexp = space + 1;
+		// here the log-alarm is created
+		if (uwsgi_alarm_log_add(line, regexp, usl->custom)) {
+			uwsgi_log("invalid log-alarm: %s\n", usl->value);
+			exit(1);
+		}
+
+		usl = usl->next;
+	}
+#endif
+}
+
+void uwsgi_alarm_thread_start() {
+	if (!uwsgi.alarm_instances) return;
+	// start the alarm_thread
+	uwsgi.alarm_thread = uwsgi_thread_new(uwsgi_alarm_thread_loop);
+	if (!uwsgi.alarm_thread) {
+		uwsgi_log("unable to spawn alarm thread\n");
+		exit(1);
+	}
+}
+
+#ifdef UWSGI_PCRE
+// check if a log should raise an alarm
+void uwsgi_alarm_log_check(char *msg, size_t len) {
+	if (!uwsgi_strncmp(msg, len, "[uwsgi-alarm", 12))
+		return;
+	struct uwsgi_alarm_log *ual = uwsgi.alarm_logs;
+	while (ual) {
+		if (uwsgi_regexp_match(ual->pattern, ual->pattern_extra, msg, len) >= 0) {
+			if (!ual->negate) {
+				uwsgi_alarm_log_run(ual, msg, len);
+			}
+			else {
+				break;
+			}
+		}
+		ual = ual->next;
+	}
+}
+#endif
+
+// call the alarm func
+void uwsgi_alarm_run(struct uwsgi_alarm_instance *uai, char *msg, size_t len) {
+	time_t now = uwsgi_now();
+	// avoid alarm storming/loop if last message is the same
+	if (!uwsgi_strncmp(msg, len, uai->last_msg, uai->last_msg_size)) {
+		if (now - uai->last_run < uwsgi.alarm_freq)
+			return;
+	}
+	uai->alarm->func(uai, msg, len);
+	uai->last_run = uwsgi_now();
+	memcpy(uai->last_msg, msg, 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;
+	if (len > uwsgi.alarm_msg_size) return;
+	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()");
+	}
+}
+
+struct uwsgi_alarm_fd *uwsgi_add_alarm_fd(int fd, char *alarm, size_t buf_len, char *msg, size_t msg_len) {
+	struct uwsgi_alarm_fd *old_uafd = NULL, *uafd = uwsgi.alarm_fds;
+	struct uwsgi_alarm_instance *uai = uwsgi_alarm_get_instance(alarm);
+	if (!uai) {
+		uwsgi_log("unable to find alarm \"%s\"\n", alarm);
+		exit(1);
+	}
+
+	if (!buf_len) buf_len = 1;	
+
+	while(uafd) {
+		// check if an equal alarm has been added
+		if (uafd->fd == fd && uafd->alarm == uai) {
+			return uafd;
+		}
+		old_uafd = uafd;
+		uafd = uafd->next;
+	}
+
+	uafd = uwsgi_calloc(sizeof(struct uwsgi_alarm_fd));
+	uafd->fd = fd;
+	uafd->buf = uwsgi_malloc(buf_len);
+	uafd->buf_len = buf_len;
+	uafd->msg = msg;
+	uafd->msg_len = msg_len;
+	uafd->alarm = uai;
+
+	if (!old_uafd) {
+		uwsgi.alarm_fds = uafd;
+	}
+	else {
+		old_uafd->next = uafd;
+	}
+
+	// avoid the fd to be closed
+	uwsgi_add_safe_fd(fd);
+	uwsgi_log("[uwsgi-alarm] added fd %d\n", fd);
+
+	return uafd;
+}

core/async.c

@@ -0,0 +1,582 @@
+#include <uwsgi.h>
+
+extern struct uwsgi_server uwsgi;
+
+/*
+
+	This is a general-purpose async loop engine (it expects a coroutine-based approach)
+
+	You can see it as an hub holding the following structures:
+
+	1) the runqueue, cores ready to be run are appended to this list
+
+	2) the fd list, this is a list of monitored file descriptors, a core can wait for all the file descriptors it needs
+
+	3) the timeout value, if set, the current core will timeout after the specified number of seconds (unless an event cancels it)
+
+
+	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) {
+		uwsgi_log_verbose("[DANGER] async queue is full !!!\n");
+		uwsgi.async_queue_is_full = now;
+	}
+}
+
+void uwsgi_async_init() {
+
+	uwsgi.async_queue = event_queue_init();
+
+	if (uwsgi.async_queue < 0) {
+		exit(1);
+	}
+
+	uwsgi_add_sockets_to_queue(uwsgi.async_queue, -1);
+
+	uwsgi.rb_async_timeouts = uwsgi_init_rb_timer();
+
+	// optimization, this array maps file descriptor to requests
+        uwsgi.async_waiting_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd);
+        uwsgi.async_proto_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd);
+
+}
+
+struct wsgi_request *find_wsgi_req_proto_by_fd(int fd) {
+	return uwsgi.async_proto_fd_table[fd];
+}
+
+struct wsgi_request *find_wsgi_req_by_fd(int fd) {
+	return uwsgi.async_waiting_fd_table[fd];
+}
+
+static void runqueue_remove(struct uwsgi_async_request *u_request) {
+
+	struct uwsgi_async_request *parent = u_request->prev;
+	struct uwsgi_async_request *child = u_request->next;
+
+	if (parent) {
+		parent->next = child;
+	}
+	if (child) {
+		child->prev = parent;
+	}
+
+	if (u_request == uwsgi.async_runqueue) {
+		uwsgi.async_runqueue = child;
+	}
+
+	if (u_request == uwsgi.async_runqueue_last) {
+		uwsgi.async_runqueue_last = parent;
+	}
+
+	free(u_request);
+}
+
+static void runqueue_push(struct wsgi_request *wsgi_req) {
+
+	// do not push the same request in the runqueue
+	struct uwsgi_async_request *uar = uwsgi.async_runqueue;
+	while(uar) {
+		if (uar->wsgi_req == wsgi_req) return;
+		uar = uar->next;
+	}
+
+	uar = uwsgi_malloc(sizeof(struct uwsgi_async_request));
+	uar->prev = NULL;
+	uar->next = NULL;
+	uar->wsgi_req = wsgi_req;
+
+	if (uwsgi.async_runqueue == NULL) {
+		uwsgi.async_runqueue = uar;
+	}
+	else {
+		uar->prev = uwsgi.async_runqueue_last;	
+	}
+
+	if (uwsgi.async_runqueue_last) {
+		uwsgi.async_runqueue_last->next = uar;
+	}
+	uwsgi.async_runqueue_last = uar;
+}
+
+struct wsgi_request *find_first_available_wsgi_req() {
+
+	struct wsgi_request *wsgi_req;
+
+	if (uwsgi.async_queue_unused_ptr < 0) {
+		return NULL;
+	}
+
+	wsgi_req = uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr];
+	uwsgi.async_queue_unused_ptr--;
+	return wsgi_req;
+}
+
+void async_reset_request(struct wsgi_request *wsgi_req) {
+	if (wsgi_req->async_timeout) {
+		uwsgi_del_rb_timer(uwsgi.rb_async_timeouts, wsgi_req->async_timeout);
+		free(wsgi_req->async_timeout);
+		wsgi_req->async_timeout = NULL;
+	}
+	
+	struct uwsgi_async_fd *uaf = wsgi_req->waiting_fds;
+	while (uaf) {
+        	event_queue_del_fd(uwsgi.async_queue, uaf->fd, uaf->event);
+                uwsgi.async_waiting_fd_table[uaf->fd] = NULL;
+                struct uwsgi_async_fd *current_uaf = uaf;
+                uaf = current_uaf->next;
+                free(current_uaf);
+	}
+
+	wsgi_req->waiting_fds = NULL;
+}
+
+static void async_expire_timeouts(uint64_t now) {
+
+	struct wsgi_request *wsgi_req;
+	struct uwsgi_rb_timer *urbt;
+
+	for (;;) {
+
+		urbt = uwsgi_min_rb_timer(uwsgi.rb_async_timeouts, NULL);
+
+		if (urbt == NULL)
+			return;
+
+		if (urbt->value <= now) {
+			wsgi_req = (struct wsgi_request *) urbt->data;
+			// timeout expired
+			wsgi_req->async_timed_out = 1;
+			// reset the request
+			async_reset_request(wsgi_req);
+			// push it in the runqueue
+			runqueue_push(wsgi_req);
+			continue;
+		}
+
+		break;
+	}
+
+}
+
+int async_add_fd_read(struct wsgi_request *wsgi_req, int fd, int timeout) {
+
+	if (uwsgi.async < 2 || !uwsgi.async_waiting_fd_table){ 
+		uwsgi_log_verbose("ASYNC call without async mode !!!\n");
+		return -1;
+	}
+
+	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
+
+	if (fd < 0)
+		return -1;
+
+	// find last slot
+	while (uad) {
+		last_uad = uad;
+		uad = uad->next;
+	}
+
+	uad = uwsgi_malloc(sizeof(struct uwsgi_async_fd));
+	uad->fd = fd;
+	uad->event = event_queue_read();
+	uad->prev = last_uad;
+	uad->next = NULL;
+
+	if (last_uad) {
+		last_uad->next = uad;
+	}
+	else {
+		wsgi_req->waiting_fds = uad;
+	}
+
+	if (timeout > 0) {
+		async_add_timeout(wsgi_req, timeout);
+	}
+	uwsgi.async_waiting_fd_table[fd] = wsgi_req;
+	wsgi_req->async_force_again = 1;
+	return event_queue_add_fd_read(uwsgi.async_queue, fd);
+}
+
+static int async_wait_fd_read(int fd, int timeout) {
+
+	struct wsgi_request *wsgi_req = current_wsgi_req();
+
+	wsgi_req->async_ready_fd = 0;
+
+	if (async_add_fd_read(wsgi_req, fd, timeout)) {
+		return -1;
+	}
+	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;
+}
+
+static int async_wait_fd_read2(int fd0, int fd1, int timeout, int *fd) {
+
+        struct wsgi_request *wsgi_req = current_wsgi_req();
+
+        wsgi_req->async_ready_fd = 0;
+
+        if (async_add_fd_read(wsgi_req, fd0, timeout)) {
+                return -1;
+        }
+
+        if (async_add_fd_read(wsgi_req, fd1, timeout)) {
+		// reset already registered fd
+		async_reset_request(wsgi_req);
+                return -1;
+        }
+
+        if (uwsgi.schedule_to_main) {
+                uwsgi.schedule_to_main(wsgi_req);
+        }
+
+        if (wsgi_req->async_timed_out) {
+                wsgi_req->async_timed_out = 0;
+                return 0;
+        }
+
+	if (wsgi_req->async_ready_fd) {
+		*fd = wsgi_req->async_last_ready_fd;
+		return 1;
+	}
+
+        return -1;
+}
+
+
+void async_add_timeout(struct wsgi_request *wsgi_req, int timeout) {
+
+	if (uwsgi.async < 2 || !uwsgi.rb_async_timeouts) {
+		uwsgi_log_verbose("ASYNC call without async mode !!!\n");
+		return;
+	}
+
+	wsgi_req->async_ready_fd = 0;
+
+	if (timeout > 0 && wsgi_req->async_timeout == NULL) {
+		wsgi_req->async_timeout = uwsgi_add_rb_timer(uwsgi.rb_async_timeouts, uwsgi_now() + timeout, wsgi_req);
+	}
+
+}
+
+int async_add_fd_write(struct wsgi_request *wsgi_req, int fd, int timeout) {
+
+	if (uwsgi.async < 2 || !uwsgi.async_waiting_fd_table) {
+		uwsgi_log_verbose("ASYNC call without async mode !!!\n");
+		return -1;
+	}
+
+	struct uwsgi_async_fd *last_uad = NULL, *uad = wsgi_req->waiting_fds;
+
+	if (fd < 0)
+		return -1;
+
+	// find last slot
+	while (uad) {
+		last_uad = uad;
+		uad = uad->next;
+	}
+
+	uad = uwsgi_malloc(sizeof(struct uwsgi_async_fd));
+	uad->fd = fd;
+	uad->event = event_queue_write();
+	uad->prev = last_uad;
+	uad->next = NULL;
+
+	if (last_uad) {
+		last_uad->next = uad;
+	}
+	else {
+		wsgi_req->waiting_fds = uad;
+	}
+
+	if (timeout > 0) {
+		async_add_timeout(wsgi_req, timeout);
+	}
+
+	uwsgi.async_waiting_fd_table[fd] = wsgi_req;
+	wsgi_req->async_force_again = 1;
+	return event_queue_add_fd_write(uwsgi.async_queue, fd);
+}
+
+static int async_wait_fd_write(int fd, int timeout) {
+	struct wsgi_request *wsgi_req = current_wsgi_req();
+
+	wsgi_req->async_ready_fd = 0;
+
+	if (async_add_fd_write(wsgi_req, fd, timeout)) {
+		return -1;
+	}
+	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_schedule_to_req(void) {
+#ifdef UWSGI_ROUTING
+        if (uwsgi_apply_routes(uwsgi.wsgi_req) == UWSGI_ROUTE_BREAK) {
+		goto end;
+        }
+	// a trick to avoid calling routes again
+	uwsgi.wsgi_req->is_routing = 1;
+#endif
+	uwsgi.wsgi_req->async_status = uwsgi.p[uwsgi.wsgi_req->uh->modifier1]->request(uwsgi.wsgi_req);
+        if (uwsgi.wsgi_req->async_status <= UWSGI_OK) goto end;
+
+	if (uwsgi.schedule_to_main) {
+        	uwsgi.schedule_to_main(uwsgi.wsgi_req);
+	}
+	return;
+
+end:
+	async_reset_request(uwsgi.wsgi_req);
+	uwsgi_close_request(uwsgi.wsgi_req);
+	uwsgi.wsgi_req->async_status = UWSGI_OK;	
+	uwsgi.async_queue_unused_ptr++;
+        uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+}
+
+void async_schedule_to_req_green(void) {
+	struct wsgi_request *wsgi_req = uwsgi.wsgi_req;
+#ifdef UWSGI_ROUTING
+        if (uwsgi_apply_routes(wsgi_req) == UWSGI_ROUTE_BREAK) {
+                goto end;
+        }
+#endif
+        for(;;) {
+		wsgi_req->async_status = uwsgi.p[wsgi_req->uh->modifier1]->request(wsgi_req);
+                if (wsgi_req->async_status <= UWSGI_OK) {
+                        break;
+                }
+                wsgi_req->switches++;
+		if (uwsgi.schedule_fix) {
+			uwsgi.schedule_fix(wsgi_req);
+		}
+                // switch after each yield
+                uwsgi.schedule_to_main(wsgi_req);
+        }
+
+#ifdef UWSGI_ROUTING
+end:
+#endif
+	// re-set the global state
+	uwsgi.wsgi_req = wsgi_req;
+        async_reset_request(wsgi_req);
+        uwsgi_close_request(wsgi_req);
+	// re-set the global state (routing could have changed it)
+	uwsgi.wsgi_req = wsgi_req;
+        wsgi_req->async_status = UWSGI_OK;
+	uwsgi.async_queue_unused_ptr++;
+        uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = wsgi_req;
+	
+}
+
+void async_loop() {
+
+	if (uwsgi.async < 2) {
+		uwsgi_log("the async loop engine requires async mode (--async <n>)\n");
+		exit(1);
+	}
+
+	int interesting_fd, i;
+	struct uwsgi_rb_timer *min_timeout;
+	int timeout;
+	int is_a_new_connection;
+	int proto_parser_status;
+
+	uint64_t now;
+
+	struct uwsgi_async_request *current_request = NULL;
+
+	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;
+
+	if (uwsgi.signal_socket > -1) {
+		event_queue_add_fd_read(uwsgi.async_queue, uwsgi.signal_socket);
+		event_queue_add_fd_read(uwsgi.async_queue, uwsgi.my_signal_socket);
+	}
+
+	// set a default request manager
+	if (!uwsgi.schedule_to_req)
+		uwsgi.schedule_to_req = async_schedule_to_req;
+
+	if (!uwsgi.schedule_to_main) {
+		uwsgi_log("*** DANGER *** async mode without coroutine/greenthread engine loaded !!!\n");
+	}
+
+	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
+
+		now = (uint64_t) uwsgi_now();
+		if (uwsgi.async_runqueue) {
+			timeout = 0;
+		}
+		else {
+			min_timeout = uwsgi_min_rb_timer(uwsgi.rb_async_timeouts, NULL);
+			if (min_timeout) {
+				timeout = min_timeout->value - now;
+				if (timeout <= 0) {
+					async_expire_timeouts(now);
+					timeout = 0;
+				}
+			}
+			else {
+				timeout = -1;
+			}
+		}
+
+		uwsgi.async_nevents = event_queue_wait_multi(uwsgi.async_queue, timeout, events, 64);
+
+		now = (uint64_t) uwsgi_now();
+		// timeout ???
+		if (uwsgi.async_nevents == 0) {
+			async_expire_timeouts(now);
+		}
+
+
+		for (i = 0; i < uwsgi.async_nevents; i++) {
+			// manage events
+			interesting_fd = event_queue_interesting_fd(events, i);
+
+			// 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);
+				continue;
+			}
+
+			is_a_new_connection = 0;
+
+			// new request coming in ?
+			uwsgi_sock = uwsgi.sockets;
+			while (uwsgi_sock) {
+
+				if (interesting_fd == uwsgi_sock->fd) {
+
+					is_a_new_connection = 1;
+
+					uwsgi.wsgi_req = find_first_available_wsgi_req();
+					if (uwsgi.wsgi_req == NULL) {
+						uwsgi_async_queue_is_full((time_t)now);
+						break;
+					}
+
+					// on error re-insert the request in the queue
+					wsgi_req_setup(uwsgi.wsgi_req, uwsgi.wsgi_req->async_id, uwsgi_sock);
+					if (wsgi_req_simple_accept(uwsgi.wsgi_req, interesting_fd)) {
+						uwsgi.async_queue_unused_ptr++;
+						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+						break;
+					}
+
+					if (wsgi_req_async_recv(uwsgi.wsgi_req)) {
+						uwsgi.async_queue_unused_ptr++;
+						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+						break;
+					}
+
+					// by default the core is in UWSGI_AGAIN mode
+					uwsgi.wsgi_req->async_status = UWSGI_AGAIN;
+					// some protocol (like zeromq) do not need additional parsing, just push it in the runqueue
+					if (uwsgi.wsgi_req->do_not_add_to_async_queue) {
+						runqueue_push(uwsgi.wsgi_req);
+					}
+
+					break;
+				}
+
+				uwsgi_sock = uwsgi_sock->next;
+			}
+
+			if (!is_a_new_connection) {
+				// proto event
+				uwsgi.wsgi_req = find_wsgi_req_proto_by_fd(interesting_fd);
+				if (uwsgi.wsgi_req) {
+					proto_parser_status = uwsgi.wsgi_req->socket->proto(uwsgi.wsgi_req);
+					// reset timeout
+					async_reset_request(uwsgi.wsgi_req);
+					// parsing complete
+					if (!proto_parser_status) {
+						// remove fd from event poll and fd proto table 
+						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
+						event_queue_del_fd(uwsgi.async_queue, interesting_fd, event_queue_read());
+						// put request in the runqueue (set it as UWSGI_OK to signal the first run)
+						uwsgi.wsgi_req->async_status = UWSGI_OK;
+						runqueue_push(uwsgi.wsgi_req);
+						continue;
+					}
+					else if (proto_parser_status < 0) {
+						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
+						close(interesting_fd);
+						continue;
+					}
+					// re-add timer
+					async_add_timeout(uwsgi.wsgi_req, uwsgi.socket_timeout);
+					continue;
+				}
+
+				// app-registered event
+				uwsgi.wsgi_req = find_wsgi_req_by_fd(interesting_fd);
+				// unknown fd, remove it (for safety)
+				if (uwsgi.wsgi_req == NULL) {
+					close(interesting_fd);
+					continue;
+				}
+
+				// remove all the fd monitors and timeout
+				async_reset_request(uwsgi.wsgi_req);
+				uwsgi.wsgi_req->async_ready_fd = 1;
+				uwsgi.wsgi_req->async_last_ready_fd = interesting_fd;
+
+				// put the request in the runqueue again
+				runqueue_push(uwsgi.wsgi_req);
+			}
+		}
+
+
+		// event queue managed, give cpu to runqueue
+		current_request = uwsgi.async_runqueue;
+
+		while(current_request) {
+
+			// current_request could be nulled on error/end of request
+			struct uwsgi_async_request *next_request = current_request->next;
+
+			uwsgi.wsgi_req = current_request->wsgi_req;
+			uwsgi.schedule_to_req();
+			uwsgi.wsgi_req->switches++;
+
+			// request ended ?
+			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);
+			}
+			current_request = next_request;
+		}
+
+	}
+
+}

core/buffer.c

@@ -0,0 +1,411 @@
+#include "uwsgi.h"
+
+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) {
+		ub->buf = uwsgi_malloc(len);
+		ub->len = len;
+	}
+	return ub;
+
+}
+
+int uwsgi_buffer_fix(struct uwsgi_buffer *ub, size_t len) {
+	if (ub->limit > 0 && len > ub->limit)
+		return -1;
+	if (ub->len < len) {
+		char *new_buf = realloc(ub->buf, len);
+		if (!new_buf) {
+			uwsgi_error("uwsgi_buffer_fix()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len = len;
+	}
+	return 0;
+}
+
+int uwsgi_buffer_ensure(struct uwsgi_buffer *ub, size_t len) {
+	size_t remains = ub->len - ub->pos;
+	if (remains < len) {
+		size_t new_len = ub->len + (len - remains);
+		if (ub->limit > 0 && new_len > ub->limit) {
+			new_len = ub->limit;
+			if (new_len == ub->len)
+				return -1;
+		}
+		char *new_buf = realloc(ub->buf, new_len);
+		if (!new_buf) {
+			uwsgi_error("uwsgi_buffer_ensure()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len = new_len;
+	}
+	return 0;
+}
+
+int uwsgi_buffer_insert(struct uwsgi_buffer *ub, size_t pos, char *buf, size_t len) {
+	size_t to_move = (ub->pos-pos);
+	if (uwsgi_buffer_ensure(ub, len)) return -1;
+	memmove(ub->buf+pos+len, ub->buf+pos, to_move);
+	memcpy(ub->buf+pos, buf, len);
+	ub->pos += len;
+	return 0;
+}
+
+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) {
+                return -1;
+        }
+	return uwsgi_buffer_insert(ub, pos, chunked, ret);
+}
+
+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) {
+                return -1;
+        }
+        return uwsgi_buffer_append(ub, chunked, ret);
+}
+
+
+int uwsgi_buffer_decapitate(struct uwsgi_buffer *ub, size_t len) {
+	if (len > ub->pos) return -1;
+	memmove(ub->buf, ub->buf + len, ub->pos-len);
+	ub->pos = ub->pos-len;
+	return 0;
+}
+
+int uwsgi_buffer_byte(struct uwsgi_buffer *ub, char byte) {
+	return uwsgi_buffer_append(ub, &byte, 1);
+}
+
+int uwsgi_buffer_u8(struct uwsgi_buffer *ub, uint8_t u8) {
+	return uwsgi_buffer_append(ub, (char *) &u8, 1);
+}
+
+int uwsgi_buffer_append(struct uwsgi_buffer *ub, char *buf, size_t len) {
+
+	size_t remains = ub->len - ub->pos;
+
+	if (len > remains) {
+		size_t chunk_size = UMAX(len, (size_t) uwsgi.page_size);
+		if (ub->limit > 0 && ub->len + chunk_size > ub->limit) {
+			// retry with another minimal size
+			if (len < (size_t) uwsgi.page_size) {
+				chunk_size = len;
+			}
+			if (ub->len + chunk_size > ub->limit)
+				return -1;
+		}
+		char *new_buf = realloc(ub->buf, ub->len + chunk_size);
+		if (!new_buf) {
+			uwsgi_error("uwsgi_buffer_append()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len += chunk_size;
+	}
+
+	memcpy(ub->buf + ub->pos, buf, len);
+	ub->pos += len;
+	return 0;
+}
+
+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 (uwsgi_buffer_append(ub, "\\\"", 2)) return -1;
+		}
+		else if (buf[i] == '\\') {
+			if (uwsgi_buffer_append(ub, "\\\\", 2)) 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);
+        buf[1] = (uint8_t) ((num >> 8) & 0xff);
+	return uwsgi_buffer_append(ub, (char *) buf, 2);
+}
+
+int uwsgi_buffer_u16be(struct uwsgi_buffer *ub, uint16_t num) {
+        uint8_t buf[2];
+        buf[1] = (uint8_t) (num & 0xff);
+        buf[0] = (uint8_t) ((num >> 8) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 2);
+}
+
+int uwsgi_buffer_u24be(struct uwsgi_buffer *ub, uint32_t num) {
+        uint8_t buf[3];
+        buf[2] = (uint8_t) (num & 0xff);
+        buf[1] = (uint8_t) ((num >> 8) & 0xff);
+        buf[0] = (uint8_t) ((num >> 16) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 3);
+}
+
+int uwsgi_buffer_u32be(struct uwsgi_buffer *ub, uint32_t num) {
+        uint8_t buf[4];
+        buf[3] = (uint8_t) (num & 0xff);
+        buf[2] = (uint8_t) ((num >> 8) & 0xff);
+        buf[1] = (uint8_t) ((num >> 16) & 0xff);
+        buf[0] = (uint8_t) ((num >> 24) & 0xff);
+        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);
+        buf[1] = (uint8_t) ((num >> 8) & 0xff);
+        buf[2] = (uint8_t) ((num >> 16) & 0xff);
+        buf[3] = (uint8_t) ((num >> 24) & 0xff);
+        return uwsgi_buffer_append(ub, (char *) buf, 4);
+}
+
+int uwsgi_buffer_u64be(struct uwsgi_buffer *ub, uint64_t num) {
+        uint8_t buf[8];
+        buf[7] = (uint8_t) (num & 0xff);
+        buf[6] = (uint8_t) ((num >> 8) & 0xff);
+        buf[5] = (uint8_t) ((num >> 16) & 0xff);
+        buf[4] = (uint8_t) ((num >> 24) & 0xff);
+        buf[3] = (uint8_t) ((num >> 32) & 0xff);
+        buf[2] = (uint8_t) ((num >> 40) & 0xff);
+        buf[1] = (uint8_t) ((num >> 48) & 0xff);
+        buf[0] = (uint8_t) ((num >> 56) & 0xff);
+        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];
+	if (!inet_ntop(AF_INET, addr, ip, INET_ADDRSTRLEN)) {
+		uwsgi_error("uwsgi_buffer_append_ipv4() -> inet_ntop()");
+		return -1;
+	}
+	return uwsgi_buffer_append(ub, ip, strlen(ip));
+}
+
+
+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)) {
+		return -1;
+	}
+	return uwsgi_buffer_append(ub, buf, ret);
+}
+
+int uwsgi_buffer_append_keyval(struct uwsgi_buffer *ub, char *key, uint16_t keylen, char *val, uint16_t vallen) {
+	if (uwsgi_buffer_u16le(ub, keylen)) return -1;
+	if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+	if (uwsgi_buffer_u16le(ub, vallen)) return -1;
+	return uwsgi_buffer_append(ub, val, vallen);
+}
+
+int uwsgi_buffer_append_keyval32(struct uwsgi_buffer *ub, char *key, uint32_t keylen, char *val, uint32_t vallen) {
+        if (uwsgi_buffer_u32be(ub, keylen)) return -1;
+        if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+        if (uwsgi_buffer_u32be(ub, vallen)) return -1;
+        return uwsgi_buffer_append(ub, val, vallen);
+}
+
+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)) {
+                return -1;
+        }
+	if (uwsgi_buffer_u16le(ub, keylen)) return -1;
+	if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+	if (uwsgi_buffer_u16le(ub, ret)) return -1;
+	return uwsgi_buffer_append(ub, buf, ret);
+}
+
+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)) {
+                return -1;
+        }
+        if (uwsgi_buffer_u16le(ub, ret)) return -1;
+        return uwsgi_buffer_append(ub, buf, ret);
+}
+
+
+int uwsgi_buffer_append_keyipv4(struct uwsgi_buffer *ub, char *key, uint16_t keylen, void *addr) {
+        if (uwsgi_buffer_u16le(ub, keylen)) return -1;
+        if (uwsgi_buffer_append(ub, key, keylen)) return -1;
+        if (uwsgi_buffer_u16le(ub, 15)) return -1;
+	char *ptr = ub->buf + (ub->pos - 2);
+        if (uwsgi_buffer_append_ipv4(ub, addr)) return -1;
+	// fix the size
+	*ptr = ((ub->buf+ub->pos) - (ptr+2));
+	return 0;
+}
+
+int uwsgi_buffer_append_base64(struct uwsgi_buffer *ub, char *s, size_t len) {
+	size_t b64_len = 0;
+	char *b64 = uwsgi_base64_encode(s, len, &b64_len);
+	if (!b64) return -1;
+	int ret = uwsgi_buffer_append(ub, b64, b64_len);
+	free(b64);
+	return ret;
+}
+
+
+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);
+}
+
+ssize_t uwsgi_buffer_write_simple(struct wsgi_request *wsgi_req, struct uwsgi_buffer *ub) {
+	size_t remains = ub->pos;
+	while(remains) {
+		ssize_t len = write(wsgi_req->fd, ub->buf + (ub->pos - remains), remains);
+		if (len <= 0) {
+			return len;
+		}
+		remains -= len;
+	}
+
+	return ub->pos;
+}
+
+int uwsgi_buffer_send(struct uwsgi_buffer *ub, int fd) {
+	size_t remains = ub->pos;
+	char *ptr = ub->buf;
+
+	while (remains > 0) {
+		int ret = uwsgi_waitfd_write(fd, uwsgi.socket_timeout);
+		if (ret > 0) {
+			ssize_t len = write(fd, ptr, remains);
+			if (len > 0) {
+				ptr += len;
+				remains -= len;
+			}
+			else if (len == 0) {
+				return -1;
+			}
+			else {
+				uwsgi_error("uwsgi_buffer_send()");
+				return -1;
+			}
+		}
+		else if (ret == 0) {
+			uwsgi_log("timeout while sending buffer !!!\n");
+			return -1;
+		}
+		else {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int uwsgi_buffer_set_uh(struct uwsgi_buffer *ub, uint8_t modifier1, uint8_t modifier2) {
+	if (ub->pos < 4) return -1;
+	ub->buf[0] = modifier1;
+	ub->buf[1] = (uint8_t) ((ub->pos - 4) & 0xff);
+	ub->buf[2] = (uint8_t) (((ub->pos - 4) >> 8) & 0xff);
+	ub->buf[3] = modifier2;
+	return 0;
+}
+
+struct uwsgi_buffer *uwsgi_buffer_from_file(char *filename) {
+	struct stat st;
+        int fd = open(filename, O_RDONLY);
+        if (fd < 0) {
+		return NULL;
+        }
+
+        if (fstat(fd, &st)) {
+                close(fd);
+		return NULL;
+        }
+
+        struct uwsgi_buffer *ub = uwsgi_buffer_new(st.st_size);
+
+        ssize_t len = read(fd, ub->buf, st.st_size);
+	close(fd);
+        if (len != st.st_size) {
+		uwsgi_buffer_destroy(ub);
+		return NULL;
+        }
+
+	ub->pos = len;
+	return ub;
+}
+
+void uwsgi_buffer_map(struct uwsgi_buffer *ub, char *buf, size_t len) {
+	if (ub->buf) {
+		free(ub->buf);
+	}
+	ub->buf = buf;
+	ub->pos = len;
+	ub->len = len;
+}

core/chunked.c

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

core/clang_fake.c

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

core/clock.c

@@ -0,0 +1,51 @@
+#include "uwsgi.h"
+
+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();
+}
+
+uint64_t uwsgi_micros() {
+	return uwsgi.clock->microseconds();
+}
+
+
+void uwsgi_register_clock(struct uwsgi_clock *clock) {
+	struct uwsgi_clock *clocks = uwsgi.clocks;
+
+	clock->next = NULL;
+
+	if (!clocks) {
+		uwsgi.clocks = clock;
+		return;
+	}
+
+	while (clocks) {
+		if (!clocks->next) {
+			clocks->next = clock;
+			return;
+		}
+		clocks = clocks->next;
+	}
+}
+
+void uwsgi_set_clock(char *name) {
+	struct uwsgi_clock *clocks = uwsgi.clocks;
+	while (clocks) {
+		if (!strcmp(name, clocks->name)) {
+			uwsgi.clock = clocks;
+			return;
+		}
+		clocks = clocks->next;
+	}
+
+	uwsgi_log("unable to set \"%s\" clock\n", name);
+	exit(1);
+}