uWSGI 1.3-rc3

ensure master_cleanup is run by the master
added a warning for --map-socket invalid syntax
2026-10-04 07:58:33 +00:00 · 2012-09-13 18:46:56 +02:00 · 2012-09-13 16:58:05 +02:00 · 2012-09-13 14:09:55 +02:00 · 2012-09-13 14:05:47 +02:00 · 2012-09-12 19:03:22 +02:00
432 changed files with 71568 additions and 10104 deletions
@@ -0,0 +1,4 @@
+syntax: glob
+
+*.o
+*.pyc
@@ -1 +1,55 @@
 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
+e91bc724325e14c13b8f548c0b6a315c48a1c32a 0.9.8-rc2
+4fb424d52f226a0a087fea89709f5eb540e03f25 0.9.8-rc3
+0f1f3924ee5309a9990d9af1ffc68846e3dfb31b 0.9.8-rc4
+42efe1f329005618c8b44f901979ebcecd5216fb 0.9.8
+fd8477b6348faf16588106055ca59df1c488f76a 0.9.8.1
+7169ef1d68d3dab4737bcc3f9e082839e5a06cc1 0.9.8.2
+f4d3c4dcd7a63e21fcc9d8d567374c69935178bd 0.9.8.3
+6945ee03c7ea95eb19217ef1e1fb17d9ae26adbc 0.9.9-beta1
+fb168b0b86169219aa9b8e40f0caa6297cf34dbc 0.9.9-rc1
+6aa667612019fcff8e68af9469f73aff6fa378a8 0.9.9-rc2
+376ffd8f190623e5e2521fe9fa64bf03c31e71be 0.9.9
+7048ae11cfc8453c6bb599af3c0dfacd7ebae43c 1.0-rc1
+7a4e021ea7ba2953e474326612c3bb82d6817f0e 1.0-rc2
+4e4e781ef89ac33e71a7e92741d54549240ed156 1.0-rc3
+24f7e260ea345c2cd73e2fd8191dddbd1b039062 1.0-rc4
+043ba93dd69cf6924e98db3cb9a8759cce997367 1.0-rc5
+a2b8f25fd17ed7424d1470a287d0b3144d2a12c8 1.0-rc6
+a3ca2e8e27c5c12c44ba0cacb4de4cb51377f184 1.0-rc7
+365e2514cc19f0366365318f12a1d63113b02924 1.0-rc8
+5da6fe43a8c29056bc9442c684615e11a3699795 1.0-rc9
+af490b8c30f83bc5fb6f3837a760981474647755 1.0-rc10
+3c70927335856883283fe4db448e092cecc0ccdb 1.0
+8fe7bb792399cb6e6a24e20551f4149409660363 1.0.1
+1d1702789710ec1c20613d2490b14f70756e67ec 1.1-rc1
+901f0cb5de36ea907b26d64ac9ce54605ec531d2 1.1-rc2
+ede5c664978bb40e476e8d4a5789562928f28507 1.1-rc3
+ef99144291f06822d026e981d5d856cbec14d867 1.1-rc4
+e1568fd16b7b586cc72deb4dfccbbe64ae0b84df 1.1
+24c8fe5a26e557db41cf1cee45b8964d5885e484 1.2-rc1
+29de0fb320bc0a1ce84972f9f249360e315d3c10 1.2-rc2
+c3cdecbf2bac591336baddd14f9ac22e18d6e200 1.2
+14524da00a8b382dffb1d16a0e70cdf4a946f369 1.3-rc2
@@ -0,0 +1,20 @@
+- 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
@@ -1,3 +1,580 @@
+*** current ***
+
+ * 1.3
+
+- python tracebacker
+- user-governed harakiri
+- simplified external plugin development
+- Linux namespace mountpoint improvements
+- secured subscription system
+- merged routers codebase (fastrouter, http, rawrouter)
+- https support in the http router
+- config report at the end of uWSGI build process
+- support for keepalive in the http router
+- improved subscription system (multicast and unix socket)
+- custom options
+- graceful reloads on shared sockets
+- configurable log-master buffer size
+- extreme-optimizations for the stats subsystem
+
+
+*** april 2012 ***
+
+ * 1.2 [20120430]
+
+- PyPy support 
+- Improved gevent support with threads
+- Python auto-reload subsystem
+- added --spooler-max-tasks
+- pthread robust mutexes support in Linux and Solaris
+- posix semaphores support in FreeBSD9
+- thread-safe ctime() reporting
+- interval support in cron subsystem
+- improved syslog support
+- better management of disconnected clients
+- static files serving improvements
+- another set of multithreading optimizations
+- minor fixes in the Rack plugin
+- Upstart socket-activation support
+
+
+*** march 2012 ***
+
+ * 1.1 [20120317]
+
+- new options parser subsystem
+- improved php support
+- multiple spooler with multiprocessing
+- segmentation fault and floating point exceptions manager
+- never-swap option
+- zergpool plugin
+- perl/psgi multiple interpreters support
+- deadlock detector
+- pluggable cheaper algos
+- new internal routing susbsystem
+- preliminary support for config logic
+- log rotation infrastructure
+- support for paste loggers
+- threading improvements
+- plugins can now mapped to specific modifiers
+- <app> tag is deprecated (use mount option)
+- report startup time for apps
+- reintroduced expat support
+- reintroduced remote spooler plugin
+- various fastrouter optimizations
+- added ruby rvm support
+
+
+*** december 2011 ***
+
+ * 1.0 [20111230]
+
+- adaptive process spawning (--cheaper option)
+- new control options --stop, --reload, --suspend, --resume, --pause
+- stats framework
+- new subscription system
+- support for mime types in static file serving
+- posix capablities support
+- uWSGI mules and farms
+- support for multiple --touch-reload options
+- new logging subsystem
+- new custom locking subsystem
+- process name handling 
+- better (and faster) HTTP parser
+- perl and python threading improvements
+- new plugins: rrdtool, carbon, cgi, php
+- various improvements in the Rack/ruby plugin
+- Linux KSM support
+- refactored ping and nagios plugins
+- support for signals in lazy mode
+- optimized static-file serving
+- support for linux unshare()
+
+*** august 2011 ***
+
+ * 0.9.9 [20110829]
+
+- various spooler improvements
+- upload progress optimizations and fixes
+- new emperor mode: Tyrant
+- allows multiple --ini options
+- better binary path detection
+- gevent loop engine support
+- resolve domain names in socket logging
+- snmp fixes and reintroduction of the snmp-api
+- fixed grunt mode
+- you can specify build profile via env var UWSGI_PROFILE
+- reintroduction of string-based multiapp
+- new option --emperor-throttle
+- improved queue and sharedarea subsystems
+- uWSGI can now be built as a shared library
+- new api attribute: uwsgi.magic_table
+- improved apache2 module
+- new option --pyshell
+- allow threads in gateways
+- fastrouter improvements
+- the application list is now shared and exported to the api
+- allows setting the thread stack size
+- UWSGI_APPID for better multiapp hosting
+- better reloading in lazy mode
+- native pump support
+- various rack fixes
+- support for attaching binary data in the executable
+- new option --set
+- extreme-optimized http protocol parser
+- WSGI handler optimizations
+
+*** july 2011 ***
+
+ * 0.9.8.3 [20110723]
+
+- implemented uwsgi.SymZipImporter to load embedded zip files
+- OSX Lion is officially supported
+- fixed xinetd support (example file added in contrib)
+- suppot for systemd socket activation
+- added --freebind option (Linux only)
+
+ * 0.9.8.2 [20110719]
+
+- fixed an ini and yaml parsing bug spotted by Raffaele Colace
+- spooler has been extremely improved
+- new option --chown-socket
+- added uwsgidecorators for elegant uwsgi api access from python
+- the rack plugin is now stable
+- support for embedding config and generic files in the server binary
+- high-performance cache-server
+- accept() is now locked on all threads in the same workers
+- preliminary implementation of hooks in emperor
+- support for C++ in server core
+- tcp port auto-bind
+- implemented workers, workerN and spooler signal target
+- prefork/multithread uwsgi.signal_wait() implementation
+- export uwsgi.node in WSGI vars
+- new option --import (python plugin)
+- support for unlimited number of Linux cgroups
+- broodlord mode
+
+*** june 2011 ***
+
+ * 0.9.8.1 [20110625]
+
+- the build system has been improved
+- various threading fixes
+- fix python GIL status after reload
+- new option --propagate-touch
+- fixed uwsgi.sendfile
+- fixed readline() support in wsgi.input
+- fixed dynamic touch reload
+- new option --logto2
+- export %c in config files
+- fixed libyaml support
+- support passing modifiers in subscription system
+- reset random seed in spooler
+- subscribe from a list in a text file
+- allow binding on port 0 (auto-assignment)
+- reset random seed on grunt
+- fix vhost mode for empty hostname
+- fixed python3+virtualenv support
+- tasks are now allowed to chdir() in spooler
+- better zeromq+clustering support
+- clustering has been refactored
+- fixed rpc
+- report correct worker id in cheap mode
+- fixed a fd-leak in attach-daemon
+- use setsid() in attach-daemon
+- zerg mode
+- added psgix.harakiri
+- allows magic vars in sqlite3 config db
+- added UWSGI_FASTROUTER_KEY var
+- slowdown async-queue-is-full messages
+- new option --cron
+- --vassals-start-hook and --vassals-stop-hook
+- the proxy plugin has been removed
+
+ * 0.9.8 [20110605]
+
+- support for --callable in virtualhosting mode
+- a NetBSD fix
+- abstract unix socket can be prefixed with \0 (nginx-style)
+- add /lib to the linker in sun-like systems
+- a mercy mode of 5 seconds is enabled by default on SIGINT/SIGQUIT
+
+ * 0.9.8-rc4 [20110602]
+
+- fixed REMOTE_ADDR when --protocol=http
+- official support for OpenIndiana
+- added a welcome.py test script
+- new api attribute uwsgi.version_info
+- improved the admin plugin
+- two new management flag for backlog queue monitoring
+- fixed uwsgi_log for bigger loglines
+- new option --early-emperor to allows out-of-jail emperors
+- emperor can now spawn other emperors (sub-emperors)
+- fixed idle mode in single-process
+- fixed solaris iovec
+
+*** may 2011 ***
+
+ * 0.9.8-rc3 [20110530]
+
+- snapshotting support
+- fixed python 3.x spooler
+- improvements for grunt processes
+- better abstract unix socket
+- --log-socket allows logging to generic DGRAM sockets
+- a bunch of solaris fixes
+- new option --no-fd-passing for fastrouter
+- --fastrouter-subscription-slot to set the number of slot in subscription server
+- unlimited shared sockets
+- fixed netlink compilation
+- auto-reconnect on emperor+amqp server disconnection
+- various emperor fixes
+- unlimited fastrouter sockets
+- better cgroup support
+- --add-header option allow adding of custom HTTP response headers
+- cheap and idle operational modes
+
+
+ * 0.9.8-rc2 [20110521]
+
+- new option --die-on-term
+- fixed touch reload
+- a couple of optimizations for wsgi.input
+- systemd integration
+
+ * 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] *
@@ -1,2 +1,5 @@
 all:
 	python uwsgiconfig.py --build
+
+clean:
+	python uwsgiconfig.py --clean
@@ -1,2 +0,0 @@
-all:
-	python2.4 uwsgiconfig.py --build
@@ -1,2 +0,0 @@
-all:
-	python2.5 uwsgiconfig.py --build
@@ -1,2 +0,0 @@
-all:
-	python2.6 uwsgiconfig.py --build
@@ -1,2 +0,0 @@
-all:
-	python3.0 uwsgiconfig.py --build
@@ -1,2 +0,0 @@
-all:
-	python3.1 uwsgiconfig.py --build
@@ -1,11 +0,0 @@
-CC=gcc
-
-PYTHON_CFLAGS=`python2.4-config --cflags`
-PYTHON_LIBS=`python2.4-config --libs`
-
-CFLAGS=$(PYTHON_CFLAGS) -DUNBIT -D_GNU_SOURCE
-LD_FLAGS=$(PYTHON_LIBS) -DUNBIT -D_GNU_SOURCE
-
-PROGRAM=/usr/share/unbit/uwsgi24
-
-include base.mk
@@ -1,11 +0,0 @@
-CC=gcc
-
-PYTHON_CFLAGS=`python2.5-config --cflags`
-PYTHON_LIBS=`python2.5-config --libs`
-
-CFLAGS=$(PYTHON_CFLAGS) -DUNBIT -D_GNU_SOURCE
-LD_FLAGS=$(PYTHON_LIBS) -DUNBIT -D_GNU_SOURCE
-
-PROGRAM=/usr/share/unbit/uwsgi
-
-include base.mk
@@ -1,15 +0,0 @@
-CC=gcc
-
-BASE=/opt/packages/python/26
-
-export LD_LIBRARY_PATH=$(BASE)/lib
-
-PYTHON_CFLAGS=`$(BASE)/bin/python2.6-config --cflags`
-PYTHON_LIBS=`$(BASE)/bin/python2.6-config --libs`
-
-CFLAGS=$(PYTHON_CFLAGS) -DUNBIT -D_GNU_SOURCE
-LD_FLAGS=$(PYTHON_LIBS) -L$(BASE)/lib -DUNBIT -D_GNU_SOURCE
-
-PROGRAM=/usr/share/unbit/uwsgi26
-
-include base.mk
@@ -1,11 +0,0 @@
-CC=gcc
-
-PYTHON_CFLAGS=`python3.0-config --cflags`
-PYTHON_LIBS=`python3.0-config --libs`
-
-CFLAGS=$(PYTHON_CFLAGS) -DUNBIT -D_GNU_SOURCE
-LD_FLAGS=$(PYTHON_LIBS) -DUNBIT -D_GNU_SOURCE
-
-PROGRAM=/usr/share/unbit/uwsgi30
-
-include base.mk
@@ -1,11 +0,0 @@
-CC=gcc
-
-PYTHON_CFLAGS=`python3.1-config --cflags`
-PYTHON_LIBS=`python3.1-config --libs`
-
-CFLAGS=$(PYTHON_CFLAGS) -DUNBIT -D_GNU_SOURCE
-LD_FLAGS=$(PYTHON_LIBS) -DUNBIT -D_GNU_SOURCE
-
-PROGRAM=/usr/share/unbit/uwsgi31
-
-include base.mk
@@ -0,0 +1,950 @@
+/*
+
+ *** uWSGI/mod_Ruwsgi ***
+
+ Copyright 2009-2010 Roger Florkowski <rflorkowski@mypublisher.com>
+ Copyright 2009-2010 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.
+
+
+*/
+
+#define MOD_UWSGI_VERSION "1.0"
+
+#include "ap_config.h"
+#include "apr_version.h"
+#include "apr_lib.h"
+#include "apr_strings.h"
+#include "httpd.h"
+#include "http_core.h"
+#include "http_request.h"
+#include "http_config.h"
+#include "http_log.h"
+#include "http_protocol.h"
+#include "util_script.h"
+
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/uio.h>
+#include <time.h>
+#include <poll.h>
+
+#define DEFAULT_TIMEOUT  60 /* default socket timeout */
+#define DEFAULT_CGIMODE  0  /* not enabled */
+
+#define UNSET 0
+#define ENABLED 1
+#define DISABLED 2
+
+#if APR_MAJOR_VERSION == 0
+#define apr_socket_send apr_send
+#define GET_PORT(port, addr) apr_sockaddr_port_get(&(port), addr)
+#define CREATE_SOCKET(sock, family, pool) \
+	apr_socket_create(sock, family, SOCK_STREAM, pool)
+#else
+#define GET_PORT(port, addr) ((port) = (addr)->port)
+#define CREATE_SOCKET(sock, family, pool) \
+	apr_socket_create(sock, family, SOCK_STREAM, APR_PROTO_TCP, pool)
+#endif
+
+typedef struct {
+	char *path;
+	char *addr;
+	apr_port_t port;
+} mount_entry;
+
+/*
+ * Configuration record.  Used per-directory configuration data.
+ */
+typedef struct {
+	mount_entry mount;
+	int enabled; /* mod_uwsgi is enabled from this directory */
+	int timeout;
+	int cgi_mode;
+	uint8_t modifier1;
+	uint8_t modifier2;
+} uwsgi_cfg;
+
+/* Server level configuration */
+typedef struct {
+	apr_array_header_t *mounts;
+	int timeout;
+	int cgi_mode;
+} uwsgi_server_cfg;
+
+module AP_MODULE_DECLARE_DATA uwsgi_module;
+
+/*
+ * Locate our directory configuration record for the current request.
+ */
+	static uwsgi_cfg *
+our_dconfig(request_rec *r)
+{
+	return (uwsgi_cfg *) ap_get_module_config(r->per_dir_config, &uwsgi_module);
+}
+
+static uwsgi_server_cfg *our_sconfig(server_rec *s)
+{
+	return (uwsgi_server_cfg *) ap_get_module_config(s->module_config,
+			&uwsgi_module);
+}
+
+	static int
+mount_entry_matches(const char *url, const char *prefix,
+		const char **path_info)
+{
+	int i;
+	for (i=0; prefix[i] != '\0'; i++) {
+		if (url[i] == '\0' || url[i] != prefix[i])
+			return 0;
+	}
+	if (url[i] == '\0' || url[i] == '/') {
+		*path_info = url + i;
+		return 1;
+	}
+	return 0;
+}
+
+static int uwsgi_translate(request_rec *r)
+{
+	uwsgi_cfg *cfg = our_dconfig(r);
+
+	if (cfg->enabled == DISABLED) {
+		return DECLINED;
+	}
+
+	if (cfg->mount.addr != UNSET) {
+		ap_assert(cfg->mount.port != UNSET);
+		r->handler = "uwsgi-handler";
+		r->filename = r->uri;
+		return OK;
+	}
+	else {
+		int i;
+		uwsgi_server_cfg *scfg = our_sconfig(r->server);
+		mount_entry *entries = (mount_entry *) scfg->mounts->elts;
+		for (i = 0; i < scfg->mounts->nelts; ++i) {
+			const char *path_info;
+			mount_entry *mount = &entries[i];
+			if (mount_entry_matches(r->uri, mount->path, &path_info)) {
+				r->handler = "uwsgi-handler";
+				r->path_info = apr_pstrdup(r->pool, path_info);
+				r->filename = r->uri;
+				ap_set_module_config(r->request_config, &uwsgi_module, mount);
+				return OK;
+			}
+		}
+	}
+	return DECLINED;
+}
+
+static int uwsgi_map_location(request_rec *r)
+{
+	if (r->handler && strcmp(r->handler, "uwsgi-handler") == 0) {
+		return OK; /* We don't want directory walk. */
+	}
+	return DECLINED;
+}
+
+
+#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
+}
+
+#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) */
+
+#define BUFFER_SIZE 8000
+
+struct sockbuff {
+	apr_socket_t *sock;
+	char buf[BUFFER_SIZE];
+	int used;
+};
+
+static void binit(struct sockbuff *s, apr_socket_t *sock)
+{
+	s->sock = sock;
+	s->used = 0;
+}
+
+static apr_status_t sendall(apr_socket_t *sock, char *buf, apr_size_t len)
+{
+	apr_status_t rv;
+	apr_size_t n;
+	while (len > 0) {
+		n = len;
+		if ((rv = apr_socket_send(sock, buf, &n))) return rv;
+		buf += n;
+		len -= n;
+	}
+	return APR_SUCCESS;
+}
+
+static apr_status_t bflush(struct sockbuff *s)
+{
+	apr_status_t rv;
+	ap_assert(s->used >= 0 && s->used <= BUFFER_SIZE);
+	if (s->used) {
+		if ((rv = sendall(s->sock, s->buf, s->used))) return rv;
+		s->used = 0;
+	}
+	return APR_SUCCESS;
+}
+
+static apr_status_t bwrite(struct sockbuff *s, char *buf, apr_size_t len)
+{
+	apr_status_t rv;
+	if (len >= BUFFER_SIZE - s->used) {
+		if ((rv = bflush(s))) return rv;
+		while (len >= BUFFER_SIZE) {
+			if ((rv = sendall(s->sock, buf, BUFFER_SIZE))) return rv;
+			buf += BUFFER_SIZE;
+			len -= BUFFER_SIZE;
+		}
+	}
+	if (len > 0) {
+		ap_assert(len < BUFFER_SIZE - s->used);
+		memcpy(s->buf + s->used, buf, len);
+		s->used += len;
+	}
+	return APR_SUCCESS;
+}
+
+static apr_status_t bputs(struct sockbuff *s, char *buf)
+{
+	return bwrite(s, buf, strlen(buf));
+}
+
+static apr_status_t bputc(struct sockbuff *s, char c)
+{
+	char buf[1];
+	buf[0] = c;
+	return bwrite(s, buf, 1);
+}
+
+static apr_status_t bputh(struct sockbuff *s, unsigned short h)
+{
+	return bwrite(s, (char *)&h, 2);
+}
+
+#define CONFIG_VALUE(value, fallback) ((value) != UNSET ? (value) : (fallback))
+
+	static apr_status_t
+open_socket(apr_socket_t **sock, request_rec *r)
+{
+	int timeout;
+	int retries = 4;
+	int sleeptime = 1;
+	apr_status_t rv;
+	apr_sockaddr_t *sockaddr;
+	uwsgi_server_cfg *scfg = our_sconfig(r->server);
+	uwsgi_cfg *cfg = our_dconfig(r);
+	mount_entry *m = (mount_entry *) ap_get_module_config(r->request_config,
+			&uwsgi_module);
+	if (!m) {
+		m = &cfg->mount;
+	}
+
+	timeout = CONFIG_VALUE(cfg->timeout, CONFIG_VALUE(scfg->timeout,
+				DEFAULT_TIMEOUT));
+	rv = apr_sockaddr_info_get(&sockaddr,
+			CONFIG_VALUE(m->addr, "localhost"),
+			APR_UNSPEC,
+			CONFIG_VALUE(m->port, 5000),
+			0,
+			r->pool);
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "apr_sockaddr_info_get() error");
+		return rv;
+	}
+
+restart:
+	*sock = NULL;
+	rv = CREATE_SOCKET(sock, sockaddr->family, r->pool);
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "apr_socket_create() error");
+		return rv;
+	}
+
+	rv = apr_socket_timeout_set(*sock, apr_time_from_sec(timeout));
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "apr_socket_timeout_set() error");
+		return rv;
+	}
+
+	rv = apr_socket_connect(*sock, sockaddr);
+	if (rv) {
+		apr_socket_close(*sock);
+		if ((APR_STATUS_IS_ECONNREFUSED(rv) |
+					APR_STATUS_IS_EINPROGRESS(rv)) && retries > 0) {
+			/* server may be temporarily down, retry */
+			ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, rv, r,
+					"uwsgi: connection failed, retrying");
+			apr_sleep(apr_time_from_sec(sleeptime));
+			--retries;
+			sleeptime *= 2;
+			goto restart;
+		}
+		log_err(APLOG_MARK, r, rv, "uwsgi: can't connect to server");
+		return rv;
+	}
+
+#ifdef APR_TCP_NODELAY
+	/* disable Nagle, we don't send small packets */
+	apr_socket_opt_set(*sock, APR_TCP_NODELAY, 1);
+#endif
+
+	return APR_SUCCESS;
+}
+
+/* This code is a duplicate of what's in util_script.c.  We can't use
+ * r->unparsed_uri because it gets changed if there was a redirect. */
+static char *original_uri(request_rec *r)
+{
+	char *first, *last;
+
+	if (r->the_request == NULL) {
+		return (char *) apr_pcalloc(r->pool, 1);
+	}
+
+	first = r->the_request;     /* use the request-line */
+
+	while (*first && !apr_isspace(*first)) {
+		++first;                /* skip over the method */
+	}
+	while (apr_isspace(*first)) {
+		++first;                /*   and the space(s)   */
+	}
+
+	last = first;
+	while (*last && !apr_isspace(*last)) {
+		++last;                 /* end at next whitespace */
+	}
+
+	return apr_pstrmemdup(r->pool, first, last - first);
+}
+
+static char *lookup_name(apr_table_t *t, const char *name)
+{
+	const apr_array_header_t *hdrs_arr = apr_table_elts(t);
+	apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
+	int i;
+
+	for (i = 0; i < hdrs_arr->nelts; ++i) {
+		if (hdrs[i].key == NULL)
+			continue;
+
+		if (strcasecmp(hdrs[i].key, name) == 0)
+			return hdrs[i].val;
+	}
+	return NULL;
+}
+
+static char *lookup_header(request_rec *r, const char *name)
+{
+	return lookup_name(r->headers_in, name);
+}
+
+static void add_header(apr_table_t *t, const char *name, const char *value)
+{
+	if (name != NULL && value != NULL)
+		apr_table_addn(t, name, value);
+}
+
+static int find_path_info(const char *uri, const char *path_info)
+{
+	int n;
+	n = strlen(uri) - strlen(path_info);
+	ap_assert(n >= 0);
+	return n;
+}
+
+static char *http2env(apr_pool_t *p, const char *name)
+{
+	char *env_name = apr_pstrcat(p, "HTTP_", name, NULL);
+	char *cp;
+
+	for (cp = env_name + 5; *cp != 0; cp++) {
+		if (*cp == '-') {
+			*cp = '_';
+		}
+		else {
+			*cp = apr_toupper(*cp);
+		}
+	}
+
+	return env_name;
+}
+
+	static apr_status_t
+send_headers(request_rec *r, struct sockbuff *s)
+{
+	int i;
+	const apr_array_header_t *hdrs_arr, *env_arr;
+	apr_table_entry_t *hdrs, *env;
+	char *buf;
+	unsigned short int n = 0;
+	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");
+	t = apr_table_make(r->pool, 40);
+	if (!t)
+		return APR_ENOMEM;
+
+	/* headers to send */
+
+	/* CONTENT_LENGTH must come first and always be present */
+	buf = lookup_header(r, "Content-Length");
+	if (buf == NULL)
+		buf = "0";
+	add_header(t, "CONTENT_LENGTH",  buf);
+
+	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)));
+	add_header(t, "SERVER_ADDR", r->connection->local_ip);
+	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));
+
+	if (r->path_info) {
+		int path_info_start = find_path_info(r->uri, r->path_info);
+		add_header(t, "SCRIPT_NAME", apr_pstrndup(r->pool, r->uri,
+					path_info_start));
+		add_header(t, "PATH_INFO", r->path_info);
+	}
+	else {
+		/* skip PATH_INFO, don't know it */
+		add_header(t, "SCRIPT_NAME", r->uri);
+	}
+
+	add_header(t, "CONTENT_TYPE", lookup_header(r, "Content-type"));
+
+	/* HTTP headers */
+	hdrs_arr = apr_table_elts(r->headers_in);
+	hdrs = (apr_table_entry_t *) hdrs_arr->elts;
+	for (i = 0; i < hdrs_arr->nelts; ++i) {
+		if (hdrs[i].key) {
+			add_header(t, http2env(r->pool, hdrs[i].key), hdrs[i].val);
+		}
+	}
+
+	/* environment variables */
+	env_arr = apr_table_elts(r->subprocess_env);
+	env = (apr_table_entry_t*) env_arr->elts;
+	for (i = 0; i < env_arr->nelts; ++i) {
+		add_header(t, env[i].key, env[i].val);
+	}
+
+	hdrs_arr = apr_table_elts(t);
+	hdrs = (apr_table_entry_t*) hdrs_arr->elts;
+
+	/* calculate length of header data */
+	for (i = 0; i < hdrs_arr->nelts; ++i) {
+		n += strlen(hdrs[i].key);
+		n += strlen(hdrs[i].val);
+		n += 4;        /* XXX */
+	}
+	log_debug(APLOG_MARK,r, apr_psprintf(r->pool, "pktheader size is %u", n));
+	log_debug(APLOG_MARK,r, apr_psprintf(r->pool, "num headers %u", hdrs_arr->nelts));
+
+	/* write pkt header */
+	rv = bputc(s, cfg->modifier1);   /* marker */
+	if (rv) return rv;
+	rv = bputh(s, n);   /* length of header data */
+	if (rv) return rv;
+	rv = bputc(s, cfg->modifier2);   /* marker */
+	if (rv) return rv;
+
+	/* write out headers */
+	for (i = 0; i < hdrs_arr->nelts; ++i) {
+		rv = bputh(s, strlen(hdrs[i].key));     /* length */
+		if (rv) return rv;
+		rv = bputs(s, hdrs[i].key);             /* key */
+		if (rv) return rv;
+		rv = bputh(s, strlen(hdrs[i].val));     /* length */
+		if (rv) return rv;
+		rv = bputs(s, hdrs[i].val);             /* data */
+		if (rv) return rv;
+	}
+
+	return APR_SUCCESS;
+}
+
+static apr_status_t send_request_body(request_rec *r, struct sockbuff *s)
+{
+	if (ap_should_client_block(r)) {
+		char buf[BUFFER_SIZE];
+		apr_status_t rv;
+		apr_off_t len;
+
+		while ((len = ap_get_client_block(r, buf, sizeof buf)) > 0) {
+			if ((rv = bwrite(s, buf, len))) return rv;
+		}
+		if (len == -1)
+			return HTTP_INTERNAL_SERVER_ERROR; /* what to return? */
+	}
+	return APR_SUCCESS;
+}
+
+static int uwsgi_handler(request_rec *r)
+{
+	apr_status_t rv = 0;
+	int cgi_mode, http_status = 0;
+	struct sockbuff s;
+	apr_socket_t *sock;
+	apr_bucket_brigade *bb = NULL;
+	apr_bucket *b          = NULL;
+	const char *location;
+	uwsgi_cfg *cfg = our_dconfig(r);
+	uwsgi_server_cfg *scfg = our_sconfig(r->server);
+
+	if (strcmp(r->handler, "uwsgi-handler"))
+		return DECLINED;
+
+	http_status = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR);
+	if (http_status != OK)
+		return http_status;
+
+	log_debug(APLOG_MARK, r, "connecting to server");
+
+	rv = open_socket(&sock, r);
+	if (rv) {
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	binit(&s, sock);
+
+	rv = send_headers(r, &s);
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "error sending request headers");
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	rv = send_request_body(r, &s);
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "error sending request body");
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	rv = bflush(&s);
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "error sending request");
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+
+	log_debug(APLOG_MARK, r, "reading response headers");
+	bb = apr_brigade_create(r->connection->pool, r->connection->bucket_alloc);
+
+	cgi_mode = CONFIG_VALUE(cfg->cgi_mode, CONFIG_VALUE(scfg->cgi_mode, DEFAULT_CGIMODE));
+	if (!cgi_mode) {
+
+		/* receive implemented with http-0.9 based protocol */
+		apr_interval_time_t timeout;
+		char buf[4096];
+		apr_pollfd_t pollfd = {r->pool, APR_POLL_SOCKET, APR_POLLIN, 0, { NULL }, NULL };
+		pollfd.desc.s = sock;
+		timeout = CONFIG_VALUE(cfg->timeout, CONFIG_VALUE(scfg->timeout,
+					DEFAULT_TIMEOUT)) * 1000 * 1000;
+		r->assbackwards = 1;       /* XXX */
+
+		for(;;) {
+			apr_int32_t nsds;
+			apr_size_t len;
+
+			if ((rv = apr_poll(&pollfd, 1, &nsds, timeout)) == APR_TIMEUP) {
+				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() timeout");
+				break;
+			}
+			if (rv != APR_SUCCESS) {
+				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: poll() %s", strerror(errno));
+				break;
+			}
+
+			len = 4096;
+			rv = apr_socket_recv(sock, buf, &len);
+			if (rv == APR_SUCCESS) {
+				apr_brigade_write(bb, NULL, NULL, buf, len);
+			}
+			else if (rv == APR_EOF) {
+				break;
+			}
+			else {
+				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() %s", strerror(errno));
+			}
+
+		}
+		log_debug(APLOG_MARK,r, "recv finished");
+		b = apr_bucket_flush_create(r->connection->bucket_alloc);
+		APR_BRIGADE_INSERT_TAIL(bb, b);
+		b = apr_bucket_eos_create(r->connection->bucket_alloc);
+		APR_BRIGADE_INSERT_TAIL(bb, b);
+
+	} else {
+
+		/* receive implemented with http-1.x based protocol */
+		b = apr_bucket_socket_create(sock, r->connection->bucket_alloc);
+		APR_BRIGADE_INSERT_TAIL(bb, b);
+		b = apr_bucket_eos_create(r->connection->bucket_alloc);
+		APR_BRIGADE_INSERT_TAIL(bb, b);
+
+		rv = ap_scan_script_header_err_brigade(r, bb, NULL);
+		if (rv) {
+			if (rv == HTTP_INTERNAL_SERVER_ERROR) {
+				log_err(APLOG_MARK, r, rv, "error reading response headers");
+			}
+			else {
+				/* Work around an Apache bug whereby the returned status is
+				 * ignored and status_line is used instead.  This bug is
+				 * present at least in 2.0.54.
+				 */
+				r->status_line = NULL;
+			}
+			apr_brigade_destroy(bb);
+			return rv;
+		}
+
+		location = apr_table_get(r->headers_out, "Location");
+
+		if (location && location[0] == '/' &&
+				((r->status == HTTP_OK) || ap_is_HTTP_REDIRECT(r->status))) {
+
+			apr_brigade_destroy(bb);
+
+			/* Internal redirect -- fake-up a pseudo-request */
+			r->status = HTTP_OK;
+
+			/* This redirect needs to be a GET no matter what the original
+			 * method was.
+			 */
+			r->method = apr_pstrdup(r->pool, "GET");
+			r->method_number = M_GET;
+
+			ap_internal_redirect_handler(location, r);
+			return OK;
+		}
+	}
+
+	rv = ap_pass_brigade(r->output_filters, bb);
+	if (rv) {
+		log_err(APLOG_MARK, r, rv, "ap_pass_brigade()");
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	return OK;
+}
+
+
+static int uwsgi_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
+		server_rec *base_server)
+{
+	ap_add_version_component(p, "mod_uwsgi/" MOD_UWSGI_VERSION);
+	return OK;
+}
+
+	static void *
+uwsgi_create_dir_config(apr_pool_t *p, char *dirspec)
+{
+	uwsgi_cfg *cfg = apr_pcalloc(p, sizeof(uwsgi_cfg));
+
+	cfg->enabled = UNSET;
+	cfg->mount.addr = UNSET;
+	cfg->mount.port = UNSET;
+	cfg->timeout = UNSET;
+	cfg->cgi_mode = UNSET;
+	cfg->modifier1 = UNSET;
+	cfg->modifier2 = UNSET;
+
+	return cfg;
+}
+
+#define MERGE(b, n, a) (n->a == UNSET ? b->a : n->a)
+
+	static void *
+uwsgi_merge_dir_config(apr_pool_t *p, void *basev, void *newv)
+{
+	uwsgi_cfg* cfg = apr_pcalloc(p, sizeof(uwsgi_cfg));
+	uwsgi_cfg* base = basev;
+	uwsgi_cfg* new = newv;
+
+	cfg->enabled = MERGE(base, new, enabled);
+	cfg->mount.addr = MERGE(base, new, mount.addr);
+	cfg->mount.port = MERGE(base, new, mount.port);
+	cfg->timeout = MERGE(base, new, timeout);
+	cfg->cgi_mode = MERGE(base, new, cgi_mode);
+	cfg->modifier1 = MERGE(base, new, modifier1);
+	cfg->modifier2 = MERGE(base, new, modifier2);
+
+	return cfg;
+}
+
+	static void *
+uwsgi_create_server_config(apr_pool_t *p, server_rec *s)
+{
+	uwsgi_server_cfg *c =
+		(uwsgi_server_cfg *) apr_pcalloc(p, sizeof(uwsgi_server_cfg));
+
+	c->mounts = apr_array_make(p, 20, sizeof(mount_entry));
+	c->timeout = UNSET;
+	c->cgi_mode = UNSET;
+	return c;
+}
+
+	static void *
+uwsgi_merge_server_config(apr_pool_t *p, void *basev, void *overridesv)
+{
+	uwsgi_server_cfg *c = (uwsgi_server_cfg *)
+		apr_pcalloc(p, sizeof(uwsgi_server_cfg));
+	uwsgi_server_cfg *base = (uwsgi_server_cfg *) basev;
+	uwsgi_server_cfg *overrides = (uwsgi_server_cfg *) overridesv;
+
+	c->mounts = apr_array_append(p, overrides->mounts, base->mounts);
+	c->timeout = MERGE(base, overrides, timeout);
+	c->cgi_mode = MERGE(base, overrides, cgi_mode);
+	return c;
+}
+
+	static const char *
+cmd_uwsgi_mount(cmd_parms *cmd, void *dummy, const char *path, const char *addr)
+{
+	int n;
+	apr_status_t rv;
+	char *scope_id = NULL; /* A ip6 parameter - not used here. */
+	uwsgi_server_cfg *scfg = our_sconfig(cmd->server);
+	mount_entry *new = apr_array_push(scfg->mounts);
+	n = strlen(path);
+	while (n > 0 && path[n-1] == '/') {
+		n--; /* strip trailing slashes */
+	}
+	new->path = apr_pstrndup(cmd->pool, path, n);
+	rv = apr_parse_addr_port(&new->addr, &scope_id, &new->port, addr,
+			cmd->pool);
+	if (rv)
+		return "error parsing address:port string";
+	return NULL;
+}
+
+	static const char *
+cmd_uwsgi_server(cmd_parms *cmd, void *pcfg, const char *addr_and_port)
+{
+	apr_status_t rv;
+	uwsgi_cfg *cfg = pcfg;
+	char *scope_id = NULL; /* A ip6 parameter - not used here. */
+
+	if (cmd->path == NULL)
+		return "not a server command";
+
+	rv = apr_parse_addr_port(&cfg->mount.addr, &scope_id, &cfg->mount.port,
+			addr_and_port, cmd->pool);
+	if (rv)
+		return "error parsing address:port string";
+
+	return NULL;
+}
+
+	static const char *
+cmd_uwsgi_handler(cmd_parms* cmd, void* pcfg, int flag)
+{
+	uwsgi_cfg *cfg = pcfg;
+
+	if (cmd->path == NULL) /* server command */
+		return "not a server command";
+
+	if (flag)
+		cfg->enabled = ENABLED;
+	else
+		cfg->enabled = DISABLED;
+
+	return NULL;
+}
+
+	static const char *
+cmd_uwsgi_timeout(cmd_parms *cmd, void* pcfg, const char *strtimeout)
+{
+	uwsgi_cfg *dcfg = pcfg;
+	int timeout = atoi(strtimeout);
+
+	if (cmd->path == NULL) {
+		uwsgi_server_cfg *scfg = our_sconfig(cmd->server);
+		scfg->timeout = timeout;
+	}
+	else {
+		dcfg->timeout = timeout;
+	}
+
+	return NULL;
+}
+
+	static const char *
+cmd_uwsgi_force_cgi_mode(cmd_parms *cmd, void *pcfg, const char *value)
+{
+	int cgi_mode;
+
+	if (!strcmp("yes", value) || !strcmp("on", value) || !strcmp("enable", value) || !strcmp("1", value)) {
+		cgi_mode = 1;
+	}
+	else {
+		cgi_mode = 0;
+	}
+
+	if (cmd->path == NULL) {
+		uwsgi_server_cfg *scfg = our_sconfig(cmd->server);
+		scfg->cgi_mode = cgi_mode;
+	}
+	else {
+		uwsgi_cfg *dcfg = pcfg;
+		dcfg->cgi_mode = cgi_mode;
+	}
+
+	return NULL;
+}
+
+	static const char *
+cmd_uwsgi_modifier1(cmd_parms *cmd, void *pcfg, const char *value)
+{
+	uwsgi_cfg *cfg = pcfg;
+	int val;
+
+	if (cmd->path == NULL) /* server command */
+		return "not a server command";
+
+	val = atoi(value);
+	if (val < 0 || val > 255) {
+		return "ignored uWSGImodifier1. Value must be between 0 and 255";
+	}
+	else {
+		cfg->modifier1 = (uint8_t) val;
+	}
+
+	return NULL;
+}
+
+	static const char *
+cmd_uwsgi_modifier2(cmd_parms *cmd, void *pcfg, const char *value)
+{
+	uwsgi_cfg *cfg = pcfg;
+	int val;
+
+	if (cmd->path == NULL) /* server command */
+		return "not a server command";
+
+	val = atoi(value);
+	if (val < 0 || val > 255) {
+		return "ignored uWSGImodifier2. Value must be between 0 and 255";
+	}
+	else {
+		cfg->modifier2 = (uint8_t) val;
+	}
+
+	return NULL;
+}
+
+static const command_rec uwsgi_cmds[] = {
+	AP_INIT_TAKE2("uWSGImount", cmd_uwsgi_mount, NULL, RSRC_CONF,
+			"path prefix and address of UWSGI server"),
+	AP_INIT_TAKE1("uWSGIserver", cmd_uwsgi_server, NULL, ACCESS_CONF,
+			"Address and port of an UWSGI server (e.g. localhost:4000)"),
+	AP_INIT_FLAG( "uWSGIhandler", cmd_uwsgi_handler, NULL, ACCESS_CONF,
+			"On or Off to enable or disable the UWSGI handler"),
+	AP_INIT_TAKE1("uWSGIserverTimeout", cmd_uwsgi_timeout, NULL, ACCESS_CONF|RSRC_CONF,
+			"Timeout (in seconds) for communication with the UWSGI server."),
+	AP_INIT_TAKE1("uWSGIforceCGImode", cmd_uwsgi_force_cgi_mode, NULL, ACCESS_CONF|RSRC_CONF,
+			"Force uWSGI CGI mode for perfect integration with apache filter"),
+	AP_INIT_TAKE1("uWSGImodifier1", cmd_uwsgi_modifier1, NULL, ACCESS_CONF,
+			"Set uWSGI modifier1"),
+	AP_INIT_TAKE1("uWSGImodifier2", cmd_uwsgi_modifier2, NULL, ACCESS_CONF,
+			"Set uWSGI modifier2"),
+	/*
+	   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"),
+	   AP_INIT_TAKE1("uWSGIforceScriptName", cmd_uwsgi_force_script_name, NULL, ACCESS_CONF,
+	   "Fix for PATH_INFO/SCRIPT_NAME when the location has filesystem correspondence"),
+	   */
+	{NULL}
+};
+
+static void uwsgi_register_hooks(apr_pool_t *p)
+{
+	ap_hook_post_config(uwsgi_init, NULL, NULL, APR_HOOK_MIDDLE);
+	ap_hook_handler(uwsgi_handler, NULL, NULL, APR_HOOK_MIDDLE);
+	ap_hook_translate_name(uwsgi_translate, NULL, NULL, APR_HOOK_LAST);
+	ap_hook_map_to_storage(uwsgi_map_location, NULL, NULL, APR_HOOK_FIRST);
+}
+
+/* Dispatch list for API hooks */
+module AP_MODULE_DECLARE_DATA uwsgi_module = {
+	STANDARD20_MODULE_STUFF,
+	uwsgi_create_dir_config,       /* create per-dir config structs */
+	uwsgi_merge_dir_config,        /* merge per-dir config structs */
+	uwsgi_create_server_config,    /* create per-server config structs */
+	uwsgi_merge_server_config,     /* merge per-server config structs */
+	uwsgi_cmds,                    /* table of config file commands */
+	uwsgi_register_hooks,          /* register hooks */
+};
+
@@ -0,0 +1,397 @@
+#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);
+
+    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) {
+        apr_table_set(r->subprocess_env, "SCRIPT_NAME", apr_pstrndup(r->pool, script_name, strlen(script_name)-strlen(path_info)));
+    }
+
+    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[0] = 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;
+}
+
+static
+apr_status_t ap_proxygetline(apr_bucket_brigade *bb, char *s, int n, request_rec *r,
+                             int fold, int *writen)
+{
+    char *tmp_s = s;
+    apr_status_t rv;
+    apr_size_t len;
+
+    rv = ap_rgetline(&tmp_s, n, &len, r, fold, bb);
+    apr_brigade_cleanup(bb);
+
+    if (rv == APR_SUCCESS) {
+        *writen = (int) len;
+    } else if (rv == APR_ENOSPC) {
+        *writen = n;
+    } else {
+        *writen = -1;
+    }
+
+    return rv;
+}
+
+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);
+
+
+	rc = ap_proxygetline(bb, buffer, sizeof(buffer), rp, 0, &len);
+	if (len == 0) {
+		rc = ap_proxygetline(bb, buffer, sizeof(buffer), rp, 0, &len);
+	}
+
+	if (len <= 0) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+	backend->worker->s->read += len;
+
+	if (!apr_date_checkmask(buffer, "HTTP/#.# ###*")) {
+		// oops
+		return HTTP_INTERNAL_SERVER_ERROR;
+	}
+
+        int major, minor;
+
+        major = buffer[5] - '0';
+        minor = buffer[7] - '0';
+
+        /* If not an HTTP/1 message or
+        * if the status line was > 8192 bytes
+         */
+        if ((major != 1) || (len >= sizeof(buffer)-1)) {
+        	return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                apr_pstrcat(r->pool, "Corrupt status line returned by remote "
+                            "server: ", buffer, NULL));
+        }
+
+        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
+    apr_table_add(r->subprocess_env, "PATH_INFO", url+strlen(worker->name));
+
+
+    /* 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 */
+};
@@ -1,18 +1,18 @@
 /* 
        
-    *** uWSGI/mod_uwsgi ***
+*** uWSGI/mod_uwsgi ***

-    Copyright 2009 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.
+Copyright 2009-2012 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.
+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
@@ -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;
@@ -264,7 +290,6 @@ static int uwsgi_handler(request_rec *r) {
 	char uwsgi_http_status[13] ;
 	int uwsgi_http_status_read = 0;
 	
-
 	apr_bucket_brigade *bb;

 	if (strcmp(r->handler, "uwsgi-handler"))
@@ -287,7 +312,6 @@ static int uwsgi_handler(request_rec *r) {
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}

-
 	if ( (ret = timed_connect(&uwsgi_poll, (struct sockaddr *) &c->s_addr, c->addr_size, c->socket_timeout, r) ) != 0) {

 		close(uwsgi_poll.fd);
@@ -317,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->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);
@@ -390,10 +408,17 @@ 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) ;
 			}
 		}
 	}
+
+	/* environment variables */
+	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, r, h[i].key, h[i].val, &pkt_size) ;
+	}	
 	

 	uwsgi_vars[0].iov_base = pkt_header;
@@ -413,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;
 	}

@@ -429,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;
 			}
 		}
@@ -453,37 +481,75 @@ 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) {
-			cnt = recv(uwsgi_poll.fd, buf, 4096, 0) ;
-			if (cnt < 0) {
-				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() %s", strerror(errno));
-				apr_brigade_destroy(bb);
-				return HTTP_INTERNAL_SERVER_ERROR;
-			}
-			else if (cnt > 0) {
-				if (!c->cgi_mode && uwsgi_http_status_read < 12) {
-	                        	if (uwsgi_http_status_read + cnt >= 12) {
-                                        	memcpy(uwsgi_http_status+uwsgi_http_status_read, buf, 12-uwsgi_http_status_read);
-                                                r->status = atoi(uwsgi_http_status+8);
-                				uwsgi_http_status_read+=cnt;
-                                        }
-                                        else {
-	                                	memcpy(uwsgi_http_status+uwsgi_http_status_read, buf, cnt);
-                                        	uwsgi_http_status_read+=cnt;
-                                        }
-                                }
-				apr_brigade_write(bb, NULL, NULL, buf, cnt);
-					
-			}
-			else {
-				break;
+			if (uwsgi_poll.revents & POLLIN || uwsgi_poll.revents & POLLHUP) {
+				cnt = recv(uwsgi_poll.fd, buf, 4096, 0) ;
+				if (cnt < 0) {
+					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 {
+						break;
+					}
+				}
+				else if (cnt > 0) {
+					if (!c->cgi_mode && uwsgi_http_status_read < 12) {
+	                        		if (uwsgi_http_status_read + cnt >= 12) {
+                                        		memcpy(uwsgi_http_status+uwsgi_http_status_read, buf, 12-uwsgi_http_status_read);
+                                                	r->status = atoi(uwsgi_http_status+8);
+                					uwsgi_http_status_read+=cnt;
+                                        	}
+                                        	else {
+	                                		memcpy(uwsgi_http_status+uwsgi_http_status_read, buf, cnt);
+                                        		uwsgi_http_status_read+=cnt;
+                                        	}
+                                	}
+					// check for client disconnect
+					if (r->connection->aborted) { 
+						close(uwsgi_poll.fd);
+						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
+						return HTTP_INTERNAL_SERVER_ERROR;
+					}
+					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
+					break;
+				}
 			}
+
+			// error
+			if (uwsgi_poll.revents & POLLERR || uwsgi_poll.revents & POLLNVAL) {
+                                break;
+                        }
 		}
 		else {
 			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;
 		}
 	}
@@ -497,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;
 		}
 	}
@@ -504,15 +571,17 @@ 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) ;
 }

-static const char * cmd_uwsgi_force_wsgi_scheme(cmd_parms *cmd, void *cfg, const char *location) {
+static const char * cmd_uwsgi_force_script_name(cmd_parms *cmd, void *cfg, const char *location) {
 	uwsgi_cfg *c = cfg;

 	if (strlen(location) <= 255 && location[0] == '/') {
@@ -526,7 +595,7 @@ static const char * cmd_uwsgi_force_wsgi_scheme(cmd_parms *cmd, void *cfg, const

 }

-static const char * cmd_uwsgi_force_script_name(cmd_parms *cmd, void *cfg, const char *scheme) {
+static const char * cmd_uwsgi_force_wsgi_scheme(cmd_parms *cmd, void *cfg, const char *scheme) {
 	uwsgi_cfg *c = cfg;

 	if (strlen(scheme) < 9 & strlen(scheme) > 0) {
@@ -540,6 +609,22 @@ static const char * cmd_uwsgi_force_script_name(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 ;
@@ -574,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 ;
 	}

@@ -675,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"),	
@@ -683,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}
 };

@@ -0,0 +1,13 @@
+import struct
+import sys
+import os
+
+filename = sys.argv[1]
+
+size = os.path.getsize(filename)
+
+f = open(filename, 'r')
+print(f.read())
+f.close()
+
+print(struct.pack("<Q", size))
@@ -1,46 +0,0 @@
-all:	clean uwsgi
-
-uwsgi:  utils.o protocol.o socket.o pymodule.o spooler.o logging.o xmlconf.o snmp.o proxy.o erlang.o wsgihandlers.o basehandlers.o main.o
-	$(CC) -lpthread utils.o protocol.o socket.o spooler.o logging.o xmlconf.o snmp.o proxy.o erlang.o pymodule.o wsgihandlers.o basehandlers.o main.o -o $(PROGRAM) $(LD_FLAGS) 
-
-utils.o: utils.c
-	$(CC) -c $(CFLAGS) utils.c
-
-protocol.o: protocol.c
-	$(CC) -c $(CFLAGS) protocol.c
-
-socket.o: socket.c
-	$(CC) -c $(CFLAGS) socket.c
-
-spooler.o: spooler.c
-	$(CC) -c $(CFLAGS) spooler.c
-
-logging.o: logging.c
-	$(CC) -c $(CFLAGS) logging.c
-
-xmlconf.o: xmlconf.c
-	$(CC) -c $(CFLAGS) xmlconf.c
-
-snmp.o: snmp.c
-	$(CC) -c $(CFLAGS) snmp.c
-
-proxy.o: proxy.c
-	$(CC) -c $(CFLAGS) proxy.c
-
-erlang.o: erlang.c
-	$(CC) -c $(CFLAGS) erlang.c
-
-pymodule.o: uwsgi_pymodule.c
-	$(CC) -c $(CFLAGS) -o pymodule.o uwsgi_pymodule.c
-
-basehandlers.o: uwsgi_handlers.c
-	$(CC) -c $(CFLAGS) -o basehandlers.o uwsgi_handlers.c
-
-wsgihandlers.o: wsgi_handlers.c
-	$(CC) -c $(CFLAGS) -o wsgihandlers.o wsgi_handlers.c
-
-main.o: uwsgi.c
-	$(CC) -c $(CFLAGS) -o main.o uwsgi.c
-        
-clean:
-	rm -f utils.o protocol.o socket.o pymodule.o spooler.o logging.o xmlconf.o snmp.o proxy.o erlang.o wsgihandlers.o basehandlers.o main.o
@@ -0,0 +1,5 @@
+import sys
+import uwsgi
+
+print("i am the bootstrap for uwsgi.SymbolsImporter")
+sys.meta_path.insert(0, uwsgi.SymbolsImporter())
@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("pygments_zip"))
@@ -0,0 +1,5 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("django_zip:djenv/lib/python2.6/site-packages"))
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("djapp_zip"))
@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.ZipImporter("data://0"))
@@ -0,0 +1,3 @@
+import uwsgi
+
+print uwsgi.extract("data://0")
@@ -0,0 +1 @@
+object file for embedded files will be put here
@@ -0,0 +1,45 @@
+[uwsgi]
+xml = auto
+ini = true
+yaml = true
+json = auto
+sqlite3 = auto
+zeromq = auto
+snmp = true
+spooler = true
+embedded = true
+ssl = auto
+udp = true
+multicast = true
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+ldap = auto
+pcre = auto
+routing = auto
+ipv6 = false
+debug = false
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
+extras =
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, router_rewrite, router_http
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = cgi
+inherit = base
@@ -0,0 +1,4 @@
+[uwsgi]
+main_plugin =
+inherit = base
+embedded_plugins = null
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = python
+inherit = base
@@ -0,0 +1,4 @@
+[uwsgi]
+main_plugin = python
+inherit = base
+embed_files = bootstrap3.py,django.zip,djapp.zip
@@ -0,0 +1,5 @@
+[uwsgi]
+main_plugin = python
+inherit = base
+
+embed_files = embedme.py,uwsgidecorators.py
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = erlang
+inherit = base
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = python,gevent
+inherit = base
@@ -0,0 +1,5 @@
+[uwsgi]
+inherit = base
+bin_name = libuwsgi.so
+embedded_plugins = null
+as_shared_library = true
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = lua
+inherit = base
@@ -0,0 +1,4 @@
+[uwsgi]
+main_plugin = 
+inherit = base
+plugins = lua
@@ -0,0 +1,5 @@
+[uwsgi]
+inherit = base
+plugins = python, ping, rack, psgi, cache, http, fastrouter
+plugin_dir = plugins
+embedded_plugins = null
@@ -0,0 +1,4 @@
+[uwsgi]
+inherit = base
+plugin_dir = /usr/lib/uwsgi
+embedded_plugins =
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = php
+inherit = base
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = psgi
+inherit = base
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = python,erlang,pyerl
+inherit = base 
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = python,lua
+inherit = base
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = pypy
+inherit = base
@@ -0,0 +1,30 @@
+[uwsgi]
+xml = true
+ini = true
+snmp = true
+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
@@ -0,0 +1,5 @@
+[uwsgi]
+main_plugin = pyuwsgi
+inherit = base
+bin_name = pyuwsgi.so
+as_shared_library = true
@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = rack
+inherit = base
@@ -0,0 +1,29 @@
+[uwsgi]
+xml = true
+ini = true
+yaml = true
+snmp = true
+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 =
@@ -0,0 +1,34 @@
+[uwsgi]
+xml = true
+ini = true
+yaml = true
+json = false
+sqlite3 = false
+zeromq = false
+snmp = false
+spooler = true
+embedded = true
+udp = true
+multicast = false
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+ldap = true
+pcre = true
+routing = true
+debug = false
+unbit = true
+xml_implementation = expat
+yaml_implementation = auto
+malloc_implementation = libc
+plugins =
+bin_name = /opt/unbit/bin/uwsgi
+append_version = unbit
+plugin_dir = /opt/unbit/uwsgi_plugins
+embedded_plugins =
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
@@ -0,0 +1,6 @@
+[uwsgi]
+inherit = unbit
+json = false
+embedded_plugins = python
+bin_name = ../bin/uwsgi
+plugin_dir = ../bin/uwsgi_plugins
@@ -0,0 +1,44 @@
+[uwsgi]
+xml = false
+ini = true
+yaml = false
+json = false
+sqlite3 = false
+zeromq = false
+snmp = false
+spooler = true
+embedded = true
+udp = true
+multicast = false
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+evdis = false
+ldap = false
+pcre = true
+routing = true
+debug = false
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
+extras = 
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins =
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+
+embed_config =
@@ -0,0 +1,18 @@
+require 'fiber'
+require 'sinatra'
+
+get '/hi' do
+
+   class Response
+	def each
+		for i in 1..10
+			yield "ciao<br/>"
+			Fiber.yield
+		end
+	end
+   end
+
+   Response.new
+end
+
+run Sinatra::Application
@@ -0,0 +1,25 @@
+require 'stringio'
+
+hello = proc do |signum|
+  puts "Hello i am signal #{signum}"
+end
+
+file_changed = proc do |signum| 
+  puts "/tmp has been modified"
+end
+
+UWSGI.register_signal(17, '', hello)
+UWSGI.register_signal(30, '', file_changed)
+
+UWSGI.add_rb_timer(17 , 2)
+UWSGI.add_timer(17 , 1)
+UWSGI.add_file_monitor(30 , '/tmp')
+
+puts UWSGI.signal_registered(1)
+puts UWSGI.signal_registered(17)
+
+run lambda { |env| 
+        puts env.inspect
+	UWSGI.signal(17)
+	[200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World!\n")] 
+}
@@ -0,0 +1,7 @@
+require 'sinatra'
+
+get '/hi' do
+	"Hello World"
+end
+
+run Sinatra::Application
@@ -0,0 +1,68 @@
+require 'stringio'
+require 'uwsgidsl'
+
+
+
+signal 17,'mule5' do |signum|
+end
+
+puts UWSGI::VERSION
+puts UWSGI::NUMPROC
+puts UWSGI::HOSTNAME
+
+puts UWSGI::OPT.inspect
+
+timer 2 do |signum|
+  puts "ciao sono un dsl ruby: #{signum} #{UWSGI::OPT.inspect}"
+end
+
+timer 1,'mule1' do |signum|
+  puts "1 second elapsed (signum #{signum})"
+end
+
+filemon '/tmp' do |signum|
+  puts "/tmp has been modified"
+end
+
+cron 5,-1,-1,-1,-1 do |signum|
+  puts "cron ready #{signum}"
+end
+
+cron 58,-1,-1,-1,-1 do |signum|
+  puts "cron ready #{signum}"
+end
+
+postfork do
+  puts "fork() called"
+end
+
+rpc 'pippo' do
+  "i am an rpc function"
+end
+
+rpc 'pluto' do |x,y|
+  "i am another rpc function #{x} #{y}"
+end
+
+begin
+  foo_func
+rescue
+end
+
+puts UWSGI.cache_exists('nilkey')
+puts UWSGI.cache_exists?('nilkey')
+
+UWSGI.cache_set!('foobar_key?a=1', UWSGI::OPT.inspect)
+begin
+puts UWSGI.cache_get(nil)
+rescue
+end
+puts UWSGI.cache_get('foobar_key?a=1')
+
+
+run lambda { |env| 
+  puts env.inspect
+  UWSGI.setprocname("i am the uWSGI rack plugin")
+  UWSGI.signal(17)
+  [200, {'Content-Type'=>'text/plain'}, StringIO.new("Hello World! #{UWSGI.mem.inspect}\n")] 
+}
@@ -0,0 +1,144 @@
+package Plack::Handler::Uwsgi;
+
+use strict;
+use warnings;
+
+use IO::Socket::INET;
+use HTTP::Status;
+
+use Plack::Util;
+
+sub new {
+    my $class = shift;
+    my $self  = bless {@_}, $class;
+    $self;
+}
+
+sub run {
+    my ($self, $app) = @_;
+
+    my $server;
+
+    if (exists($ENV{'UWSGI_FD'})) {
+        $server = IO::Socket::UNIX->new_from_fd($ENV{'UWSGI_FD'}, '+<');
+    }
+    else {	
+        $server = IO::Socket::INET->new(LocalPort => $self->{port}, LocalAddr => $self->{host}, Listen => 100, ReuseAddr => 1);
+    }
+
+    while ( my $client = $server->accept ) {
+
+        my $head = '';
+        my $remains = 4;
+
+        while($remains) {
+            $client->recv(my $buf, $remains);	
+            last unless $buf;
+            $head.=$buf;
+            $remains -= length($buf);
+        }
+
+        if (length($head) != 4) {
+            $client->close;
+            next;
+        }
+
+        my ($mod1, $envsize, $mod2) = unpack('CvC', $head);
+
+        unless ($envsize) {
+            $client->close;
+            next;
+        }
+
+        $remains = $envsize;
+        my $envbuf = '';
+        while($remains) {
+            my $buf;
+            if ($remains >= 4096) {
+                $client->recv($buf, 4096);	
+            }
+            else {
+                $client->recv($buf, $remains);	
+            }
+
+            unless($buf) {
+                $client->close;
+                next;
+            }
+
+            $envbuf.=$buf;
+            $remains -= length($buf);
+        }
+
+        if (length($envbuf) != $envsize ) {
+            $client->close;
+            next;
+        }
+
+        my %env;
+
+        my $i = 0;
+        while($i < $envsize) {
+            my $kl = unpack('v', substr($envbuf, $i, 2)); $i+=2;
+            my $key = substr($envbuf, $i, $kl); $i+=$kl;
+            my $vl = unpack('v', substr($envbuf, $i, 2)); $i+=2;
+            $env{$key} = substr($envbuf, $i, $vl); $i+=$vl;
+        }
+
+        my $env = {
+            %env,
+            'psgi.version'      => [1,1],
+            'psgi.url_scheme'   => ($env{HTTPS}||'off') =~ /^(?:on|1)$/i ? 'https' : 'http',
+            'psgi.input'        => $client,
+            'psgi.errors'       => *STDERR,
+            'psgi.multithread'  => Plack::Util::FALSE,
+            'psgi.multiprocess' => Plack::Util::TRUE,
+            'psgi.run_once'     => Plack::Util::FALSE,
+            'psgi.streaming'    => Plack::Util::TRUE,
+            'psgi.nonblocking'  => Plack::Util::FALSE,
+        };
+
+        my $res = Plack::Util::run_app $app, $env;
+
+        if (ref $res eq 'ARRAY') {
+            $self->_handle_response($client, $env{'SERVER_PROTOCOL'}, $res);
+        }
+        elsif (ref $res eq 'CODE') {
+            $res->(sub {
+                    $self->_handle_response($client, $env{'SERVER_PROTOCOL'}, $_[0]);
+                });
+        }
+        else {
+            die "Bad response $res";
+        }
+
+        $client->close;
+
+    }
+}
+
+sub _handle_response {
+    my ($self, $client, $protocol, $res) = @_;
+
+    $client->send($protocol.' '.$res->[0].' '.HTTP::Status::status_message( $res->[0] )."\r\n");
+
+    my $headers = $res->[1];
+    my $hdrs = '';
+    while (my ($k, $v) = splice @$headers, 0, 2) {
+        $hdrs .= "$k: $v\r\n";
+    }
+    $hdrs .= "\r\n";
+
+    $client->send($hdrs);
+
+    my $cb = sub { $client->send($_[0]) };
+    my $body = $res->[2];
+    if (defined $body) {
+        Plack::Util::foreach($body, $cb);
+    }
+    else {
+        return Plack::Util::inline_object write => $cb,close => sub { };
+    }
+}
+
+1;
@@ -0,0 +1,12 @@
+use POSIX;
+use IO::Socket::INET;
+use IO::Socket::INET6;
+
+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);
+
+dup2($s->fileno, 17);
+dup2($s2->fileno, 22);
+dup2($s3->fileno, 30);
+exec './uwsgi','-M', '--socket','fd://17', '--http-socket','fd://22', '--socket','fd://30';
@@ -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
+
@@ -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);
+}
@@ -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
@@ -0,0 +1,33 @@
+# uwsgi --master --chdir /opt/graphite/webapp/graphite --module graphite_uwsgi ...
+#
+#
+# this module will update a carbon server (used by the graphite tool: http://graphite.wikidot.com/)
+# with requests count made by a Django app (and can track graphite itself as it is a Django app ;)
+#
+#
+
+import os
+import uwsgi
+import time
+from django.core.handlers.wsgi import WSGIHandler
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+CARBON_SERVER = "127.0.0.1:2003"
+
+def update_carbon(signum):
+    # connect to the carbon server
+    carbon_fd = uwsgi.connect(CARBON_SERVER)
+    # send data to the carbon server
+    uwsgi.send(carbon_fd, "uwsgi.%s.requests %d %d\n" % (uwsgi.hostname, uwsgi.total_requests(), int(time.time())))
+    # close the connection with the carbon server
+    uwsgi.close(carbon_fd)
+
+# register a new uwsgi signal (signum: 17)
+uwsgi.register_signal(17, '', update_carbon)
+
+# attach a timer of 10 seconds to signal 17
+uwsgi.add_timer(17, 10)
+
+# the Django app
+application = WSGIHandler()
@@ -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;
+}
@@ -0,0 +1,66 @@
+import django
+from django.core.management.base import BaseCommand
+from django.conf import settings
+import os
+import sys
+
+class Command(BaseCommand):
+    help = "Runs this project as a uWSGI application. Requires the uwsgi binary in system path."
+
+    http_port = '8000'
+    socket_addr = None
+
+    def handle(self, *args, **options):
+        for arg in args:
+            k,v = arg.split('=')
+            if k == 'http':
+                if self.http_port:
+                   self.http_port = v
+            elif k == 'socket':
+                self.http_port = None
+                self.socket_addr = v
+
+        # load http and python plugin: first the specific version, otherwise try with the generic one
+        if self.http_port:
+            os.environ['UWSGI_PLUGINS'] = 'http,python%d%d:python' % (sys.version_info[0], sys.version_info[1])
+        else:
+            os.environ['UWSGI_PLUGINS'] = 'python%d%d:python' % (sys.version_info[0], sys.version_info[1])
+
+        # load the Django WSGI handler
+        os.environ['UWSGI_MODULE'] = 'django.core.handlers.wsgi:WSGIHandler()'
+        # DJANGO settings
+        if options['settings']:
+            os.environ['DJANGO_SETTINGS_MODULE'] = options['settings']
+        else:
+            os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+        # bind the http server to the default port
+        if self.http_port:
+            os.environ['UWSGI_HTTP'] = ':%s' % self.http_port
+        elif self.socket_addr:
+            os.environ['UWSGI_SOCKET'] = self.socket_addr
+
+	# map admin static files
+	os.environ['UWSGI_STATIC_MAP'] = '%s=%s' % (settings.ADMIN_MEDIA_PREFIX, os.path.join(django.__path__[0], 'contrib', 'admin', 'media'))
+        # remove sockets/pidfile at exit
+        os.environ['UWSGI_VACUUM'] = '1'
+        # retrieve/set the PythonHome
+        os.environ['UWSGI_PYHOME'] = sys.prefix
+        # increase buffer size a bit
+        os.environ['UWSGI_BUFFER_SIZE'] = '8192'
+        # add threads for concurrency
+        os.environ['UWSGI_THREADS'] = '8'
+        # enable the master process
+        os.environ['UWSGI_MASTER'] = '1'
+        # use uWSGI python module aliasing to fix the PYTHONPATH
+        os.environ['UWSGI_PYMODULE_ALIAS'] = '%s=./' % os.path.basename(os.getcwd())
+        # exec the uwsgi binary
+        os.execvp('uwsgi', ('uwsgi',))
+
+    def usage(self, subcomand):
+        return r"""
+run this project on the uWSGI server
+
+  http=PORT		run the embedded http server on port PORT
+  socket=ADDR		bind the uwsgi server on address ADDR (this will disable the http server)
+        """
@@ -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";
@@ -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"
+
+
@@ -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
@@ -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)
@@ -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";
@@ -0,0 +1,17 @@
+# uWSGI - manage uWSGI application server
+#
+
+description     "uWSGI"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+env LOGTO=/tmp/uwsgi.log
+env BINPATH=/home/foo/uwsgi/uwsgi
+
+# --no-orphans avoid workers without master
+# --die-on-term could be a good idea
+exec $BINPATH --no-orphans --socket :3033 --uid 1001 --gid 1001 --limit-as 256 -w simple_app --logto $LOGTO -M -p 4
+
@@ -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
@@ -1,403 +1,334 @@
-# Copyright 2009 Unbit S.a.s. <info@unbit.it>
-# see the COPYRIGHT file
+require 'rubygems'
+require 'socket'
+begin
+        require 'bundler/setup'
+rescue LoadError
+end
+require 'rack'
+require 'rack/content_length'
+require 'rack/rewindable_input'
+require 'stringio'

-$stdout.sync = true
-options = {}
+require 'optparse'

-if Process.uid == 0
-        puts "Never run uRack as root !!!"
-        exit
+options = {
+        :processes => 1,
+        :threads => 1,
+        :master => false,
+        :logging => true,
+        :static => true,
+        :config => nil,
+        :cachehack => false
+}
+
+opts = OptionParser.new do |opts|
+
+        opts.on("-p", "--processes=nproc", Integer, '') { |p| options[:processes] = p }
+        opts.on("-t", "--threads=nthreads", Integer, '') { |t| options[:threads] = t }
+        opts.on("-M", "--master", '') { options[:master] = true }
+        opts.on("-L", "--no-logging", '') { options[:logging] = false }
+        opts.on("-S", "--no-static", '') { options[:static] = false }
+        opts.on("-C", "--cache-hack", '') { options[:cachehack] = true }
+        
+        opts.parse! ARGV
 end

-$stderr.puts "[#{Time.new}] starting uRack"
+if ARGV[0]
+        options[:config] = ARGV[0]
+end

 def human_round(float)
        (float * (10 ** 2)).round / (10 ** 2).to_f
 end

-unless ENV.has_key?('UNBIT_RACK_PATH')
-        if File.exists?("#{ARGV.last}/config/environment.rb")
-                RAILS_ROOT = String.new(ARGV.last)
-        else
-                RAILS_ROOT = String.new(Dir.getwd)
-        end
-        options[:sockname] = '/tmp/uwsgi.sock'
-        options[:sock_chmod] = 0
-        options[:stderr_logfile] = nil
-else
-        $domain = ARGV.last.gsub('[','').gsub(']','')   
-        $unbit_log_base = "[uRack/Unbit on #{$domain}]"
-        RAILS_ROOT = String.new(ENV['UNBIT_RACK_PATH'])
-        options[:unbit] = true
-        $limit_as = human_round(Process.getrlimit(Process::RLIMIT_AS)[1].to_f/1024/1024)
-        puts "#{$unbit_log_base} process address space limit is #{$limit_as} MB"
-        $uidsec_size = syscall(357,0,0)
-        puts "#{$unbit_log_base} need #{$uidsec_size} bytes to store uidsec_struct..."
-        $uidsec = '1' * $uidsec_size
-        puts "#{$unbit_log_base} uidsec_struct allocated."
-end
-
-
-options[:environment] = (ENV['RAILS_ENV'] || "development").dup
-options[:processes] = 1
-options[:serve_file] = nil
-options[:max_input_size] = 8
-options[:unbit_debug] = false
-options[:master] = true
-options[:gc_freq] = nil
-
-require 'optparse'
-
-ARGV.clone.options do |opts|
-        opts.on('-s', '--socket=socket', String, 'Unix socket path.', 'Default: /tmp/uwsgi.sock') { |v|
-                options[:sockname] = v
-        }
-        opts.on('-C','--chmod','chmod to 666 the unix socket.') {
-                options[:sock_chmod] = true
-        }
-        opts.on('-F','--serve-file','serve static file.') {
-                options[:serve_file] = true
-        }
-        opts.on('-p', '--processes=processes', Integer, 'Number of processes to spawn.', 'Default: 1') {|v|
-                options[:processes] = v
-        }
-        opts.on('-g', '--gc-freq=requests', Integer, 'Number of requests between GC.', 'Default: 1') {|v|
-                options[:gc_freq] = v
-        }
-        opts.on('-d', '--daemon=logfile', 'Put processes in background.', 'Default: all processes stay in foreground') {|v|
-                options[:stderr_logfile] = v
-        }
-        opts.on('-i', '--max-input-size=size', 'Max POST data size (in Kbyte). Bigger data goes into a temporary file.', 'Default: 8') {|v|
-                options[:max_input_size] = v
-        }
-        opts.on('-D', '--unbit-debug', 'Enable debug-level logging.', 'Default: disabled') {|v|
-                options[:unbit_debug] = true
-        }
-        opts.on('-M', '--master-process', 'Enable the master process manager.', 'Default: disabled') {|v|
-                options[:master] = true
-        }
-        opts.on("-e", '--environment=name', String, 'Specifies the environment to run this server under (test/development/production).','Default: development') { |v|
-                options[:environment] = v
-        }
-
-        opts.separator ""
-
-        opts.parse!
-end
-
-puts "[#{Time.new}] uRack: loading app [#{RAILS_ROOT}]..."
-starttime = Time.now
-require RAILS_ROOT + "/config/environment"
-
-options[:app_name] = RAILS_ROOT
-
-require 'socket'
-require 'rubygems'
-require 'rack'
-require 'rack/utils'
-require 'rack/content_length'
+$requests = 0
+$workers = Array.new
+$mywid = 0

 module Rack
-        module Handler
-                class Unbit
-                        class Tempfile < ::Tempfile
-                                def _close
-                                        @tmpfile.close if @tmpfile
-                                        @data[1] = nil if @data
-                                        @tmpfile = nil
-                                end
-                        end
-                        def self.run(app, options={})

-                                # parse the socket options
-                                # note: on unbit we use the stdin as communication socket
-                                
-                                server = nil
-                                master_pid = Process.pid
-                                options[:processes] ||= 1
+  class RailsCachingHack
+    def initialize app
+      @app = app
+    end

-                                unless options[:unbit]
-                                        begin
-                                                ::File.delete(options[:sockname])
-                                        rescue
-                                        end
+    def stripuri(uri)
+      uri = uri.split('/')
+      uri.slice!(1)
+      val = uri.join('/')
+    end
+    def call env
+      env['PATH_INFO'] = stripuri(env['PATH_INFO']) if env['PATH_INFO']
+      env['REQUEST_URI'] = stripuri(env['REQUEST_URI']) if env['REQUEST_URI']
+      env['REQUEST_URI'] = '/' if env['REQUEST_URI'] == ''
+      @app.call env
+    end
+  end

-                                        server = UNIXServer.new(options[:sockname])
-                                        if options[:sock_chmod]
-                                                ::File.chmod(0666, options[:sockname])
-                                        end
+  module Handler
+    class Unbit

-                                        if options[:stderr_logfile]
-                                                cwd = Dir.getwd
-                                                Process.daemon
-                                                Dir.chdir(cwd)
-                                                $stdout.reopen(options[:stderr_logfile],'a')
-                                                $stderr.reopen(options[:stderr_logfile],'a')
-                                                # log files need to be unbuffered !
-                                                $stdout.sync = true
-                                                $stderr.sync = true
-                                                # pid is changed after the .daemon call
-                                                master_pid = Process.pid
-                                        end
-                                else
-                                        server = UNIXServer.for_fd($stdin.fileno)
-                                end
+      def self.run(app, options={})
+        server = UNIXServer.for_fd(0)

-                                $workers = Array.new
+        can_spawn = true
+        if options[:master]
+                $0 = 'uRack master'
+                $workers[0] = Process.pid
+                ulog("master process enabled (pid: #{$workers[0]})")
+                $workers[1] = Process.fork
+                if $workers[1].to_i > 0
+                        ulog("spawned worker 1 (pid: #{$workers[1]})")
+                elsif $workers[1].to_i == 0
+                        $0 = "uRack worker 1"
+			$mywid = 1
+                        can_spawn = false
+                end
+        else
+                $0 = 'uRack worker 1'
+                $workers[0] = nil
+                $workers[1] = Process.pid
+		$mywid = 1
+                ulog("spawned worker 1 (pid: #{$workers[1]})")
+        end

-                                if options[:master]
-                                        $0 = "uRack #{ARGV.last}"
-                                        pid = Process.fork
-                                        if pid.to_i > 0
-                                                puts "[#{Time.new}] uRack: spawned rack worker 1 (pid: #{pid})"
-                                                $workers[1] = pid ;
-                                        end
-                                end
-
-                                # the check on master pid is necessary
-                                # without it the first worker will execute this part
-                                if options[:processes] > 1 and Process.pid == master_pid
-                                        for p in 2..options[:processes]
-                                                pid = Process.fork
-                                                break if pid.to_i == 0
-                                                puts "[#{Time.new}] uRack: spawned rack worker #{p} (pid: #{pid})"
-                                                $workers[p] = pid ;
-                                        end
-                                end
-
-
-                                
-                                # am i the master ?
-                                if options[:master] and Process.pid == master_pid
-                                        Signal.trap('TERM') do
-                                                puts "[#{Time.new}] uRack: gracefully killing uRack"
-                                                for wid in 1..options[:processes]
-                                                        Process.kill('TERM', $workers[wid]);
-                                                end
-                                                exit 0;
-                                        end
-                                        Signal.trap('QUIT') do
-                                                puts "[#{Time.new}] uRack: brutally killing uRack"
-                                                for wid in 1..options[:processes]
-                                                        Process.kill('INT', $workers[wid]);
-                                                end
-                                                exit 0;
-                                        end
-                                        puts "[#{Time.new}] uRack: the master process manager is alive."
-                                        while 1
-                                                pid = Process.waitpid
-                                                puts "[#{Time.new}] uRack: worker died ! (pid: #{pid})"
-                                                newpid = Process.fork
-                                                break if newpid.to_i == 0
-                                                puts "[#{Time.new}] uRack: respawned rack worker (pid: #{newpid})"
-                                                for wid in 1..options[:processes]
-                                                        if $workers[wid] == pid
-                                                                $workers[wid] = newpid
-                                                                break
-                                                        end
-                                                end
-                                        end
-                                end
-
-                                if Process.pid != master_pid
-                                        $0 = $0.gsub(/^uRack/,'urack')
-                                        Signal.trap("TERM") do
-                                                puts "[#{Time.new}] uRack: grecefully killing process #{Process.pid}..."
-                                                if $in_request == 0
-                                                        puts "[#{Time.new}] uRack: goodbye to process #{Process.pid}"
-                                                        exit 0
-                                                end
-                                                $manage_next_request = nil
-                                        end
-                                        Signal.trap('INT') do
-                                                puts "[#{Time.new}] uRack: brutally killing process #{Process.pid}..."
-                                                exit 0
-                                        end
-                                        Signal.trap('PIPE') do
-                                                puts "[#{Time.new}] uRack: the webserver (or the client) has closed the connection with process #{Process.pid} !!!"
-                                        end
-                                end
-
-                                max_input_size = options[:max_input_size].to_i * 1024
-                                requests = 0
-
-                                null_post = StringIO.new('')
-
-                                options[:app_name] ||= Dir.getwd
-
-                                app = Rack::ContentLength.new(app)
-
-                                $manage_next_request = true
-
-                                if options[:gc_freq].to_i > 1
-                                        GC.disable
-                                end
-
-                                while $manage_next_request
-
-                                        $in_request = 0 
-                                        client = server.accept
-                                        $in_request = 1
-
-                                        timed_out = false
-                                                        
-                                        ver, size, arg1 = client.recvfrom(4)[0].unpack('CvC')
-
-                                        vars = client.recvfrom(size)[0]
-                                        env = Hash.new
-
-                                        i = 0
-                                        while i < size
-                                                kl = vars[i, 2].unpack('v')[0]
-                                                i = i + 2
-                                                key = vars[i, kl]
-                                                i = i + kl
-                                                vl = vars[i, 2].unpack('v')[0]
-                                                i = i + 2
-                                                value = vars[i, vl]
-                                                i = i + vl
-                                                env[key] = value
-                                        end
-
-                                        rack_input = null_post
-
-                                        env.delete 'CONTENT_LENGTH' if env['CONTENT_LENGTH'] == ''
-
-                                        if env['CONTENT_LENGTH'].to_i > 0
-                                                cl = env['CONTENT_LENGTH'].to_i
-
-                                                if cl <= max_input_size
-                                                        poststr = ''
-                                                        while poststr.size < cl
-                                                                poststr = poststr + client.recvfrom(cl-poststr.size)[0] ;
-                                                        end
-                                                        
-                                                        rack_input = StringIO.new(poststr)
-                                                else
-                                                        rack_input = Tempfile.new('UnbitRack')
-                                                        rack_input.chmod(0000)
-
-                                                        bytes_read = 0
-                                                        while bytes_read < cl
-                                                                buf = client.recvfrom(4096)[0]
-                                                                rack_input.write(buf)
-                                                                bytes_read += buf.size
-                                                        end
-                                                        rack_input.rewind
-                                                end
-                                        end
-
-                                        env["SCRIPT_NAME"] = ""
-                                        env.update({"rack.version" => [0,1],
-                                                "rack.input" => rack_input,
-                                                "rack.errors" => $stderr,
-                                                "rack.multithread" => false,
-                                                "rack.multiprocess" => true,
-                                                "rack.run_once" => false,
-                                                "rack.url_scheme" => "http"
-                                        })
-
-                                        env["QUERY_STRING"] ||= ""
-                                        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-                                        env["REQUEST_PATH"] ||= "/"
-
-
-                                        begin
-                                                #puts env.inspect
-                                                $start_of_request = Time.new
-                                                status, headers, body = app.call(env)
-                                                $speed = Time.new - $start_of_request
-                                        
-                                                client.print "#{env["HTTP_VERSION"]} #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]}\r\n"
-                                                headers.each {|k,vs|
-                                                        vs.split("\n").each { |v|
-                                                                client.print "#{k}: #{v}\r\n"
-                                                        }
-                                                }
-                                                client.print "\r\n"
-                                                client.flush
-
-                                                body.each {|part|
-                                                        client.print part
-                                                        client.flush
-                                                }
-                                        rescue Errno::EPIPE
-                                                puts "[#{Time.new}] uRack: the webserver (or the client) has closed the connection with process #{Process.pid} !!!"
-                                                timed_out = true
-                                        ensure
-                                                if rack_input.respond_to? :unlink
-                                                        rack_input.unlink
-                                                end
-                                                unless rack_input.closed?
-                                                        rack_input.close
-                                                end
-                                                client.close
-                                                requests = requests+1
-                                                # logging 
-                                                begin
-                                                        # the syscall 356 is only available on unbit kernels
-                                                        # other systems need to use the proc file way
-                                                        # stat = ::File.open('/proc/self/stat', 'r')
-                                                        # procline = stat.readline
-                                                        # statd = procline.split /\s+/
-                                                        # stat.close
-                                                        $stderr.puts "[#{Time.new}] uRack: [#{options[:app_name]}] req: #{requests} ip: #{env['REMOTE_ADDR']} pid: #{Process.pid} as: #{human_round(syscall(356).to_f/1024/1024)} MB => #{env['REQUEST_METHOD']} #{env['REQUEST_URI']} in #{$speed} secs [#{status}]#{' TIMED OUT !!!' if timed_out}"
-                                                rescue
-                                                        $stderr.puts "[#{Time.new}] uRack: [#{options[:app_name]}] req: #{requests} unable to get /proc/self/stat or syscall 356"
-                                                end
-                                                if syscall(357, $uidsec, 0) == $uidsec_size
-                                                        if $uidsec[120..123].unpack('i')[0] > 0
-                                                                $stderr.puts "[#{Time.new}] uRack: found a memory allocation error for request #{requests} (pid: #{Process.pid}). Better to kill myself..."
-                                                                $manage_next_request = nil
-                                                        end
-                                                end
-                                                $uidsec = '1' * $uidsec_size
-                                                if options[:unbit_debug]
-                                                        current_as = human_round( (syscall(356).to_f/1024/1024) - $last_as )
-                                                        $stderr.puts "#{$unbit_log_base} resource status after request #{requests}: AS for this request: #{current_as} MB | OBJ for this request: #{ObjectSpace.each_object {} - $last_obj} | OBJ total: #{ObjectSpace.each_object {}}"
-                                                        $last_as = human_round(syscall(356).to_f/1024/1024) ;
-                                                        $last_obj = ObjectSpace.each_object {}
-                                                end
-                                                if options[:gc_freq].to_i > 1
-                                                        if requests % options[:gc_freq].to_i == 0
-                                                                $stderr.puts "[#{Time.new}] uRack: [#{options[:app_name]}] calling GC for pid #{Process.pid} after #{requests} requests."
-                                                                GC.enable ; GC.start ; GC.disable
-                                                        end
-                                                end
-                                        end
-                                end
-
-                                puts "[#{Time.new}] uRack: goodbye to process #{Process.pid}"
+        if options[:processes] > 1 and can_spawn
+                for p in 2..options[:processes]
+                        $workers[p] = Process.fork
+                        if $workers[p].to_i == 0
+                                $0 = "uRack worker #{p}"
+				$mywid = p
+                                break
+                        elsif $workers[p].to_i > 0
+                                ulog("spawned worker #{p} (pid: #{$workers[p]})")
                        end
                end
        end
+
+        # am i the master ?
+        if options[:master] and Process.pid == $workers[0]
+                while 1
+                        i_am_a_child = false
+                        pid = Process.waitpid
+                        for wid in 1..options[:processes]
+                                if $workers[wid] == pid
+                                        ulog("worker #{wid} died ! (pid: #{pid})")
+                                        $workers[wid] = Process.fork
+                                        if $workers[wid].to_i == 0
+                                                $0 = "uRack worker #{wid}"
+                                                i_am_a_child = true
+						$mywid = wid
+                                                break
+                                        elsif $workers[wid].to_i > 0
+                                                ulog("respawned worker #{wid} (pid: #{$workers[wid]})")
+                                        end
+                                        
+                                end
+                        end
+                        break if i_am_a_child
+                end
+        end
+        
+	if options[:threads] > 2
+		for t in 2..options[:threads]
+			wt = Thread.new do
+			    ulog("spawning thread #{t} on worker #{$mywid}")
+            		    while client = server.accept
+                		serve client, app, options
+            		    end
+			end
+		end
+	end
+
+        while client = server.accept
+        	serve client, app, options
+        end
+
+      end
+
+      def self.serve(client, app, options)
+
+        speed = Time.now
+        head, sender = client.recvfrom(4)
+
+        unless head
+          client.close
+          return
+        end
+        
+        mod1, size, mod2 = head.unpack('CvC')
+
+        if size == 0 or size.nil?
+          client.close
+          return
+        end
+
+        vars, sender = client.recvfrom(size)
+
+        if vars.length != size
+          client.close
+          return
+        end
+
+        env = Hash.new
+
+        i = 0
+        while i < size
+          kl = vars[i, 2].unpack('v')[0]
+          i = i + 2
+          key = vars[i, kl]
+          i = i + kl
+          vl = vars[i, 2].unpack('v')[0]
+          i = i + 2
+          value = vars[i, vl]
+          i = i + vl
+          env[key] = value
+        end
+
+
+
+        env.delete "HTTP_CONTENT_LENGTH"
+        env.delete "HTTP_CONTENT_TYPE"
+
+        env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
+        env["QUERY_STRING"] ||= ""
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["REQUEST_PATH"] ||= "/"
+        env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
+        env.delete "CONTENT_TYPE"  if env["CONTENT_TYPE"] == ""
+        env.delete "CONTENT_LENGTH"  if env["CONTENT_LENGTH"] == ""
+        
+        
+        if env["CONTENT_LENGTH"].to_i > 4096
+                rack_input = Rack::RewindableInput::Tempfile.new('Rack_unbit_Input')
+                rack_input.chmod(0000)
+                rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding)
+                rack_input.binmode
+                rack_input.unlink
+
+                remains = env["CONTENT_LENGTH"].to_i
+                while remains > 0
+                        if remains >= 4096
+                                buf, sender = client.recvfrom(4096)
+                        else
+                                buf, sender = client.recvfrom(remains)
+                        end
+
+			if buf.length == 0
+				break
+			end
+
+                        rack_input.write( buf )
+                        remains -= buf.length
+                end
+
+        elsif env["CONTENT_LENGTH"].to_i > 0
+                rack_input =  StringIO.new(client.recvfrom(env["CONTENT_LENGTH"].to_i)[0])
+        else
+                rack_input = StringIO.new('')
+        end
+
+        rack_input.rewind
+
+        env.update({"rack.version" => [1,1],
+                     "rack.input" => rack_input,
+                     "rack.errors" => $stderr,
+
+                     "rack.multithread" => false,
+                     "rack.multiprocess" => true,
+                     "rack.run_once" => false,
+
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
+                   })
+
+        app = Rack::ContentLength.new(app)
+
+        disconnected = false
+        begin
+          status, headers, body = app.call(env)
+          begin
+            send_headers client, env["HTTP_VERSION"] ,status, headers
+            send_body client, body
+          ensure
+            body.close  if body.respond_to? :close
+          end
+        rescue Errno::EPIPE, Errno::ECONNRESET
+          disconnected = true
+        ensure
+          rack_input.close
+          client.close
+        end
+        $requests = $requests+1
+        
+        ulog("req: #{$requests} ip: #{env['REMOTE_ADDR']} pid: #{Process.pid} as: #{human_round(syscall(356).to_f/1024/1024)} MB => #{env['REQUEST_METHOD']} #{env['REQUEST_URI']} in #{Time.now-speed} secs [#{status}]#{' DISCONNECTED !!!' if disconnected}") if options[:logging]
+      end
+
+      def self.send_headers(client, protocol, status, headers)
+        client.print "#{protocol} #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]}\r\n"
+        headers.each { |k, vs|
+          vs.split("\n").each { |v|
+            client.print "#{k}: #{v}\r\n"
+          }
+        }
+        client.print "\r\n"
+        client.flush
+      end
+
+      def self.send_body(client, body)
+        body.each { |part|
+          client.print part
+          client.flush
+        }
+      end
+    end
+  end
 end

+def ulog(message)
+        $stderr.puts "[#{Time.new}] uRack: #{message}"
+end
+
+ulog("starting at #{Dir.getwd}")
+limit_as = human_round(Process.getrlimit(Process::RLIMIT_AS)[1].to_f/1024/1024)
+ulog("your process address space limit is #{limit_as} MB")
 server = Rack::Handler.get('Unbit')

-app = Rack::Builder.new {
-        if options[:serve_file]
-                puts "[#{Time.new}] uRack: file serving enabled."
-                use Rails::Rack::Static
+starttime = Time.now
+
+app = nil
+
+if options[:config]
+        cfgfile = File.read(options[:config])
+        if cfgfile[/^#\\(.*)/]
+                opts.parse! $1.split(/\s+/)
        end
-        if ActionController.const_defined?(:Dispatcher) && (ActionController::Dispatcher.instance_methods.include?(:call) || ActionController::Dispatcher.instance_methods.include?("call"))
-                run ActionController::Dispatcher.new
+        app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, options[:config]
+else
+        # falling back to rails
+        if Dir.getwd =~ /\/public\/?$/  
+                require '../config/environment'
        else
-                require 'thin'
-                run Rack::Adapter::Rails.new(:environment => ENV['RAILS_ENV'])
+                require 'config/environment'
        end
-}.to_app
-
-if options[:unbit]
-$after_spawn_used_as = human_round(syscall(356).to_f/1024/1024)
-$stderr.puts "#{$unbit_log_base} now you have #{$limit_as-$after_spawn_used_as} MB of address space available (used #{$after_spawn_used_as}MB after app startup)"
+        app = Rack::Builder.new {
+                if options[:cachehack]
+                        use Rack::RailsCachingHack
+                end
+                if options[:static]
+                        use Rails::Rack::Static
+                end
+                if ActionController.const_defined?(:Dispatcher) && (ActionController::Dispatcher.instance_methods.include?(:call) || ActionController::Dispatcher.instance_methods.include?("call"))
+                        run ActionController::Dispatcher.new
+                else
+                        require 'thin'
+                        run Rack::Adapter::Rails.new(:environment => ENV['RAILS_ENV'])
+                end
+        }
 end
-secs = Time.now-starttime
-puts "[#{Time.new}] uRack: ready to serve requests after #{secs.to_i} secs (pid: #{Process.pid})"

-if options[:unbit_debug]
-        $last_as = $after_spawn_used_as ;
-        $last_obj = ObjectSpace.each_object {}
-end
+
+ulog("your app is ready (in #{Time.now-starttime} seconds).")
+

 server.run(app, options)
+
@@ -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)
@@ -0,0 +1,30 @@
+-module(uwsgi).
+-export([encode/1,send/3]).
+
+	
+encode(Vars) ->
+	Body = lists:map(fun(X) -> Len = length(X), lists:append( binary_to_list(<<Len:16/little-unsigned-integer>>), X) end, Vars),
+	lists:flatten(Body).
+	
+response(Sock, Output) ->
+	case gen_tcp:recv(Sock,0) of
+		{ ok, Data } ->
+			response(Sock, lists:append(Output, binary_to_list(Data)));
+		{ error, closed } ->
+			gen_tcp:close(Sock),
+			Output
+	end.
+
+send(Host, Port, Message) ->
+	{ ok, Sock } = gen_tcp:connect( Host, Port, [ binary, { active, false} ]),
+
+	Body = encode(Message),
+
+	Len = length(Body),
+
+	ok = gen_tcp:send(Sock, << 0, Len:16/little-unsigned-integer, 0>>),
+
+	ok = gen_tcp:send(Sock, Body),
+
+	response(Sock, []).
+
@@ -6,7 +6,6 @@ import java.util.Enumeration;
 import org.apache.catalina.util.IOTools;

 public class uwsgi extends HttpServlet {
-
 	private String mountpoint = null;

 	public void init(ServletConfig config) throws ServletException {
@@ -22,34 +21,34 @@ public class uwsgi extends HttpServlet {
 		if (getServletConfig().getInitParameter("mountpoint") != null) {
 			mountpoint = getServletConfig().getInitParameter("mountpoint");
 			if (mountpoint.length() <= 1) {
-				mountpoint = null ;
+				mountpoint = null;
 			}
 		}
 	}

-	
+
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
-	throws IOException, ServletException {
+		throws IOException, ServletException {
 		uWSGIHandler(request, response);
 	}

 	public void doGet(HttpServletRequest request, HttpServletResponse response)
-	throws IOException, ServletException {
+		throws IOException, ServletException {
 		uWSGIHandler(request, response);
 	}

-	
+
 	private void uWSGIHandler(HttpServletRequest request, HttpServletResponse response)
-	throws IOException, ServletException {
+		throws IOException, ServletException {

 		Socket client = new Socket("localhost",3017);
-		ByteArrayOutputStream uwsgi_request = new ByteArrayOutputStream() ;
+		ByteArrayOutputStream uwsgi_request = new ByteArrayOutputStream();
 		DataOutputStream wos = new DataOutputStream(uwsgi_request); 

 		DataOutputStream os = new DataOutputStream(client.getOutputStream());
 		DataInputStream is = new DataInputStream( client.getInputStream() );

-	
+
 		ServletOutputStream out = response.getOutputStream();

 		boolean hasBody = false;
@@ -104,14 +103,14 @@ public class uwsgi extends HttpServlet {

 		if (mountpoint != null) {
 			wos.writeShort(swapShort( (short) 11));
-                	wos.writeBytes("SCRIPT_NAME");
-			wos.writeShort(swapShort( (short) mountpoint.length() ) ) ;
-			wos.writeBytes( mountpoint ) ;
+			wos.writeBytes("SCRIPT_NAME");
+			wos.writeShort(swapShort( (short) mountpoint.length() ) );
+			wos.writeBytes( mountpoint );
 		}
-		
+

 		wos.writeShort(swapShort( (short) 9));
-                wos.writeBytes("PATH_INFO");
+		wos.writeBytes("PATH_INFO");
 		if (mountpoint != null) {
 			wos.writeShort(swapShort( (short) (request.getRequestURI().length() - mountpoint.length()) ) );
 			wos.writeBytes( request.getRequestURI().substring(mountpoint.length())  );
@@ -149,14 +148,14 @@ public class uwsgi extends HttpServlet {
 			hasBody = true;
 		}

-		
+
 		// taken from CGI servlet

 		Enumeration headers = request.getHeaderNames();
 		String header = null;
 		while (headers.hasMoreElements()) {
-                	header = null;
-                	header = ((String) headers.nextElement()).toUpperCase();
+			header = null;
+			header = ((String) headers.nextElement()).toUpperCase();
 			wos.writeShort(swapShort( (short) ("HTTP_" + header.replace('-', '_')).length() ));
 			wos.writeBytes("HTTP_" + header.replace('-', '_'));
 			wos.writeShort(swapShort( (short) request.getHeader(header).length() ));
@@ -175,16 +174,16 @@ public class uwsgi extends HttpServlet {
 			IOTools.flow(request.getInputStream(), os);
 		}

-		boolean statusParsed = false ;
+		boolean statusParsed = false;
 		for(;;) {
-			String line = byte_readline(is) ;
+			String line = byte_readline(is);
 			if (line == "") {
 				break;
 			}
 			if (statusParsed == false) {
 				String[] status = line.split(" ",3);
 				response.setStatus( Integer.parseInt(status[1]) );
-				statusParsed = true ;
+				statusParsed = true;
 			}
 			else {
 				String[] keyval = line.split(": ",2);
@@ -200,7 +199,7 @@ public class uwsgi extends HttpServlet {
 		byte cb[] = new byte[4096];
 		int len = 0;
 		for(;;) {
-			len = is.read(cb,0,4096) ;
+			len = is.read(cb,0,4096);
 			if ( len > 0) {
 				out.write(cb,0,len);	
 			}
@@ -208,7 +207,7 @@ public class uwsgi extends HttpServlet {
 				break;
 			}
 		}
-		
+

 	}

@@ -218,19 +217,19 @@ public class uwsgi extends HttpServlet {
 		for(;;) {
 			byte b = is.readByte();
 			if (b == 10) {
-				break ;
+				break;
 			}
-			line.write(b) ;
+			line.write(b);
 		}

 		return line.toString("ASCII").replaceAll("\\n","").replaceAll("\\r","");
 	}

 	private short swapShort(short x) {
-	
-		short tmp1 = (short) (x>>8) ;
-		short tmp2 = (short) (x<<8) ;
-		return (short) (tmp1 | tmp2)  ;
+
+		short tmp1 = (short) (x>>8);
+		short tmp2 = (short) (x<<8);
+		return (short) (tmp1 | tmp2);
 	}	

 }
@@ -0,0 +1,150 @@
+require 'socket'
+require 'rack/content_length'
+require 'rack/rewindable_input'
+require 'stringio'
+
+module Rack
+  module Handler
+    class Uwsgi
+
+      def self.run(app, options={})
+	if ENV['UWSGI_FD']
+          server = UNIXServer.for_fd(ENV['UWSGI_FD'].to_i)
+	else
+          server = TCPServer.new(options[:Host], options[:Port])
+	end
+	while client = server.accept
+          serve client, app
+	end
+      end
+
+      def self.serve(client, app)
+
+	head, sender = client.recvfrom(4)
+
+	unless head
+	  client.close
+	  return
+	end
+	
+	mod1, size, mod2 = head.unpack('CvC')
+
+	if size == 0 or size.nil?
+	  client.close
+	  return
+	end
+
+	vars, sender = client.recvfrom(size)
+
+	if vars.length != size
+	  client.close
+	  return
+	end
+
+	env = Hash.new
+
+	i = 0
+	while i < size
+          kl = vars[i, 2].unpack('v')[0]
+          i = i + 2
+          key = vars[i, kl]
+	  i = i + kl
+          vl = vars[i, 2].unpack('v')[0]
+          i = i + 2
+	  value = vars[i, vl]
+          i = i + vl
+          env[key] = value
+	end
+
+
+
+        env.delete "HTTP_CONTENT_LENGTH"
+        env.delete "HTTP_CONTENT_TYPE"
+
+        env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
+        env["QUERY_STRING"] ||= ""
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["REQUEST_PATH"] ||= "/"
+        env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
+        env.delete "CONTENT_TYPE"  if env["CONTENT_TYPE"] == ""
+        env.delete "CONTENT_LENGTH"  if env["CONTENT_LENGTH"] == ""
+        
+	
+	if env["CONTENT_LENGTH"].to_i > 4096
+		rack_input = Rack::RewindableInput::Tempfile.new('Rack_uwsgi_Input')
+		rack_input.chmod(0000)
+		rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding)
+      		rack_input.binmode
+      		if RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/
+        	  rack_input.unlink
+		end
+
+		remains = env["CONTENT_LENGTH"].to_i
+		while remains > 0
+			if remains >= 4096
+				buf, sender = client.recvfrom(4096)
+			else
+				buf, sender = client.recvfrom(remains)
+			end
+
+			rack_input.write( buf )
+			remains -= buf.length
+		end
+
+	elsif env["CONTENT_LENGTH"].to_i > 0
+		rack_input =  StringIO.new(client.recvfrom(env["CONTENT_LENGTH"].to_i)[0])
+	else
+		rack_input = StringIO.new('')
+	end
+
+	rack_input.rewind
+
+        env.update({"rack.version" => [1,1],
+                     "rack.input" => rack_input,
+                     "rack.errors" => $stderr,
+
+                     "rack.multithread" => false,
+                     "rack.multiprocess" => true,
+                     "rack.run_once" => false,
+
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
+                   })
+
+
+        app = Rack::ContentLength.new(app)
+
+        begin
+          status, headers, body = app.call(env)
+          begin
+            send_headers client, env["HTTP_VERSION"] ,status, headers
+            send_body client, body
+          ensure
+            body.close  if body.respond_to? :close
+          end
+	rescue Errno::EPIPE, Errno::ECONNRESET
+        ensure
+	  rack_input.close
+	  client.close
+        end
+      end
+
+      def self.send_headers(client, protocol, status, headers)
+	client.print "#{protocol} #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]}\r\n"
+        headers.each { |k, vs|
+          vs.split("\n").each { |v|
+            client.print "#{k}: #{v}\r\n"
+          }
+        }
+        client.print "\r\n"
+        client.flush
+      end
+
+      def self.send_body(client, body)
+        body.each { |part|
+          client.print part
+          client.flush
+        }
+      end
+    end
+  end
+end
@@ -2,8 +2,8 @@

 *** uWSGI cgi client ***

-to compile:
-        gcc -Wall -o uwsgi_client.cgi uwsgi_client.c
+ to compile:
+ gcc -Wall -o uwsgi_client.cgi uwsgi_client.c

 */

@@ -18,79 +18,79 @@ to compile:
 #define UWSGI_SOCK "/tmp/uwsgi.sock"

 int main() {
-        extern char **environ;
-        char *env ;
-        struct sockaddr_un s_addr ;
-        int uwsgi_socket ;
-        int res, cnt;
-        char *place_holder;
-        
-        unsigned short len ;
-        char message[4096];
-        char *mptr;
+	extern char **environ;
+	char *env;
+	struct sockaddr_un s_addr;
+	int uwsgi_socket;
+	int res, cnt;
+	char *place_holder;
+
+	unsigned short len;
+	char message[4096];
+	char *mptr;
 	char *content_length;

-        memset(&s_addr, 0, sizeof(struct sockaddr_un)) ;
+	memset(&s_addr, 0, sizeof(struct sockaddr_un));

-        s_addr.sun_family = AF_UNIX;
-        strcpy(s_addr.sun_path, UWSGI_SOCK);
+	s_addr.sun_family = AF_UNIX;
+	strcpy(s_addr.sun_path, UWSGI_SOCK);

-        uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (uwsgi_socket < 0) {
-                perror("socket()");
-                exit(1);
-        }
+	uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (uwsgi_socket < 0) {
+		perror("socket()");
+		exit(1);
+	}

-        if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
-                perror("connect()");
-                exit(1);
-        }
+	if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
+		perror("connect()");
+		exit(1);
+	}

-        memset(message, 0, 4096);
+	memset(message, 0, 4096);

-        mptr = message+4;
+	mptr = message+4;

-        if (**environ) {
-                while( (env = *environ) ) {
-                        place_holder = strchr(env,'=');
-                        // key
-                        len = place_holder-env ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, env, len);
-                        mptr+=len ;
-                        // value
-                        len = (unsigned short) (env+strlen(env) - (place_holder+1)) ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, place_holder+1, len);
-                        mptr+= len ;    
-                        *environ++;
-                }
-        }
-
-        message[0] = 0;
-        len = (mptr-message)-4 ;
-        memcpy(message+1, &len, 2) ;
-        message[3] = 0 ;
-
-        res = send(uwsgi_socket, message, mptr-message, 0);
-
-	if ( (content_length = getenv("CONTENT_LENGTH")) != NULL) {
-		if (atoi(content_length) > 0) {
-        		while( (cnt = read(0, message, 4096)) ) {
-               			send(uwsgi_socket, message, cnt, 0) ; 
-        		}
+	if (**environ) {
+		while( (env = *environ) ) {
+			place_holder = strchr(env,'=');
+			// key
+			len = place_holder-env;
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, env, len);
+			mptr+=len;
+			// value
+			len = (unsigned short) (env+strlen(env) - (place_holder+1));
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, place_holder+1, len);
+			mptr+= len;
+			*environ++;
 		}
 	}

-        if (res == mptr-message) {
-                while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
-                        write(1, message, res) ;
-                }
-        }
-        
-        return 0;
-        
+	message[0] = 0;
+	len = (mptr-message)-4;
+	memcpy(message+1, &len, 2);
+	message[3] = 0;
+
+	res = send(uwsgi_socket, message, mptr-message, 0);
+
+	if ( (content_length = getenv("CONTENT_LENGTH")) != NULL) {
+		if (atoi(content_length) > 0) {
+			while( (cnt = read(0, message, 4096)) ) {
+				send(uwsgi_socket, message, cnt, 0);
+			}
+		}
+	}
+
+	if (res == mptr-message) {
+		while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
+			write(1, message, res);
+		}
+	}
+
+	return 0;
+
 }

@@ -2,8 +2,8 @@

 *** uWSGI cgi client ***

-to compile:
-        gcc -Wall -o uwsgi_client.cgi uwsgi_dynamic_client.c
+ to compile:
+ gcc -Wall -o uwsgi_client.cgi uwsgi_dynamic_client.c

 */

@@ -19,77 +19,77 @@ to compile:
 #define UWSGI_SCRIPT "myapp_wsgi"

 int main() {
-        extern char **environ;
-        char *env ;
-        struct sockaddr_un s_addr ;
-        int uwsgi_socket ;
-        int res, cnt;
-        char *place_holder;
-        
-        unsigned short len ;
-        char message[4096];
-        char *mptr;
+	extern char **environ;
+	char *env;
+	struct sockaddr_un s_addr;
+	int uwsgi_socket;
+	int res, cnt;
+	char *place_holder;

-        memset(&s_addr, 0, sizeof(struct sockaddr_un)) ;
+	unsigned short len;
+	char message[4096];
+	char *mptr;

-        s_addr.sun_family = AF_UNIX;
-        strcpy(s_addr.sun_path, UWSGI_SOCK);
+	memset(&s_addr, 0, sizeof(struct sockaddr_un));

-        uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (uwsgi_socket < 0) {
-                perror("socket()");
-                exit(1);
-        }
+	s_addr.sun_family = AF_UNIX;
+	strcpy(s_addr.sun_path, UWSGI_SOCK);

-        if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
-                perror("connect()");
-                exit(1);
-        }
+	uwsgi_socket = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (uwsgi_socket < 0) {
+		perror("socket()");
+		exit(1);
+	}

-        memset(message, 0, 4096);
+	if (connect(uwsgi_socket, (struct sockaddr *) &s_addr, strlen(UWSGI_SOCK) + ( (void *)&s_addr.sun_path - (void *)&s_addr) ) != 0) {
+		perror("connect()");
+		exit(1);
+	}

-        mptr = message+4;
-        if (setenv("UWSGI_SCRIPT", UWSGI_SCRIPT, 1) != 0) {
-                perror("setenv()");
-                exit(1);
-        }
-        if (**environ) {
-                while( (env = *environ) ) {
-                        place_holder = strchr(env,'=');
-                        // key
-                        len = place_holder-env ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, env, len);
-                        mptr+=len ;
-                        // value
-                        len = (unsigned short) (env+strlen(env) - (place_holder+1)) ;
-                        memcpy(mptr, &len, 2);
-                        mptr+=2;
-                        memcpy(mptr, place_holder+1, len);
-                        mptr+= len ;    
-                        *environ++;
-                }
-        }
+	memset(message, 0, 4096);

-        message[0] = 0;
-        len = (mptr-message)-4 ;
-        memcpy(message+1, &len, 2) ;
-        message[3] = 0 ;
+	mptr = message+4;
+	if (setenv("UWSGI_SCRIPT", UWSGI_SCRIPT, 1) != 0) {
+		perror("setenv()");
+		exit(1);
+	}
+	if (**environ) {
+		while( (env = *environ) ) {
+			place_holder = strchr(env,'=');
+			// key
+			len = place_holder-env;
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, env, len);
+			mptr+=len;
+			// value
+			len = (unsigned short) (env+strlen(env) - (place_holder+1));
+			memcpy(mptr, &len, 2);
+			mptr+=2;
+			memcpy(mptr, place_holder+1, len);
+			mptr+= len;
+			*environ++;
+		}
+	}

-        res = send(uwsgi_socket, message, mptr-message, 0);
+	message[0] = 0;
+	len = (mptr-message)-4;
+	memcpy(message+1, &len, 2);
+	message[3] = 0;

-        while( (cnt = read(0, message, 4096)) ) {
-                send(uwsgi_socket, message, cnt, 0) ; 
-        }
+	res = send(uwsgi_socket, message, mptr-message, 0);
+
+	while( (cnt = read(0, message, 4096)) ) {
+		send(uwsgi_socket, message, cnt, 0);
+	}
+
+	if (res == mptr-message) {
+		while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
+			write(1, message, res);
+		}
+	}
+
+	return 0;

-        if (res == mptr-message) {
-                while( (res = recv(uwsgi_socket, message, 4096,0)) ) {
-                        write(1, message, res) ;
-                }
-        }
-        
-        return 0;
-        
 }

@@ -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
@@ -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
+}
+
@@ -0,0 +1,469 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_async_init() {
+	int i;
+
+	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();
+
+                uwsgi.async_queue_unused = uwsgi_malloc(sizeof(struct wsgi_request *) * uwsgi.async);
+
+                for (i = 0; i < uwsgi.async; i++) {
+                        uwsgi.async_queue_unused[i] = &uwsgi.workers[uwsgi.mywid].cores[i].req;
+                }
+
+                uwsgi.async_queue_unused_ptr = uwsgi.async - 1;
+
+}
+
+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 = uwsgi_now();
+	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, uwsgi_now()+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;
+
+	time_t now, last_now = 0;
+
+	static struct uwsgi_async_request *current_request = NULL, *next_async_request = NULL;
+
+	void *events = event_queue_alloc(64);
+	struct uwsgi_socket *uwsgi_sock;
+
+	uwsgi.async_runqueue = NULL;
+	uwsgi.async_runqueue_cnt = 0;
+
+	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;
+
+	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 - uwsgi_now();
+                        	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);
+
+			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) {
+						now = uwsgi_now();
+						if (now > last_now) {
+							uwsgi_log("async queue is full !!!\n");
+							last_now = now;
+						}
+						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__
+					 /* re-set blocking socket */
+    					int arg = uwsgi_sock->arg;
+   					arg &= (~O_NONBLOCK);
+    	                                if (fcntl(uwsgi.wsgi_req->poll.fd, F_SETFL, 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	
+#ifndef UWSGI_EVENT_USE_PORT
+						event_queue_del_fd(uwsgi.async_queue, interesting_fd, event_queue_read());
+#endif
+						uwsgi.async_proto_fd_table[interesting_fd] = NULL;
+						// put request in the runqueue
+						runqueue_push(uwsgi.wsgi_req);
+						continue;
+					}
+					else if (proto_parser_status < 0) {
+						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;
+
+}
@@ -0,0 +1,71 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_buffer *uwsgi_buffer_new(size_t len) {
+	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_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);
+		char *new_buf = realloc(ub->buf, ub->len + chunk_size);
+		if (!new_buf) {
+			uwsgi_error("realloc()");
+			return -1;
+		}
+		ub->buf = new_buf;
+		ub->len += chunk_size;
+	}
+
+	memcpy(ub->buf + ub->pos, buf, len);
+	ub->pos += len;
+	return 0;
+}
+
+void uwsgi_buffer_destroy(struct uwsgi_buffer *ub) {
+	if (ub->buf) free(ub->buf);
+	free(ub);
+}
+
+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.shared->options[UWSGI_OPTION_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("write()");
+				return -1;
+			}
+		}
+		else if (ret == 0) {
+			uwsgi_log("timeout while sending buffer !!!\n");
+			return -1;
+		}
+		else {
+			return -1;
+		}
+	}
+
+	return 0;
+}
@@ -0,0 +1,443 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_init_cache() {
+	int i;
+
+	if (!uwsgi.cache_blocksize)
+        	uwsgi.cache_blocksize = UMAX16;
+
+                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_rwlock_init("cache");
+
+                uwsgi_log("*** Cache subsystem initialized: %dMB (key: %llu bytes, keys: %llu bytes, data: %llu bytes) preallocated ***\n", ((uwsgi.cache_blocksize * uwsgi.cache_max_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items)) / (1024 * 1024),
+				 (unsigned long long) sizeof(struct uwsgi_cache_item), (unsigned long long) sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, (unsigned long long) uwsgi.cache_blocksize * uwsgi.cache_max_items);
+}
+
+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_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;
+	uint64_t rounds = 0;
+
+	//uwsgi_log("found slot %d for key %d\n", slot, hash_key);
+
+	uci = &uwsgi.cache_items[slot];
+
+	// first round
+	if (uci->djbhash != hash) return 0;
+	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];
+		rounds++;
+		if (rounds > uwsgi.cache_max_items) {
+			uwsgi_log("ALARM !!! cache-loop (and potential deadlock) detected slot = %llu prev = %llu next = %llu\n", uci->next, slot, uci->prev, uci->next);	
+			// terrible case: the whole uWSGI stack can deadlock, leaving only the master alive
+			// if the master is avalable, trigger a brutal reload
+			if (uwsgi.master_process) {
+				kill(uwsgi.workers[0].pid, SIGTERM);
+			}
+			// otherwise kill the current worker (could be pretty useless...)
+			else {
+				exit(1);
+			}
+		}
+		if (uci->djbhash != hash) return 0;
+		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) {
+
+	struct uwsgi_cache_item *uci;
+	int ret = -1;
+
+	if (!index)
+		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;	
+		}
+		else {
+			// set next as the new entry point (could be 0)
+			uwsgi.cache_hashtable[uci->djbhash % 0xffff] = 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;
+		uci->expires = 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 += uwsgi_now();
+		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;
+		// reset values
+		uci->prev = 0;
+		uci->next = 0;
+
+		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;
+		}
+	}
+	else if (flags & UWSGI_CACHE_FLAG_UPDATE) {
+		uci = &uwsgi.cache_items[index] ;
+		if (expires) {
+			expires += uwsgi_now();
+			uci->expires = expires;
+		}
+		memcpy(uwsgi.cache+(index*uwsgi.cache_blocksize), val, vallen);
+		uci->valsize = vallen;
+		ret = 0;
+	}
+
+end:
+	return ret;
+	
+}
+
+/* THIS PART IS HEAVILY OPTIMIZED: PERFORMANCE NOT ELEGANCE !!! */
+
+void *cache_thread_loop(void *fd_ptr) {
+
+	int *fd_tmp = (int *) fd_ptr;
+	int fd = *fd_tmp;
+	int i;
+	ssize_t len;
+	char uwsgi_packet[UMAX16+4];
+	struct uwsgi_header *uh = (struct uwsgi_header *) uwsgi_packet;
+	char *val;
+	uint64_t vallen;
+	char *key;
+	uint16_t keylen;
+	struct pollfd ctl_poll;
+	char *watermark;
+	struct sockaddr_un ctl_sun;
+	socklen_t ctl_sun_len;
+
+	ctl_poll.events = POLLIN;
+
+	for(;;) {
+		ctl_sun_len = sizeof(struct sockaddr_un);
+		pthread_mutex_lock(&uwsgi.cache_server_lock);
+
+		ctl_poll.fd = accept(fd, (struct sockaddr *) &ctl_sun, &ctl_sun_len);
+
+		pthread_mutex_unlock(&uwsgi.cache_server_lock);
+
+		if (ctl_poll.fd < 0) {
+			uwsgi_error("cache accept()");
+			continue;
+		}
+		i = 0;
+		while(i < 4) {
+			len = poll(&ctl_poll, 1, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+			if (len <= 0) {
+				uwsgi_error("cache poll()");
+				goto clear;
+			}
+			len = read(ctl_poll.fd, uwsgi_packet+i, 4-i);
+			if (len < 0) {
+				uwsgi_error("cache read()");
+				goto clear;
+			}
+			i+=len;
+		}
+
+		if (uh->pktsize == 0) goto clear;
+
+		while(i < 4+uh->pktsize) {
+			len = poll(&ctl_poll, 1, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+			if (len <= 0) {
+				uwsgi_error("cache poll()");
+				goto clear;
+			}
+			len = read(ctl_poll.fd, uwsgi_packet+i, (4+uh->pktsize)-i);
+			if (len < 0) {
+				uwsgi_error("cache read()");
+				goto clear;
+			}
+			i+=len;
+		}
+
+		watermark = uwsgi_packet+4+uh->pktsize;
+
+		// get first parameter
+		memcpy(&keylen, uwsgi_packet+4, 2);
+#ifdef __BIG_ENDIAN__
+        	keylen = uwsgi_swap16(keylen);
+#endif
+		if (uwsgi_packet+6+keylen > watermark) goto clear;
+		key = uwsgi_packet+6+keylen+2;
+		memcpy(&keylen, key-2, 2);
+#ifdef __BIG_ENDIAN__
+        	keylen = uwsgi_swap16(keylen);
+#endif
+
+		if (key+keylen > watermark) goto clear;
+
+		val = uwsgi_cache_get(key, keylen, &vallen);
+                if (val && vallen > 0) {
+                	if (write(ctl_poll.fd, val, vallen) < 0) {
+				uwsgi_error("cache write()");
+			}
+		}
+
+clear:
+		close(ctl_poll.fd);
+	}
+
+	return NULL;
+}
+
+int uwsgi_cache_server(char *socket, int threads) {
+
+	int *fd = uwsgi_malloc(sizeof(int));
+	
+	int i;
+	pthread_t thread_id;
+        char *tcp_port = strchr(socket, ':');
+        if (tcp_port) {
+                *fd = bind_to_tcp(socket, uwsgi.listen_queue, tcp_port);
+        }
+        else {
+                *fd = bind_to_unix(socket, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
+        }
+
+        pthread_mutex_init(&uwsgi.cache_server_lock, NULL);
+
+	if (threads < 1) threads = 1;
+
+	uwsgi_log("*** cache-optimized server enabled on fd %d (%d threads) ***\n", *fd, threads);
+
+	for(i=0;i<threads;i++) {
+		pthread_create(&thread_id, NULL, cache_thread_loop, (void *) fd);
+	}
+
+        return *fd;
+}
+
@@ -0,0 +1,46 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+// 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);
+}
@@ -0,0 +1,464 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+
+#ifdef UWSGI_UDP
+
+static void cluster_manage_opt(char *key, uint16_t keylen, char *value, uint16_t vallen, void *foobar) {
+
+	add_exported_option( uwsgi_concat2n(key, keylen, "", 0), uwsgi_concat2n(value, vallen, "", 0), 0);
+
+}
+
+void cluster_setup() {
+
+	int rlen;
+// get cluster configuration
+        if (uwsgi.cluster != NULL) {
+                // get multicast socket
+
+                uwsgi.cluster_fd = uwsgi_cluster_join(uwsgi.cluster);
+
+                uwsgi_log("JOINED CLUSTER: %s\n", uwsgi.cluster);
+
+                // ask for cluster options only if bot pre-existent options are set
+                if (uwsgi.exported_opts_cnt == 1 && !uwsgi.cluster_nodes) {
+                        // now wait max 60 seconds and resend multicast request every 10 seconds
+                        for (;;) {
+                                uwsgi_log("asking \"%s\" uWSGI cluster for configuration data:\n", uwsgi.cluster);
+                                if (uwsgi_send_empty_pkt(uwsgi.cluster_fd, uwsgi.cluster, 99, 0) < 0) {
+                                        uwsgi_log("unable to send multicast message to %s\n", uwsgi.cluster);
+                                        continue;
+                                }
+                              waitfd:
+                                rlen = uwsgi_waitfd(uwsgi.cluster_fd, 10);
+                                if (rlen < 0) {
+                                        break;
+                                }
+                                else if (rlen > 0) {
+                                        // receive the packet
+                                        char clusterbuf[4096];
+                                        if (!uwsgi_hooked_parse_dict_dgram(uwsgi.cluster_fd, clusterbuf, 4096, 99, 1, cluster_manage_opt, NULL)) {
+                                                uwsgi_configure();
+                                                goto options_parsed;
+                                        }
+                                        else {
+                                                goto waitfd;
+                                        }
+                                }
+                        }
+                }
+              options_parsed:
+
+                if (!uwsgi.cluster_nodes)
+                        uwsgi_cluster_add_me();
+        }
+}
+
+
+
+
+void uwsgi_cluster_add_node(struct uwsgi_cluster_node *nucn, int type) {
+
+        int i;
+        struct uwsgi_cluster_node *ucn;
+        char *tcp_port;
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("adding node\n");
+#endif
+
+        tcp_port = strchr(nucn->name, ':');
+#ifndef UWSGI_ZEROMQ
+        if (tcp_port == NULL) {
+#else
+        char *zmq_dash = strchr(nucn->name, '-');
+        if (tcp_port == NULL && zmq_dash == NULL) {
+#endif
+
+                fprintf(stdout, "invalid cluster node name %s\n", nucn->name);
+                return;
+        }
+
+        // first check for already present node
+        for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+                ucn = &uwsgi.shared->nodes[i];
+                if (ucn->name[0] != 0) {
+                        if (!strcmp(ucn->name, nucn->name)) {
+                                ucn->status = UWSGI_NODE_OK;
+                                ucn->last_seen = uwsgi_now();
+                                // update requests
+                                ucn->requests = nucn->requests;
+                                return;
+                        }
+                }
+        }
+
+        for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+                ucn = &uwsgi.shared->nodes[i];
+
+                if (ucn->name[0] == 0) {
+                        memcpy(ucn->name, nucn->name, strlen(nucn->name) + 1);
+                        memcpy(ucn->nodename, nucn->nodename, strlen(nucn->nodename) + 1);
+                        ucn->workers = nucn->workers;
+                        ucn->ucn_addr.sin_family = AF_INET;
+                        if (tcp_port) {
+                                ucn->ucn_addr.sin_port = htons(atoi(tcp_port + 1));
+                                tcp_port[0] = 0;
+                        }
+                        if (nucn->name[0] == 0) {
+                                ucn->ucn_addr.sin_addr.s_addr = INADDR_ANY;
+                        }
+                        else {
+#ifdef UWSGI_DEBUG
+                                uwsgi_log("%s\n", nucn->name);
+#endif
+                                ucn->ucn_addr.sin_addr.s_addr = inet_addr(nucn->name);
+                        }
+
+                        ucn->type = type;
+                        // here memory can be freed, as it is allocated by uwsgi_concat2n
+                        if (type != CLUSTER_NODE_DYNAMIC && tcp_port) {
+                                tcp_port[0] = ':';
+                        }
+                        ucn->last_seen = uwsgi_now();
+                        ucn->requests = nucn->requests;
+                        uwsgi_log("[uWSGI cluster] added node %s\n", ucn->name);
+                        return;
+                }
+        }
+
+        uwsgi_log("unable to add node %s\n", nucn->name);
+}
+
+
+
+int uwsgi_cluster_add_me() {
+
+        const char *key1 = "hostname";
+        const char *key2 = "address";
+        const char *key3 = "workers";
+        const char *key4 = "requests";
+
+        char *ptrbuf;
+        uint16_t ustrlen;
+        char numproc[6];
+
+#ifdef UWSGI_ZEROMQ
+        char uuid_zmq_str[37];
+        uuid_t uuid_zmq;
+        if (!uwsgi.sockets && !uwsgi.zeromq) {
+#else
+        if (!uwsgi.sockets) {
+#endif
+                uwsgi_log("you need to specify at least a socket to start a uWSGI cluster\n");
+                exit(1);
+        }
+
+        snprintf(numproc, 6, "%d", uwsgi.numproc);
+
+        size_t len;
+
+        if (uwsgi.sockets) {
+                len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key2) + 2 + strlen(uwsgi.sockets->name) + 2 + strlen(key3) + 2 + strlen(numproc) + 2 + strlen(key4) + 2 + 1;
+        }
+#ifdef UWSGI_ZEROMQ
+        else if (uwsgi.zeromq) {
+                uuid_generate(uuid_zmq);
+                uuid_unparse(uuid_zmq, uuid_zmq_str);
+                len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key2) + 2 + strlen(uuid_zmq_str) + 2 + strlen(key3) + 2 + strlen(numproc) + 2 + strlen(key4) + 2 + 1;
+        }
+#endif
+        else {
+                len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key3) + 2 + strlen(numproc) + 2 + strlen(key4) + 2 + 1;
+        }
+        char *buf = uwsgi_malloc(len);
+
+        ptrbuf = buf;
+
+        ustrlen = strlen(key1);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, key1, strlen(key1));
+        ptrbuf += strlen(key1);
+
+        ustrlen = strlen(uwsgi.hostname);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, uwsgi.hostname, strlen(uwsgi.hostname));
+        ptrbuf += strlen(uwsgi.hostname);
+
+
+        if (uwsgi.sockets && uwsgi.sockets->name) {
+                ustrlen = strlen(key2);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, key2, strlen(key2));
+                ptrbuf += strlen(key2);
+
+                ustrlen = strlen(uwsgi.sockets->name);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, uwsgi.sockets->name, strlen(uwsgi.sockets->name));
+                ptrbuf += strlen(uwsgi.sockets->name);
+        }
+#ifdef UWSGI_ZEROMQ
+        else if (uwsgi.zeromq) {
+                ustrlen = strlen(key2);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, key2, strlen(key2));
+                ptrbuf += strlen(key2);
+
+                ustrlen = strlen(uuid_zmq_str);
+                *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                memcpy(ptrbuf, uuid_zmq_str, strlen(uuid_zmq_str));
+                ptrbuf += strlen(uuid_zmq_str);
+        }
+#endif
+
+
+	ustrlen = strlen(key3);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, key3, strlen(key3));
+        ptrbuf += strlen(key3);
+
+        ustrlen = strlen(numproc);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, numproc, strlen(numproc));
+        ptrbuf += strlen(numproc);
+
+        ustrlen = strlen(key4);
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, key4, strlen(key4));
+        ptrbuf += strlen(key4);
+
+        ustrlen = 1;
+        *ptrbuf++ = (uint8_t) (ustrlen & 0xff);
+        *ptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+        memcpy(ptrbuf, "0", 1);
+        ptrbuf += 1;
+
+
+        uwsgi_string_sendto(uwsgi.cluster_fd, 95, 0, (struct sockaddr *) &uwsgi.mc_cluster_addr, sizeof(uwsgi.mc_cluster_addr), buf, len);
+
+        free(buf);
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("add_me() successfull\n");
+#endif
+
+        return 0;
+}
+
+
+int uwsgi_cluster_join(char *name) {
+
+        int fd;
+        char *cp;
+        int broadcast = 0;
+
+
+
+        if (name[0] == ':') {
+                fd = bind_to_udp(name, 0, 1);
+                broadcast = 1;
+        }
+        else {
+                fd = bind_to_udp(name, 1, 0);
+        }
+
+        if (fd >= 0) {
+                cp = strchr(name, ':');
+                cp[0] = 0;
+                uwsgi.mc_cluster_addr.sin_family = AF_INET;
+                if (broadcast) {
+                        uwsgi.mc_cluster_addr.sin_addr.s_addr = INADDR_BROADCAST;
+                }
+                else {
+                        uwsgi.mc_cluster_addr.sin_addr.s_addr = inet_addr(name);
+                }
+                uwsgi.mc_cluster_addr.sin_port = htons(atoi(cp + 1));
+                cp[0] = ':';
+
+
+                // announce my presence to all the nodes
+                uwsgi_string_sendto(fd, 73, 0, (struct sockaddr *) &uwsgi.mc_cluster_addr, sizeof(uwsgi.mc_cluster_addr), uwsgi.hostname, strlen(uwsgi.hostname));
+        }
+        else {
+                exit(1);
+        }
+
+
+        return fd;
+
+}
+
+
+char *uwsgi_cluster_best_node() {
+
+        int i;
+        int best_node = -1;
+        struct uwsgi_cluster_node *ucn;
+
+        for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+                ucn = &uwsgi.shared->nodes[i];
+                if (ucn->name[0] != 0 && ucn->status == UWSGI_NODE_OK) {
+                        if (best_node == -1) {
+                                best_node = i;
+                        }
+                        else {
+                                if (ucn->last_choosen < uwsgi.shared->nodes[best_node].last_choosen) {
+                                        best_node = i;
+                                }
+                        }
+                }
+        }
+
+        if (best_node == -1) {
+                return NULL;
+        }
+
+        uwsgi.shared->nodes[best_node].last_choosen = uwsgi_now();
+        return uwsgi.shared->nodes[best_node].name;
+}
+
+
+void manage_cluster_announce(char *key, uint16_t keylen, char *val, uint16_t vallen, void *data) {
+
+        char *tmpstr;
+        struct uwsgi_cluster_node *ucn = (struct uwsgi_cluster_node *) data;
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("%.*s = %.*s\n", keylen, key, vallen, val);
+#endif
+
+        if (!uwsgi_strncmp("hostname", 8, key, keylen)) {
+                strncpy(ucn->nodename, val, UMIN(vallen, 255));
+        }
+
+        if (!uwsgi_strncmp("address", 7, key, keylen)) {
+                strncpy(ucn->name, val, UMIN(vallen, 100));
+        }
+
+        if (!uwsgi_strncmp("workers", 7, key, keylen)) {
+                tmpstr = uwsgi_concat2n(val, vallen, "", 0);
+                ucn->workers = atoi(tmpstr);
+                free(tmpstr);
+        }
+
+        if (!uwsgi_strncmp("requests", 8, key, keylen)) {
+                tmpstr = uwsgi_concat2n(val, vallen, "", 0);
+                ucn->requests = strtoul(tmpstr, NULL, 0);
+                free(tmpstr);
+        }
+}
+
+void manage_cluster_message(char *cluster_opt_buf, int cluster_opt_size) {
+
+		struct uwsgi_cluster_node nucn;
+
+		switch (uwsgi.workers[0].cores[0].req.uh.modifier1) {
+                                        case 95:
+                                                memset(&nucn, 0, sizeof(struct uwsgi_cluster_node));
+
+#ifdef __BIG_ENDIAN__
+                                                uwsgi.workers[0].cores[0].req.uh.pktsize = uwsgi_swap16(uwsgi.wsgi_requests[0]->uh.pktsize);
+#endif
+                                                uwsgi_hooked_parse(uwsgi.workers[0].cores[0].req.buffer, uwsgi.workers[0].cores[0].req.uh.pktsize, manage_cluster_announce, &nucn);
+                                                if (nucn.name[0] != 0) {
+                                                        uwsgi_cluster_add_node(&nucn, CLUSTER_NODE_DYNAMIC);
+                                                }
+                                                break;
+                                        case 96:
+#ifdef __BIG_ENDIAN__
+                                                uwsgi.workers[0].cores[0].req.uh.pktsize = uwsgi_swap16(uwsgi.wsgi_requests[0]->uh.pktsize);
+#endif
+                                                uwsgi_log_verbose("%.*s\n", uwsgi.workers[0].cores[0].req.uh.pktsize, uwsgi.workers[0].cores[0].req.buffer);
+                                                break;
+                                        case 98:
+                                                if (kill(getpid(), SIGHUP)) {
+                                                        uwsgi_error("kill()");
+                                                }
+                                                break;
+                                        case 99:
+                                                if (uwsgi.cluster_nodes)
+                                                        break;
+                                                if (uwsgi.workers[0].cores[0].req.uh.modifier2 == 0) {
+                                                        uwsgi_log("requested configuration data, sending %d bytes\n", cluster_opt_size);
+                                                        sendto(uwsgi.cluster_fd, cluster_opt_buf, cluster_opt_size, 0, (struct sockaddr *) &uwsgi.mc_cluster_addr, sizeof(uwsgi.mc_cluster_addr));
+                                                }
+                                                break;
+                                        case 73:
+#ifdef __BIG_ENDIAN__
+                                                uwsgi.workers[0].cores[0].req.uh.pktsize = uwsgi_swap16(uwsgi.workers[0].cores[0].req.uh.pktsize);
+#endif
+                                                uwsgi_log_verbose("[uWSGI cluster %s] new node available: %.*s\n", uwsgi.cluster, uwsgi.workers[0].cores[0].req.uh.pktsize, uwsgi.workers[0].cores[0].req.buffer);
+                                                break;
+                                        }
+}
+
+#endif
+
+
+char *uwsgi_setup_clusterbuf(size_t *size) {
+
+	size_t cluster_opt_size = 4;
+	int i;
+
+	for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
+                        //uwsgi_log("%s\n", uwsgi.exported_opts[i]->key);
+                        cluster_opt_size += 2 + strlen(uwsgi.exported_opts[i]->key);
+                        if (uwsgi.exported_opts[i]->value) {
+                                cluster_opt_size += 2 + strlen(uwsgi.exported_opts[i]->value);
+                        }
+                        else {
+                                cluster_opt_size += 2 + 1;
+                        }
+                }
+
+                //uwsgi_log("cluster opts size: %d\n", cluster_opt_size);
+                char *cluster_opt_buf = uwsgi_malloc(cluster_opt_size);
+
+                struct uwsgi_header *uh = (struct uwsgi_header *) cluster_opt_buf;
+
+                uh->modifier1 = 99;
+                uh->pktsize = cluster_opt_size - 4;
+                uh->modifier2 = 1;
+
+#ifdef __BIG_ENDIAN__
+                uh->pktsize = uwsgi_swap16(uh->pktsize);
+#endif
+
+                char *cptrbuf = cluster_opt_buf + 4;
+
+                for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
+                        //uwsgi_log("%s\n", uwsgi.exported_opts[i]->key);
+                        uint16_t ustrlen = strlen(uwsgi.exported_opts[i]->key);
+                        *cptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                        *cptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                        memcpy(cptrbuf, uwsgi.exported_opts[i]->key, ustrlen);
+                        cptrbuf += ustrlen;
+
+                        if (uwsgi.exported_opts[i]->value) {
+                                ustrlen = strlen(uwsgi.exported_opts[i]->value);
+                                *cptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                                *cptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                                memcpy(cptrbuf, uwsgi.exported_opts[i]->value, ustrlen);
+                        }
+                        else {
+                                ustrlen = 1;
+                                *cptrbuf++ = (uint8_t) (ustrlen & 0xff);
+                                *cptrbuf++ = (uint8_t) ((ustrlen >> 8) & 0xff);
+                                *cptrbuf = '1';
+                        }
+                        cptrbuf += ustrlen;
+                }
+
+		return cluster_opt_buf;
+}
@@ -0,0 +1,935 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+#ifdef UWSGI_EVENT_USE_PORT
+
+#include <port.h>
+
+#define UWSGI_EVENT_IN POLLIN
+#define UWSGI_EVENT_OUT POLLOUT
+
+int event_queue_init() {
+
+        int port = port_create();
+
+        if (port < 0) {
+                uwsgi_error("port_create()");
+                return -1;
+        }
+
+        return port;
+}
+
+int event_queue_del_fd(int eq, int fd, int event) {
+
+        if (port_dissociate(eq, PORT_SOURCE_FD, fd)) {
+                uwsgi_error("port_disassociate");
+                return -1;
+        }
+
+        return fd;
+}
+
+int event_queue_fd_write_to_read(int eq, int fd) {
+
+        if (port_associate(eq, PORT_SOURCE_FD, fd, POLLIN, NULL)) {
+                uwsgi_error("port_associate");
+                return -1;
+        }
+
+        return fd;
+
+}
+
+int event_queue_fd_read_to_write(int eq, int fd) {
+
+        if (port_associate(eq, PORT_SOURCE_FD, fd, POLLOUT, NULL)) {
+                uwsgi_error("port_associate");
+                return -1;
+        }
+
+        return fd;
+
+}
+
+
+
+int event_queue_interesting_fd_has_error(void *events, int id) {
+	port_event_t *pe = (port_event_t *) events;
+	if (pe[id].portev_events == POLLHUP || pe[id].portev_events == POLLERR) {
+                return 1;
+        }
+        return 0;
+}
+
+
+
+int event_queue_add_fd_read(int eq, int fd) {
+
+        if (port_associate(eq, PORT_SOURCE_FD, fd, POLLIN, NULL)) {
+                uwsgi_error("port_associate");
+                return -1;
+        }
+
+        return fd;
+}
+
+int event_queue_add_fd_write(int eq, int fd) {
+
+        if (port_associate(eq, PORT_SOURCE_FD, fd, POLLOUT, NULL)) {
+                uwsgi_error("port_associate");
+                return -1;
+        }
+
+        return fd;
+}
+
+void *event_queue_alloc(int nevents) {
+
+        return uwsgi_malloc(sizeof(port_event_t) * nevents);
+}
+
+int event_queue_interesting_fd(void *events, int id) {
+	port_event_t *pe = (port_event_t *) events;
+	if (pe[id].portev_source == PORT_SOURCE_FILE || pe[id].portev_source == PORT_SOURCE_TIMER) {
+                return (long) pe[id].portev_user;
+        }
+
+	return (int) pe[id].portev_object;
+}
+
+int event_queue_wait_multi(int eq, int timeout, void *events, int nevents) {
+
+        int ret;
+	uint_t nget = 1;
+	timespec_t ts;
+	port_event_t *pe;
+
+	if (timeout >= 0) {
+                ts.tv_sec = timeout;
+                ts.tv_nsec = 0;
+                ret = port_getn(eq, events, nevents, &nget, &ts);
+        }
+        else {
+                ret = port_getn(eq, events, nevents, &nget, NULL);
+        }
+
+	if (ret < 0) {
+                if (errno != ETIME) {
+                        uwsgi_error("port_getn()");
+                        return -1;
+                }
+                return 0;
+        }
+
+	pe = (port_event_t *) events;
+
+        return nget;
+}
+
+
+
+int event_queue_wait(int eq, int timeout, int *interesting_fd) {
+
+        int ret;
+	port_event_t pe;
+	timespec_t ts;
+
+        if (timeout > 0) {
+		ts.tv_sec = timeout;
+		ts.tv_nsec = 0;
+        	ret = port_get(eq, &pe, &ts);
+        }
+	else {
+        	ret = port_get(eq, &pe, NULL);
+	}
+        if (ret < 0) {
+		if (errno != ETIME) {
+                	uwsgi_error("port_get()");
+			return -1;
+		}
+		return 0;
+        }
+
+	if (pe.portev_source == PORT_SOURCE_FD) {
+		// event must be readded (damn Oracle/Sun why the fu*k you made such a horrible choice ???? why not adding a ONESHOT flag ???)
+		if (port_associate(eq, pe.portev_source, pe.portev_object, pe.portev_events, NULL)) {
+                	uwsgi_error("port_associate");
+        	}
+	}
+
+
+	if (pe.portev_source == PORT_SOURCE_FILE || pe.portev_source == PORT_SOURCE_TIMER) {
+        	*interesting_fd = (long) pe.portev_user;
+	}
+	else {
+		*interesting_fd = (int) pe.portev_object;
+	}
+
+        return 1;
+}
+
+#endif
+
+
+#ifdef UWSGI_EVENT_USE_EPOLL
+
+#include <sys/epoll.h>
+
+#define UWSGI_EVENT_IN EPOLLIN
+#define UWSGI_EVENT_OUT EPOLLOUT
+
+int event_queue_init() {
+
+        int epfd;
+
+
+        epfd = epoll_create(256);
+
+        if (epfd < 0) {
+                uwsgi_error("epoll_create()");
+                return -1;
+        }
+
+        return epfd;
+}
+
+
+int event_queue_add_fd_read(int eq, int fd) {
+
+        struct epoll_event ee;
+
+        memset(&ee, 0, sizeof(struct epoll_event));
+        ee.events = EPOLLIN;
+        ee.data.fd = fd;
+
+        if (epoll_ctl(eq, EPOLL_CTL_ADD, fd, &ee)) {
+                uwsgi_error("epoll_ctl()");
+                return -1;
+        }
+
+        return fd;
+}
+
+int event_queue_fd_write_to_read(int eq, int fd) {
+
+        struct epoll_event ee;
+
+        memset(&ee, 0, sizeof(struct epoll_event));
+        ee.events = EPOLLIN;
+        ee.data.fd = fd;
+
+        if (epoll_ctl(eq, EPOLL_CTL_MOD, fd, &ee)) {
+                uwsgi_error("epoll_ctl()");
+                return -1;
+        }
+
+        return fd;
+}
+
+int event_queue_fd_read_to_write(int eq, int fd) {
+
+        struct epoll_event ee;
+
+        memset(&ee, 0, sizeof(struct epoll_event));
+        ee.events = EPOLLOUT;
+        ee.data.fd = fd;
+
+        if (epoll_ctl(eq, EPOLL_CTL_MOD, fd, &ee)) {
+                uwsgi_error("epoll_ctl()");
+                return -1;
+        }
+
+        return fd;
+}
+
+
+int event_queue_del_fd(int eq, int fd, int event) {
+
+        struct epoll_event ee;
+
+        memset(&ee, 0, sizeof(struct epoll_event));
+        ee.data.fd = fd;
+	ee.events = event;
+
+        if (epoll_ctl(eq, EPOLL_CTL_DEL, fd, &ee)) {
+                uwsgi_error("epoll_ctl()");
+                return -1;
+        }
+
+        return fd;
+}
+
+int event_queue_add_fd_write(int eq, int fd) {
+
+        struct epoll_event ee;
+
+        memset(&ee, 0, sizeof(struct epoll_event));
+        ee.events = EPOLLOUT;
+        ee.data.fd = fd;
+
+        if (epoll_ctl(eq, EPOLL_CTL_ADD, fd, &ee)) {
+                uwsgi_error("epoll_ctl()");
+                return -1;
+        }
+
+        return fd;
+}
+
+void *event_queue_alloc(int nevents) {
+
+	return uwsgi_malloc(sizeof(struct epoll_event) * nevents);
+}
+
+int event_queue_interesting_fd(void *events, int id) {
+	struct epoll_event *ee = (struct epoll_event *) events;
+	return ee[id].data.fd;
+}
+
+int event_queue_interesting_fd_has_error(void *events, int id) {
+	struct epoll_event *ee = (struct epoll_event *) events;
+	if (ee[id].events == EPOLLHUP || ee[id].events == EPOLLERR || (ee[id].events == (EPOLLERR|EPOLLHUP))) {
+		return 1;
+	}
+	return 0;
+}
+
+int event_queue_wait_multi(int eq, int timeout, void *events, int nevents) {
+
+	int ret;
+
+	if (timeout > 0) {
+                timeout = timeout*1000;
+        }
+
+        ret = epoll_wait(eq, (struct epoll_event *) events, nevents, timeout);
+        if (ret < 0) {
+		if (errno != EINTR)
+                	uwsgi_error("epoll_wait()");
+        }
+
+        return ret;
+}
+
+int event_queue_wait(int eq, int timeout, int *interesting_fd) {
+
+        int ret;
+	struct epoll_event ee;
+
+        if (timeout > 0) {
+                timeout = timeout*1000;
+        }
+
+        ret = epoll_wait(eq, &ee, 1, timeout);
+        if (ret < 0) {
+		if (errno != EINTR)
+                	uwsgi_error("epoll_wait()");
+        }
+
+	if (ret > 0) {
+                *interesting_fd = ee.data.fd;
+        }
+
+        return ret;
+}
+
+#endif
+
+#ifdef UWSGI_EVENT_USE_KQUEUE
+
+#define UWSGI_EVENT_IN EVFILT_READ
+#define UWSGI_EVENT_OUT EVFILT_WRITE
+
+int event_queue_init() {
+
+	int kfd = kqueue();
+
+        if (kfd < 0) {
+                uwsgi_error("kqueue()");
+                return -1;
+        }
+
+	return kfd;
+}
+
+int event_queue_fd_write_to_read(int eq, int fd) {
+
+	struct kevent kev;
+
+#ifndef __FreeBSD__
+        EV_SET(&kev, fd, EVFILT_WRITE, EV_DISABLE, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+#endif
+
+        EV_SET(&kev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+	
+	return fd;
+}
+
+int event_queue_fd_read_to_write(int eq, int fd) {
+
+        struct kevent kev;
+
+#ifndef __FreeBSD__
+        EV_SET(&kev, fd, EVFILT_READ, EV_DISABLE, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+#endif
+
+        EV_SET(&kev, fd, EVFILT_WRITE, EV_ADD, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+
+        return fd;
+}
+
+
+int event_queue_del_fd(int eq, int fd, int event) {
+
+	struct kevent kev;
+
+        EV_SET(&kev, fd, event, EV_DELETE, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+	
+	return fd;
+}
+
+int event_queue_add_fd_read(int eq, int fd) {
+
+	struct kevent kev;
+
+        EV_SET(&kev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+	
+	return fd;
+}
+
+int event_queue_add_fd_write(int eq, int fd) {
+
+	struct kevent kev;
+
+        EV_SET(&kev, fd, EVFILT_WRITE, EV_ADD, 0, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+	
+	return 0;
+}
+
+void *event_queue_alloc(int nevents) {
+
+        return uwsgi_malloc(sizeof(struct kevent) * nevents);
+}
+
+int event_queue_wait_multi(int eq, int timeout, void *events, int nevents) {
+
+        int ret;
+        struct timespec ts;
+
+        if (timeout < 0) {
+                ret = kevent(eq, NULL, 0, events, nevents, NULL);
+        }
+        else {
+                memset(&ts, 0, sizeof(struct timespec));
+                ts.tv_sec = timeout;
+                ret = kevent(eq, NULL, 0, (struct kevent *)events, nevents, &ts);
+        }
+
+        if (ret < 0) {
+		if (errno != EINTR)
+                	uwsgi_error("kevent()");
+        }
+
+        return ret;
+
+}
+
+int event_queue_interesting_fd(void *events, int id) {
+
+	struct kevent *ev = (struct kevent *) events;
+	return ev[id].ident;
+}
+
+int event_queue_interesting_fd_has_error(void *events, int id) {
+	struct kevent *ev = (struct kevent *) events;
+
+	// DO NOT CHECK FOR EOF !!!
+        if ( ev[id].flags & EV_ERROR ) {
+                return 1;
+        }
+        return 0;
+}
+
+
+
+int event_queue_wait(int eq, int timeout, int *interesting_fd) {
+
+	int ret;
+	struct timespec ts;
+	struct kevent ev;
+
+	if (timeout <= 0) {
+        	ret = kevent(eq, NULL, 0, &ev, 1, NULL);
+        }
+        else {
+                memset(&ts, 0, sizeof(struct timespec));
+                ts.tv_sec = timeout;
+                ret = kevent(eq, NULL, 0, &ev, 1, &ts);
+        }
+
+        if (ret < 0) {
+		if (errno != EINTR)
+                	uwsgi_error("kevent()");
+        }
+
+	if (ret > 0) {
+		*interesting_fd = ev.ident;
+	}
+
+	return ret;
+
+}
+#endif
+
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_NONE
+int event_queue_add_file_monitor(int eq, char *filename, int *id) { return -1;}
+struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {return NULL;}
+#endif
+
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_PORT
+int event_queue_add_file_monitor(int eq, char *filename, int *id) {
+
+	struct file_obj fo;
+	struct stat st;
+	static int fmon_id = 0xffffee00;
+
+	if (stat(filename, &st)) {
+		uwsgi_error("stat()");
+		return -1;
+	}
+
+	fo.fo_name = filename;
+	fo.fo_atime = st.st_atim;
+	fo.fo_mtime = st.st_mtim;
+	fo.fo_ctime = st.st_ctim;
+	
+	fmon_id++;
+	if (port_associate(eq, PORT_SOURCE_FILE, (uintptr_t) &fo, FILE_MODIFIED|FILE_ATTRIB, (void *) (long) fmon_id)) {
+		uwsgi_error("port_associate()");
+		return -1;
+	}
+
+
+	*id = fmon_id;
+
+        uwsgi_log("added new file to monitor %s [%d]\n", filename, *id);
+
+        return *id;
+}
+
+struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
+
+        int i;
+	struct file_obj fo;
+        struct stat st;
+
+        for(i=0;i<ushared->files_monitored_cnt;i++) {
+                if (ushared->files_monitored[i].registered) {
+                        if (ushared->files_monitored[i].fd == id) {
+				if (stat(ushared->files_monitored[i].filename, &st)) {
+                			uwsgi_error("stat()");
+                			return NULL;
+        			}			
+				fo.fo_name = ushared->files_monitored[i].filename;
+        			fo.fo_atime = st.st_atim;
+        			fo.fo_mtime = st.st_mtim;
+        			fo.fo_ctime = st.st_ctim;
+				if (port_associate(eq, PORT_SOURCE_FILE, (uintptr_t) &fo, FILE_MODIFIED|FILE_ATTRIB, (void *)(long)id)) {
+                			uwsgi_error("port_associate()");
+                			return NULL;
+        			}
+                                return &ushared->files_monitored[i];
+                        }
+                }
+        }
+
+        return NULL;
+
+}
+
+#endif
+
+
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_KQUEUE
+int event_queue_add_file_monitor(int eq, char *filename, int *id) {
+
+	struct kevent kev;
+
+	int fd = open(filename, O_RDONLY);
+	if (fd < 0) {
+		uwsgi_error_open(filename);
+		return -1;
+	}
+	
+        EV_SET(&kev, fd, EVFILT_VNODE, EV_ADD|EV_CLEAR, NOTE_WRITE|NOTE_DELETE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME|NOTE_REVOKE, 0, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+
+	*id = fd;
+
+	uwsgi_log("added new file to monitor %s\n", filename);
+	
+	return fd;
+}
+
+struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
+
+	int i;
+
+        for(i=0;i<ushared->files_monitored_cnt;i++) {
+        	if (ushared->files_monitored[i].registered) {
+                	if (ushared->files_monitored[i].fd == id) {
+                        	return &ushared->files_monitored[i];
+			}
+		}
+        }
+
+        return NULL;
+
+}
+
+#endif
+
+#ifdef UWSGI_EVENT_FILEMONITOR_USE_INOTIFY
+
+
+#ifdef OBSOLETE_LINUX_KERNEL
+int event_queue_add_file_monitor(int eq, char *filename, int *id) {
+	return -1;
+}
+struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
+	return NULL;
+}
+#else
+#include <sys/inotify.h>
+
+int event_queue_add_file_monitor(int eq, char *filename, int *id) {
+
+	int ifd = -1;
+	int i;
+	int add_to_queue = 0;
+
+	for (i=0;i<ushared->files_monitored_cnt;i++) {
+		if (ushared->files_monitored[i].registered) {
+			ifd = ushared->files_monitored[0].fd;
+			break;
+		}
+	}
+
+	if (ifd == -1) {
+		ifd = inotify_init();
+		if (ifd < 0) {
+			uwsgi_error("inotify_init()");
+			return -1;
+		}		
+		add_to_queue = 1;
+	}
+
+	*id = inotify_add_watch(ifd, filename, IN_ATTRIB|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MODIFY|IN_MOVE_SELF|IN_MOVED_FROM|IN_MOVED_TO);
+		
+#ifdef UWSGI_DEBUG
+	uwsgi_log("added watch %d for filename %s\n", *id, filename);
+#endif
+
+	if (add_to_queue) {
+		return event_queue_add_fd_read(eq, ifd);
+	}
+	else {
+		return ifd;
+	}
+}
+
+struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
+
+	ssize_t rlen = 0;
+	struct inotify_event ie, *bie, *iie;
+	int i,j;
+	int items = 0;
+
+	unsigned int isize = sizeof(struct inotify_event);
+	struct uwsgi_fmon *uf = NULL;
+
+	if (ioctl(id, FIONREAD, &isize) < 0) {
+		uwsgi_error("ioctl()");
+		return NULL;
+	}
+
+	if (isize > sizeof(struct inotify_event)) {
+		bie = uwsgi_malloc(isize);
+		rlen = read(id, bie, isize);
+	}
+	else {
+		rlen = read(id, &ie, sizeof(struct inotify_event));
+		bie = &ie;
+	}
+
+	if (rlen < 0) {
+		uwsgi_error("read()");
+	}
+	else {
+		items = isize/(sizeof(struct inotify_event));
+#ifdef UWSGI_DEBUG
+		uwsgi_log("inotify returned %d items\n", items);
+#endif
+		for(j=0;j<items;j++) {	
+			iie = &bie[j];
+			for(i=0;i<ushared->files_monitored_cnt;i++) {
+				if (ushared->files_monitored[i].registered) {
+					if (ushared->files_monitored[i].fd == id && ushared->files_monitored[i].id == iie->wd) {
+						uf = &ushared->files_monitored[i];
+					}
+				}
+			}
+
+		}	
+
+		if (items > 1) {
+			free(bie);
+		}
+
+		return uf;
+	}
+	
+	return NULL;
+	
+}
+
+#endif
+#endif
+
+#ifdef UWSGI_EVENT_TIMER_USE_TIMERFD
+
+#ifndef UWSGI_EVENT_TIMER_USE_TIMERFD_NOINC
+#include <sys/timerfd.h>
+#endif
+
+#ifndef TFD_CLOEXEC
+
+// timerfd support
+
+enum
+  {
+    TFD_CLOEXEC = 02000000,
+#define TFD_CLOEXEC TFD_CLOEXEC
+    TFD_NONBLOCK = 04000
+#define TFD_NONBLOCK TFD_NONBLOCK
+  };
+
+
+/* Bits to be set in the FLAGS parameter of `timerfd_settime'.  */
+enum
+  {
+    TFD_TIMER_ABSTIME = 1 << 0
+#define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME
+  };
+
+
+static int timerfd_create (clockid_t __clock_id, int __flags) {
+#ifdef __amd64__
+	return syscall(283, __clock_id, __flags);
+#elif defined(__i386__)
+	return syscall(322, __clock_id, __flags);
+#else
+	return -1;
+#endif
+}
+
+static int timerfd_settime (int __ufd, int __flags,
+                            __const struct itimerspec *__utmr,
+                            struct itimerspec *__otmr) {
+#ifdef __amd64__
+	return syscall(286, __ufd, __flags, __utmr, __otmr);
+#elif defined(__i386__)
+	return syscall(325, __ufd, __flags, __utmr, __otmr);
+#endif
+}
+#endif
+
+int event_queue_add_timer(int eq, int *id, int sec) {
+
+	struct itimerspec it;
+	int tfd = timerfd_create(CLOCK_REALTIME, TFD_CLOEXEC);
+
+	if (tfd < 0) {
+		uwsgi_error("timerfd_create()");
+		return -1;
+	}
+
+	it.it_value.tv_sec = sec;
+	it.it_value.tv_nsec = 0;
+
+	it.it_interval.tv_sec = sec;
+	it.it_interval.tv_nsec = 0;
+
+	if (timerfd_settime(tfd, 0, &it, NULL)) {
+		uwsgi_error("timerfd_settime()");
+		close(tfd);
+		return -1;
+	}
+	
+	*id = tfd;
+	return event_queue_add_fd_read(eq, tfd);
+}
+
+struct uwsgi_timer *event_queue_ack_timer(int id) {
+	
+	int i;
+	ssize_t rlen;
+	uint64_t counter;
+	struct uwsgi_timer *ut = NULL;
+
+	for(i=0;i<ushared->timers_cnt;i++) {
+		if (ushared->timers[i].registered) {
+			if (ushared->timers[i].id == id) {
+				ut = &ushared->timers[i];
+			}
+		}
+	}
+
+	rlen = read(id, &counter, sizeof(uint64_t));
+
+	if (rlen < 0) {
+		uwsgi_error("read()");
+	}
+	
+	return ut;
+}
+#endif
+
+#ifdef UWSGI_EVENT_TIMER_USE_NONE
+int event_queue_add_timer(int eq, int *id, int sec) { return -1; }
+struct uwsgi_timer *event_queue_ack_timer(int id) { return NULL;}
+#endif
+
+#ifdef UWSGI_EVENT_TIMER_USE_PORT
+int event_queue_add_timer(int eq, int *id, int sec) {
+
+	static int timer_id = 0xffffff00;
+	port_notify_t		pnotif;
+	struct sigevent		sigev;
+	itimerspec_t it;
+	timer_t tid;
+
+	timer_id++;
+
+	pnotif.portnfy_port = eq;
+	pnotif.portnfy_user = (void *) (long) timer_id;
+
+	sigev.sigev_notify = SIGEV_PORT;
+	sigev.sigev_value.sival_ptr = &pnotif;
+
+	if (timer_create(CLOCK_REALTIME, &sigev, &tid) < 0) {
+		uwsgi_error("timer_create()");
+		return -1;
+	}
+
+	
+	it.it_value.tv_sec = sec;
+        it.it_value.tv_nsec = 0;
+
+        it.it_interval.tv_sec = sec;
+        it.it_interval.tv_nsec = 0;
+
+	if (timer_settime(tid, 0, &it, NULL) < 0) {
+		uwsgi_error("timer_settime()");
+		return -1;
+	}
+
+	*id = timer_id;
+
+	return *id;
+
+}
+
+struct uwsgi_timer *event_queue_ack_timer(int id) {
+
+	int i;
+	struct uwsgi_timer *ut = NULL;
+
+	for(i=0;i<uwsgi.shared->timers_cnt;i++) {
+		if (uwsgi.shared->timers[i].registered) {
+			if (uwsgi.shared->timers[i].id == id) {
+				ut = &uwsgi.shared->timers[i];
+			}
+		}
+	}
+
+	return ut;
+}
+#endif
+
+
+#ifdef UWSGI_EVENT_TIMER_USE_KQUEUE
+int event_queue_add_timer(int eq, int *id, int sec) {
+
+	static int timer_id = 0xffffff00;
+	struct kevent kev;
+
+	*id = timer_id ;
+	timer_id++;	
+
+        EV_SET(&kev, *id, EVFILT_TIMER, EV_ADD, 0, sec*1000, 0);
+        if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
+                uwsgi_error("kevent()");
+                return -1;
+        }
+	
+	return *id;
+}
+
+struct uwsgi_timer *event_queue_ack_timer(int id) {
+
+	int i;
+	struct uwsgi_timer *ut = NULL;
+
+	for(i=0;i<uwsgi.shared->timers_cnt;i++) {
+		if (uwsgi.shared->timers[i].registered) {
+			if (uwsgi.shared->timers[i].id == id) {
+				ut = &uwsgi.shared->timers[i];
+			}
+		}
+	}
+
+	return ut;
+
+}
+#endif
+
+inline int event_queue_read() {
+	return UWSGI_EVENT_IN;
+}
+
+inline int event_queue_write() {
+	return UWSGI_EVENT_OUT;
+}
@@ -0,0 +1,161 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct uwsgi_gateway *register_gateway(char *name, void (*loop)(int, void *), void *data) {
+
+        struct uwsgi_gateway *ug;
+        int num=1,i;
+
+        if (ushared->gateways_cnt >= MAX_GATEWAYS) {
+                uwsgi_log("you can register max %d gateways\n", MAX_GATEWAYS);
+                return NULL;
+        }
+
+        for(i=0;i<ushared->gateways_cnt;i++) {
+                if (!strcmp(name, ushared->gateways[i].name)) {
+                        num++;
+                }
+        }
+
+	char *fullname = uwsgi_concat3(name, " ", uwsgi_num2str(num));
+
+        ug = &ushared->gateways[ushared->gateways_cnt];
+        ug->pid = 0;
+        ug->name = name;
+        ug->loop = loop;
+        ug->num = num;
+	ug->fullname = fullname;
+	ug->data = data;
+
+	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, ug->internal_subscription_pipe)) {
+		uwsgi_error("socketpair()");
+	}
+
+	if (!uwsgi.master_process)
+		gateway_respawn(ushared->gateways_cnt);
+
+        ushared->gateways_cnt++;
+
+
+        return ug;
+}
+
+void gateway_respawn(int id) {
+
+	pid_t gw_pid;
+	struct uwsgi_gateway *ug = &ushared->gateways[id];
+
+	if (uwsgi.master_process)
+		uwsgi.shared->gateways_harakiri[id] = 0;
+	
+	gw_pid = uwsgi_fork(ug->fullname);
+	if (gw_pid < 0) {
+                uwsgi_error("fork()");
+		return;
+	}
+
+	if (gw_pid == 0) {
+		uwsgi_fixup_fds(0, 0, ug);
+		if (uwsgi.master_as_root) uwsgi_as_root();
+#ifdef __linux__
+                if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0,0,0)) {
+                        uwsgi_error("prctl()");
+                }
+#endif
+		uwsgi.mypid = getpid();
+		signal(SIGALRM, SIG_IGN);
+        	signal(SIGHUP, SIG_IGN);
+        	signal(SIGINT, end_me);
+        	signal(SIGTERM, end_me);
+        	signal(SIGUSR1, SIG_IGN);
+        	signal(SIGUSR2, SIG_IGN);
+        	signal(SIGPIPE, SIG_IGN);
+        	signal(SIGSTOP, SIG_IGN);
+        	signal(SIGTSTP, SIG_IGN);
+
+		ug->loop(id, ug->data);
+		// never here !!! (i hope)
+		exit(1);	
+	}
+
+	ug->pid = gw_pid;
+	ug->respawns++;
+	if (ug->respawns == 1) {
+		uwsgi_log( "spawned %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	}
+	else {
+		uwsgi_log( "respawned %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	}
+	
+}
+
+struct uwsgi_gateway_socket *uwsgi_new_gateway_socket(char *name, char *owner) {
+
+        struct uwsgi_gateway_socket *uwsgi_sock = uwsgi.gateway_sockets, *old_uwsgi_sock;
+
+        if (!uwsgi_sock) {
+                uwsgi.gateway_sockets = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                uwsgi_sock = uwsgi.gateway_sockets;
+        }
+        else {
+                while(uwsgi_sock) {
+                        old_uwsgi_sock = uwsgi_sock;
+                        uwsgi_sock = uwsgi_sock->next;
+                }
+
+                uwsgi_sock = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                old_uwsgi_sock->next = uwsgi_sock;
+        }
+
+        memset(uwsgi_sock, 0, sizeof(struct uwsgi_gateway_socket));
+	uwsgi_sock->fd = -1;
+	uwsgi_sock->shared = 0;
+        uwsgi_sock->name = name;
+	uwsgi_sock->name_len = strlen(name);
+	uwsgi_sock->owner = owner;
+
+        return uwsgi_sock;
+}
+
+struct uwsgi_gateway_socket *uwsgi_new_gateway_socket_from_fd(int fd, char *owner) {
+
+        struct uwsgi_gateway_socket *uwsgi_sock = uwsgi.gateway_sockets, *old_uwsgi_sock;
+
+        if (!uwsgi_sock) {
+                uwsgi.gateway_sockets = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                uwsgi_sock = uwsgi.gateway_sockets;
+        }
+        else {
+                while(uwsgi_sock) {
+                        old_uwsgi_sock = uwsgi_sock;
+                        uwsgi_sock = uwsgi_sock->next;
+                }
+
+                uwsgi_sock = uwsgi_malloc(sizeof(struct uwsgi_gateway_socket));
+                old_uwsgi_sock->next = uwsgi_sock;
+        }
+
+        memset(uwsgi_sock, 0, sizeof(struct uwsgi_gateway_socket));
+	uwsgi_sock->fd = fd;
+        uwsgi_sock->name = uwsgi_getsockname(fd);
+	uwsgi_sock->name_len = strlen(uwsgi_sock->name);
+        uwsgi_sock->owner = owner;
+
+        return uwsgi_sock;
+}
+
+
+void uwsgi_gateway_go_cheap(char *gw_id, int queue, int *i_am_cheap) {
+
+        uwsgi_log("[%s pid %d] no more nodes available. Going cheap...\n", gw_id, (int) uwsgi.mypid);
+        struct uwsgi_gateway_socket *ugs = uwsgi.gateway_sockets;
+        while (ugs) {
+                if (!strcmp(ugs->owner, gw_id) && !ugs->subscription) {
+                        event_queue_del_fd(queue, ugs->fd, event_queue_read());
+                }
+                ugs = ugs->next;
+        }
+        *i_am_cheap = 1;
+}
+
@@ -0,0 +1,160 @@
+#ifdef UWSGI_INI
+
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+/*
+   ini file must be read ALL into memory.
+   This memory must not be freed for all the server lifecycle
+   */
+
+void ini_rstrip(char *line) {
+
+	off_t i;
+
+	for(i = strlen(line)-1;i>=0; i--) {
+		if (line[i] == ' ' || line[i] == '\t' || line[i] == '\r') {
+			line[i] = 0;
+			continue;
+		}
+		break;
+	}
+}
+
+char *ini_lstrip(char *line) {
+
+	off_t i;
+	char *ptr = line;
+
+	for(i=0;i< (int) strlen(line);i++) {
+		if (line[i] == ' ' || line[i] == '\t' || line[i] == '\r') {
+			ptr++;
+			continue;
+		}
+		break;
+	}
+
+	return ptr;
+}
+
+char *ini_get_key(char *key) {
+
+	off_t i;
+	char *ptr = key;
+
+	for(i=0;i< (int) strlen(key);i++) {
+		ptr++;
+		if (key[i] == '=') {
+			key[i] = 0;
+			return ptr;
+		}
+	}
+
+	return ptr;
+}
+
+char *ini_get_line(char *ini, off_t size) {
+
+	off_t i;
+	char *ptr = ini;
+
+	for(i=0;i<size;i++) {
+		ptr++;
+		if (ini[i] == '\n') {
+			ini[i] = 0;
+			return ptr;
+		}
+	}
+
+	// check if it is a stupid file without \n at the end
+	if (ptr > ini) {
+		return ptr;
+	}
+
+	return NULL;
+
+}
+
+void uwsgi_ini_config(char *file, char *magic_table[]) {
+
+	int len = 0;
+	char *ini;
+
+	char *ini_line;
+
+	char *section = "";
+	char *key;
+	char *val;
+
+	int lines = 1;
+
+	char *section_asked = "uwsgi";
+	char *colon;
+
+	if (uwsgi_check_scheme(file)) {
+                colon = uwsgi_get_last_char(file, '/');
+                colon = uwsgi_get_last_char(colon, ':');
+        }
+        else {
+                colon = uwsgi_get_last_char(file, ':');
+        }
+
+	if (colon) {
+		colon[0] = 0;
+		if (colon[1] != 0) {
+			section_asked = colon+1;
+		}
+	}
+
+	if (file[0] != 0) {
+		uwsgi_log("[uWSGI] getting INI configuration from %s\n", file);
+	}
+
+	ini = uwsgi_open_and_read(file, &len, 1, magic_table);
+
+	while(len) {
+		ini_line = ini_get_line(ini, len);
+		if (ini_line == NULL) {
+			break;
+		}
+		lines++;
+
+		// skip empty line
+		key = ini_lstrip(ini);
+		ini_rstrip(key);
+		if (key[0] != 0) {
+			if (key[0] == '[') {
+				section = key+1;
+				section[strlen(section)-1] = 0;
+			}
+			else if (key[0] == ';' || key[0] == '#') {
+				// this is a comment
+			}
+			else {
+				// val is always valid, but (obviously) can be ignored
+				val = ini_get_key(key);
+
+				if (!strcmp(section, section_asked)) {
+					ini_rstrip(key);
+					val = ini_lstrip(val);
+					ini_rstrip(val);
+					add_exported_option((char *)key, val, 0);
+				}
+			}
+		}
+
+
+		len -= (ini_line - ini);
+		ini += (ini_line - ini);
+
+	}
+
+	if (colon) {
+		colon[0] = ':';
+	}
+
+
+}
+
+#endif
@@ -0,0 +1,254 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_init_default() {
+
+	uwsgi.cpus = 1;
+
+	uwsgi.backtrace_depth = 64;
+        uwsgi.max_apps = 64;
+
+        uwsgi.master_queue = -1;
+
+        uwsgi.signal_socket = -1;
+        uwsgi.my_signal_socket = -1;
+        uwsgi.cache_server_fd = -1;
+        uwsgi.stats_fd = -1;
+
+        uwsgi.original_log_fd = -1;
+
+        uwsgi.emperor_fd_config = -1;
+        // default emperor scan frequency
+        uwsgi.emperor_freq = 3;
+        uwsgi.emperor_throttle = 1000;
+        uwsgi.emperor_heartbeat = 30;
+        // max 3 minutes throttling
+        uwsgi.emperor_max_throttle = 1000 * 180;
+        uwsgi.emperor_pid = -1;
+
+        uwsgi.subscribe_freq = 10;
+        uwsgi.subscription_tolerance = 17;
+
+        uwsgi.cluster_fd = -1;
+        uwsgi.cores = 1;
+        uwsgi.threads = 1;
+
+        uwsgi.default_app = -1;
+
+        uwsgi.buffer_size = 4096;
+        uwsgi.numproc = 1;
+
+        uwsgi.forkbomb_delay = 2;
+
+        uwsgi.async = 1;
+        uwsgi.listen_queue = 100;
+
+        uwsgi.cheaper_overload = 3;
+
+        uwsgi.log_master_bufsize = 8192;
+
+        uwsgi.max_vars = MAX_VARS;
+        uwsgi.vec_size = 4 + 1 + (4 * MAX_VARS);
+
+        uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] = 4;
+        uwsgi.shared->options[UWSGI_OPTION_LOGGING] = 1;
+
+#ifdef UWSGI_SPOOLER
+        uwsgi.shared->spooler_frequency = 30;
+
+        uwsgi.shared->spooler_signal_pipe[0] = -1;
+        uwsgi.shared->spooler_signal_pipe[1] = -1;
+#endif
+        uwsgi.shared->mule_signal_pipe[0] = -1;
+        uwsgi.shared->mule_signal_pipe[1] = -1;
+
+        uwsgi.shared->mule_queue_pipe[0] = -1;
+        uwsgi.shared->mule_queue_pipe[1] = -1;
+
+        uwsgi.shared->worker_log_pipe[0] = -1;
+        uwsgi.shared->worker_log_pipe[1] = -1;
+
+#ifdef UWSGI_SSL
+        // 1 day of tolerance
+        uwsgi.subscriptions_sign_check_tolerance = 3600 * 24;
+#endif
+
+}
+
+void uwsgi_setup_reload() {
+
+        char env_reload_buf[11];
+
+	char *env_reloads = getenv("UWSGI_RELOADS");
+        if (env_reloads) {
+                //convert env value to int
+                uwsgi.reloads = atoi(env_reloads);
+                uwsgi.reloads++;
+                //convert reloads to string
+                int rlen = snprintf(env_reload_buf, 10, "%u", uwsgi.reloads);
+                if (rlen > 0) {
+                        env_reload_buf[rlen] = 0;
+                        if (setenv("UWSGI_RELOADS", env_reload_buf, 1)) {
+                                uwsgi_error("setenv()");
+                        }
+                }
+                uwsgi.is_a_reload = 1;
+        }
+        else {
+                if (setenv("UWSGI_RELOADS", "0", 1)) {
+                        uwsgi_error("setenv()");
+                }
+        }
+
+}
+
+void uwsgi_autoload_plugins_by_name(char *argv_zero) {
+
+	char *plugins_requested = NULL;
+
+	char *original_proc_name = getenv("UWSGI_ORIGINAL_PROC_NAME");
+        if (!original_proc_name) {
+                // here we use argv[0];
+                original_proc_name = argv_zero;
+                setenv("UWSGI_ORIGINAL_PROC_NAME", original_proc_name, 1);
+        }
+        char *p = strrchr(original_proc_name, '/');
+        if (p == NULL)
+                p = original_proc_name;
+        p = strstr(p, "uwsgi_");
+        if (p != NULL) {
+                plugins_requested = strtok(uwsgi_str(p + 6), "_");
+                while (plugins_requested) {
+                        uwsgi_log("[uwsgi] implicit plugin requested %s\n", plugins_requested);
+                        uwsgi_load_plugin(-1, plugins_requested, NULL);
+                        plugins_requested = strtok(NULL, "_");
+                }
+        }
+
+        plugins_requested = getenv("UWSGI_PLUGINS");
+        if (plugins_requested) {
+                plugins_requested = uwsgi_concat2(plugins_requested, "");
+                char *p = strtok(plugins_requested, ",");
+                while (p != NULL) {
+                        uwsgi_load_plugin(-1, p, NULL);
+                        p = strtok(NULL, ",");
+                }
+        }
+
+}
+
+void uwsgi_commandline_config() {
+	int i;
+
+	uwsgi.option_index = -1;
+
+        char *optname;
+        while ((i = getopt_long(uwsgi.argc, uwsgi.argv, uwsgi.short_options, uwsgi.long_options, &uwsgi.option_index)) != -1) {
+
+                if (i == '?') {
+                        uwsgi_log("getopt_long() error\n");
+                        exit(1);
+                }
+
+                if (uwsgi.option_index > -1) {
+                        optname = (char *) uwsgi.long_options[uwsgi.option_index].name;
+                }
+                else {
+                        optname = uwsgi_get_optname_by_index(i);
+                }
+                if (!optname) {
+                        uwsgi_log("unable to parse command line options\n");
+                        exit(1);
+                }
+                uwsgi.option_index = -1;
+                add_exported_option(optname, optarg, 0);
+        }
+
+
+#ifdef UWSGI_DEBUG
+        uwsgi_log("optind:%d argc:%d\n", optind, uwsgi.argc);
+#endif
+
+        if (optind < uwsgi.argc) {
+                for (i = optind; i < uwsgi.argc; i++) {
+                        char *lazy = uwsgi.argv[i];
+                        if (lazy[0] != '[') {
+                                uwsgi_opt_load(NULL, lazy, NULL);
+                                // manage magic mountpoint
+                                int magic = 0;
+                                int j;
+                                for (j = 0; j < uwsgi.gp_cnt; j++) {
+                                        if (uwsgi.gp[j]->magic) {
+                                                if (uwsgi.gp[j]->magic(NULL, lazy)) {
+                                                        magic = 1;
+                                                        break;
+                                                }
+                                        }
+                                }
+                                if (!magic) {
+                                        for (j = 0; j < 256; j++) {
+                                                if (uwsgi.p[j]->magic) {
+                                                        if (uwsgi.p[j]->magic(NULL, lazy)) {
+                                                                magic = 1;
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+
+}
+
+void uwsgi_setup_workers() {
+	int i,j;
+	// allocate shared memory for workers + master
+        uwsgi.workers = (struct uwsgi_worker *) uwsgi_calloc_shared(sizeof(struct uwsgi_worker) * (uwsgi.numproc + 1 + uwsgi.grunt));
+
+        for (i = 0; i <= uwsgi.numproc; i++) {
+                // allocate memory for apps
+                uwsgi.workers[i].apps = (struct uwsgi_app *) uwsgi_calloc_shared(sizeof(struct uwsgi_app) * uwsgi.max_apps);
+
+                // allocate memory for cores
+                uwsgi.workers[i].cores = (struct uwsgi_core *) uwsgi_calloc_shared(sizeof(struct uwsgi_core) * uwsgi.cores);
+
+		// this is a trick for avoiding too much memory areas
+		void *ts = uwsgi_calloc_shared(sizeof(void *) * uwsgi.max_apps * uwsgi.cores);
+		void *buffers = uwsgi_malloc_shared(uwsgi.buffer_size * uwsgi.cores);
+		void *hvec = uwsgi_malloc_shared(sizeof(struct iovec) * uwsgi.vec_size * uwsgi.cores);	
+		void *post_buf = NULL;
+		if (uwsgi.post_buffering > 0)
+			post_buf = uwsgi_malloc_shared(uwsgi.post_buffering_bufsize * uwsgi.cores);	
+		
+
+                for (j = 0; j < uwsgi.cores; j++) {
+                        // allocate shared memory for thread states (required for some language, like python)
+                        uwsgi.workers[i].cores[j].ts = ts + ((sizeof(void *) * uwsgi.max_apps) * j);
+                        // raw per-request buffer
+                        uwsgi.workers[i].cores[j].buffer = buffers + (uwsgi.buffer_size * j);
+                        // iovec for uwsgi vars
+                        uwsgi.workers[i].cores[j].hvec = hvec + ((sizeof(struct iovec) * uwsgi.vec_size) * j);
+                        if (post_buf)
+                                uwsgi.workers[i].cores[j].post_buf = post_buf + (uwsgi.post_buffering_bufsize *j);
+                }
+
+                // master does not need to following steps...
+                if (i == 0) continue;
+                uwsgi.workers[i].signal_pipe[0] = -1;
+                uwsgi.workers[i].signal_pipe[1] = -1;
+                snprintf(uwsgi.workers[i].name, 0xff, "uWSGI worker %d", i);
+                snprintf(uwsgi.workers[i].snapshot_name, 0xff, "uWSGI snapshot %d", i);
+        }
+
+	uint64_t total_memory = (sizeof(struct uwsgi_app) * uwsgi.max_apps) + (sizeof(struct uwsgi_core) * uwsgi.cores) + (sizeof(void *) * uwsgi.max_apps * uwsgi.cores) +
+				(uwsgi.buffer_size * uwsgi.cores) + (sizeof(struct iovec) * uwsgi.vec_size * uwsgi.cores);
+	if (uwsgi.post_buffering > 0) {
+		total_memory += (uwsgi.post_buffering_bufsize * uwsgi.cores);
+	}
+
+	total_memory *= (uwsgi.numproc + uwsgi.master_process);
+        uwsgi_log("mapped %llu bytes (%llu KB) for %d cores\n", total_memory, total_memory / 1024, uwsgi.cores*uwsgi.numproc);
+
+}
@@ -0,0 +1,111 @@
+#ifdef UWSGI_JSON
+
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+#include <jansson.h>
+
+
+/*
+	I really love the jansson library...
+   */
+
+void uwsgi_json_config(char *file, char *magic_table[]) {
+
+	int len = 0;
+	char *json_data;
+
+
+	const char *key;
+
+	json_t *root;
+	json_error_t error;
+	json_t *config;
+	json_t *config_value, *config_array_item;
+
+	void *config_iter;
+
+	char *object_asked = "uwsgi";
+	char *colon;
+	int i;
+
+	if (uwsgi_check_scheme(file)) {
+                colon = uwsgi_get_last_char(file, '/');
+                colon = uwsgi_get_last_char(colon, ':');
+        }
+        else {
+                colon = uwsgi_get_last_char(file, ':');
+        }
+
+	if (colon) {
+		colon[0] = 0;
+		if (colon[1] != 0) {
+			object_asked = colon+1;
+		}
+	}
+
+	uwsgi_log("[uWSGI] getting JSON configuration from %s\n", file);
+
+	json_data = uwsgi_open_and_read(file, &len, 1, magic_table);
+
+#ifdef JANSSON_MAJOR_VERSION 
+	root = json_loads(json_data, 0, &error);
+#else
+	root = json_loads(json_data, &error);
+#endif
+
+	if (!root) {
+		uwsgi_log("error parsing JSON data: line %d %s\n", error.line, error.text);
+		exit(1);
+	}
+
+	config = json_object_get(root, object_asked);
+
+	if (!json_is_object(config)) {
+		uwsgi_log("you must define a object named %s in your JSON data\n", object_asked);
+		exit(1);
+	}
+	
+	config_iter = json_object_iter(config);
+
+	while(config_iter) {
+		key = json_object_iter_key(config_iter);
+		config_value = json_object_iter_value(config_iter);	
+
+		if (json_is_string(config_value)) {
+			add_exported_option((char *)key, (char *) json_string_value(config_value), 0);
+		}
+		else if (json_is_true(config_value)) {
+			add_exported_option((char *)key, strdup("1"), 0);
+		}
+		else if (json_is_false(config_value) || json_is_null(config_value)) {
+			add_exported_option((char *)key, strdup("0"), 0);
+		}
+		else if (json_is_integer(config_value)) {
+			add_exported_option((char *)key, uwsgi_num2str(json_integer_value(config_value)), 0);
+		}
+		else if (json_is_array(config_value)) {
+			for(i=0;i<(int)json_array_size(config_value);i++) {
+				config_array_item = json_array_get(config_value, i);				
+				if (json_is_string(config_array_item)) {
+                        		add_exported_option((char *)key, (char *) json_string_value(config_array_item), 0);
+                		}
+                		else if (json_is_true(config_array_item)) {
+                        		add_exported_option((char *)key, strdup("1"), 0);
+                		}
+                		else if (json_is_false(config_array_item) || json_is_null(config_array_item)) {
+                        		add_exported_option((char *)key, strdup("0"), 0);
+                		}
+                		else if (json_is_integer(config_array_item)) {
+                        		add_exported_option((char *)key, uwsgi_num2str(json_integer_value(config_array_item)), 0);
+                		}
+			}
+		}
+
+		config_iter = json_object_iter_next(config, config_iter);
+	}
+	
+}
+
+#endif
@@ -0,0 +1,369 @@
+#ifdef UWSGI_LDAP
+
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+#include <ldap.h>
+
+#ifndef LDAP_OPT_SUCCESS
+#define LDAP_OPT_SUCCESS LDAP_SUCCESS
+#endif
+
+#ifndef ldap_unbind_ext_s
+#define ldap_unbind_ext_s ldap_unbind_ext
+#endif
+
+void ldap2uwsgi(char *ldapname, char *uwsginame) {
+	char *ptr = uwsginame;
+
+	int i;
+
+	for(i=0;i< (int) strlen(ldapname);i++) {
+		if (isupper( (int)ldapname[i])) {
+			*ptr++ = '-';
+			*ptr++ = tolower( (int) ldapname[i]);
+		}
+		else {
+			*ptr++ = ldapname[i];
+		}
+	}
+
+	*ptr++= 0;
+}
+
+int calc_ldap_name(char *name) {
+	int i;
+	int counter = 0;
+
+	for(i=0;i< (int)strlen(name);i++) {
+		if (isupper( (int) name[i])) {
+			counter++;
+		}
+	}
+
+	return strlen(name) + counter;
+}
+
+struct uwsgi_ldap_entry {
+	int num;
+	char names[1024];
+	int has_arg;
+};
+
+
+void uwsgi_name_to_ldap(char *src, char *dst) {	
+
+	int i;
+	char *ptr = dst;
+
+	memset(dst, 0, 1024);
+
+	strcat(dst, " 'uWSGI");
+
+	ptr+= 7;
+
+	for(i=0;i< (int)strlen(src);i++) {
+        	if (src[i] == '-') {
+                	i++;
+                        *ptr++= toupper( (int) src[i]);
+                }
+                else {
+                	*ptr++= src[i];
+                }
+	}
+
+	strcat(dst, "'");
+
+}
+
+struct uwsgi_ldap_entry *get_ldap_by_num(struct uwsgi_ldap_entry *root, int num, int count) {
+
+	int i;
+	struct uwsgi_ldap_entry *ule;
+
+	for(i=0;i<count;i++) {
+		ule = &root[i];
+		if (ule->num == num) {
+			return ule;
+		}
+	}
+
+	return NULL;
+}
+
+struct uwsgi_ldap_entry *search_ldap_cache(struct uwsgi_ldap_entry *root, char *name, int count) {
+	int i;
+	struct uwsgi_ldap_entry *ule;
+
+	for(i=0;i<count;i++) {
+		ule = &root[i];
+		if (uwsgi_list_has_str(ule->names, name+1)) {
+			return ule;
+		}
+	}
+
+	return NULL;
+}
+
+struct uwsgi_ldap_entry *get_ldap_names(int *count) {
+
+	struct uwsgi_option *op = uwsgi.options;
+	struct uwsgi_ldap_entry *ule, *entry;
+	char ldap_name[1024];
+
+	*count = 0;
+
+	ule = uwsgi_malloc(sizeof(struct uwsgi_ldap_entry)*uwsgi_count_options(op));
+
+	while( op && op->name ) {
+
+		uwsgi_name_to_ldap((char *)op->name, ldap_name);
+
+		entry = search_ldap_cache(ule, ldap_name, *count);
+
+		if (entry) goto next;
+
+		entry = &ule[*count] ;
+		entry->num = *count;
+		strcpy(entry->names, ldap_name);
+		*count = *count+1;
+
+		entry->has_arg = op->type;
+		
+next:
+		op++;
+	}
+
+	return ule;
+}
+
+void uwsgi_opt_ldap_dump_ldif(char *opt, char *foo, void *bar) {
+
+	int i;
+	int items;
+
+	uwsgi_log("\n");
+	uwsgi_log("dn: cn=uwsgi,cn=schema,cn=config\n");
+	uwsgi_log("objectClass: olcSchemaConfig\n");
+	uwsgi_log("cn: uwsgi\n");
+
+	struct uwsgi_ldap_entry *entry, *ule = get_ldap_names(&items);
+
+	for(i=0;i<items;i++) {
+
+		entry = &ule[i];
+		uwsgi_log("olcAttributeTypes: ( 1.3.6.1.4.1.35156.17.4.%d NAME (%s", entry->num, entry->names);
+
+		if (entry->has_arg) {
+			uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )\n");
+		}
+		else {
+			uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
+		}
+	}
+
+	uwsgi_log("olcAttributeTypes: ( 1.3.6.1.4.1.35156.17.4.50000 NAME 'uWSGInull' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
+
+
+	uwsgi_log("olcObjectClasses: ( 1.3.6.1.4.1.35156.17.3.1 NAME 'uWSGIConfig' SUP top AUXILIARY DESC 'uWSGI configuration' MAY ( ");
+
+	
+	for(i=0;i<items;i++) {
+
+                entry = &ule[i];
+
+		char *list2 = uwsgi_concat2(entry->names+1, "");
+		char *p = strtok(list2, " ");
+        	while (p != NULL) {
+			uwsgi_log("%.*s $ ", strlen(p)-2, p+1);
+                	p = strtok(NULL, " ");
+        	}
+
+        	free(list2);
+
+	}
+
+	uwsgi_log("uWSGInull ))\n");
+
+	uwsgi_log("\n");
+
+	exit(0);
+}
+
+void uwsgi_opt_ldap_dump(char *opt, char *foo, void *bar) {
+
+	int i;
+	int items;
+
+	struct uwsgi_ldap_entry *entry, *ule = get_ldap_names(&items);
+
+        for(i=0;i<items;i++) {
+
+                entry = &ule[i];
+                uwsgi_log("attributetype ( 1.3.6.1.4.1.35156.17.4.%d NAME (%s", entry->num, entry->names);
+
+                if (entry->has_arg) {
+                        uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )\n");
+                }
+                else {
+                        uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
+                }
+        }
+
+
+	uwsgi_log("attributetype ( 1.3.6.1.4.1.35156.17.4.50000 NAME 'uWSGInull' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
+
+	uwsgi_log("objectclass ( 1.3.6.1.4.1.35156.17.3.1 NAME 'uWSGIConfig' SUP top AUXILIARY DESC 'uWSGI configuration' MAY ( ");
+
+	for(i=0;i<items;i++) {
+
+                entry = &ule[i];
+
+                char *list2 = uwsgi_concat2(entry->names+1, "");
+                char *p = strtok(list2, " ");
+                while (p != NULL) {
+                        uwsgi_log("%.*s $ ", strlen(p)-2, p+1);
+                        p = strtok(NULL, " ");
+                }
+
+                free(list2);
+
+        }
+
+
+
+
+	uwsgi_log("uWSGInull ))\n");
+
+	exit(0);
+}
+
+void uwsgi_ldap_config(char *url) {
+
+	LDAP *ldp;
+	LDAPMessage *results, *entry;
+	BerElement *ber;
+	struct berval **bervalues;
+	char *attr;
+	char *uwsgi_attr;
+
+	char *url_slash;
+
+	int desired_version = LDAP_VERSION3;
+	int ret;
+
+	LDAPURLDesc *ldap_url;
+
+	if (!ldap_is_ldap_url(url)) {
+		uwsgi_log("invalid LDAP url.\n");
+		exit(1);
+	}
+
+	if (ldap_url_parse(url, &ldap_url) != LDAP_SUCCESS) {
+		uwsgi_log("unable to parse LDAP url.\n");
+		exit(1);
+	}
+	
+	uwsgi_log("[uWSGI] getting LDAP configuration from %s\n", url);
+
+	url_slash = strchr(url, '/');
+	url_slash = strchr(url_slash + 1, '/');
+
+	url_slash = strchr(url_slash + 1, '/');
+	if (url_slash) {
+		url_slash[0] = 0;
+	}
+
+#ifdef UWSGI_DEBUG
+	uwsgi_debug("LDAP URL: %s\n", url);
+	uwsgi_debug("LDAP BASE DN: %s\n", ldap_url->lud_dn);
+#endif
+
+#if LDAP_API_VERSION >= 3000
+	if ( (ret = ldap_initialize( &ldp, url)) != LDAP_SUCCESS) {
+		uwsgi_log("LDAP: %s\n", ldap_err2string(ret));
+		exit(1);
+	}
+#else
+	if ( (ldp = ldap_init( ldap_url->lud_host, ldap_url->lud_port)) == NULL) {
+		uwsgi_error("ldap_init()");
+		exit(1);
+	}
+#endif
+
+
+	if ( (ret = ldap_set_option(ldp, LDAP_OPT_PROTOCOL_VERSION, &desired_version)) != LDAP_OPT_SUCCESS) {
+		uwsgi_log("LDAP: %s\n", ldap_err2string(ret));
+		exit(1);
+	}
+
+
+	if ( (ret = ldap_search_ext_s(ldp, ldap_url->lud_dn, ldap_url->lud_scope, ldap_url->lud_filter, NULL, 0, NULL, NULL, NULL, 1, &results)) != LDAP_SUCCESS) {
+		uwsgi_log("LDAP: %s\n", ldap_err2string(ret));
+		exit(1);
+	}
+
+#ifdef UWSGI_DEBUG
+	uwsgi_debug("LDAP connection initialized %p\n", ldp);
+#endif
+
+	free(ldap_url);
+
+	if (ldap_count_entries(ldp, results) < 1) {
+		uwsgi_log("no LDAP entry found\n");
+		exit(1);
+	}
+
+	entry = ldap_first_entry(ldp, results);
+
+	int found = 0;
+	for( attr = ldap_first_attribute(ldp, entry, &ber); attr != NULL; attr = ldap_next_attribute(ldp, entry, ber)) {
+		if (!strncmp(attr,"uWSGI",5)) {
+
+			found = 1;
+			uwsgi_attr = malloc( calc_ldap_name(attr) + 1 );
+			if (!uwsgi_attr) {
+				uwsgi_error("malloc()");
+				exit(1);
+			}
+
+			ldap2uwsgi(attr+5, uwsgi_attr);
+
+#ifdef UWSGI_DEBUG
+			uwsgi_debug("LDAP attribute: %s = --%s\n", attr, uwsgi_attr);
+#endif
+			bervalues = ldap_get_values_len(ldp, entry, attr);
+			if (bervalues) {
+				// do not free uwsgi_attr/uwsgi_val;
+				char *uwsgi_val = malloc( bervalues[0]->bv_len + 1 );
+				if (!uwsgi_val) {
+					uwsgi_error("malloc()");
+					exit(1);
+				}
+
+				memcpy(uwsgi_val, bervalues[0]->bv_val, bervalues[0]->bv_len);
+				uwsgi_val[bervalues[0]->bv_len] = 0;
+
+				add_exported_option((char*) uwsgi_attr, uwsgi_val, 0);
+				free(bervalues);
+			}
+			else {
+				free(uwsgi_attr);
+			}
+		}
+		free(attr);
+	}
+
+	if (!found) {
+		uwsgi_log("no uWSGI LDAP entry found\n");
+		exit(1);
+	}
+
+	free(ber);
+	free(results);
+
+	ldap_unbind_ext_s(ldp, NULL, NULL);
+
+}
+#endif
@@ -0,0 +1,631 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+static struct uwsgi_lock_item *uwsgi_register_lock(char *id, int rw) {
+
+	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
+	if (!uli) {
+		uwsgi.registered_locks = uwsgi_malloc_shared(sizeof(struct uwsgi_lock_item));
+		uwsgi.registered_locks->id = id;
+		uwsgi.registered_locks->pid = 0;
+		if (rw) {
+			uwsgi.registered_locks->lock_ptr = uwsgi_malloc_shared(uwsgi.rwlock_size);
+		}
+		else {
+			uwsgi.registered_locks->lock_ptr = uwsgi_malloc_shared(uwsgi.lock_size);
+		}
+		uwsgi.registered_locks->rw = rw;
+		uwsgi.registered_locks->next = NULL;
+		return uwsgi.registered_locks;
+	}
+
+	while(uli) {
+		if (!uli->next) {
+			uli->next = uwsgi_malloc_shared(sizeof(struct uwsgi_lock_item));
+			if (rw) {
+				uli->next->lock_ptr = uwsgi_malloc_shared(uwsgi.rwlock_size);
+			}
+			else {
+				uli->next->lock_ptr = uwsgi_malloc_shared(uwsgi.lock_size);
+			}
+			uli->next->id = id;
+			uli->next->pid = 0;
+			uli->next->rw = rw;
+			uli->next->next = NULL;
+			return uli->next;
+		}
+		uli = uli->next;
+	}
+
+	uwsgi_log("*** DANGER: unable to allocate lock %s ***\n", id);
+	exit(1);
+
+}
+
+#ifdef UWSGI_LOCK_USE_MUTEX
+
+#ifdef EOWNERDEAD
+#define UWSGI_LOCK_ENGINE_NAME "pthread robust mutexes"
+int uwsgi_pthread_robust_mutexes_enabled = 1;
+#else
+#define UWSGI_LOCK_ENGINE_NAME "pthread mutexes"
+#endif
+
+#define UWSGI_LOCK_SIZE	sizeof(pthread_mutex_t)
+
+#ifdef OBSOLETE_LINUX_KERNEL
+#define UWSGI_RWLOCK_SIZE	sizeof(pthread_mutex_t)
+#else
+#define UWSGI_RWLOCK_SIZE	sizeof(pthread_rwlock_t)
+#endif
+
+// REMEMBER lock must contains space for both pthread_mutex_t and pthread_mutexattr_t !!! 
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+
+	pthread_mutexattr_t attr;
+	
+        struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+
+#ifdef EOWNERDEAD
+retry:
+#endif
+	if (pthread_mutexattr_init(&attr)) {
+        	uwsgi_log("unable to allocate mutexattr structure\n");
+                exit(1);
+	}
+
+        if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
+        	uwsgi_log("unable to share mutex\n");
+                exit(1);
+        }
+
+#ifdef EOWNERDEAD
+	if (uwsgi_pthread_robust_mutexes_enabled) {
+        	if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP)) {
+        		uwsgi_log("unable to make the mutex 'robust'\n");
+                	exit(1);
+        	}
+	}
+#endif
+
+        if (pthread_mutex_init((pthread_mutex_t *) uli->lock_ptr, &attr)) {
+#ifdef EOWNERDEAD
+		if (uwsgi_pthread_robust_mutexes_enabled) {
+			uwsgi_log("!!! it looks like your kernel does not support pthread robust mutexes !!!\n");
+			uwsgi_log("!!! falling back to standard pthread mutexes !!!\n");
+			uwsgi_pthread_robust_mutexes_enabled = 0;
+			pthread_mutexattr_destroy(&attr);
+			goto retry;
+		}
+#endif
+        	uwsgi_log("unable to initialize mutex\n");
+                exit(1);
+        }
+
+	pthread_mutexattr_destroy(&attr);
+
+#ifdef EOWNERDEAD
+	if (!uwsgi_pthread_robust_mutexes_enabled) {
+		uli->can_deadlock = 1;
+	}
+#else
+	uli->can_deadlock = 1;
+#endif
+
+	return uli;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+
+	if (pthread_mutex_trylock((pthread_mutex_t *) uli->lock_ptr) == 0 ) {
+		pthread_mutex_unlock((pthread_mutex_t *) uli->lock_ptr);	
+		return 0;
+	}
+	return uli->pid;
+}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	return uwsgi_lock_fast_check(uli);
+#else
+
+	if (pthread_rwlock_trywrlock((pthread_rwlock_t *) uli->lock_ptr) == 0 ) {
+		pthread_rwlock_unlock((pthread_rwlock_t *) uli->lock_ptr);	
+		return 0;
+	}
+        return uli->pid;
+#endif
+}
+
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+
+#ifdef EOWNERDEAD
+	if (pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr) == EOWNERDEAD) {
+		uwsgi_log("[deadlock-detector] a process holding a robust mutex died. recovering...\n");
+		pthread_mutex_consistent_np((pthread_mutex_t *) uli->lock_ptr);
+	}
+#else
+	pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr);
+#endif
+        uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+
+	pthread_mutex_unlock((pthread_mutex_t *) uli->lock_ptr);
+	uli->pid = 0;
+
+}
+
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	uwsgi_lock_fast(uli);
+#else
+	pthread_rwlock_rdlock((pthread_rwlock_t *) uli->lock_ptr);
+        uli->pid = uwsgi.mypid;
+#endif
+}
+
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	uwsgi_lock_fast(uli);
+#else
+	pthread_rwlock_wrlock((pthread_rwlock_t *) uli->lock_ptr);
+        uli->pid = uwsgi.mypid;
+#endif
+}
+
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) {
+#ifdef OBSOLETE_LINUX_KERNEL
+	uwsgi_unlock_fast(uli);
+#else
+	pthread_rwlock_unlock((pthread_rwlock_t *) uli->lock_ptr);
+        uli->pid = 0;
+#endif
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) {
+
+#ifdef OBSOLETE_LINUX_KERNEL
+	return uwsgi_lock_fast_init(id);
+#else
+
+	pthread_rwlockattr_t attr;
+
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 1);
+
+        if (pthread_rwlockattr_init(&attr)) {
+                uwsgi_log("unable to allocate rwlock structure\n");
+                exit(1);
+        }
+
+        if (pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
+                uwsgi_log("unable to share rwlock\n");
+                exit(1);
+        }
+
+        if (pthread_rwlock_init((pthread_rwlock_t *) uli->lock_ptr, &attr)) {
+                uwsgi_log("unable to initialize rwlock\n");
+                exit(1);
+        }
+
+	pthread_rwlockattr_destroy(&attr);
+
+	uli->can_deadlock = 1;
+
+	return uli;
+#endif
+
+
+
+}
+
+
+
+#elif defined(UWSGI_LOCK_USE_UMTX)
+
+/* Warning: FreeBSD is still not ready for process-shared UMTX */
+
+#include <machine/atomic.h>
+#include <sys/umtx.h>
+
+#define UWSGI_LOCK_SIZE		sizeof(struct umtx)
+#define UWSGI_RWLOCK_SIZE	sizeof(struct umtx)
+#define UWSGI_LOCK_ENGINE_NAME	"FreeBSD umtx"
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) { return uwsgi_lock_fast_init(id) ;}
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) { uwsgi_unlock_fast(uli); }
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+	umtx_init((struct umtx*) uli->lock_ptr);
+	return uli;
+}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+	umtx_lock((struct umtx*) uli->lock_ptr, (u_long) getpid() );
+	uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+	umtx_unlock((struct umtx*) uli->lock_ptr, (u_long) getpid() );
+	uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (umtx_trylock((struct umtx*) uli->lock_ptr, (u_long) getpid() )) {
+		umtx_unlock((struct umtx*) uli->lock_ptr, (u_long) getpid() );
+		return 0;
+	}
+	return uli->pid;
+}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_fast_check(uli); }
+
+#elif defined(UWSGI_LOCK_USE_POSIX_SEM)
+
+#define UWSGI_LOCK_SIZE         sizeof(sem_t)
+#define UWSGI_RWLOCK_SIZE       sizeof(sem_t)
+#define UWSGI_LOCK_ENGINE_NAME  "POSIX semaphores"
+
+#include <semaphore.h>
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+        struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+        sem_init((sem_t*) uli->lock_ptr, 1, 1);
+	uli->can_deadlock = 1;
+        return uli;
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) { return uwsgi_lock_fast_init(id) ;}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+        sem_wait((sem_t *) uli->lock_ptr);
+        uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+        sem_post((sem_t*) uli->lock_ptr);
+        uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (sem_trywait((sem_t *) uli->lock_ptr) == 0) {
+		sem_post((sem_t*) uli->lock_ptr);
+                return 0;
+        }
+        return uli->pid;
+}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_fast_check(uli); }
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) { uwsgi_unlock_fast(uli); }
+
+
+#elif defined(UWSGI_LOCK_USE_OSX_SPINLOCK)
+
+#define UWSGI_LOCK_ENGINE_NAME "OSX spinlocks"
+#define UWSGI_LOCK_SIZE		sizeof(OSSpinLock)
+#define UWSGI_RWLOCK_SIZE	sizeof(OSSpinLock)
+
+
+struct uwsgi_lock_item *uwsgi_lock_fast_init(char *id) {
+
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+	memset(uli->lock_ptr, 0, UWSGI_LOCK_SIZE);
+	uli->can_deadlock = 1;
+	return uli;
+}
+
+void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
+
+	OSSpinLockLock((OSSpinLock *) uli->lock_ptr);
+	uli->pid = uwsgi.mypid;
+}
+
+void uwsgi_unlock_fast(struct uwsgi_lock_item *uli) {
+
+	OSSpinLockUnlock((OSSpinLock *) uli->lock_ptr);
+	uli->pid = 0;
+}
+
+pid_t uwsgi_lock_fast_check(struct uwsgi_lock_item *uli) {
+	if (OSSpinLockTry((OSSpinLock *) uli->lock_ptr)) {
+		OSSpinLockUnlock((OSSpinLock *) uli->lock_ptr);
+		return 0;
+	}
+	return uli->pid;
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_fast_init(char *id) { 
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 1);
+	memset(uli->lock_ptr, 0, UWSGI_LOCK_SIZE);
+	uli->can_deadlock = 1;
+	return uli;
+}
+
+void uwsgi_rlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+void uwsgi_wlock_fast(struct uwsgi_lock_item *uli) { uwsgi_lock_fast(uli);}
+
+pid_t uwsgi_rwlock_fast_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_fast_check(uli); }
+
+void uwsgi_rwunlock_fast(struct uwsgi_lock_item *uli) { uwsgi_unlock_fast(uli); }
+
+#else
+
+#define uwsgi_lock_fast_init uwsgi_lock_ipcsem_init
+#define uwsgi_lock_fast_check uwsgi_lock_ipcsem_check
+#define uwsgi_lock_fast uwsgi_lock_ipcsem
+#define uwsgi_unlock_fast uwsgi_unlock_ipcsem
+
+#define uwsgi_rwlock_fast_init uwsgi_rwlock_ipcsem_init
+#define uwsgi_rwlock_fast_check uwsgi_rwlock_ipcsem_check
+
+#define uwsgi_rlock_fast uwsgi_rlock_ipcsem
+#define uwsgi_wlock_fast uwsgi_wlock_ipcsem
+#define uwsgi_rwunlock_fast uwsgi_rwunlock_ipcsem
+
+#define UWSGI_LOCK_SIZE sizeof(int)
+#define UWSGI_RWLOCK_SIZE sizeof(int)
+
+#define UWSGI_LOCK_ENGINE_NAME "ipcsem"
+
+#define UWSGI_IPCSEM_ATEXIT	1
+
+#endif
+
+struct uwsgi_lock_item *uwsgi_lock_ipcsem_init(char *id) {
+
+	// used by ftok
+	static int counter = 1;
+	union semun {
+ 		int val;
+		struct semid_ds *buf;
+		ushort *array;
+	} semu ;
+	int semid;
+	key_t myKey;
+
+	struct uwsgi_lock_item *uli = uwsgi_register_lock(id, 0);
+
+	if (uwsgi.ftok) {
+		myKey = ftok(uwsgi.ftok, counter);
+		if (myKey < 0) {
+			uwsgi_error("ftok()");
+			exit(1);
+		}
+		counter++;
+		semid = semget(myKey, 1, IPC_CREAT|0666);
+	}
+	else {
+		semid = semget(IPC_PRIVATE, 1, IPC_CREAT|IPC_EXCL| 0666);
+	}
+
+	if (semid < 0) {
+		uwsgi_error("semget()");
+		exit(1);
+	}
+	// do this now, to allows triggering of atexit hook in case of problems
+	memcpy(uli->lock_ptr, &semid, sizeof(int));
+
+	semu.val = 1;
+	if (semctl(semid, 0, SETVAL, semu)) {
+		uwsgi_error("semctl()");
+		exit(1);
+	}
+	
+	return uli;
+}
+
+void uwsgi_lock_ipcsem(struct uwsgi_lock_item *uli) {
+
+	int semid;
+	struct sembuf sb;
+	sb.sem_num = 0;
+	sb.sem_op = -1;
+	sb.sem_flg = SEM_UNDO;
+
+	memcpy(&semid, uli->lock_ptr, sizeof(int));
+
+	if (semop(semid, &sb, 1)) {
+		uwsgi_error("semop()");
+	} 
+}
+
+void uwsgi_unlock_ipcsem(struct uwsgi_lock_item *uli) {
+
+	int semid;
+	struct sembuf sb;
+	sb.sem_num = 0;
+	sb.sem_op = 1;
+	sb.sem_flg = SEM_UNDO;
+
+	memcpy(&semid, uli->lock_ptr, sizeof(int));
+
+	if (semop(semid, &sb, 1)) {
+		uwsgi_error("semop()");
+	} 
+
+}
+
+struct uwsgi_lock_item *uwsgi_rwlock_ipcsem_init(char *id) { return uwsgi_lock_ipcsem_init(id);}
+void uwsgi_rlock_ipcsem(struct uwsgi_lock_item *uli) { uwsgi_lock_ipcsem(uli);}
+void uwsgi_wlock_ipcsem(struct uwsgi_lock_item *uli) { uwsgi_lock_ipcsem(uli);}
+void uwsgi_rwunlock_ipcsem(struct uwsgi_lock_item *uli) { uwsgi_unlock_ipcsem(uli); }
+
+// ipc cannot deadlock
+pid_t uwsgi_lock_ipcsem_check(struct uwsgi_lock_item *uli) {
+	return 0;
+}
+
+void uwsgi_ipcsem_clear(void) {
+
+	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
+
+	if (!uwsgi.workers) goto clear;
+
+	if (uwsgi.mywid == 0) goto clear;
+
+	if (uwsgi.master_process && getpid() == uwsgi.workers[0].pid) goto clear;
+
+	if (!uwsgi.master_process && uwsgi.mywid == 1) goto clear;
+
+	return;
+
+clear:
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("removing sysvipc semaphores...\n");
+#endif
+        while(uli) {
+		int semid = 0;
+		memcpy(&semid, uli->lock_ptr, sizeof(int));
+		if (semctl(semid, 0, IPC_RMID)) {
+			uwsgi_error("semctl()");
+		}
+		uli = uli->next;
+	}
+}
+
+
+pid_t uwsgi_rwlock_ipcsem_check(struct uwsgi_lock_item *uli) { return uwsgi_lock_ipcsem_check(uli); }
+
+
+void uwsgi_setup_locking() {
+
+	// use the fastest available locking
+	if (uwsgi.lock_engine) {
+		if (!strcmp(uwsgi.lock_engine, "ipcsem")) {
+			uwsgi_log_initial("lock engine: ipcsem\n");
+			atexit(uwsgi_ipcsem_clear);
+			uwsgi.lock_ops.lock_init = uwsgi_lock_ipcsem_init;
+			uwsgi.lock_ops.lock_check = uwsgi_lock_ipcsem_check;
+			uwsgi.lock_ops.lock = uwsgi_lock_ipcsem;
+			uwsgi.lock_ops.unlock = uwsgi_unlock_ipcsem;
+			uwsgi.lock_ops.rwlock_init = uwsgi_rwlock_ipcsem_init;
+			uwsgi.lock_ops.rwlock_check = uwsgi_rwlock_ipcsem_check;
+			uwsgi.lock_ops.rlock = uwsgi_rlock_ipcsem;
+			uwsgi.lock_ops.wlock = uwsgi_wlock_ipcsem;
+			uwsgi.lock_ops.rwunlock = uwsgi_rwunlock_ipcsem;
+			uwsgi.lock_size = 8;
+			uwsgi.rwlock_size = 8;
+			return;
+		}
+	}
+
+	uwsgi_log_initial("lock engine: %s\n", UWSGI_LOCK_ENGINE_NAME);
+#ifdef UWSGI_IPCSEM_ATEXIT
+	atexit(uwsgi_ipcsem_clear);
+#endif
+	uwsgi.lock_ops.lock_init = uwsgi_lock_fast_init;
+	uwsgi.lock_ops.lock_check = uwsgi_lock_fast_check;
+	uwsgi.lock_ops.lock = uwsgi_lock_fast;
+	uwsgi.lock_ops.unlock = uwsgi_unlock_fast;
+	uwsgi.lock_ops.rwlock_init = uwsgi_rwlock_fast_init;
+	uwsgi.lock_ops.rwlock_check = uwsgi_rwlock_fast_check;
+	uwsgi.lock_ops.rlock = uwsgi_rlock_fast;
+	uwsgi.lock_ops.wlock = uwsgi_wlock_fast;
+	uwsgi.lock_ops.rwunlock = uwsgi_rwunlock_fast;
+	uwsgi.lock_size = UWSGI_LOCK_SIZE;
+	uwsgi.rwlock_size = UWSGI_RWLOCK_SIZE;
+
+	// application generic lock
+	int i;
+        uwsgi.user_lock = uwsgi_malloc(sizeof(void *) * (uwsgi.locks + 1));
+        for (i = 0; i < uwsgi.locks + 1; i++) {
+                uwsgi.user_lock[i] = uwsgi_lock_init(uwsgi_concat2("user ", uwsgi_num2str(i)));
+        }
+
+	// event queue lock (mitigate same event on multiple queues)
+        if (uwsgi.threads > 1) {
+                pthread_mutex_init(&uwsgi.thunder_mutex, NULL);
+        }
+
+        if (uwsgi.master_process) {
+                // signal table lock
+                uwsgi.signal_table_lock = uwsgi_lock_init("signal");
+
+                // fmon table lock
+                uwsgi.fmon_table_lock = uwsgi_lock_init("filemon");
+
+                // timer table lock
+                uwsgi.timer_table_lock = uwsgi_lock_init("timer");
+
+                // probe table lock
+                uwsgi.probe_table_lock = uwsgi_lock_init("probe");
+
+                // rb_timer table lock
+                uwsgi.rb_timer_table_lock = uwsgi_lock_init("rbtimer");
+
+                // cron table lock
+                uwsgi.cron_table_lock = uwsgi_lock_init("cron");
+        }
+
+        uwsgi.rpc_table_lock = uwsgi_lock_init("rpc");
+
+}
+
+
+int uwsgi_fcntl_lock(int fd) {
+	struct flock fl;
+	fl.l_type = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_pid = 0;
+
+	int ret = fcntl(fd, F_SETLKW, &fl);
+	if (ret < 0)
+		uwsgi_error("fcntl()");
+
+	return ret;
+}
+
+int uwsgi_fcntl_is_locked(int fd) {
+
+	struct flock fl;
+        fl.l_type = F_WRLCK;
+        fl.l_whence = SEEK_SET;
+        fl.l_start = 0;
+        fl.l_len = 0;
+        fl.l_pid = 0;
+
+        if (fcntl(fd, F_SETLK, &fl)) {
+		return 1;
+	}
+
+	return 0;
+	
+}
+
+void uwsgi_deadlock_check(pid_t diedpid) {
+	struct uwsgi_lock_item *uli = uwsgi.registered_locks;
+                while (uli) {
+                        if (!uli->can_deadlock)
+                                goto nextlock;
+                        pid_t locked_pid = 0;
+                        if (uli->rw) {
+                                locked_pid = uwsgi_rwlock_check(uli);
+                        }
+                        else {
+                                locked_pid = uwsgi_lock_check(uli);
+                        }
+                        if (locked_pid == diedpid) {
+                                uwsgi_log("[deadlock-detector] pid %d was holding lock %s (%p)\n", (int) diedpid, uli->id, uli->lock_ptr);
+                                if (uli->rw) {
+                                        uwsgi_rwunlock(uli);
+                                }
+                                else {
+                                        uwsgi_unlock(uli);
+                                }
+                        }
+nextlock:
+                        uli = uli->next;
+                }
+
+}
@@ -0,0 +1,122 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+struct wsgi_request *threaded_current_wsgi_req() {
+	return pthread_getspecific(uwsgi.tur_key);
+}
+struct wsgi_request *simple_current_wsgi_req() {
+	return uwsgi.wsgi_req;
+}
+
+
+void uwsgi_register_loop(char *name, void *loop) {
+
+	if (uwsgi.loops_cnt >= MAX_LOOPS) {
+		uwsgi_log("you can define %d loops at max\n", MAX_LOOPS);
+		exit(1);
+	}
+
+	uwsgi.loops[uwsgi.loops_cnt].name = name;
+	uwsgi.loops[uwsgi.loops_cnt].loop = loop;
+	uwsgi.loops_cnt++;
+}
+
+void *uwsgi_get_loop(char *name) {
+
+	int i;
+
+	for (i = 0; i < uwsgi.loops_cnt; i++) {
+		if (!strcmp(name, uwsgi.loops[i].name)) {
+			return uwsgi.loops[i].loop;
+		}
+	}
+
+	return NULL;
+}
+
+void *simple_loop(void *arg1) {
+
+	long core_id = (long) arg1;
+
+	struct wsgi_request *wsgi_req = &uwsgi.workers[uwsgi.mywid].cores[core_id].req;
+
+#ifdef UWSGI_THREADING
+	int i;
+	sigset_t smask;
+
+	if (uwsgi.threads > 1) {
+
+		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &i);
+		pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &i);
+		pthread_setspecific(uwsgi.tur_key, (void *) wsgi_req);
+
+		if (core_id > 0) {
+			// block all signals on new threads
+			sigfillset(&smask);
+#ifdef UWSGI_DEBUG
+			sigdelset(&smask, SIGSEGV);
+#endif
+			pthread_sigmask(SIG_BLOCK, &smask, NULL);
+
+			// run per-thread socket hook
+			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+			while(uwsgi_sock) {
+				if (uwsgi_sock->proto_thread_fixup) {
+					uwsgi_sock->proto_thread_fixup(uwsgi_sock, core_id);
+				}
+				uwsgi_sock = uwsgi_sock->next;
+			}
+
+			for (i = 0; i < 256; i++) {
+				if (uwsgi.p[i]->init_thread) {
+					uwsgi.p[i]->init_thread(core_id);
+				}
+			}
+		}
+	}
+#endif
+
+	// initialize the main event queue to monitor sockets
+	int main_queue = event_queue_init();
+
+	uwsgi_add_sockets_to_queue(main_queue, core_id);
+
+	if (uwsgi.signal_socket > -1) {
+		event_queue_add_fd_read(main_queue, uwsgi.signal_socket);
+		event_queue_add_fd_read(main_queue, uwsgi.my_signal_socket);
+	}
+
+
+	// ok we are ready, let's start managing requests and signals
+	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
+
+		wsgi_req_setup(wsgi_req, core_id, NULL);
+
+		if (wsgi_req_accept(main_queue, wsgi_req)) {
+			continue;
+		}
+
+		if (wsgi_req_recv(wsgi_req)) {
+			uwsgi_destroy_request(wsgi_req);
+			continue;
+		}
+
+		uwsgi_close_request(wsgi_req);
+	}
+
+	// end of the loop
+	if (uwsgi.workers[uwsgi.mywid].destroy && uwsgi.workers[0].pid > 0) {
+#ifdef __APPLE__
+		kill(uwsgi.workers[0].pid, SIGTERM);
+#else
+		if (uwsgi.propagate_touch) {
+			kill(uwsgi.workers[0].pid, SIGHUP);
+		}
+		else {
+			gracefully_kill(0);
+		}
+#endif
+	}
+	return NULL;
+}
@@ -0,0 +1,448 @@
+/*
+
+uWSGI mules are very simple workers only managing signals or running custom code in background.
+
+By default they born in signal-only mode, but if you patch them (passing the script/code to run) they will became fully customized daemons.
+
+*/
+
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void uwsgi_mule_handler(void);
+
+void mule_send_msg(int fd, char *message, size_t len) {
+
+	socklen_t so_bufsize_len = sizeof(int);
+	int so_bufsize = 0;
+
+	if (write(fd, message, len) != (ssize_t) len) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                        if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &so_bufsize, &so_bufsize_len)) {
+                                uwsgi_error("getsockopt()");
+                        }
+                        uwsgi_log("*** MULE MSG QUEUE IS FULL: buffer size %d bytes (you can tune it with --signal-bufsize) ***\n", so_bufsize);
+                }
+                else {
+                        uwsgi_error("mule_send_msg()");
+                }
+	}
+}
+
+void uwsgi_mule(int id) {
+
+	int i;
+
+	pid_t pid = uwsgi_fork(uwsgi.mules[id-1].name);
+	if (pid == 0) {
+#ifdef __linux__
+                if (prctl(PR_SET_PDEATHSIG, SIGKILL, 0,0,0)) {
+                        uwsgi_error("prctl()");
+                }
+#endif
+		uwsgi.muleid = id;
+		// avoid race conditions
+		uwsgi.mules[id-1].id = id;
+		uwsgi.mules[id-1].pid = getpid();
+
+		uwsgi_fixup_fds(0, id, NULL);
+
+		uwsgi.my_signal_socket = uwsgi.mules[id-1].signal_pipe[1];
+		uwsgi.signal_socket = uwsgi.shared->mule_signal_pipe[1];
+
+		uwsgi_close_all_sockets();
+
+		for (i = 0; i < 256; i++) {
+                	if (uwsgi.p[i]->master_fixup) {
+                		uwsgi.p[i]->master_fixup(1);
+                	}
+                }
+
+		for (i = 0; i < 256; i++) {
+                        if (uwsgi.p[i]->post_fork) {
+                                uwsgi.p[i]->post_fork();
+                        }
+                }
+
+
+		if (uwsgi.mules[id-1].patch) {
+			for (i = 0; i < 256; i++) {
+                        	if (uwsgi.p[i]->mule) {
+                                	if (uwsgi.p[i]->mule(uwsgi.mules[id-1].patch) == 1) {
+						// never here
+						break;
+					}
+				}
+                        }
+		}
+
+		uwsgi_mule_handler();
+	}
+	else if (pid > 0) {
+		uwsgi.mules[id-1].id = id;
+		uwsgi.mules[id-1].pid = pid;
+		uwsgi_log("spawned uWSGI mule %d (pid: %d)\n", id, (int) pid);
+	}
+}
+
+int uwsgi_farm_has_mule(struct uwsgi_farm *farm, int muleid) {
+
+	struct uwsgi_mule_farm *umf = farm->mules;
+
+	while(umf) {
+		if (umf->mule->id == muleid) {
+			return 1;
+		}
+		umf = umf->next;
+	}
+
+	return 0;
+}
+
+int farm_has_signaled(int fd) {
+
+	int i;
+	for(i=0;i<uwsgi.farms_cnt;i++) {
+		struct uwsgi_mule_farm *umf = uwsgi.farms[i].mules;
+		while(umf) {
+			if (umf->mule->id == uwsgi.muleid && uwsgi.farms[i].signal_pipe[1] == fd) {
+				return 1;
+			}
+			umf = umf->next;
+		}
+	}
+	
+	return 0;
+}
+
+int farm_has_msg(int fd) {
+
+        int i;
+        for(i=0;i<uwsgi.farms_cnt;i++) {
+                struct uwsgi_mule_farm *umf = uwsgi.farms[i].mules;
+                while(umf) {
+                        if (umf->mule->id == uwsgi.muleid && uwsgi.farms[i].queue_pipe[1] == fd) {
+                                return 1;
+                        }
+                        umf = umf->next;
+                }
+        }
+
+        return 0;
+}
+
+
+void uwsgi_mule_add_farm_to_queue(int queue) {
+
+	int i;
+	for(i=0;i<uwsgi.farms_cnt;i++) {
+		if (uwsgi_farm_has_mule(&uwsgi.farms[i], uwsgi.muleid)) {
+			event_queue_add_fd_read(queue, uwsgi.farms[i].signal_pipe[1]);	
+			event_queue_add_fd_read(queue, uwsgi.farms[i].queue_pipe[1]);	
+		}
+	}
+}
+
+void uwsgi_mule_handler() {
+	
+	ssize_t len;
+	uint8_t uwsgi_signal;
+	int rlen;
+	int interesting_fd;
+	
+	// this must be configurable
+	char message[65536];
+
+	int mule_queue = event_queue_init();
+
+	event_queue_add_fd_read(mule_queue, uwsgi.signal_socket);
+	event_queue_add_fd_read(mule_queue, uwsgi.my_signal_socket);
+	event_queue_add_fd_read(mule_queue, uwsgi.mules[uwsgi.muleid-1].queue_pipe[1]);
+	event_queue_add_fd_read(mule_queue, uwsgi.shared->mule_queue_pipe[1]);
+
+	uwsgi_mule_add_farm_to_queue(mule_queue);
+
+	for(;;) {
+		rlen = event_queue_wait(mule_queue, -1, &interesting_fd);
+		if (rlen <= 0) {
+			continue;
+		}
+
+		if (interesting_fd == uwsgi.signal_socket || interesting_fd == uwsgi.my_signal_socket || farm_has_signaled(interesting_fd)) {
+			len = read(interesting_fd, &uwsgi_signal, 1);
+			if (len <= 0) {
+                		uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
+                        	end_me(0);
+                	}
+#ifdef UWSGI_DEBUG
+			uwsgi_log_verbose("master sent signal %d to mule %d\n", uwsgi_signal, uwsgi.muleid);
+#endif
+			if (uwsgi_signal_handler(uwsgi_signal)) {
+                		uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.muleid);
+                	}
+		}
+		else if (interesting_fd == uwsgi.mules[uwsgi.muleid-1].queue_pipe[1] || interesting_fd == uwsgi.shared->mule_queue_pipe[1] || farm_has_msg(interesting_fd)) {
+			len = read(interesting_fd, message, 65536);
+			if (len < 0) {
+				uwsgi_error("read()");
+			}	
+			else {
+				int i,found = 0;
+				for(i=0;i<256;i++) {
+                                	if (uwsgi.p[i]->mule_msg) {
+                                        	if (uwsgi.p[i]->mule_msg(message, len)) {
+							found = 1;
+							break;
+						}
+					}
+                                }
+				if (!found)
+					uwsgi_log("*** mule %d received a %d bytes message ***\n", uwsgi.muleid, len);
+			}
+		}
+	}
+
+}
+
+struct uwsgi_mule *get_mule_by_id(int id) {
+
+	int i;
+
+	for(i=0;i<uwsgi.mules_cnt;i++) {
+		if (uwsgi.mules[i].id == id) {
+			return &uwsgi.mules[i];
+		}
+	}
+
+	return NULL;
+}
+
+struct uwsgi_farm *get_farm_by_name(char *name) {
+
+        int i;
+
+        for(i=0;i<uwsgi.farms_cnt;i++) {
+                if (!strcmp(uwsgi.farms[i].name, name)) {
+                        return &uwsgi.farms[i];
+                }
+        }
+
+        return NULL;
+}
+
+
+struct uwsgi_mule_farm *uwsgi_mule_farm_new(struct uwsgi_mule_farm **umf, struct uwsgi_mule *um) {
+
+        struct uwsgi_mule_farm *uwsgi_mf = *umf, *old_umf;
+
+        if (!uwsgi_mf) {
+                *umf = uwsgi_malloc(sizeof(struct uwsgi_mule_farm));
+                uwsgi_mf = *umf;
+        }
+        else {
+                while(uwsgi_mf) {
+                        old_umf = uwsgi_mf;
+			uwsgi_mf = uwsgi_mf->next;
+                }
+
+                uwsgi_mf = uwsgi_malloc(sizeof(struct uwsgi_mule_farm));
+                old_umf->next = uwsgi_mf;
+        }
+
+        uwsgi_mf->mule = um;
+        uwsgi_mf->next = NULL;
+
+        return uwsgi_mf;
+}
+
+ssize_t uwsgi_mule_get_msg(int manage_signals, int manage_farms, char *message, size_t buffer_size, int timeout) {
+
+        ssize_t len = 0;
+        struct pollfd *mulepoll;
+        int count = 4;
+        int farms_count = 0;
+        uint8_t uwsgi_signal;
+        int i;
+
+	if (uwsgi.muleid == 0) return -1;
+
+        if (manage_signals) count = 2;
+
+        if (!manage_farms) goto next;
+
+        for(i=0;i<uwsgi.farms_cnt;i++) {
+                if (uwsgi_farm_has_mule(&uwsgi.farms[i], uwsgi.muleid)) farms_count++;
+        }
+next:
+
+        if (timeout > -1) timeout = timeout*1000;
+
+        mulepoll = uwsgi_malloc(sizeof(struct pollfd) * (count+farms_count));
+
+        mulepoll[0].fd = uwsgi.mules[uwsgi.muleid-1].queue_pipe[1];
+        mulepoll[0].events = POLLIN;
+        mulepoll[1].fd = uwsgi.shared->mule_queue_pipe[1];
+        mulepoll[1].events = POLLIN;
+        if (count > 2) {
+                mulepoll[2].fd = uwsgi.signal_socket;
+                mulepoll[2].events = POLLIN;
+                mulepoll[3].fd = uwsgi.my_signal_socket;
+                mulepoll[3].events = POLLIN;
+        }
+
+	if (farms_count > 0) {
+		int tmp_cnt = 0;
+        	for(i=0;i<uwsgi.farms_cnt;i++) {
+			if (uwsgi_farm_has_mule(&uwsgi.farms[i], uwsgi.muleid)) {
+                		mulepoll[count+tmp_cnt].fd = uwsgi.farms[i].queue_pipe[1];
+                		mulepoll[count+tmp_cnt].events = POLLIN;
+				tmp_cnt++;
+			}
+        	}
+	}
+
+        int ret = poll(mulepoll, count+farms_count, timeout);
+        if (ret <= 0) {
+                uwsgi_error("poll");
+        }
+        else {
+                if (mulepoll[0].revents & POLLIN) {
+                        len = read(uwsgi.mules[uwsgi.muleid-1].queue_pipe[1], message, buffer_size);
+                }
+                else if (mulepoll[1].revents & POLLIN) {
+                        len = read(uwsgi.shared->mule_queue_pipe[1], message, buffer_size);
+                }
+                else {
+                        if (count > 2) {
+                                int interesting_fd = -1;
+                                if (mulepoll[2].revents & POLLIN) {
+                                        interesting_fd = mulepoll[2].fd;
+                                }
+                                else if (mulepoll[3].revents & POLLIN) {
+                                        interesting_fd = mulepoll[3].fd;
+                                }
+
+                                if (interesting_fd > -1) {
+                                        len = read(interesting_fd, &uwsgi_signal, 1);
+                                        if (len <= 0) {
+                                                uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
+                                                end_me(0);
+                                        }
+#ifdef UWSGI_DEBUG
+                                        uwsgi_log_verbose("master sent signal %d to mule %d\n", uwsgi_signal, uwsgi.muleid);
+#endif
+                                        if (uwsgi_signal_handler(uwsgi_signal)) {
+                                                uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.mywid);
+                                        }
+					// set the error condition
+					len = -1;
+                                        goto clear;
+                                }
+                        }
+
+			// read messages in the farm
+                        for(i=0;i<farms_count;i++) {
+                                if (mulepoll[count+i].revents & POLLIN) {
+                                        len = read(mulepoll[count+i].fd, message, buffer_size);
+                                        break;
+                                }
+                        }
+                }
+        }
+
+        if (len < 0) {
+                uwsgi_error("read()");
+                goto clear;
+        }
+
+clear:
+        free(mulepoll);
+        return len;
+}
+
+
+void uwsgi_opt_add_mule(char *opt, char *value, void *foobar) {
+
+	uwsgi.mules_cnt++;
+        uwsgi_string_new_list(&uwsgi.mules_patches, value);
+}
+
+void uwsgi_opt_add_mules(char *opt, char *value, void *foobar) {
+	int i;
+
+	for(i=0;i<atoi(value);i++) {
+                        uwsgi.mules_cnt++;
+                        uwsgi_string_new_list(&uwsgi.mules_patches, NULL);
+                }
+}
+
+void uwsgi_opt_add_farm(char *opt, char *value, void *foobar) {
+	uwsgi.farms_cnt++;
+                uwsgi_string_new_list(&uwsgi.farms_list, value);
+
+}
+
+void uwsgi_setup_mules_and_farms() {
+	int i;
+	if (uwsgi.mules_cnt > 0) {
+                uwsgi.mules = (struct uwsgi_mule *) uwsgi_calloc_shared(sizeof(struct uwsgi_mule) * uwsgi.mules_cnt);
+
+                create_signal_pipe(uwsgi.shared->mule_signal_pipe);
+                create_signal_pipe(uwsgi.shared->mule_queue_pipe);
+
+                for (i = 0; i < uwsgi.mules_cnt; i++) {
+                        // create the socket pipe
+                        create_signal_pipe(uwsgi.mules[i].signal_pipe);
+                        create_signal_pipe(uwsgi.mules[i].queue_pipe);
+
+                        uwsgi.mules[i].id = i + 1;
+
+                        snprintf(uwsgi.mules[i].name, 0xff, "uWSGI mule %d", i + 1);
+                }
+        }
+
+        if (uwsgi.farms_cnt > 0) {
+                uwsgi.farms = (struct uwsgi_farm *) uwsgi_calloc_shared(sizeof(struct uwsgi_farm) * uwsgi.farms_cnt);
+
+                struct uwsgi_string_list *farm_name = uwsgi.farms_list;
+                for (i = 0; i < uwsgi.farms_cnt; i++) {
+
+                        char *farm_value = uwsgi_str(farm_name->value);
+
+                        char *mules_list = strchr(farm_value, ':');
+                        if (!mules_list) {
+                                uwsgi_log("invalid farm value (%s) must be in the form name:mule[,muleN].\n", farm_value);
+                                exit(1);
+                        }
+
+                        mules_list[0] = 0;
+                        mules_list++;
+
+                        strncpy(uwsgi.farms[i].name, farm_value, 0xff);
+
+                        // create the socket pipe
+                        create_signal_pipe(uwsgi.farms[i].signal_pipe);
+                        create_signal_pipe(uwsgi.farms[i].queue_pipe);
+
+                        char *p = strtok(mules_list, ",");
+                        while (p != NULL) {
+                                struct uwsgi_mule *um = get_mule_by_id(atoi(p));
+                                if (!um) {
+                                        uwsgi_log("invalid mule id: %s\n", p);
+                                        exit(1);
+                                }
+
+                                uwsgi_mule_farm_new(&uwsgi.farms[i].mules, um);
+
+                                p = strtok(NULL, ",");
+                        }
+                        uwsgi_log("created farm %d name: %s mules:%s\n", i + 1, uwsgi.farms[i].name, strchr(farm_name->value, ':') + 1);
+
+                        farm_name = farm_name->next;
+
+                }
+
+        }
+
+}
@@ -0,0 +1,72 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+
+
+void uwsgi_systemd_notify(char *message) {
+
+	struct msghdr *msghdr = (struct msghdr *) uwsgi.notification_object;
+	struct iovec *iovec = msghdr->msg_iov;
+
+	iovec[0].iov_base = "STATUS=";
+	iovec[0].iov_len = 7;
+
+	iovec[1].iov_base = message;
+	iovec[1].iov_len = strlen(message);
+
+	iovec[2].iov_base = "\n";
+        iovec[2].iov_len = 1;
+
+	msghdr->msg_iovlen = 3;
+
+	sendmsg(uwsgi.notification_fd, msghdr, 0);
+}
+
+void uwsgi_systemd_notify_ready(void) {
+
+	struct msghdr *msghdr = (struct msghdr *) uwsgi.notification_object;
+        struct iovec *iovec = msghdr->msg_iov;
+
+        iovec[0].iov_base = "STATUS=uWSGI is ready\nREADY=1\n";
+        iovec[0].iov_len = 30;
+
+	msghdr->msg_iovlen = 1;
+
+	sendmsg(uwsgi.notification_fd, msghdr, 0);
+	
+}
+
+
+void uwsgi_systemd_init(char *systemd_socket) {
+
+	struct sockaddr_un *sd_sun;
+	struct msghdr *msghdr;
+
+	uwsgi.notification_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+	if (uwsgi.notification_fd < 0) {
+		uwsgi_error("socket()");
+		return;
+	}
+
+	sd_sun = uwsgi_malloc(sizeof(struct sockaddr_un));
+	memset(sd_sun, 0, sizeof(struct sockaddr_un));
+	sd_sun->sun_family = AF_UNIX;
+	strncpy(sd_sun->sun_path, systemd_socket, sizeof(sd_sun->sun_path));
+	if (sd_sun->sun_path[0] == '@') sd_sun->sun_path[0] = 0;
+
+	msghdr = uwsgi_malloc(sizeof(struct msghdr));
+	memset(msghdr, 0, sizeof(struct msghdr));
+
+	msghdr->msg_iov = uwsgi_malloc(sizeof(struct iovec)*3);
+	memset(msghdr->msg_iov, 0, sizeof(struct iovec)*3);
+
+	msghdr->msg_name = sd_sun;
+	msghdr->msg_namelen = sizeof(struct sockaddr_un);
+
+	uwsgi.notification_object = msghdr;
+
+	uwsgi.notify = uwsgi_systemd_notify;
+	uwsgi.notify_ready = uwsgi_systemd_notify_ready;
+	
+}
@@ -0,0 +1,277 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+static int plugin_already_loaded(const char *plugin) {
+	int i;
+
+	for (i = 0; i < 256; i++) {
+		if (uwsgi.p[i]->name) {
+			if (!strcmp(plugin, uwsgi.p[i]->name)) {
+#ifdef UWSGI_DEBUG
+				uwsgi_log("%s plugin already available\n", plugin);
+#endif
+				return 1;
+			}	
+		}
+		if (uwsgi.p[i]->alias) {
+			if (!strcmp(plugin, uwsgi.p[i]->alias)) {
+#ifdef UWSGI_DEBUG
+				uwsgi_log("%s plugin already available\n", plugin);
+#endif
+				return 1;
+			}	
+		}
+	}
+
+	for(i=0;i<uwsgi.gp_cnt;i++) {
+
+		if (uwsgi.gp[i]->name) {
+                        if (!strcmp(plugin, uwsgi.gp[i]->name)) {
+#ifdef UWSGI_DEBUG
+                                uwsgi_log("%s plugin already available\n", plugin);
+#endif
+                                return 1;
+                        }       
+                }
+                if (uwsgi.gp[i]->alias) {
+                        if (!strcmp(plugin, uwsgi.gp[i]->alias)) {
+#ifdef UWSGI_DEBUG
+                                uwsgi_log("%s plugin already available\n", plugin);
+#endif
+                                return 1;
+                        }
+                }
+        }
+
+	return 0;
+}
+
+void *uwsgi_load_plugin(int modifier, char *plugin, char *has_option) {
+
+	void *plugin_handle = NULL;
+	char *plugin_abs_path = NULL;
+	char *plugin_filename = NULL;
+
+	int need_free = 0;
+	char *plugin_name = plugin;
+	char *plugin_symbol_name_start = plugin;
+
+
+	struct uwsgi_plugin *up;
+	char linkpath_buf[1024], linkpath[1024];
+	int linkpath_size;
+
+	char *colon = strchr(plugin_name, ':');
+	if (colon) {
+		colon[0] = 0;
+		modifier = atoi(plugin_name);
+		plugin_name = colon+1;
+		colon[0] = ':';
+	}
+
+	if (!uwsgi_endswith(plugin_name, "_plugin.so")) {
+		plugin_name = uwsgi_concat2(plugin_name, "_plugin.so");
+		need_free = 1;
+	}
+
+	plugin_symbol_name_start = plugin_name;
+
+	// step 1: check for absolute plugin (stop if it fails)
+	if (strchr(plugin_name, '/')) {
+		plugin_handle = dlopen(plugin_name, RTLD_NOW | RTLD_GLOBAL);
+		if (!plugin_handle) {
+			if (!has_option)
+				uwsgi_log( "%s\n", dlerror());
+			goto end;
+		}
+		plugin_symbol_name_start = uwsgi_get_last_char(plugin_name, '/');
+		plugin_symbol_name_start++;
+		plugin_abs_path = plugin_name;
+		goto success;
+	}
+
+	// step dir, check for user-supplied plugins directory
+	struct uwsgi_string_list *pdir = uwsgi.plugins_dir;
+	while(pdir) {
+		plugin_filename = uwsgi_concat3(pdir->value, "/", plugin_name);
+		plugin_handle = dlopen(plugin_filename, RTLD_NOW | RTLD_GLOBAL);
+		if (plugin_handle) {
+			plugin_abs_path = plugin_filename;
+			//free(plugin_filename);
+			goto success;
+		}
+		free(plugin_filename);
+		plugin_filename = NULL;
+		pdir = pdir->next;
+	}
+
+	// last step: search in compile-time plugin_dir
+	if (!plugin_handle) {
+		plugin_filename = uwsgi_concat3(UWSGI_PLUGIN_DIR, "/", plugin_name);
+		plugin_handle = dlopen(plugin_filename, RTLD_NOW | RTLD_GLOBAL);
+		plugin_abs_path = plugin_filename;
+		//free(plugin_filename);
+	}
+
+success:
+        if (!plugin_handle) {
+		if (!has_option)
+                	uwsgi_log( "%s\n", dlerror());
+        }
+        else {
+		char *plugin_entry_symbol = uwsgi_concat2n(plugin_symbol_name_start, strlen(plugin_symbol_name_start)-3, "", 0);
+                up = dlsym(plugin_handle, plugin_entry_symbol);
+		if (!up) {
+			// is it a link ?
+			memset(linkpath_buf, 0, 1024);
+			memset(linkpath, 0, 1024);
+			if ((linkpath_size = readlink(plugin_abs_path, linkpath_buf, 1023)) > 0) {
+				do {
+					linkpath_buf[linkpath_size] = '\0';
+					strncpy(linkpath, linkpath_buf, linkpath_size+1);
+				} while ((linkpath_size = readlink(linkpath, linkpath_buf, 1023)) > 0);
+#ifdef UWSGI_DEBUG
+				uwsgi_log("%s\n", linkpath);
+#endif
+				free(plugin_entry_symbol);
+				up = dlsym(plugin_handle, plugin_entry_symbol);
+				char *slash = uwsgi_get_last_char(linkpath, '/');
+				if (!slash) {
+					slash = linkpath;
+				}
+				else {
+					slash++;
+				}
+				plugin_entry_symbol = uwsgi_concat2n(slash, strlen(slash)-3, "",0);
+				up = dlsym(plugin_handle, plugin_entry_symbol);
+			}
+		}
+                if (up) {
+			if (!up->name) {
+				uwsgi_log("the loaded plugin (%s) has no .name attribute\n", plugin_name);
+				if (dlclose(plugin_handle)) {
+                                	uwsgi_error("dlclose()");
+                                }
+				if (need_free)
+					free(plugin_name);
+				if (plugin_filename)
+					free(plugin_filename);
+				free(plugin_entry_symbol);
+				return NULL;
+			}
+			if (plugin_already_loaded(up->name)) {
+				if (dlclose(plugin_handle)) {
+                                	uwsgi_error("dlclose()");
+                                }
+				if (need_free)
+					free(plugin_name);
+				if (plugin_filename)
+					free(plugin_filename);
+				free(plugin_entry_symbol);
+				return NULL;
+			}
+			if (has_option) {
+				struct uwsgi_option *op = up->options;
+				int found = 0;
+				while (op && op->name) {
+					if (!strcmp(has_option, op->name)) {
+						found = 1;
+						break;
+					}	
+                			op++;
+				}
+				if (!found) {
+					if (dlclose(plugin_handle)) {
+						uwsgi_error("dlclose()");
+					}
+					if (need_free)
+						free(plugin_name);
+					if (plugin_filename)
+						free(plugin_filename);
+					free(plugin_entry_symbol);
+					return NULL;
+				}
+				
+			}
+			if (modifier != -1) {
+				fill_plugin_table(modifier, up);			
+				up->modifier1 = modifier;
+			}
+			else {
+				fill_plugin_table(up->modifier1, up);			
+			}
+			if (need_free)
+				free(plugin_name);
+			if (plugin_filename)
+				free(plugin_filename);
+			free(plugin_entry_symbol);
+
+			if (up->on_load)
+				up->on_load();
+			return plugin_handle;
+                }
+		if (!has_option)
+                	uwsgi_log( "%s\n", dlerror());
+        }
+
+end:
+	if (need_free)
+		free(plugin_name);
+	if (plugin_filename)
+		free(plugin_filename);
+
+	return NULL;
+}
+
+int uwsgi_try_autoload(char *option) {
+	DIR *d;
+	struct dirent *dp;
+	// step dir, check for user-supplied plugins directory
+        struct uwsgi_string_list *pdir = uwsgi.plugins_dir;
+        while(pdir) {
+		d = opendir(pdir->value);
+		if (d) {
+			while ((dp = readdir(d)) != NULL) {
+				if (uwsgi_endswith(dp->d_name, "_plugin.so")) {
+					char *filename = uwsgi_concat3(pdir->value, "/", dp->d_name);
+					if (uwsgi_load_plugin(-1, filename, option)) {	
+						uwsgi_log("option \"%s\" found in plugin %s\n", option, filename);
+						free(filename);
+						closedir(d);
+						// add new options
+						build_options();
+						return 1;
+					}
+					free(filename);
+				}
+			}
+			closedir(d);
+		}
+                pdir = pdir->next;
+        }
+
+        // last step: search in compile-time plugin_dir
+	d = opendir(UWSGI_PLUGIN_DIR);
+	if (!d) return 0;
+
+	while((dp = readdir(d)) != NULL) {
+		if (uwsgi_endswith(dp->d_name, "_plugin.so")) {
+				char *filename = uwsgi_concat3(UWSGI_PLUGIN_DIR, "/", dp->d_name);
+				if (uwsgi_load_plugin(-1, filename, option)) {
+					uwsgi_log("option \"%s\" found in plugin %s\n", option, filename);
+					free(filename);
+					closedir(d);
+					// add new options
+					build_options();
+					return 1;
+				}
+				free(filename);
+		}
+        }
+
+	closedir(d);
+
+	return 0;
+
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`object file for embedded files will be put here`