fixed casting

.hgignore

@@ -0,0 +1,4 @@
+syntax: glob
+
+*.o
+*.pyc

.hgtags

@@ -19,3 +19,12 @@ 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

CONTRIBUTORS

@@ -0,0 +1,14 @@
+- 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

ChangeLog

@@ -1,3 +1,152 @@
+*** 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]

Makefile

@@ -1,2 +1,5 @@
 all:
 	python uwsgiconfig.py --build
+
+clean:
+	python uwsgiconfig.py --clean

apache2/mod_uwsgi.c

@@ -51,7 +51,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 +72,7 @@ typedef struct {
 	char script_name[256];
 	char scheme[9];
 	int cgi_mode ;
+	int max_vars;
 } uwsgi_cfg;
 
 module AP_MODULE_DECLARE_DATA uwsgi_module;
@@ -83,8 +83,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 +160,7 @@ 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;
 
 	return c;
 }
@@ -164,6 +175,7 @@ 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;
 
 	return c;
 }
@@ -243,11 +255,8 @@ static int uwsgi_handler(request_rec *r) {
 
 	uwsgi_cfg *c = ap_get_module_config(r->per_dir_config, &uwsgi_module);
 
-#if APR_IS_BIGENDIAN
-	struct iovec uwsgi_vars[(MAX_VARS*6)+1] ;
-#else
-	struct iovec uwsgi_vars[(MAX_VARS*4)+1] ;
-#endif
+	struct iovec *uwsgi_vars;
+
 	int vecptr = 1 ;
 	char pkt_header[4];
 	uint16_t pkt_size = 0;
@@ -315,48 +324,53 @@ static int uwsgi_handler(request_rec *r) {
 	}
 
 
+#if APR_IS_BIGENDIAN
+        uwsgi_vars = malloc(sizeof(struct iovec) * (c->max_vars*6)+1);
+#else
+        uwsgi_vars = malloc(sizeof(struct iovec) * (c->max_vars*4)+1);
+#endif
 		
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REQUEST_METHOD", (char *) r->method, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "QUERY_STRING", r->args ? r->args : "", &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_NAME", (char *) ap_get_server_name(r), &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)), &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "SERVER_PROTOCOL", r->protocol, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REQUEST_URI", r->unparsed_uri, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REMOTE_ADDR", r->connection->remote_ip, &pkt_size) ;
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "REMOTE_USER", r->user ? r->user : "", &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REQUEST_METHOD", (char *) r->method, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "QUERY_STRING", r->args ? r->args : "", &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_NAME", (char *) ap_get_server_name(r), &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_PORT", apr_psprintf(r->pool, "%u",ap_get_server_port(r)), &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SERVER_PROTOCOL", r->protocol, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REQUEST_URI", r->unparsed_uri, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_ADDR", r->connection->remote_ip, &pkt_size) ;
+	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "REMOTE_USER", r->user ? r->user : "", &pkt_size) ;
 	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, "AUTH_TYPE", (char *) ap_auth_type(r), &pkt_size) ;
 	}
-	vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "DOCUMENT_ROOT", (char *) ap_document_root(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) ;
+			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) ;
 		}
 		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) ;
+			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) ;
+				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) ;
 			}
 			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) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "SCRIPT_NAME", apr_pstrndup(r->pool, r->uri, (strlen(r->uri) - strlen(r->path_info) )) , &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "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) ;
 		}
 	}
 
@@ -364,19 +378,13 @@ static int uwsgi_handler(request_rec *r) {
 	headers = apr_table_elts(r->headers_in);
 	h = (apr_table_entry_t *) headers->elts;
 
-	// check for max vars (a bit ugly)
-	cnt = headers->nelts ;
-	if (cnt + 11 > MAX_VARS) {
-		cnt = MAX_VARS -11;
-	}
-
-	for(i=0;i< cnt;i++) {
+	for(i=0;i< headers->nelts;i++) {
 		if (h[i].key){
 			if (!strcasecmp(h[i].key, "Content-Type")) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "CONTENT_TYPE", h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "CONTENT_TYPE", h[i].val, &pkt_size) ;
 			}
 			else if (!strcasecmp(h[i].key, "Content-Length")) {
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, "CONTENT_LENGTH", h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, "CONTENT_LENGTH", h[i].val, &pkt_size) ;
 			}
 			else {
 				penv = apr_pstrcat(r->pool, "HTTP_", h[i].key, NULL);
@@ -388,7 +396,7 @@ static int uwsgi_handler(request_rec *r) {
 						*cp = toupper(*cp);
 					}
 				}
-				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, penv, h[i].val, &pkt_size) ;
+				vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, penv, h[i].val, &pkt_size) ;
 			}
 		}
 	}
@@ -397,7 +405,7 @@ static int uwsgi_handler(request_rec *r) {
 	headers = apr_table_elts(r->subprocess_env);
 	h = (apr_table_entry_t*) headers->elts;
 	for (i = 0; i < headers->nelts; ++i) {
-		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, h[i].key, h[i].val, &pkt_size) ;
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, r, h[i].key, h[i].val, &pkt_size) ;
 	}	
 	
 
@@ -418,11 +426,13 @@ static int uwsgi_handler(request_rec *r) {
 	if (cnt < 0) {
 		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: writev() %s", strerror(errno));
 		close(uwsgi_poll.fd);
+		free(uwsgi_vars);
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 	else if (cnt != pkt_size+4) {
 		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: writev() returned wrong size");
 		close(uwsgi_poll.fd);
+		free(uwsgi_vars);
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
 
@@ -434,6 +444,7 @@ static int uwsgi_handler(request_rec *r) {
 			if (cnt < 0) {
 				ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: read() client block failed !");
 				close(uwsgi_poll.fd);
+				free(uwsgi_vars);
 				return HTTP_INTERNAL_SERVER_ERROR;
 			}
 		}
@@ -458,6 +469,7 @@ static int uwsgi_handler(request_rec *r) {
 		if (cnt == 0) {
 			ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() timeout");
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 		else if (cnt > 0) {
@@ -467,6 +479,7 @@ static int uwsgi_handler(request_rec *r) {
 					if (errno != ECONNRESET) {
 						ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: recv() %s", strerror(errno));
 						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
 						return HTTP_INTERNAL_SERVER_ERROR;
 					}
 					else {
@@ -489,6 +502,7 @@ static int uwsgi_handler(request_rec *r) {
 					if (r->connection->aborted) { 
 						close(uwsgi_poll.fd);
 						apr_brigade_destroy(bb);
+						free(uwsgi_vars);
 						return HTTP_INTERNAL_SERVER_ERROR;
 					}
 					apr_brigade_write(bb, NULL, NULL, buf, cnt);
@@ -508,6 +522,7 @@ static int uwsgi_handler(request_rec *r) {
 			ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "uwsgi: poll() %s", strerror(errno));
 			close(uwsgi_poll.fd);
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 	}
@@ -521,6 +536,7 @@ static int uwsgi_handler(request_rec *r) {
 
 	if (!c->cgi_mode) {
 		if (uwsgi_http_status_read == 0) {
+			free(uwsgi_vars);
 			return HTTP_INTERNAL_SERVER_ERROR;
 		}
 	}
@@ -528,11 +544,13 @@ static int uwsgi_handler(request_rec *r) {
 
 		if (hret = ap_scan_script_header_err_brigade(r, bb, NULL)) {
 			apr_brigade_destroy(bb);
+			free(uwsgi_vars);
 			return hret;
 		}
 	}
 
 
+	free(uwsgi_vars);
 	return ap_pass_brigade(r->output_filters, bb) ;
 }
 
@@ -564,6 +582,22 @@ static const char * cmd_uwsgi_force_wsgi_scheme(cmd_parms *cmd, void *cfg, const
 
 }
 
+static const char *cmd_uwsgi_max_vars(cmd_parms *cmd, void *cfg, const char *value) {
+	uwsgi_cfg *c ;
+        int val ;
+
+        if (cfg) {
+                c = cfg ;
+        }
+        else {
+                c = ap_get_module_config(cmd->server->module_config, &uwsgi_module);
+        }
+
+        c->max_vars = atoi(value);
+
+        return NULL;
+}
+
 static const char * cmd_uwsgi_modifier1(cmd_parms *cmd, void *cfg, const char *value) {
 
         uwsgi_cfg *c ;
@@ -707,6 +741,7 @@ 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("uWSGImaxVars", cmd_uwsgi_max_vars, NULL, ACCESS_CONF, "Set the maximum allowed number of uwsgi variables (default 128)"),	
 	{NULL}
 };
 

async.c

@@ -2,6 +2,10 @@
 
 extern struct uwsgi_server uwsgi;
 
+struct wsgi_request *find_wsgi_req_proto_by_fd(int fd) {
+	return uwsgi.async_proto_fd_table[fd];
+}
+
 struct wsgi_request *find_wsgi_req_by_fd(int fd) {
 	return uwsgi.async_waiting_fd_table[fd];
 }
@@ -195,14 +199,23 @@ void *async_loop(void *arg1) {
 	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);
+	}
+
 	// set a default request manager
         if (!uwsgi.schedule_to_req) uwsgi.schedule_to_req = async_schedule_to_req;
 
@@ -235,49 +248,105 @@ void *async_loop(void *arg1) {
                 	async_expire_timeouts();
 		}
 
+
 		for(i=0;i<uwsgi.async_nevents;i++) {
 			// manage events
 			interesting_fd = event_queue_interesting_fd(events, i);
 
-			// new request coming in
-			if (interesting_fd == uwsgi.sockets[0].fd) {
-				uwsgi.wsgi_req = find_first_available_wsgi_req();
-				if (uwsgi.wsgi_req == NULL) {
-					uwsgi_log("async queue is full !!!\n");
-					continue;
-				}
+			is_a_new_connection = 0;
 
-				wsgi_req_setup(uwsgi.wsgi_req, uwsgi.wsgi_req->async_id );
-				if (wsgi_req_simple_accept(uwsgi.wsgi_req, interesting_fd)) {
+			// 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 = time(NULL);
+						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
-					continue;
-				}
-#ifdef UWSGI_EVENT_USE_PORT
-                                event_queue_add_fd_read(uwsgi.async_queue, interesting_fd);
-#endif
 
 // on linux we do not need to reset the socket to blocking state
 #ifndef __linux__
-				if (uwsgi.numproc > 1) {
-	                                /* re-set blocking socket */
-	                                if (fcntl(uwsgi.wsgi_req->poll.fd, F_SETFL, uwsgi.sockets[0].arg) < 0) {
-	                                        uwsgi_error("fcntl()");
-	                                	continue;
+					if (uwsgi.numproc > 1) {
+	                                	/* re-set blocking socket */
+	                                	if (fcntl(uwsgi.wsgi_req->poll.fd, F_SETFL, uwsgi_sock->arg) < 0) {
+	                                        	uwsgi_error("fcntl()");
+							uwsgi.async_queue_unused_ptr++;
+							uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+	                                		break;
+						}
 					}
-				}
 #endif
 
+					if (wsgi_req_async_recv(uwsgi.wsgi_req)) {
+						uwsgi.async_queue_unused_ptr++;
+						uwsgi.async_queue_unused[uwsgi.async_queue_unused_ptr] = uwsgi.wsgi_req;
+						break;
+					}
 
-				if (wsgi_req_simple_recv(uwsgi.wsgi_req)) {
+					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 == -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;
 				}
 
-				// put request in the runqueue
-				runqueue_push(uwsgi.wsgi_req);
-			}
-			else {
 				// app event
 				uwsgi.wsgi_req = find_wsgi_req_by_fd(interesting_fd);
 				// unknown fd, remove it (for safety)
@@ -324,7 +393,7 @@ void *async_loop(void *arg1) {
 
 			next_async_request = current_request->next;
 			// request ended ?
-			if (uwsgi.wsgi_req->async_status == UWSGI_OK) {
+			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

attach.py

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

bootstrap.py

@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.SymbolsImporter())

bootstrap2.py

@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.SymbolsZipImporter("pygments_zip"))

bootstrap3.py

@@ -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"))

bootstrap4.py

@@ -0,0 +1,4 @@
+import sys
+import uwsgi
+
+sys.meta_path.insert(0, uwsgi.ZipImporter("data://0"))

build/README

@@ -0,0 +1 @@
+object file for embedded files will be put here

buildconf/default.ini

@@ -2,6 +2,9 @@
 xml = true
 ini = true
 yaml = true
+json = auto
+sqlite3 = auto
+zeromq = auto
 snmp = true
 sctp = false
 spooler = true
@@ -18,16 +21,24 @@ pcre = auto
 debug = false
 unbit = false
 xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
 plugins =
 bin_name = uwsgi
+append_version =
 plugin_dir = .
-embedded_plugins = python, ping, nagios, rpc, fastrouter, http, ugreen
+embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
+as_shared_library = false
 
 locking = auto
 event = auto
 timer = auto
 filemonitor = auto
 
+embed_files =
+
+embed_config =
+
 [python]
 paste = true
 web3 = true

buildconf/django.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+inherit = default
+embed_files = bootstrap3.py,django.zip,djapp.zip

buildconf/embedded.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+inherit = default
+
+embed_files = embedme.py,uwsgidecorators.py

buildconf/lib.ini

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

buildconf/modular.ini

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

buildconf/pylua.ini

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

buildconf/rack.ini

@@ -1,3 +1,3 @@
 [uwsgi]
 inherit = default
-embedded_plugins = rack, ping, nagios, rpc
+embedded_plugins = rack, ping, cache, nagios, rpc, fastrouter, http, ugreen

buildconf/unbit.ini

@@ -2,6 +2,9 @@
 xml = true
 ini = true
 yaml = true
+json = true
+sqlite3 = true
+zeromq = false
 snmp = false
 sctp = false
 spooler = true
@@ -10,14 +13,23 @@ udp = true
 multicast = false
 threading = true
 sendfile = true
-nagios = false
 minterpreters = true
 async = true
+evdis = false
 ldap = true
+pcre = false
 debug = false
 unbit = true
 xml_implementation = libxml2
+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

buildconf/unbitstaff.ini

@@ -1,5 +1,6 @@
 [uwsgi]
 inherit = unbit
+json = false
 embedded_plugins = python
 bin_name = ../bin/uwsgi
 plugin_dir = ../bin/uwsgi_plugins

cache.c

@@ -2,6 +2,98 @@
 
 extern struct uwsgi_server uwsgi;
 
+void uwsgi_init_cache() {
+	int i;
+
+	if (!uwsgi.cache_blocksize)
+                        uwsgi.cache_blocksize = UMAX16;
+
+                if (uwsgi.cache_blocksize % uwsgi.page_size != 0) {
+                        uwsgi_log("invalid cache blocksize %llu: must be a multiple of memory page size (%d bytes)\n", (unsigned long long) uwsgi.cache_blocksize, uwsgi.page_size);
+                        exit(1);
+                }
+
+                uwsgi.cache_hashtable = (uint64_t *) mmap(NULL, sizeof(uint64_t) * UMAX16, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+                if (!uwsgi.cache_hashtable) {
+                        uwsgi_error("mmap()");
+                        exit(1);
+                }
+
+                memset(uwsgi.cache_hashtable, 0, sizeof(uint64_t) * UMAX16);
+
+                uwsgi.cache_unused_stack = (uint64_t *) mmap(NULL, sizeof(uint64_t) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+                if (!uwsgi.cache_unused_stack) {
+                        uwsgi_error("mmap()");
+                        exit(1);
+                }
+
+                memset(uwsgi.cache_unused_stack, 0, sizeof(uint64_t) * uwsgi.cache_max_items);
+
+                // the first cache item is always zero
+                uwsgi.shared->cache_first_available_item = 1;
+                uwsgi.shared->cache_unused_stack_ptr = 0;
+
+                //uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+                if (uwsgi.cache_store) {
+                        uwsgi.cache_filesize = (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items);
+                        int cache_fd;
+                        struct stat cst;
+
+                        if (stat(uwsgi.cache_store, &cst)) {
+                                uwsgi_log("creating a new cache store file: %s\n", uwsgi.cache_store);
+                                cache_fd = open(uwsgi.cache_store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
+                                if (cache_fd >= 0) {
+                                        // fill the caching store
+                                        if (ftruncate(cache_fd, uwsgi.cache_filesize)) {
+                                                uwsgi_log("ftruncate()");
+                                                exit(1);
+                                        }
+                                }
+                        }
+                        else {
+                                if ((size_t) cst.st_size != uwsgi.cache_filesize || !S_ISREG(cst.st_mode)) {
+                                        uwsgi_log("invalid cache store file. Please remove it or fix cache blocksize/items to match its size\n");
+                                        exit(1);
+                                }
+                                cache_fd = open(uwsgi.cache_store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
+                                uwsgi_log("recovered cache from backing store file: %s\n", uwsgi.cache_store);
+                        }
+
+                        if (cache_fd < 0) {
+                                uwsgi_error_open(uwsgi.cache_store);
+                                exit(1);
+                        }
+                        uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, uwsgi.cache_filesize, PROT_READ | PROT_WRITE, MAP_SHARED, cache_fd, 0);
+                        uwsgi_cache_fix();
+
+                }
+                else {
+                        uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+                        for (i = 0; i < (int) uwsgi.cache_max_items; i++) {
+                                memset(&uwsgi.cache_items[i], 0, sizeof(struct uwsgi_cache_item));
+                        }
+                }
+                if (!uwsgi.cache_items) {
+                        uwsgi_error("mmap()");
+                        exit(1);
+                }
+
+                /*
+                   uwsgi.cache = mmap(NULL, uwsgi.cache_blocksize * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+                   if (!uwsgi.cache) {
+                   uwsgi_error("mmap()");
+                   exit(1);
+                   }
+                 */
+
+                uwsgi.cache = ((void *) uwsgi.cache_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items);
+
+                uwsgi.cache_lock = uwsgi_mmap_shared_rwlock();
+                uwsgi_rwlock_init(uwsgi.cache_lock);
+
+                uwsgi_log("*** Cache subsystem initialized: %dMB preallocated ***\n", ((sizeof(uint64_t) * UMAX16) + (sizeof(uint64_t) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items)) / (1024 * 1024));
+}
+
 struct uwsgi_subscriber_name *uwsgi_get_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen) {
 
 	uint64_t ovl;
@@ -39,7 +131,7 @@ struct uwsgi_subscriber_name *uwsgi_get_subscriber(struct uwsgi_dict *udict, cha
 	return ret;
 }
 
-void uwsgi_add_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen, char *address, uint64_t address_len) {
+void uwsgi_add_subscriber(struct uwsgi_dict *udict, struct uwsgi_subscribe_req *usr) {
 
 	char *ptr;
 	uint64_t vallen = 0;
@@ -47,11 +139,11 @@ void uwsgi_add_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen,
 	int found = 0;
 	int i;
 	
-	ptr = uwsgi_dict_get(udict, key, keylen, &vallen);
+	ptr = uwsgi_dict_get(udict, usr->key, usr->keylen, &vallen);
 	if (ptr && vallen) {
 		usub = (struct uwsgi_subscriber *) ptr;
 		for(i=0;i<(int)usub->nodes;i++) {
-			if (!uwsgi_strncmp(usub->names[i].name, usub->names[i].len, address, address_len)) {
+			if (!uwsgi_strncmp(usub->names[i].name, usub->names[i].len, usr->address, usr->address_len)) {
 				found = 1;
 				break;
 			}
@@ -65,8 +157,10 @@ void uwsgi_add_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen,
 					break;
 				}
 			}
-			usub->names[found].len = address_len;
-			memcpy(usub->names[found].name, address, address_len);
+			usub->names[found].len = usr->address_len;
+			usub->names[found].modifier1 = usr->modifier1;
+			usub->names[found].modifier2 = usr->modifier2;
+			memcpy(usub->names[found].name, usr->address, usr->address_len);
 			if (found == (int) usub->nodes) {
 				usub->nodes++;
 			}
@@ -76,8 +170,10 @@ void uwsgi_add_subscriber(struct uwsgi_dict *udict, char *key, uint16_t keylen,
 	else {
 		nusub.nodes = 1;
 		nusub.current = 0;
-		memcpy(nusub.names[0].name, address, address_len);
-		uwsgi_dict_set(udict, key, keylen, (char *) &nusub, sizeof(struct uwsgi_subscriber));
+		memcpy(nusub.names[0].name, usr->address, usr->address_len);
+		nusub.names[0].modifier1 = usr->modifier1;
+		nusub.names[0].modifier2 = usr->modifier2;
+		uwsgi_dict_set(udict, usr->key, usr->keylen, (char *) &nusub, sizeof(struct uwsgi_subscriber));
 	}
 
 }
@@ -416,6 +512,16 @@ int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint64_t vallen, uint
 			uci->prev = last_index;
 		}
 	}
+	else if (flags && UWSGI_CACHE_FLAG_UPDATE) {
+		uci = &uwsgi.cache_items[index] ;
+		if (expires) {
+			expires += time(NULL);
+			uci->expires = expires;
+		}
+		memcpy(uwsgi.cache+(index*uwsgi.cache_blocksize), val, vallen);
+		uci->valsize = vallen;
+		ret = 0;
+	}
 
 end:
 	return ret;
@@ -487,102 +593,124 @@ end:
 
 }
 
+/* THIS PART IS HEAVILY OPTIMIZED: PERFORMANCE NOT ELEGANCE !!! */
 
-void cache_command(char *key, uint16_t keylen, char *val, uint16_t vallen, void *data) {
+void *cache_thread_loop(void *fd_ptr) {
 
-	struct wsgi_request *wsgi_req = (struct wsgi_request *) data;
-	uint64_t tmp_vallen = 0;
+	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;
 
-	if (vallen > 0) {
-		if (!uwsgi_strncmp(key, keylen, "key", 3)) {
-			val = uwsgi_cache_get(val, vallen, &tmp_vallen);
-                        if (val && tmp_vallen > 0) {
-                        	wsgi_req->response_size = write(wsgi_req->poll.fd, val, tmp_vallen);
-                        }
+	ctl_poll.events = POLLIN;
 
-		}		
-		else if (!uwsgi_strncmp(key, keylen, "get", 3)) {
-			val = uwsgi_cache_get(val, vallen, &tmp_vallen);
-			if (val && vallen > 0) {
-                        	wsgi_req->response_size = write(wsgi_req->poll.fd, val, tmp_vallen);
+	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;
 			}
-			else {
-				wsgi_req->response_size = write(wsgi_req->poll.fd, "HTTP/1.0 404 Not Found\r\n\r\n<h1>Not Found</h1>", 44);
+			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()");
 			}
 		}
-	}
-}
 
-int uwsgi_cache_request(struct wsgi_request *wsgi_req) {
-
-	uint64_t vallen = 0;
-	char *value;
-	char *argv[3];
-	uint8_t argc = 0;
-
-	switch(wsgi_req->uh.modifier2) {
-		case 0:
-			// get
-			if (wsgi_req->uh.pktsize > 0) {
-				value = uwsgi_cache_get(wsgi_req->buffer, wsgi_req->uh.pktsize, &vallen);
-				if (value && vallen > 0) {
-					wsgi_req->uh.pktsize = vallen;
-					wsgi_req->response_size = write(wsgi_req->poll.fd, &wsgi_req->uh, 4);
-					wsgi_req->response_size += write(wsgi_req->poll.fd, value, vallen);
-				}
-			}
-			break;		
-		case 1:
-			// set
-			if (wsgi_req->uh.pktsize > 0) {
-				argc = 3;
-				if (!uwsgi_parse_array(wsgi_req->buffer, wsgi_req->uh.pktsize, argv, &argc)) {
-					if (argc > 1) {
-						uwsgi_cache_set(argv[0], strlen(argv[0]), argv[1], strlen(argv[1]), 0, 0);
-					}
-				}
-			}
-			break;
-		case 2:
-			// del
-			if (wsgi_req->uh.pktsize > 0) {
-				uwsgi_cache_del(wsgi_req->buffer, wsgi_req->uh.pktsize);
-			}
-			break;
-		case 3:
-		case 4:
-			// dict
-			if (wsgi_req->uh.pktsize > 0) {
-				uwsgi_hooked_parse(wsgi_req->buffer, wsgi_req->uh.pktsize, cache_command, (void *) wsgi_req);
-			}
-			break;
-		case 5:
-			// get (uwsgi + stream)
-			if (wsgi_req->uh.pktsize > 0) {
-				value = uwsgi_cache_get(wsgi_req->buffer, wsgi_req->uh.pktsize, &vallen);
-				if (value && vallen > 0) {
-					wsgi_req->uh.pktsize = 0;
-					wsgi_req->uh.modifier2 = 1;
-					wsgi_req->response_size = write(wsgi_req->poll.fd, &wsgi_req->uh, 4);
-					wsgi_req->response_size += write(wsgi_req->poll.fd, value, vallen);
-				}
-				else {
-					wsgi_req->uh.pktsize = 0;
-					wsgi_req->uh.modifier2 = 0;
-					wsgi_req->response_size = write(wsgi_req->poll.fd, &wsgi_req->uh, 4);
-				}
-			}
-			break;		
+clear:
+		close(ctl_poll.fd);
 	}
 
-	return 0;
+	return NULL;
 }
 
-struct uwsgi_plugin uwsgi_cache_plugin = {
+int uwsgi_cache_server(char *socket, int threads) {
 
-        .name = "cache",
-        .modifier1 = 111, 
-        .request = uwsgi_cache_request,
+	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;
+}
 

config17.ru

@@ -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")] 
+}

contrib/graphite_uwsgi.py

@@ -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()

contrib/spoolqueue/producer.py

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

contrib/spoolqueue/tasks.py

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

contrib/spoolqueue/tasksconsumer.py

@@ -0,0 +1,44 @@
+from uwsgidecorators import *
+import Queue
+from threading import Thread
+
+queues = {}
+
+class queueconsumer(object):
+
+    def __init__(self, name, num=1, **kwargs):
+        self.name = name
+	self.num = num
+        self.queue = Queue.Queue()
+	self.threads = []
+	self.func = None
+	queues[self.name] = self
+
+
+    @staticmethod
+    def consumer(self):
+        while True:
+	    req = self.queue.get()
+            print req
+	    self.func(req)
+	    self.queue.task_done()
+
+    def __call__(self, f):
+        self.func = f
+	for i in range(self.num):
+	    t = Thread(target=self.consumer,args=(self,))	
+	    self.threads.append(t)
+	    t.daemon = True
+	    t.start()
+
+@spool
+def spooler_enqueuer(arguments):
+    if 'queue' in arguments:
+        queue = arguments['queue']
+        queues[queue].queue.put(arguments)
+    else:
+        raise Exception("You have to specify a queue name")
+
+
+def enqueue(*args, **kwargs):
+    return spooler_enqueuer.spool(*args, **kwargs)

contrib/xinetd_uwsgi

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

decoratortest.py

@@ -0,0 +1,122 @@
+#!./uwsgi --import decoratortest -s :3035 -M --spooler myspool --enable-threads -p 8 --spooler-ordered
+import uwsgi
+
+from uwsgidecorators import *
+
+from uwsgicc import app as application
+
+import time
+
+
+# register rpc function helloworld
+@rpc("helloworld")
+def hello_world():
+    return "Hello World"
+
+# register signal 1
+@signal(1)
+def what_time_is_it(num):
+    print(time.asctime())
+
+# register signal 100
+@signal(100, target='workers')
+def what_time_is_it(num):
+    print("*** I AM THE WORKER %d AT %s ***" % (uwsgi.worker_id(), time.asctime()))
+
+
+# a 3 seconds timer
+@timer(3)
+def salut(num):
+    print("Salut !!! 3 seconds elapsed and signal %d raised" % num)
+
+# a 10 seconds red black timer (executed by the spooler)
+@rbtimer(10, target='spooler')
+def tenseconds(num):
+    print("red black timer !!! 10 seconds elapsed and signal %d raised" % num)
+
+# monitor /tmp directory
+@filemon("/tmp")
+def tmpmodified(num):
+    print("/tmp has been modified")
+
+
+# spool a long running task
+@spool
+def a_long_task(args):
+    for i in xrange(1,10):
+        print("%s = %d" % ( str(args), i))
+        time.sleep(1)
+
+# continuosly spool a long running task
+@spoolforever
+def an_infinite_task(args):
+    for i in xrange(1,4):
+        print("infinite: %d %s" % (i, str(args)))
+        time.sleep(1)
+
+
+# spool a task after 60 seconds
+@spool
+def delayed_task(args):
+    print("*** I am a delayed spool job. It is %s [%s]***" % (time.asctime(), str(args)))
+    # send a signal to all workers
+    uwsgi.signal(100)
+
+@spool
+def big_body_task(args):
+    print("*** managing a task with a body of %d bytes ***" % len(args['body']))
+    print(args['body'].swapcase()) 
+
+# run a task every hour
+@cron(59, -1, -1, -1, -1)
+def one_hour_passed(num):
+    print("received signal %d after 1 hour" % num)
+
+@thread
+def a_running_thread():
+    while True:
+        time.sleep(2)
+        print("i am a no-args thread")
+
+@thread
+def a_running_thread_with_args(who):
+    while True:
+        time.sleep(2)
+        print("Hello %s (from arged-thread)" % who)
+
+@postfork
+@thread
+def a_post_fork_thread():
+    while True:
+        time.sleep(3)
+        print("Hello from a thread in worker %d" % uwsgi.worker_id())
+
+@postfork
+def fork_happened():
+    print("fork() has been called [1]")
+
+@postfork
+def fork_happened2():
+    print("waiting for a signal...")
+    uwsgi.signal_wait()
+    print("signal received: %d" % uwsgi.signal_received())
+    print("fork() has been called [2] wid: %d" % uwsgi.worker_id())
+
+@postfork
+@lock
+def locked_func():
+    print("starting locked function on worker %d" % uwsgi.worker_id())
+    for i in xrange(1, 100):
+        time.sleep(0.2)
+        print("[locked %d] waiting..." % uwsgi.worker_id())
+    print("done with locked function on worker %d" % uwsgi.worker_id())
+
+spool_filename = a_long_task.spool({'foo':'bar'}, hello='world')
+print("spool filename = %s" % spool_filename)
+an_infinite_task.spool(foo='bar', priority=3)
+delayed_task.spool(foo2='bar2', at=time.time()+60)
+a_running_thread()
+a_running_thread_with_args("uWSGI")
+uwsgi_source_file = open('uwsgi.c','r')
+print(big_body_task.spool(priority=9,filename='uwsgi.c',body=uwsgi_source_file.read()))
+uwsgi_source_file.close()

django/uwsgitemplate.py

@@ -0,0 +1,29 @@
+from django.template.base import TemplateDoesNotExist
+from django.template.loader import BaseLoader
+from django.conf import settings
+
+try:
+    import uwsgi
+    on_uwsgi = True
+except:
+    on_uwsgi = False
+
+
+
+
+class Loader(BaseLoader):
+
+    is_usable = on_uwsgi
+
+    def symbolize(self, name):
+        return name.replace('.','_').replace('/','_').replace('-','_')
+
+    def load_template_source(self, template_name, template_dirs=None):
+        filename = 'templates_' + self.symbolize(template_name)
+        for app in settings.INSTALLED_APPS:
+            try:
+                symbol = "%s_%s" % (self.symbolize(app), filename)
+                return (uwsgi.embedded_data(symbol), "sym://%s" % symbol)
+            except:
+                pass
+        raise TemplateDoesNotExist(template_name)

emperor.c

@@ -5,29 +5,88 @@
 extern struct uwsgi_server uwsgi;
 extern char **environ;
 
+int emperor_queue;
+char *emperor_absolute_dir;
+
 struct uwsgi_instance {
-	struct uwsgi_instance *ui_prev;
-	struct uwsgi_instance *ui_next;
+        struct uwsgi_instance *ui_prev;
+        struct uwsgi_instance *ui_next;
 
-	char name[0xff];
-	pid_t pid;
+        char name[0xff];
+        pid_t pid;
 
-	int status;
-	time_t born;
-	time_t last_mod;
+        int status;
+        time_t born;
+        time_t last_mod;
+        time_t last_loyal;
 
-	uint64_t respawns;
-	int use_config;
+        uint64_t respawns;
+        int use_config;
 
-	int pipe[2];
-	int pipe_config[2];
+        int pipe[2];
+        int pipe_config[2];
 
-	char *config;
-	uint32_t config_len;
+        char *config;
+        uint32_t config_len;
+
+        int loyal;
+
+        int zerg;
 };
 
+
 struct uwsgi_instance *ui;
 
+static void royal_death(int signum) {
+
+
+	if (uwsgi.vassals_stop_hook) {
+
+		struct uwsgi_instance *c_ui = ui->ui_next;
+
+		while (c_ui) {
+                        uwsgi_log("running vassal stop-hook: %s %s\n", uwsgi.vassals_stop_hook, c_ui->name);
+			if (setenv("UWSGI_VASSALS_DIR", emperor_absolute_dir, 1)) {
+                                uwsgi_error("setenv()");
+                        }
+                        int stop_hook_ret = uwsgi_run_command_and_wait(uwsgi.vassals_stop_hook, c_ui->name);
+                        uwsgi_log("%s stop-hook returned %d\n", c_ui->name, stop_hook_ret);
+			c_ui = c_ui->ui_next;
+		}
+        }
+	uwsgi_notify("The Emperor is buried.");
+	exit(0);
+}
+
+
+void emperor_stats() {
+
+	struct uwsgi_instance *c_ui = ui->ui_next;
+
+        while (c_ui) {
+
+		uwsgi_log("vassal instance %s (last modified %d) status %d loyal %d zerg %d\n",c_ui->name, c_ui->last_mod, c_ui->status, c_ui->loyal, c_ui->zerg);
+
+                c_ui = c_ui->ui_next;
+        }
+
+}
+
+struct uwsgi_instance *emperor_get_by_fd(int fd) {
+
+        struct uwsgi_instance *c_ui = ui;
+
+        while (c_ui->ui_next) {
+                c_ui = c_ui->ui_next;
+
+                if (c_ui->pipe[0] == fd) {
+                        return c_ui;
+                }
+        }
+        return NULL;
+}
+
+
 struct uwsgi_instance *emperor_get(char *name) {
 
 	struct uwsgi_instance *c_ui = ui;
@@ -59,8 +118,21 @@ void emperor_del(struct uwsgi_instance *c_ui) {
 		close(c_ui->pipe_config[0]);
 	}
 
+	if (uwsgi.vassals_stop_hook) {
+                        uwsgi_log("running vassal stop-hook: %s %s\n", uwsgi.vassals_stop_hook, c_ui->name);
+			if (setenv("UWSGI_VASSALS_DIR", emperor_absolute_dir, 1)) {
+                                uwsgi_error("setenv()");
+                        }
+                        int stop_hook_ret = uwsgi_run_command_and_wait(uwsgi.vassals_stop_hook, c_ui->name);
+                        uwsgi_log("%s stop-hook returned %d\n", c_ui->name, stop_hook_ret);
+                }
+
 	uwsgi_log("removed uwsgi instance %s\n", c_ui->name);
 
+	if (c_ui->zerg) {
+		uwsgi.emperor_broodlord_count--;
+	}
+
 	free(c_ui);
 
 }
@@ -102,9 +174,14 @@ void emperor_add(char *name, time_t born, char *config, uint32_t config_size) {
 	struct uwsgi_instance *c_ui = ui;
 	struct uwsgi_instance *n_ui = NULL;
 	pid_t pid;
-	char *argv[4];
+	char **argv;
 	char *uef;
 	char **uenvs;
+	int counter;
+	char *colon = NULL;
+	int i;
+
+	sleep(1);
 
 	while (c_ui->ui_next) {
 		c_ui = c_ui->ui_next;
@@ -120,17 +197,30 @@ void emperor_add(char *name, time_t born, char *config, uint32_t config_size) {
 	}
 
 	c_ui->ui_next = n_ui;
+#ifdef UWSGI_DEBUG
 	uwsgi_log("c_ui->ui_next = %p\n", c_ui->ui_next);
+#endif
 	n_ui->ui_prev = c_ui;
+
+	if (strchr(name,':')) {
+		n_ui->zerg = 1;
+		uwsgi.emperor_broodlord_count++;
+	}
+
 	memcpy(n_ui->name, name, strlen(name));
 	n_ui->born = born;
 	n_ui->last_mod = born;
+	// start without loyalty
+	n_ui->last_loyal = born;
+	n_ui->loyal = 0;
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, n_ui->pipe)) {
 		uwsgi_error("socketpair()");
 		goto clear;
 	}
 
+	event_queue_add_fd_read(emperor_queue, n_ui->pipe[0]);
+
 	if (n_ui->use_config) {
 		if (socketpair(AF_UNIX, SOCK_STREAM, 0, n_ui->pipe_config)) {
 			uwsgi_error("socketpair()");
@@ -138,6 +228,8 @@ void emperor_add(char *name, time_t born, char *config, uint32_t config_size) {
 		}
 	}
 
+	// TODO pre-start hook
+
 	// a new uWSGI instance will start 
 	pid = fork();
 	if (pid < 0) {
@@ -162,6 +254,7 @@ void emperor_add(char *name, time_t born, char *config, uint32_t config_size) {
 	else {
 
 		unsetenv("UWSGI_RELOADS");
+		unsetenv("NOTIFY_SOCKET");
 
 		uef = uwsgi_num2str(n_ui->pipe[1]);
 		if (setenv("UWSGI_EMPEROR_FD", uef, 1)) {
@@ -208,9 +301,23 @@ void emperor_add(char *name, time_t born, char *config, uint32_t config_size) {
 			close(n_ui->pipe_config[0]);
 		}
 
+		counter = 4;
+		struct uwsgi_config_template *uct = uwsgi.vassals_templates;
+                while(uct) {
+			counter+=2;
+			uct = uct->next;
+		}
 
+		argv = uwsgi_malloc(sizeof(char *) * counter);
 		// set args
 		argv[0] = uwsgi.binary_path;
+
+		if (uwsgi.emperor_broodlord) {
+			colon = strchr(name, ':');
+			if (colon) {
+				colon[0] = 0;
+			}
+		}
 		if (!strcmp(name + (strlen(name) - 4), ".xml"))
 			argv[1] = "--xml";
 		if (!strcmp(name + (strlen(name) - 4), ".ini"))
@@ -219,14 +326,46 @@ void emperor_add(char *name, time_t born, char *config, uint32_t config_size) {
 			argv[1] = "--yaml";
 		if (!strcmp(name + (strlen(name) - 5), ".yaml"))
 			argv[1] = "--yaml";
+		if (!strcmp(name + (strlen(name) - 3), ".js"))
+			argv[1] = "--json";
+
+		if (colon) {
+			colon[0] = ':';
+		}
 		argv[2] = name;
-		argv[3] = NULL;
+		counter = 3;
+		uct = uwsgi.vassals_templates;
+        	while(uct) {
+			argv[counter] = "--inherit";
+			argv[counter+1] = uct->filename;
+			counter+=2;
+			uct = uct->next;
+		}
+		argv[counter] = NULL;
+
+		// close all of the unneded fd
+		for(i=3;i<sysconf(_SC_OPEN_MAX);i++) {
+			if (i != n_ui->pipe[1]) {
+				close(i);
+			}
+		}
+
+		if (uwsgi.vassals_start_hook) {
+			uwsgi_log("running vassal start-hook: %s %s\n", uwsgi.vassals_start_hook, n_ui->name);
+			if (setenv("UWSGI_VASSALS_DIR", emperor_absolute_dir, 1)) {
+				uwsgi_error("setenv()");
+			}
+			int start_hook_ret = uwsgi_run_command_and_wait(uwsgi.vassals_start_hook, n_ui->name);
+			uwsgi_log("%s start-hook returned %d\n", n_ui->name, start_hook_ret);
+		}
+
 		// start !!!
 		if (execvp(argv[0], argv)) {
 			uwsgi_error("execvp()");
 		}
+		uwsgi_log("is the uwsgi binary in your system PATH ?\n");
 		// never here
-		exit(1);
+		exit(UWSGI_EXILE_CODE);
 	}
 
       clear:
@@ -256,15 +395,37 @@ void emperor_loop() {
 	int amqp_fd = -1;
 	char *amqp_routing_key;
 
+	void *events;
+	int nevents;
+	int interesting_fd;
+	char notification_message[64];
+
 	signal(SIGPIPE, SIG_IGN);
+	uwsgi_unix_signal(SIGINT, royal_death);
+        uwsgi_unix_signal(SIGTERM, royal_death);
+        uwsgi_unix_signal(SIGQUIT, royal_death);
+        uwsgi_unix_signal(SIGUSR1, emperor_stats);
 
 	memset(&ui_base, 0, sizeof(struct uwsgi_instance));
 
-	uwsgi_log("*** starting uWSGI Emperor ***\n");
+
+	emperor_queue = event_queue_init();
+
+        events = event_queue_alloc(64);
+
+	if (uwsgi.has_emperor) {
+		uwsgi_log("*** starting uWSGI sub-Emperor ***\n");
+	}
+	else {
+		uwsgi_log("*** starting uWSGI Emperor ***\n");
+	}
 
 	amqp_port = strchr(uwsgi.emperor_dir, ':');
 
 	if (amqp_port) {
+		if (uwsgi.emperor_amqp_vhost == NULL) uwsgi.emperor_amqp_vhost = "/";
+		if (uwsgi.emperor_amqp_username == NULL) uwsgi.emperor_amqp_username = "guest";
+		if (uwsgi.emperor_amqp_password == NULL) uwsgi.emperor_amqp_password = "guest";
 reconnect:
 		while(amqp_fd == -1) {	
 			uwsgi_log("connecting to AMQP server...\n");
@@ -275,14 +436,17 @@ reconnect:
 		}
 
 		uwsgi_log("subscribing to queue...\n");
-		if (uwsgi_amqp_consume_queue(amqp_fd, "/", "", "uwsgi.emperor", "fanout") < 0) {
+		if (uwsgi_amqp_consume_queue(amqp_fd, uwsgi.emperor_amqp_vhost, uwsgi.emperor_amqp_username, uwsgi.emperor_amqp_password, "", "uwsgi.emperor", "fanout") < 0) {
 			close(amqp_fd);
 			amqp_fd = -1;
+			sleep(1);
 			goto reconnect;
 		}
+
+		event_queue_add_fd_read(emperor_queue, amqp_fd);
 	}
 	else {
-		if (!glob(uwsgi.emperor_dir, GLOB_MARK, NULL, &g)) {
+		if (!glob(uwsgi.emperor_dir, GLOB_MARK|GLOB_NOCHECK, NULL, &g)) {
 			if (g.gl_pathc == 1 && g.gl_pathv[0][strlen(g.gl_pathv[0]) - 1] == '/') {
 				simple_mode = 1;
 				if (chdir(uwsgi.emperor_dir)) {
@@ -295,10 +459,13 @@ reconnect:
 			uwsgi_error("glob()");
 			exit(1);
 		}
+		emperor_absolute_dir = realpath(".", NULL);
 	}
 
 	ui = &ui_base;
 
+	int freq = 0 ;
+
 	for (;;) {
 
 
@@ -309,13 +476,19 @@ reconnect:
 			}
 		}
 
-		if (amqp_fd > -1) {
-			uint64_t msgsize;
-			if (uwsgi_waitfd(amqp_fd, 3)) {
+		nevents = event_queue_wait_multi(emperor_queue, freq, events, 64);
+		freq = 3;
+
+		for (i = 0; i<nevents;i++) {
+			interesting_fd = event_queue_interesting_fd(events, i);
+
+			if (amqp_fd > -1 && interesting_fd == amqp_fd ) {
+				uint64_t msgsize;
 				char *config = uwsgi_amqp_consume(amqp_fd, &msgsize, &amqp_routing_key);
 				
 				if (!config) {
 					uwsgi_log("problem with RabbitMQ server, trying reconnection...\n");
+					event_queue_del_fd(emperor_queue, amqp_fd, event_queue_read());
 					close(amqp_fd);
 					amqp_fd = -1;
 					goto reconnect;
@@ -329,10 +502,13 @@ reconnect:
 					ui_current = emperor_get(config_file);
 
                                         if (ui_current) {
+						// ignore event if i am not loyal
+						if (!ui_current->loyal) continue;
 						free(ui_current->config);
 						ui_current->config = config;
 						ui_current->config_len = msgsize;
 						if (!msgsize) {
+							// SAFE
 							emperor_del(ui_current);
 						}
 						else {
@@ -352,7 +528,9 @@ reconnect:
 				if (msgsize) {
 					if (msgsize >= 0xff) { free(config); continue; }
 
+#ifdef UWSGI_DEBUG
 					uwsgi_log("%.*s\n", (int)msgsize, config);
+#endif
 					char *config_file = uwsgi_concat2n(config, msgsize, "", 0);
 					free(config);
 
@@ -371,6 +549,8 @@ reconnect:
 					ui_current = emperor_get(config_file);
 
 					if (ui_current) {
+						// ignore event if i am not loyal
+						if (!ui_current->loyal) continue;
 						emperor_respawn(ui_current, time(NULL));
 					}
 					else {
@@ -381,11 +561,50 @@ reconnect:
 				}
 				}
 			}
+			else {
+				ui_current = emperor_get_by_fd(interesting_fd);
+				if (ui_current) {
+					char byte;
+					ssize_t rlen = read(interesting_fd, &byte, 1);
+					if (rlen <= 0) {
+						// SAFE
+						emperor_del(ui_current);
+					}
+					else {
+						if (byte == 17) {
+							ui_current->loyal = 1;
+							uwsgi_log("*** vassal %s is now loyal ***\n", ui_current->name);
+							
+							// TODO post-start hook
+						}
+						else if (byte == 22) {
+							emperor_stop(ui_current);
+						}
+						else if (byte == 30 && uwsgi.emperor_broodlord > 0 && uwsgi.emperor_broodlord_count < uwsgi.emperor_broodlord) {
+							uwsgi_log("[emperor] going in broodlord mode: launching zergs for %s\n", ui_current->name);
+							char *zerg_name = uwsgi_concat3(ui_current->name,":","zerg");
+							emperor_add(zerg_name, time(NULL), NULL, 0);
+							free(zerg_name);
+						}
+					}
+				}
+				else {
+					uwsgi_log("unrecognized event on fd %d\n", interesting_fd);
+					event_queue_del_fd(emperor_queue, interesting_fd, event_queue_read());
+					close(interesting_fd);
+				}
+			}
 		}
-		else if (simple_mode) {
+
+		if (amqp_fd == -1) {
+		if (simple_mode) {
 			DIR *dir = opendir(".");
 			while ((de = readdir(dir)) != NULL) {
-				if (!strcmp(de->d_name + (strlen(de->d_name) - 4), ".xml") || !strcmp(de->d_name + (strlen(de->d_name) - 4), ".ini") || !strcmp(de->d_name + (strlen(de->d_name) - 4), ".yml") || !strcmp(de->d_name + (strlen(de->d_name) - 5), ".yaml")
+				if (!strcmp(de->d_name + (strlen(de->d_name) - 4), ".xml") ||
+					!strcmp(de->d_name + (strlen(de->d_name) - 4), ".ini") ||
+					!strcmp(de->d_name + (strlen(de->d_name) - 4), ".yml") ||
+					!strcmp(de->d_name + (strlen(de->d_name) - 5), ".yaml") ||
+					!strcmp(de->d_name + (strlen(de->d_name) - 3), ".js")
 					) {
 
 
@@ -414,7 +633,7 @@ reconnect:
 			closedir(dir);
 		}
 		else {
-			if (glob(uwsgi.emperor_dir, GLOB_MARK, NULL, &g)) {
+			if (glob(uwsgi.emperor_dir, GLOB_MARK|GLOB_NOCHECK, NULL, &g)) {
 				uwsgi_error("glob()");
 				continue;
 			}
@@ -423,6 +642,7 @@ reconnect:
 				if (!strcmp(g.gl_pathv[i] + (strlen(g.gl_pathv[i]) - 4), ".xml") ||
 					!strcmp(g.gl_pathv[i] + (strlen(g.gl_pathv[i]) - 4), ".ini") ||
 					!strcmp(g.gl_pathv[i] + (strlen(g.gl_pathv[i]) - 4), ".yml") ||
+					!strcmp(g.gl_pathv[i] + (strlen(g.gl_pathv[i]) - 3), ".js") ||
 					!strcmp(g.gl_pathv[i] + (strlen(g.gl_pathv[i]) - 5), ".yaml")
 					) {
 
@@ -451,6 +671,7 @@ reconnect:
 
 			}
 		}
+		}
 
 		// check for removed instances
 
@@ -461,6 +682,12 @@ reconnect:
 			has_children++;
 		}
 
+		if (uwsgi.notify) {
+			if (snprintf(notification_message, 64, "The Emperor is governing %d vassals", has_children) >= 34) {
+				uwsgi_notify(notification_message);
+			}
+		}
+
 		if (has_children) {
 			diedpid = waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
 		}
@@ -475,21 +702,33 @@ reconnect:
 		ui_current = ui;
 		while (ui_current->ui_next) {
 			ui_current = ui_current->ui_next;
+			// check loyalty if not in simple/glob mode
+			if (amqp_fd > -1) {
+				if (!ui_current->loyal && (time(NULL)-ui_current->last_loyal) > 60) {
+					uwsgi_log("!!! no loyalty showed by instance %s !!!\n", ui_current->name);
+					// SAFE
+					emperor_del(ui_current);
+					break;
+				}
+			}
 			if (ui_current->status == 1) {
 				if (ui_current->config) free(ui_current->config);
+				// SAFE
 				emperor_del(ui_current);
 				break;
 			}
-			else if (!ui_current->use_config && strncmp(ui_current->name, "http://",7) && stat(ui_current->name, &st)) {
+			else if (!ui_current->use_config && strncmp(ui_current->name, "http://",7) && stat(ui_current->name, &st) && !ui_current->zerg) {
 				emperor_stop(ui_current);
 			}
 			else if (ui_current->pid == diedpid) {
 				if (ui_current->status == 0) {
 					// respawn an accidentally dead instance if its exit code is not UWSGI_EXILE_CODE
 					if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == UWSGI_EXILE_CODE) {
+						// SAFE
 						emperor_del(ui_current);
 					}
 					else {
+						// UNSAFE
 						emperor_add(ui_current->name, ui_current->last_mod, ui_current->config, ui_current->config_len);
 						emperor_del(ui_current);
 					}
@@ -498,14 +737,13 @@ reconnect:
 				else if (ui_current->status == 1) {
 					// remove 'marked for dead' instance
 					if (ui_current->config) free(ui_current->config);
+					// SAFE
 					emperor_del(ui_current);
 					break;
 				}
 			}
 		}
 
-		if (amqp_fd < 0)
-		sleep(3);
 
 	}
 

event.c

@@ -591,7 +591,9 @@ int event_queue_add_file_monitor(int eq, char *filename, int *id) {
 
 	*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);
@@ -630,7 +632,9 @@ struct uwsgi_fmon *event_queue_ack_file_monitor(int eq, int id) {
 	}
 	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++) {
@@ -816,8 +820,6 @@ int event_queue_add_timer(int eq, int *id, int sec) {
 	*id = timer_id ;
 	timer_id++;	
 
-	uwsgi_log("registering timer %d\n", sec);
-	
         EV_SET(&kev, *id, EVFILT_TIMER, EV_ADD, 0, sec*1000, 0);
         if (kevent(eq, &kev, 1, NULL, 0, NULL) < 0) {
                 uwsgi_error("kevent()");

fibers.ru

@@ -2,10 +2,36 @@ require 'fiber'
 class SuspendingBody
 
 	def each
-		for i in 1..10
+		for i in 1..3
 			yield "number: #{i}\n"
+			UWSGI.async_sleep(1)
+			puts "sleep..."
 			Fiber.yield
 		end
+
+		fd = UWSGI.async_connect("81.174.68.52:80")
+		UWSGI.wait_fd_write(fd, 3)
+		Fiber.yield
+		io = IO.new(fd)
+		puts "connected"
+		io.syswrite("GET /uwsgi/export/1081%3A362d695b2f25/plugins/fiber/fiber.c HTTP/1.0\r\n")
+		io.syswrite("Host: projects.unbit.it\r\n")
+		io.syswrite("\r\n")
+
+		UWSGI.wait_fd_read(fd, 3)
+		Fiber.yield
+
+		puts "data available"
+
+		begin
+		while body = io.sysread(fd)
+			yield body
+			Fiber.yield
+		end
+		rescue
+		end
+	
+		io.close
 	end
 
 end

flaskpost.py

@@ -0,0 +1,12 @@
+from flask import Flask, request
+app = Flask(__name__)
+app.debug = True
+
+@app.route('/')
+def hello_world():
+    return "<form method='POST' enctype='multipart/form-data' action='/upload'><input type='text' name='pippo'/><input type='file' name='ufile'/><input type='submit' value='upload'/></form>"
+
+@app.route('/upload',  methods=['GET', 'POST'])
+def upload_file():
+    return str(len(request.form.get('pippo', 'boh'))) + request.form.get('pippo', 'boh')
+    return request.files['ufile'].read()

gateway.c

@@ -60,6 +60,11 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop)(void)) {
                         uwsgi_error("prctl()");
                 }
 #endif
+
+		if (!uwsgi.sockets) {
+			// wait for child end
+			//waitpid(-1, &i, 0);
+		}
 			loop();
 			// never here !!! (i hope)
 			exit(1);	
@@ -117,6 +122,12 @@ void gateway_respawn(int id) {
 	}
 
 	ug->pid = gw_pid;
-	uwsgi_log( "respawned uWSGI %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	ug->respawns++;
+	if (ug->respawns == 1) {
+		uwsgi_log( "spawned uWSGI %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	}
+	else {
+		uwsgi_log( "respawned uWSGI %s %d (pid: %d)\n", ug->name, ug->num, (int) gw_pid);
+	}
 	
 }

heavytest.ini

@@ -0,0 +1,27 @@
+[uwsgi]
+
+master = true
+processes = 4
+threads = 8
+
+; initialize 4 sockets with 4 different protocols
+socket = :3031
+socket = :3032
+socket = :3033
+socket = :3034
+
+socket-protocol = 0,uwsgi
+socket-protocol = 1,http
+socket-protocol = 2,fastcgi
+socket-protocol = 3,uwsgidump
+
+
+; add a cache with 1000 items of 96k
+cache = 1000
+cache-blocksize = 98304
+
+
+log-micros = true
+
+module = heavytest
+mount = /cc=uwsgicc/__init__.py

heavytest.py

@@ -0,0 +1,14 @@
+import uwsgi
+import werkzeug.testapp
+
+uwsgi.cache_set("/cache/get", "HTTP 1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<h1>I am the uWSGI cache</h1>")
+
+def app001(env, start_response):
+    start_response('200 OK', [('Content-Type', 'text/html')])
+    return "PATH_INFO=%s" % env['PATH_INFO']
+
+def app002(env, start_response):
+    start_response('200 OK', [('Content-Type', 'text/html')])
+    return "requests: %d" % uwsgi.total_requests()
+
+uwsgi.applications = { '':werkzeug.testapp.test_app, '/app001':app001, '/app002':app002 }

hello_world.py

@@ -0,0 +1,6 @@
+import uwsgi
+#uwsgi.cache_set('/', "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\nHello World from cache")
+def application(env, start_response):
+    start_response('200 OK', [('Content-Type', 'text/html')])
+    yield str(env['wsgi.input'].fileno())
+    yield "<h1>Hello World</h1>"

ini.c

@@ -67,6 +67,11 @@ char *ini_get_line(char *ini, off_t size) {
 		}
 	}
 
+	// check if it is a stupid file without \n at the end
+	if (ptr > ini) {
+		return ptr;
+	}
+
 	return NULL;
 
 }
@@ -87,7 +92,14 @@ void uwsgi_ini_config(char *file, char *magic_table[]) {
 	char *section_asked = "uwsgi";
 	char *colon;
 
-	colon = uwsgi_get_last_char(file, ':');
+	if (!uwsgi_startswith(file, "http://", 7) || !uwsgi_startswith(file, "data://", 7) || !uwsgi_startswith(file, "sym://", 6) ) {
+                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) {
@@ -95,7 +107,9 @@ void uwsgi_ini_config(char *file, char *magic_table[]) {
 		}
 	}
 
-	uwsgi_log("[uWSGI] getting INI configuration from %s\n", file);
+	if (file[0] != 0) {
+		uwsgi_log("[uWSGI] getting INI configuration from %s\n", file);
+	}
 
 	ini = uwsgi_open_and_read(file, &len, 1, magic_table);
 
@@ -136,6 +150,11 @@ void uwsgi_ini_config(char *file, char *magic_table[]) {
 
 	}
 
+	if (colon) {
+		colon[0] = ':';
+	}
+
+
 }
 
 #endif

it.unbit.uwsgi.emperor.plist

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

it.unbit.uwsgi.plist

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

json.c

@@ -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_startswith(file, "http://", 7) || !uwsgi_startswith(file, "data://", 7) || !uwsgi_startswith(file, "sym://", 6)) {
+                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, (char *) "1", 0);
+		}
+		else if (json_is_false(config_value) || json_is_null(config_value)) {
+			add_exported_option((char *)key, (char *) "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, (char *) "1", 0);
+                		}
+                		else if (json_is_false(config_array_item) || json_is_null(config_array_item)) {
+                        		add_exported_option((char *)key, (char *) "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

lib/amqp.c

@@ -699,7 +699,9 @@ static int amqp_send_connection_start_ok(int fd, char *mech, char *sasl_response
 	
 }
 
-int uwsgi_amqp_consume_queue(int fd, char *vhost, char *queue, char *exchange, char *exchange_type) {
+int uwsgi_amqp_consume_queue(int fd, char *vhost, char *username, char *password, char *queue, char *exchange, char *exchange_type) {
+
+	char *auth = uwsgi_concat4n("\0",1, username, strlen(username), "\0",1, password, strlen(password));
 
 	if (send(fd, AMQP_CONNECTION_HEADER, 8, 0) < 0) {
 		uwsgi_error("send()");
@@ -712,11 +714,14 @@ int uwsgi_amqp_consume_queue(int fd, char *vhost, char *queue, char *exchange, c
 	}
 
 	uwsgi_log("sending Connection.start-ok\n");
-	if (amqp_send_connection_start_ok(fd, "PLAIN", "\0guest\0guest", 12, "en_US") < 0) {
+	if (amqp_send_connection_start_ok(fd, "PLAIN", auth, strlen(username)+strlen(password)+2, "en_US") < 0) {
+		free(auth);
 		uwsgi_log("AMQP error sending Connection.start-ok\n");
 		return -1;
 	}
 
+	free(auth);
+
 	if (amqp_wait_connection_tune(fd) < 0) {
 		uwsgi_log("AMQP error waiting for Connection.tune\n");
 		return -1;
@@ -795,5 +800,7 @@ int uwsgi_amqp_consume_queue(int fd, char *vhost, char *queue, char *exchange, c
 	}
 	
 	free(queue);
+
+	uwsgi_log("AMQP subscription done, waiting for events...\n");
 	return 0;
 }

lib/linux_ns.c

@@ -0,0 +1,149 @@
+#include "../uwsgi.h"
+
+
+extern struct uwsgi_server uwsgi;
+
+#ifndef CLONE_NEWUTS
+#define CLONE_NEWUTS 0x04000000
+#endif
+
+#ifndef CLONE_NEWPID
+#define CLONE_NEWPID 0x20000000
+#endif
+
+#ifndef CLONE_NEWIPC
+#define CLONE_NEWIPC 0x08000000
+#endif
+
+#ifndef CLONE_NEWNET
+#define CLONE_NEWNET 0x40000000
+#endif
+
+void linux_namespace_start(void *argv) {
+	for (;;) {
+		char stack[PTHREAD_STACK_MIN];
+		int waitpid_status;
+		uwsgi_log("*** jailing uWSGI in %s ***\n", uwsgi.ns);
+		int clone_flags = SIGCHLD | CLONE_NEWUTS | CLONE_NEWPID | CLONE_NEWIPC | CLONE_NEWNS;
+		if (uwsgi.ns_net) {
+			clone_flags |= CLONE_NEWNET;
+		}
+		pid_t pid = clone(uwsgi_start, stack + PTHREAD_STACK_MIN, clone_flags, (void *) argv);
+		if (pid == -1) {
+			uwsgi_error("clone()");
+			exit(1);
+		}
+		uwsgi_log("waiting for jailed master (pid: %d) death...\n", (int) pid);
+		pid = waitpid(pid, &waitpid_status, 0);
+		if (pid < 0) {
+			uwsgi_error("waitpid()");
+			exit(1);
+		}
+
+		// in Linux this is reliable
+		if (WIFEXITED(waitpid_status) && WEXITSTATUS(waitpid_status) == 1) {
+			exit(1);
+		}
+
+		uwsgi_log("pid %d ended. Respawning...\n", (int) pid);
+	}
+
+	// never here
+}
+
+
+
+void linux_namespace_jail() {
+
+	char *ns_tmp_mountpoint = NULL, *ns_tmp_mountpoint2 = NULL;
+
+	if (getpid() != 1) {
+		uwsgi_log("your kernel does not support linux pid namespace\n");
+		exit(1);
+	}
+
+	char *ns_hostname = strchr(uwsgi.ns, ':');
+	if (ns_hostname) {
+		ns_hostname[0] = 0;
+		ns_hostname++;
+		if (sethostname(ns_hostname, strlen(ns_hostname))) {
+			uwsgi_error("sethostname()");
+		}
+	}
+
+	FILE *procmounts;
+	char line[1024];
+	int unmounted = 1;
+	char *delim0, *delim1;
+
+	if (chdir(uwsgi.ns)) {
+		uwsgi_error("chdir()");
+		exit(1);
+	}
+
+	if (strcmp(uwsgi.ns, "/")) {
+		ns_tmp_mountpoint = uwsgi_concat2(uwsgi.ns, "/.uwsgi_ns_tmp_mountpoint");
+		mkdir(ns_tmp_mountpoint, S_IRWXU);
+
+		ns_tmp_mountpoint2 = uwsgi_concat2(ns_tmp_mountpoint, "/.uwsgi_ns_tmp_mountpoint");
+		mkdir(ns_tmp_mountpoint2, S_IRWXU);
+
+		if (mount(uwsgi.ns, ns_tmp_mountpoint, "none", MS_BIND, NULL)) {
+			uwsgi_error("mount()");
+		}
+		if (chdir(ns_tmp_mountpoint)) {
+			uwsgi_error("chdir()");
+		}
+
+		if (pivot_root(".", ns_tmp_mountpoint2)) {
+			uwsgi_error("pivot_root()");
+			exit(1);
+		}
+
+
+
+		if (chdir("/")) {
+			uwsgi_error("chdir()");
+			exit(1);
+		}
+
+	}
+
+	uwsgi_log("remounting /proc\n");
+	if (mount("proc", "/proc", "proc", 0, NULL)) {
+		uwsgi_error("mount()");
+	}
+
+	while (unmounted) {
+
+		unmounted = 0;
+		procmounts = fopen("/proc/self/mounts", "r");
+		while (fgets(line, 1024, procmounts) != NULL) {
+			delim0 = strchr(line, ' ');
+			delim0++;
+			delim1 = strchr(delim0, ' ');
+			*delim1 = 0;
+			if (!strcmp(delim0, "/") || !strcmp(delim0, "/proc"))
+				continue;
+			if (!umount(delim0)) {
+				unmounted++;
+			}
+		}
+		fclose(procmounts);
+	}
+
+	if (rmdir("/.uwsgi_ns_tmp_mountpoint/.uwsgi_ns_tmp_mountpoint")) {
+		uwsgi_error("rmdir()");
+	}
+	if (rmdir("/.uwsgi_ns_tmp_mountpoint")) {
+		uwsgi_error("rmdir()");
+	}
+
+	if (strcmp(uwsgi.ns, "/")) {
+		free(ns_tmp_mountpoint2);
+		free(ns_tmp_mountpoint);
+	}
+
+
+
+}

lib/netlink.c

@@ -4,6 +4,8 @@
 #include <linux/rtnetlink.h>
 #include <net/if.h>
 
+#ifdef CLONE_NEWNET
+
 #define NLMSG_TAIL(nmsg) \
         ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 
@@ -377,3 +379,4 @@ int uwsgi_nl_send(struct nlmsghdr *nlmsg) {
 	close(nlfd);
 	return ret;
 }
+#endif

lib/rbtree.c

@@ -25,6 +25,16 @@
 
 #include "../uwsgi.h"
 
+static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
+{
+        rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p;
+}
+static inline void rb_set_color(struct rb_node *rb, int color)
+{
+        rb->rb_parent_color = (rb->rb_parent_color & ~1) | color;
+}
+
+
 static void __rb_rotate_left(struct rb_node *node, struct rb_root *root)
 {
 	struct rb_node *right = node->rb_right;
@@ -282,3 +292,18 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
 	if (color == RB_BLACK)
 		__rb_erase_color(child, parent, root);
 }
+
+#ifdef __clang__
+void rb_link_node(struct rb_node * node, struct rb_node * parent,
+                                struct rb_node ** rb_link)
+#else
+inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
+                                struct rb_node ** rb_link)
+#endif
+{
+        node->rb_parent_color = (unsigned long )parent;
+        node->rb_left = node->rb_right = NULL;
+
+        *rb_link = node;
+}
+

lib/rbtree.h

@@ -37,7 +37,6 @@ struct rb_root
 	struct rb_node *rb_node;
 };
 
-
 #define rb_parent(r)   ((struct rb_node *)((r)->rb_parent_color & ~3))
 #define rb_color(r)   ((r)->rb_parent_color & 1)
 #define rb_is_red(r)   (!rb_color(r))
@@ -45,24 +44,13 @@ struct rb_root
 #define rb_set_red(r)  do { (r)->rb_parent_color &= ~1; } while (0)
 #define rb_set_black(r)  do { (r)->rb_parent_color |= 1; } while (0)
 
-static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
-{
-	rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p;
-}
-static inline void rb_set_color(struct rb_node *rb, int color)
-{
-	rb->rb_parent_color = (rb->rb_parent_color & ~1) | color;
-}
-
 void rb_insert_color(struct rb_node *, struct rb_root *);
 void rb_erase(struct rb_node *, struct rb_root *);
 
-static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
-                                struct rb_node ** rb_link)
-{
-        node->rb_parent_color = (unsigned long )parent;
-        node->rb_left = node->rb_right = NULL;
-
-        *rb_link = node;
-}
-
+#ifdef __clang__
+void rb_link_node(struct rb_node *, struct rb_node *,
+                                struct rb_node **);
+#else
+inline void rb_link_node(struct rb_node *, struct rb_node *,
+                                struct rb_node **);
+#endif

logging.c

@@ -47,8 +47,10 @@ void log_request(struct wsgi_request *wsgi_req) {
 
 	struct uwsgi_app *wi;
 
+	if (wsgi_req->do_not_log) return ;
+
 	if (wsgi_req->app_id >= 0) {
-		wi = &uwsgi.apps[wsgi_req->app_id];
+		wi = &uwsgi_apps[wsgi_req->app_id];
 		if (wi->requests > 0) {
 			app_req = wi->requests;
 		}
@@ -171,6 +173,8 @@ void get_memusage() {
 
 #if defined(__FreeBSD__)
 	kv = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, NULL);
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+	kv = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
 #else
 	kv = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
 #endif

loop.c

@@ -2,12 +2,16 @@
 
 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; }
+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);
@@ -21,8 +25,8 @@ void uwsgi_register_loop(char *name, void *loop) {
 void *uwsgi_get_loop(char *name) {
 
 	int i;
-	
-	for(i=0;i<uwsgi.loops_cnt;i++) {
+
+	for (i = 0; i < uwsgi.loops_cnt; i++) {
 		if (!strcmp(name, uwsgi.loops[i].name)) {
 			return uwsgi.loops[i].loop;
 		}
@@ -44,46 +48,194 @@ void *simple_loop(void *arg1) {
 
 	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);
 			pthread_sigmask(SIG_BLOCK, &smask, NULL);
-			for(i=0;i<0xFF;i++) {
+			for (i = 0; i < 0xFF; i++) {
 				if (uwsgi.p[i]->init_thread) {
 					uwsgi.p[i]->init_thread(core_id);
 				}
 			}
-			/*
-			   pts = PyThreadState_New(uwsgi.main_thread->interp);
-			   pthread_setspecific(uwsgi.ut_save_key, (void *) pts);
-			   */
 		}
 	}
 #endif
 
+	// initialize the main event queue to monitor sockets
+	int main_queue = event_queue_init();
+
+	uwsgi_add_sockets_to_queue(main_queue);
+
+	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);
+	}
+
 	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
 
+		wsgi_req_setup(wsgi_req, core_id, NULL);
 
-		UWSGI_CLEAR_STATUS;
-
-
-		wsgi_req_setup(wsgi_req, core_id);
-
-		if (wsgi_req_accept(wsgi_req)) {
+		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);
 	}
 
-	pthread_exit(NULL);
-	
-	//never here
+	// 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;
 }
+
+#ifdef UWSGI_ZEROMQ
+void *zeromq_loop(void *arg1) {
+	sigset_t smask;
+	int i;
+
+	long core_id = (long) arg1;
+
+	struct wsgi_request *wsgi_req = uwsgi.wsgi_requests[core_id];
+	uwsgi.zeromq_recv_flag = 0;
+	zmq_pollitem_t zmq_poll_items[3];
+	char uwsgi_signal;
+
+	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);
+			pthread_sigmask(SIG_BLOCK, &smask, NULL);
+			for (i = 0; i < 0xFF; i++) {
+				if (uwsgi.p[i]->init_thread) {
+					uwsgi.p[i]->init_thread(core_id);
+				}
+			}
+
+
+			void *tmp_zmq_pull = zmq_socket(uwsgi.zmq_context, ZMQ_PULL);
+			if (tmp_zmq_pull == NULL) {
+				uwsgi_error("zmq_socket()");
+				exit(1);
+			}
+			if (zmq_connect(tmp_zmq_pull, uwsgi.zmq_receiver) < 0) {
+				uwsgi_error("zmq_connect()");
+				exit(1);
+			}
+
+			pthread_setspecific(uwsgi.zmq_pull, tmp_zmq_pull);
+		}
+
+	}
+
+
+	if (uwsgi.signal_socket > -1) {
+		zmq_poll_items[0].socket = pthread_getspecific(uwsgi.zmq_pull);
+		zmq_poll_items[0].fd = -1;
+		zmq_poll_items[0].events = ZMQ_POLLIN;
+
+		zmq_poll_items[1].socket = NULL;
+		zmq_poll_items[1].fd = uwsgi.signal_socket;
+		zmq_poll_items[1].events = ZMQ_POLLIN;
+
+		zmq_poll_items[2].socket = NULL;
+		zmq_poll_items[2].fd = uwsgi.my_signal_socket;
+		zmq_poll_items[2].events = ZMQ_POLLIN;
+	}
+
+
+	while (uwsgi.workers[uwsgi.mywid].manage_next_request) {
+
+		wsgi_req_setup(wsgi_req, core_id, NULL);
+
+		uwsgi.edge_triggered = 1;
+		wsgi_req->socket = uwsgi.zmq_socket;
+
+
+		if (uwsgi.signal_socket > -1) {
+			if (zmq_poll(zmq_poll_items, 3, -1) < 0) {
+				uwsgi_error("zmq_poll()");
+				continue;
+			}
+
+			if (zmq_poll_items[1].revents & ZMQ_POLLIN) {
+                		if (read(uwsgi.signal_socket, &uwsgi_signal, 1) <= 0) {
+                        		if (uwsgi.no_orphans) {
+                                		uwsgi_log_verbose("uWSGI worker %d screams: UAAAAAAH my master died, i will follow him...\n", uwsgi.mywid);
+                                		end_me(0);
+                        		}
+                		}
+                		else {
+#ifdef UWSGI_DEBUG
+                        		uwsgi_log_verbose("master sent signal %d to worker %d\n", uwsgi_signal, uwsgi.mywid);
+#endif
+                        		if (uwsgi_signal_handler(uwsgi_signal)) {
+                                		uwsgi_log_verbose("error managing signal %d on worker %d\n", uwsgi_signal, uwsgi.mywid);
+                        		}
+                		}
+				continue;
+			}
+
+			if (zmq_poll_items[2].revents & ZMQ_POLLIN) {
+                                if (read(uwsgi.my_signal_socket, &uwsgi_signal, 1) <= 0) {
+                                        if (uwsgi.no_orphans) {
+                                                uwsgi_log_verbose("uWSGI worker %d screams: UAAAAAAH my master died, i will follow him...\n", uwsgi.mywid);
+                                                end_me(0);
+                                        }
+                                }
+                                else {
+#ifdef UWSGI_DEBUG
+                                        uwsgi_log_verbose("master sent signal %d to worker %d\n", uwsgi_signal, uwsgi.mywid);
+#endif
+                                        if (uwsgi_signal_handler(uwsgi_signal)) {
+                                                uwsgi_log_verbose("error managing signal %d on worker %d\n", uwsgi_signal, uwsgi.mywid);
+                                        }
+                                }
+                                continue;
+                        }
+
+			
+
+			if (zmq_poll_items[0].revents & ZMQ_POLLIN) {
+				wsgi_req->poll.fd = wsgi_req->socket->proto_accept(wsgi_req, uwsgi.zmq_socket->fd);
+			}
+		}
+		else {
+			wsgi_req->poll.fd = wsgi_req->socket->proto_accept(wsgi_req, uwsgi.zmq_socket->fd);
+		}
+
+		if (wsgi_req->poll.fd >= 0) {
+			wsgi_req_recv(wsgi_req);
+		}
+
+		uwsgi_close_request(wsgi_req);
+	}
+
+
+        // end of the loop
+        return NULL;
+}
+#endif

master.c

@@ -2,6 +2,17 @@
 
 extern struct uwsgi_server uwsgi;
 
+void uwsgi_restore_auto_snapshot(int signum) {
+
+	if (uwsgi.workers[1].snapshot > 0) {
+		uwsgi.restore_snapshot = 1;
+	}
+	else {
+		uwsgi_log("[WARNING] no snapshot available\n");
+	}
+	
+}
+
 void expire_rb_timeouts(struct rb_root *root) {
 
         time_t current = time(NULL);
@@ -31,32 +42,24 @@ void expire_rb_timeouts(struct rb_root *root) {
         }
 }
 
-
-void uwsgi_subscribe(char *subscription) {
-
+void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, char *modifier1, size_t modifier1_len) {
 	char *ssb;
 	char subscrbuf[4096];
+
 	uint16_t ustrlen;
 
-	char *udp_address = strchr(subscription,':');
-        if (!udp_address) return;
+	ssb = subscrbuf;
 
-        char *subscription_key = strchr(udp_address+1, ':');
-	if (!subscription_key) return;
-        udp_address = uwsgi_concat2n(subscription, subscription_key-subscription, "", 0);
-
-        ssb = subscrbuf;
-
-	ustrlen = 3;
+        ustrlen = 3;
         *ssb++ = (uint8_t) (ustrlen  & 0xff);
         *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
         memcpy(ssb, "key", ustrlen);
         ssb+=ustrlen;
 
-        ustrlen = strlen(subscription_key+1);
+        ustrlen = keysize;
         *ssb++ = (uint8_t) (ustrlen  & 0xff);
         *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
-        memcpy(ssb, subscription_key+1, ustrlen);
+        memcpy(ssb, key, ustrlen);
         ssb+=ustrlen;
 
         ustrlen = 7;
@@ -65,14 +68,112 @@ void uwsgi_subscribe(char *subscription) {
         memcpy(ssb, "address", ustrlen);
         ssb+=ustrlen;
 
-        ustrlen = strlen(uwsgi.sockets[0].name);
+        ustrlen = strlen(uwsgi.sockets->name);
         *ssb++ = (uint8_t) (ustrlen  & 0xff);
         *ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
-        memcpy(ssb, uwsgi.sockets[0].name, ustrlen);
+        memcpy(ssb, uwsgi.sockets->name, ustrlen);
         ssb+=ustrlen;
 
+	if (modifier1) {
+		ustrlen = 9;
+        	*ssb++ = (uint8_t) (ustrlen  & 0xff);
+        	*ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        	memcpy(ssb, "modifier1", ustrlen);
+        	ssb+=ustrlen;
+
+        	ustrlen = modifier1_len;
+        	*ssb++ = (uint8_t) (ustrlen  & 0xff);
+        	*ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
+        	memcpy(ssb, modifier1, ustrlen);
+        	ssb+=ustrlen;
+	}
+
         send_udp_message(224, udp_address, subscrbuf, ssb-subscrbuf);
-	free(udp_address);
+}
+
+void uwsgi_subscribe(char *subscription) {
+
+	int subfile_size;
+	int i;
+	char *key = NULL;
+	int keysize = 0;
+	char *modifier1 = NULL;
+	int modifier1_len = 0;
+
+	char *udp_address = strchr(subscription,':');
+        if (!udp_address) return;
+
+        char *subscription_key = strchr(udp_address+1, ':');
+	if (!subscription_key) return;
+
+        udp_address = uwsgi_concat2n(subscription, subscription_key-subscription, "", 0);
+
+	if (subscription_key[1] == '@') {
+		if (!uwsgi_file_exists(subscription_key+2)) goto clear;
+		char *lines = uwsgi_open_and_read(subscription_key+2, &subfile_size, 1, NULL);
+		if (subfile_size > 0) {
+			key = lines;
+			for(i=0;i<subfile_size;i++) {
+				if (lines[i] == 0) {
+					if (keysize > 0) {
+						if (key[0] != '#' && key[0] != '\n') {
+							modifier1 = strchr(key, ',');
+                					if (modifier1) {
+                        					modifier1[0] = 0;
+                        					modifier1++;
+                        					modifier1_len = strlen(modifier1);
+								keysize = strlen(key);
+                					}
+							uwsgi_send_subscription(udp_address, key, keysize, modifier1, modifier1_len);
+							modifier1 = NULL;
+							modifier1_len = 0;
+						}
+					}	
+					break;
+				}
+				else if (lines[i] == '\n') {
+					if (keysize > 0) {
+						if (key[0] != '#' && key[0] != '\n') {
+							lines[i] = 0;
+							modifier1 = strchr(key, ',');
+                					if (modifier1) {
+                        					modifier1[0] = 0;
+                        					modifier1++;
+                        					modifier1_len = strlen(modifier1);
+								keysize = strlen(key);
+                					}
+							uwsgi_send_subscription(udp_address, key, keysize, modifier1, modifier1_len);
+							modifier1 = NULL;
+							modifier1_len = 0;
+							lines[i] = '\n';
+						}
+					}
+					key = lines+i+1;
+					keysize = 0;
+					continue;
+				}
+				keysize++;
+			}
+
+			free(lines);
+		}
+	}
+	else {
+		modifier1 = strchr(subscription_key+1, ',');
+		if (modifier1) {
+			modifier1[0] = 0;
+			modifier1++;
+			modifier1_len = strlen(modifier1);
+		}
+
+		uwsgi_send_subscription(udp_address, subscription_key+1, strlen(subscription_key+1), modifier1, modifier1_len);
+		if (modifier1)
+			modifier1[-1] = ',';
+	}
+
+clear:
+
+        free(udp_address);
 
 }
 
@@ -85,8 +186,23 @@ void get_linux_tcp_info(int fd) {
 		if (!uwsgi.shared->ti.tcpi_sacked) {
 			return;
 		}
+
+		uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = uwsgi.shared->ti.tcpi_unacked;
+		if (uwsgi.vassal_sos_backlog > 0 && uwsgi.has_emperor) {
+			if ((int)uwsgi.shared->ti.tcpi_unacked >= uwsgi.vassal_sos_backlog) {
+				// ask emperor for help
+				char byte = 30;
+                		if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
+                        		uwsgi_error("write()");
+                		}
+				else {
+					uwsgi_log("asking emperor for reinforcements (backlog: %d)...\n", (int) uwsgi.shared->ti.tcpi_unacked);
+				}
+			}
+		}
 		if (uwsgi.shared->ti.tcpi_unacked >= uwsgi.shared->ti.tcpi_sacked) {
 			uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, uwsgi.shared->ti.tcpi_unacked, uwsgi.shared->ti.tcpi_sacked);
+			uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
 		}
 	}
 }
@@ -96,7 +212,10 @@ void manage_cluster_announce(char *key, uint16_t keylen, char *val, uint16_t val
 
 	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));
@@ -121,24 +240,19 @@ void manage_cluster_announce(char *key, uint16_t keylen, char *val, uint16_t val
 
 void master_loop(char **argv, char **environ) {
 
-	uint64_t master_cycles = 0;
 	uint64_t tmp_counter;
 
 	char log_buf[4096];
 
-	time_t current_time = time(NULL);
 
 	struct timeval last_respawn;
+	int last_respawn_rate = 0;
 
-	pid_t pid;
 	int pid_found = 0;
 
 	pid_t diedpid;
 	int waitpid_status;
 
-	int working_workers = 0;
-	int blocking_workers = 0;
-
 	int ready_to_reload = 0;
 	int ready_to_die = 0;
 
@@ -146,6 +260,9 @@ void master_loop(char **argv, char **environ) {
 
 	uint8_t uwsgi_signal;
 
+	time_t last_request_timecheck = 0;
+	uint64_t last_request_count = 0;
+
 #ifdef UWSGI_UDP
 	struct sockaddr_in udp_client;
 	socklen_t udp_len;
@@ -168,22 +285,30 @@ void master_loop(char **argv, char **environ) {
 	int snmp_fd = -1;
 #endif
 
-	int i=0,j;
+	int i=0;
 	int rlen;
 
 	int check_interval = 1;
 
 	struct uwsgi_rb_timer *min_timeout;
 	struct rb_root *rb_timers = uwsgi_init_rb_timer();
-	struct tm *uwsgi_cron_delta;
 
+	uwsgi.current_time = time(NULL);
 
 	uwsgi_unix_signal(SIGHUP, grace_them_all);
-	uwsgi_unix_signal(SIGTERM, reap_them_all);
+	if (uwsgi.die_on_term) {
+		uwsgi_unix_signal(SIGTERM, kill_them_all);
+		uwsgi_unix_signal(SIGQUIT, reap_them_all);
+	}
+	else {
+		uwsgi_unix_signal(SIGTERM, reap_them_all);
+		uwsgi_unix_signal(SIGQUIT, kill_them_all);
+	}
 	uwsgi_unix_signal(SIGINT, kill_them_all);
-	uwsgi_unix_signal(SIGQUIT, kill_them_all);
 	uwsgi_unix_signal(SIGUSR1, stats);
-
+	if (uwsgi.auto_snapshot) {
+		uwsgi_unix_signal(SIGURG, uwsgi_restore_auto_snapshot);
+	}
 
 	uwsgi.master_queue = event_queue_init();
 
@@ -206,6 +331,12 @@ void master_loop(char **argv, char **environ) {
 	if (uwsgi.has_emperor) {
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.emperor_fd);
 	}
+
+	if (uwsgi.zerg_server) {
+		uwsgi.zerg_server_fd = bind_to_unix(uwsgi.zerg_server, uwsgi.listen_queue, 0, 0);
+		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.zerg_server_fd);
+		uwsgi_log("*** Zerg server enabled on %s ***\n", uwsgi.zerg_server);
+	}
 #ifdef UWSGI_UDP
 	if (uwsgi.udp_socket) {
 		udp_fd = bind_to_udp(uwsgi.udp_socket, 0, 0);
@@ -217,6 +348,12 @@ void master_loop(char **argv, char **environ) {
 			event_queue_add_fd_read(uwsgi.master_queue, udp_fd);
 		}
 	}
+
+	if (uwsgi.cheap) {
+		uwsgi_add_sockets_to_queue(uwsgi.master_queue);
+		uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
+	}
+
 #ifdef UWSGI_MULTICAST
 	if (uwsgi.cluster) {
 
@@ -359,10 +496,19 @@ void master_loop(char **argv, char **environ) {
 	for (;;) {
 		//uwsgi_log("ready_to_reload %d %d\n", ready_to_reload, uwsgi.numproc);
 
+		if (uwsgi.to_outworld) {
+			//uwsgi_log("%d/%d\n", uwsgi.lazy_respawned, uwsgi.numproc);
+			if (uwsgi.lazy_respawned >= uwsgi.numproc) {
+				uwsgi.to_outworld = 0;
+				uwsgi.master_mercy = 0;
+				uwsgi.lazy_respawned = 0;
+			}
+		}
 		if (uwsgi.master_mercy) {
 			if (uwsgi.master_mercy < time(NULL)) {
 				for(i=1;i<=uwsgi.numproc;i++) {
 					if (uwsgi.workers[i].pid > 0) {
+						if (uwsgi.lazy && uwsgi.workers[i].destroy == 0) continue;
 						uwsgi_log("worker %d (pid: %d) is taking too much time to die...NO MERCY !!!\n", i, uwsgi.workers[i].pid);
 						if (!kill(uwsgi.workers[i].pid, SIGKILL)) {
 							if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
@@ -371,37 +517,59 @@ void master_loop(char **argv, char **environ) {
 							uwsgi.workers[i].pid = 0;
 							if (uwsgi.to_hell) { ready_to_die++;}
 							else if (uwsgi.to_heaven) { ready_to_reload++;}
+							else if (uwsgi.to_outworld) {
+								uwsgi.lazy_respawned++;
+								if (uwsgi_respawn_worker(i)) return;	
+							}
 						}
 						else {
 							uwsgi_error("kill()");
 						}
 					}
 				}
+				uwsgi.master_mercy = 0;
 			}
 		}
-		if (ready_to_die >= uwsgi.numproc && uwsgi.to_hell) {
-#ifdef UWSGI_SPOOLER
-			if (uwsgi.spool_dir && uwsgi.shared->spooler_pid > 0) {
-				kill(uwsgi.shared->spooler_pid, SIGKILL);
-				uwsgi_log( "killed the spooler with pid %d\n", uwsgi.shared->spooler_pid);
+		if (uwsgi.respawn_workers) {
+			for(i=1;i<=uwsgi.numproc;i++) {
+				if (uwsgi_respawn_worker(i)) return;
 			}
 
-#endif
+			uwsgi.respawn_workers = 0;
+		}
+		if (uwsgi.restore_snapshot) {
+			uwsgi_log("[snapshot] restoring workers...\n");
+			for(i=1;i<=uwsgi.numproc;i++) {
+				if (uwsgi.workers[i].pid == 0) continue;
+				kill(uwsgi.workers[i].pid, SIGKILL);
+				if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+                                	uwsgi_error("waitpid()");
+                                }
+				if (uwsgi.auto_snapshot > 0 && i > uwsgi.auto_snapshot) {
+					uwsgi.workers[i].pid = 0;
+					uwsgi.workers[i].snapshot = 0;
+				}
+				else {
+					uwsgi.workers[i].pid = uwsgi.workers[i].snapshot;
+					uwsgi.workers[i].snapshot = 0;
+					kill(uwsgi.workers[i].pid, SIGURG);
+					uwsgi_log( "Restored uWSGI worker %d (pid: %d)\n", i, (int) uwsgi.workers[i].pid);
+				}
+			}
+
+			uwsgi.restore_snapshot = 0;
+			continue;
+		}
+		if ((uwsgi.cheap || ready_to_die >= uwsgi.numproc) && uwsgi.to_hell) {
+			// call a series of waitpid to ensure all processes (gateways and daemons) are dead
+			for(i=0;i<(uwsgi.gateways_cnt+ushared->daemons_cnt);i++) {
+				diedpid = waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
+			}
 
-			// TODO kill all the gateways
 			uwsgi_log( "goodbye to uWSGI.\n");
 			exit(0);
 		}
-		if (ready_to_reload >= uwsgi.numproc && uwsgi.to_heaven) {
-#ifdef UWSGI_SPOOLER
-			if (uwsgi.spool_dir && uwsgi.shared->spooler_pid > 0) {
-				kill(uwsgi.shared->spooler_pid, SIGKILL);
-				uwsgi_log( "wait4() the spooler with pid %d...", uwsgi.shared->spooler_pid);
-				diedpid = waitpid(uwsgi.shared->spooler_pid, &waitpid_status, 0);
-				uwsgi_log( "done.");
-			}
-#endif
-
+		if ( (uwsgi.cheap || ready_to_reload >= uwsgi.numproc) && uwsgi.to_heaven) {
 			// call a series of waitpid to ensure all processes (gateways and daemons) are dead
 			for(i=0;i<(uwsgi.gateways_cnt+ushared->daemons_cnt);i++) {
 				diedpid = waitpid(WAIT_ANY, &waitpid_status, WNOHANG);
@@ -422,12 +590,14 @@ void master_loop(char **argv, char **environ) {
 			uwsgi_log( "closing all non-uwsgi socket fds > 2 (_SC_OPEN_MAX = %ld)...\n", sysconf(_SC_OPEN_MAX));
 			for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
 				int found = 0;
-				for(j=0;j<uwsgi.sockets_cnt;j++) {
-					if (i == uwsgi.sockets[j].fd) {
-						uwsgi_log("found fd %d mapped to socket %d (%s)\n", i, j, uwsgi.sockets[j].name);
+				struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+                		while(uwsgi_sock) {
+					if (i == uwsgi_sock->fd) {
+						uwsgi_log("found fd %d mapped to socket %d (%s)\n", i, uwsgi_get_socket_num(uwsgi_sock), uwsgi_sock->name);
 						found = 1;
 						break;
 					}
+					uwsgi_sock = uwsgi_sock->next;
 				}
 
 				if (!found) {
@@ -438,7 +608,11 @@ void master_loop(char **argv, char **environ) {
 					}
 				}
 				if (!found) {
+#ifdef __APPLE__
+					fcntl(i, F_SETFD, FD_CLOEXEC);	
+#else
 					close(i);
+#endif
 				}
 			}
 
@@ -451,14 +625,17 @@ void master_loop(char **argv, char **environ) {
 			exit(1);
 		}
 
-		if (uwsgi.numproc > 0 || uwsgi.gateways_cnt > 0 || ushared->daemons_cnt > 0) {
-			master_has_children = 1;
-		}
+		if (!uwsgi.cheap) {
+
+			if (uwsgi.numproc > 0 || uwsgi.gateways_cnt > 0 || ushared->daemons_cnt > 0) {
+				master_has_children = 1;
+			}
 #ifdef UWSGI_SPOOLER
-		if (uwsgi.spool_dir && uwsgi.shared->spooler_pid > 0) {
-			master_has_children = 1;
-		}
+			if (uwsgi.spool_dir && uwsgi.shared->spooler_pid > 0) {
+				master_has_children = 1;
+			}
 #endif
+		}
 
 		if (!master_has_children) {
 			diedpid = 0;
@@ -546,70 +723,11 @@ void master_loop(char **argv, char **environ) {
 			
 				// check uwsgi-cron table
 				if (ushared->cron_cnt) {
-					current_time = time(NULL);
-					uwsgi_cron_delta = localtime( &current_time );
+					uwsgi_manage_signal_cron(time(NULL));
+				}
 
-					if (uwsgi_cron_delta) {
-
-						// fix month
-						uwsgi_cron_delta->tm_mon++;
-
-						uwsgi_lock(uwsgi.cron_table_lock);
-						for(i=0;i<ushared->cron_cnt;i++) {
-	
-							struct uwsgi_cron *ucron = &ushared->cron[i];
-							int uc_minute, uc_hour, uc_day, uc_month, uc_week;
-
-							uc_minute = ucron->minute;
-							uc_hour = ucron->hour;
-							uc_day = ucron->day;
-							uc_month = ucron->month;
-							uc_week = ucron->week;
-	
-							if (ucron->minute == -1) uc_minute = uwsgi_cron_delta->tm_min;
-							if (ucron->hour == -1) uc_hour = uwsgi_cron_delta->tm_hour;
-							if (ucron->month == -1) uc_month = uwsgi_cron_delta->tm_mon;
-
-							// mday and wday are ORed
-							if (ucron->day == -1 && ucron->week == -1) {
-								if (ucron->day == -1) uc_day = uwsgi_cron_delta->tm_mday;
-								if (ucron->week == -1) uc_week = uwsgi_cron_delta->tm_wday;
-							}
-							else if (ucron->day == -1) {
-								ucron->day = uwsgi_cron_delta->tm_mday;
-							}
-							else if (ucron->week == -1) {
-								ucron->week = uwsgi_cron_delta->tm_wday;
-							}
-							else {
-								if (ucron->day == uwsgi_cron_delta->tm_mday) {
-									ucron->week = uwsgi_cron_delta->tm_wday;
-								}
-								else if (ucron->week == uwsgi_cron_delta->tm_wday) {
-									ucron->day = uwsgi_cron_delta->tm_mday;
-								}
-							}
-							
-							if (uwsgi_cron_delta->tm_min == uc_minute &&
-								uwsgi_cron_delta->tm_hour == uc_hour &&
-								uwsgi_cron_delta->tm_mon == uc_month &&
-								uwsgi_cron_delta->tm_mday == uc_day &&
-								uwsgi_cron_delta->tm_wday == uc_week) {
-
-
-								// date match, signal it ?
-								if (current_time - ucron->last_job > 60) {
-									uwsgi_route_signal(ucron->sig);
-									ucron->last_job = current_time;
-								}
-							}
-					
-						}
-						uwsgi_unlock(uwsgi.cron_table_lock);
-					}
-					else {
-						uwsgi_error("localtime()");
-					}
+				if (uwsgi.crons) {
+					uwsgi_manage_command_cron(time(NULL));
 				}
 
 				if (rlen > 0) {
@@ -621,17 +739,83 @@ void master_loop(char **argv, char **environ) {
 								if (uwsgi.log_syslog) {
 									syslog(LOG_INFO, "%.*s", rlen, log_buf);
 								}
+#ifdef UWSGI_ZEROMQ
+								else if (uwsgi.zmq_log_socket) {
+                                                                        zmq_msg_t msg;
+                                                                        if (zmq_msg_init_size (&msg, rlen) == 0) {
+                                                                                memcpy(zmq_msg_data(&msg), log_buf, rlen);
+                                                                                zmq_send(uwsgi.zmq_log_socket, &msg, 0);
+                                                                                zmq_msg_close(&msg);
+                                                                        }
+                                                                }
+#endif
+								else if (uwsgi.log_socket) {
+									sendto(uwsgi.log_socket_fd, log_buf, rlen, 0, &uwsgi.log_socket_addr->sa, uwsgi.log_socket_size);
+								}
+								else {
+									rlen = write(uwsgi.original_log_fd, log_buf, rlen);
+								}
 								// TODO allow uwsgi.logger = func
 							}	
 						}
 					}
 
+					if (uwsgi.zerg_server) {
+						if (interesting_fd == uwsgi.zerg_server_fd) {
+							struct sockaddr_un zsun;
+							socklen_t zsun_len = sizeof(struct sockaddr_un);
+							int zerg_client = accept(uwsgi.zerg_server_fd, (struct sockaddr *) &zsun, &zsun_len);
+							if (zerg_client < 0) {
+								uwsgi_error("zerg: accept()");
+								continue;
+							}
+
+							struct msghdr zerg_msg;
+							void *zerg_msg_control = uwsgi_malloc(CMSG_SPACE (sizeof (int) * uwsgi_count_sockets(uwsgi.sockets)));
+							struct iovec zerg_iov;
+							struct cmsghdr *cmsg;
+
+							zerg_iov.iov_base = "uwsgi-zerg";
+                        				zerg_iov.iov_len = 10;
+
+							zerg_msg.msg_name    = NULL;
+                                        		zerg_msg.msg_namelen = 0;
+                                        		zerg_msg.msg_iov     = &zerg_iov;
+                                        		zerg_msg.msg_iovlen  = 1;
+                                        		zerg_msg.msg_flags   = 0;
+                                        		zerg_msg.msg_control    = zerg_msg_control;
+                                        		zerg_msg.msg_controllen = CMSG_SPACE (sizeof (int) * uwsgi_count_sockets(uwsgi.sockets));
+
+                                        		cmsg = CMSG_FIRSTHDR (&zerg_msg);
+                                        		cmsg->cmsg_len   = CMSG_LEN (sizeof (int) * uwsgi_count_sockets(uwsgi.sockets));
+                                        		cmsg->cmsg_level = SOL_SOCKET;
+                                        		cmsg->cmsg_type  = SCM_RIGHTS;
+
+							struct uwsgi_socket *uwsgi_sock = uwsgi.sockets; 
+							unsigned char *zerg_fd_ptr = CMSG_DATA(cmsg);
+							while(uwsgi_sock) {
+								memcpy(zerg_fd_ptr, &uwsgi_sock->fd, sizeof(int));
+								zerg_fd_ptr += sizeof(int);
+								uwsgi_sock = uwsgi_sock->next;
+							}
+
+                                        		if (sendmsg(zerg_client, &zerg_msg, 0) < 0) {
+                                                		uwsgi_error("sendmsg()");
+                                        		}
+
+
+                                        		close(zerg_client);
+
+							free(zerg_msg_control);
+						}
+					}
+
 					if (uwsgi.has_emperor) {
 						if (interesting_fd == uwsgi.emperor_fd) {
 							char byte;
 							rlen = read(uwsgi.emperor_fd, &byte, 1);
                                                         if (rlen > 0) {
-								uwsgi_log("received message %d from emperor\n", byte);
+								uwsgi_log_verbose("received message %d from emperor\n", byte);
 								// remove me
 								if (byte == 0) {
 									close(uwsgi.emperor_fd);
@@ -651,6 +835,25 @@ void master_loop(char **argv, char **environ) {
 							}
 						}
 					}
+
+
+					if (uwsgi.cheap) {
+						int found = 0 ;
+						struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+						while(uwsgi_sock) {
+							if (interesting_fd == uwsgi_sock->fd) {
+								found = 1;
+								uwsgi.cheap = 0;
+								uwsgi_del_sockets_from_queue(uwsgi.master_queue);
+								for(i=1;i<=uwsgi.numproc;i++) {
+									if (uwsgi_respawn_worker(i)) return;		
+								}
+								break;
+							}
+							uwsgi_sock = uwsgi_sock->next;
+						}
+						if (found) continue;
+					}
 #ifdef UWSGI_SNMP
 					if (uwsgi.snmp_addr && interesting_fd == snmp_fd) {
 						udp_len = sizeof(udp_client);
@@ -802,7 +1005,9 @@ void master_loop(char **argv, char **environ) {
 							uwsgi_error("read()");
 						}	
 						else if (rlen > 0) {
-							uwsgi_log("received uwsgi signal %d from workers\n", uwsgi_signal);
+#ifdef UWSGI_DEBUG
+							uwsgi_log_verbose("received uwsgi signal %d from a worker\n", uwsgi_signal);
+#endif
 							uwsgi_route_signal(uwsgi_signal);
 						}
 						else {
@@ -813,7 +1018,7 @@ void master_loop(char **argv, char **environ) {
 					}
 				}
 
-			current_time = time(NULL);	
+			uwsgi.current_time = time(NULL);	
 			// checking logsize
 			if (uwsgi.logfile) {
 				uwsgi.shared->logsize = lseek(2, 0, SEEK_CUR);
@@ -831,27 +1036,62 @@ void master_loop(char **argv, char **environ) {
 			}
 
 				
-			master_cycles++;
-			working_workers = 0;
-			blocking_workers = 0;
+			uwsgi.master_cycles++;
 
 			// recalculate requests counter on race conditions risky configurations
 			// a bit of inaccuracy is better than locking;)
 
 			if (uwsgi.numproc > 1) {
 				tmp_counter = 0;
-				for(i=1;i<uwsgi.numproc+1;i++) {
+				for(i=1;i<uwsgi.numproc+1;i++)
 					tmp_counter += uwsgi.workers[i].requests;
-				}
 				uwsgi.workers[0].requests = tmp_counter;
 			}
+		
+			if (uwsgi.idle > 0 && !uwsgi.cheap) {
+				uwsgi.current_time = time(NULL);
+				if (!last_request_timecheck) last_request_timecheck = uwsgi.current_time;
+				if (last_request_count != uwsgi.workers[0].requests) {
+					last_request_timecheck = uwsgi.current_time;
+					last_request_count = uwsgi.workers[0].requests;
+				}
+				else if (uwsgi.current_time - last_request_timecheck > uwsgi.idle) {
+					uwsgi_log("workers have been inactive for more than %d seconds\n", uwsgi.idle);
+					uwsgi.cheap = 1;
+					master_has_children = 0;
+					if (uwsgi.die_on_idle) {
+						if (uwsgi.has_emperor) {
+							char byte = 22;
+							if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
+								uwsgi_error("write()");
+								kill_them_all(0);	
+							}
+						}
+						else {
+							kill_them_all(0);	
+						}
+						continue;
+					}
+					for(i=1;i<=uwsgi.numproc;i++) {
+                               			if (uwsgi.workers[i].pid == 0) continue;
+                               			kill(uwsgi.workers[i].pid, SIGKILL);
+                               			if (waitpid(uwsgi.workers[i].pid, &waitpid_status, 0) < 0) {
+                                       			uwsgi_error("waitpid()");
+                               			}
+					}
+					uwsgi_add_sockets_to_queue(uwsgi.master_queue);
+                			uwsgi_log("cheap mode enabled: waiting for socket connection...\n");
+					last_request_timecheck = 0;
+					continue;	
+				}
+			}
 
 			// remove expired cache items TODO use rb_tree timeouts
 			if (uwsgi.cache_max_items > 0) {
 				for(i=0;i< (int)uwsgi.cache_max_items;i++) {
 					uwsgi_wlock(uwsgi.cache_lock);
 					if (uwsgi.cache_items[i].expires) {
-						if (uwsgi.cache_items[i].expires < (uint64_t) current_time) {
+						if (uwsgi.cache_items[i].expires < (uint64_t) uwsgi.current_time) {
 							uwsgi_cache_del(uwsgi.cache_items[i].key, uwsgi.cache_items[i].keysize);
 						}
 					}
@@ -865,16 +1105,19 @@ void master_loop(char **argv, char **environ) {
 
 
 #ifdef __linux__
-			for(i=0;i<uwsgi.sockets_cnt;i++) {
-				if (uwsgi.sockets[i].family != AF_INET) continue;
-				get_linux_tcp_info(uwsgi.sockets[i].fd);
+			struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
+                	while(uwsgi_sock) {
+				if (uwsgi_sock->family == AF_INET) {
+					get_linux_tcp_info(uwsgi_sock->fd);
+				}
+				uwsgi_sock = uwsgi_sock->next;
 			}
 #endif
 
 			for (i = 1; i <= uwsgi.numproc; i++) {
 				/* first check for harakiri */
 				if (uwsgi.workers[i].harakiri > 0) {
-					if (uwsgi.workers[i].harakiri < (time_t) current_time) {
+					if (uwsgi.workers[i].harakiri < (time_t) uwsgi.current_time) {
 						/* first try to invoke the harakiri() custom handler */
 						/* TODO */
 						/* then brutally kill the worker */
@@ -921,49 +1164,22 @@ void master_loop(char **argv, char **environ) {
 						uwsgi.workers[i].harakiri = 0;
 					}
 				}
-				/* load counters */
-				if (uwsgi.workers[i].status & UWSGI_STATUS_IN_REQUEST)
-					working_workers++;
 
-				if (uwsgi.workers[i].status & UWSGI_STATUS_BLOCKING)
-					blocking_workers++;
-
-				uwsgi.workers[i].last_running_time = uwsgi.workers[i].running_time;
+				// need to find a better way
+				//uwsgi.workers[i].last_running_time = uwsgi.workers[i].running_time;
 			}
 
 #ifdef UWSGI_UDP
 			// check for cluster nodes
-			for (i = 0; i < MAX_CLUSTER_NODES; i++) {
-				struct uwsgi_cluster_node *ucn = &uwsgi.shared->nodes[i];
-
-				if (ucn->name[0] != 0 && ucn->type == CLUSTER_NODE_STATIC && ucn->status == UWSGI_NODE_FAILED) {
-					// should i retry ?
-					if (master_cycles % ucn->errors == 0) {
-						if (!uwsgi_ping_node(i, uwsgi.wsgi_req)) {
-							ucn->status = UWSGI_NODE_OK;
-							uwsgi_log( "re-enabled cluster node %d/%s\n", i, ucn->name);
-						}
-						else {
-							ucn->errors++;
-						}
-					}
-				}
-				else if (ucn->name[0] != 0 && ucn->type == CLUSTER_NODE_DYNAMIC) {
-					// if the last_seen attr is higher than 30 secs ago, mark the node as dead
-					if ( (current_time - ucn->last_seen) > 30) {
-						uwsgi_log_verbose("no presence announce in the last 30 seconds by node %s, i assume it is dead.\n", ucn->name);
-						ucn->name[0] = 0 ;
-					}
-				}
-			}
+			master_check_cluster_nodes();
 
 			// reannounce myself every 10 cycles
-			if (uwsgi.cluster && uwsgi.cluster_fd >= 0 && !uwsgi.cluster_nodes && (master_cycles % 10) == 0) {
+			if (uwsgi.cluster && uwsgi.cluster_fd >= 0 && !uwsgi.cluster_nodes && (uwsgi.master_cycles % 10) == 0) {
 				uwsgi_cluster_add_me();
 			}
 
 			// resubscribe every 10 cycles
-			if (uwsgi.subscriptions_cnt > 0 && ((master_cycles % 10) == 0 || master_cycles == 1)) {
+			if (uwsgi.subscriptions_cnt > 0 && ((uwsgi.master_cycles % 10) == 0 || uwsgi.master_cycles == 1)) {
 				for(i=0;i<uwsgi.subscriptions_cnt;i++) {
 					uwsgi_subscribe(uwsgi.subscriptions[i]);
 				}
@@ -971,13 +1187,13 @@ void master_loop(char **argv, char **environ) {
 
 #endif
 
-			if (uwsgi.cache_store && uwsgi.cache_filesize && uwsgi.cache_store_sync && ((master_cycles % uwsgi.cache_store_sync) == 0)) {
+			if (uwsgi.cache_store && uwsgi.cache_filesize && uwsgi.cache_store_sync && ((uwsgi.master_cycles % uwsgi.cache_store_sync) == 0)) {
 				if (msync(uwsgi.cache_items, uwsgi.cache_filesize, MS_ASYNC)) {
                         		uwsgi_error("msync()");
                 		}
 			}
 
-			if (uwsgi.queue_store && uwsgi.queue_filesize && uwsgi.queue_store_sync && ((master_cycles % uwsgi.queue_store_sync) == 0)) {
+			if (uwsgi.queue_store && uwsgi.queue_filesize && uwsgi.queue_store_sync && ((uwsgi.master_cycles % uwsgi.queue_store_sync) == 0)) {
 				if (msync(uwsgi.queue, uwsgi.queue_filesize, MS_ASYNC)) {
                         		uwsgi_error("msync()");
                 		}
@@ -993,7 +1209,7 @@ void master_loop(char **argv, char **environ) {
                 		}
                 		else {
 					if (tr_st.st_mtime > uwsgi.last_touch_reload_mtime) {
-						uwsgi_log("*** %s has been touched... grace them all !!! ***\n");
+						uwsgi_log("*** %s has been touched... grace them all !!! ***\n", uwsgi.touch_reload);
 						grace_them_all(0);
 					}
                 		}
@@ -1006,6 +1222,9 @@ void master_loop(char **argv, char **environ) {
 			continue;
 
 		}
+		// reload gateways and daemons only on normal workflow
+		if (!uwsgi.to_heaven && !uwsgi.to_hell) {
+
 #ifdef UWSGI_SPOOLER
 		/* reload the spooler */
 		if (uwsgi.spool_dir && uwsgi.shared->spooler_pid > 0) {
@@ -1017,8 +1236,6 @@ void master_loop(char **argv, char **environ) {
 		}
 #endif
 
-		// reload gateways and daemons only on normal workflow
-		if (!uwsgi.to_heaven && !uwsgi.to_hell) {
 		/* reload the gateways */
 		// TODO reload_gateway(diedpid);
 		pid_found = 0;
@@ -1044,6 +1261,7 @@ void master_loop(char **argv, char **environ) {
                 }
 
 		if (pid_found) continue;
+
 		}
 
 		/* What happens here ?
@@ -1085,6 +1303,13 @@ void master_loop(char **argv, char **environ) {
 				uwsgi.workers[uwsgi.mywid].harakiri = 0;	
                                 continue;
                         }
+			else if (uwsgi.to_outworld) {
+				uwsgi.lazy_respawned++;
+				uwsgi.workers[uwsgi.mywid].destroy = 0;
+				uwsgi.workers[uwsgi.mywid].pid = 0;
+				// only to be safe :P
+                                uwsgi.workers[uwsgi.mywid].harakiri = 0;
+			}
 
 
 		if (uwsgi.workers[uwsgi.mywid].manage_next_request) {
@@ -1092,9 +1317,16 @@ void master_loop(char **argv, char **environ) {
 		}
 		gettimeofday(&last_respawn, NULL);
 		if (last_respawn.tv_sec == uwsgi.respawn_delta) {
-			uwsgi_log( "worker respawning too fast !!! i have to sleep a bit...\n");
-			/* TODO, user configurable fork throttler */
-			sleep(2);
+			last_respawn_rate++;
+			if (last_respawn_rate > uwsgi.numproc) {
+				uwsgi_log( "worker respawning too fast !!! i have to sleep a bit...\n");
+				/* TODO, user configurable fork throttler */
+				sleep(2);
+				last_respawn_rate = 0;
+			}
+		}
+		else {
+			last_respawn_rate = 0;
 		}
 		gettimeofday(&last_respawn, NULL);
 		uwsgi.respawn_delta = last_respawn.tv_sec;
@@ -1106,27 +1338,9 @@ void master_loop(char **argv, char **environ) {
 			continue;
 		}
 		*/
-		pid = fork();
-		if (pid == 0) {
-			// fix the communication pipe
-			close(uwsgi.shared->worker_signal_pipe[0]);
-			uwsgi.mypid = getpid();
-			uwsgi.workers[uwsgi.mywid].pid = uwsgi.mypid;
-			uwsgi.workers[uwsgi.mywid].harakiri = 0;
-			uwsgi.workers[uwsgi.mywid].requests = 0;
-			uwsgi.workers[uwsgi.mywid].failed_requests = 0;
-			uwsgi.workers[uwsgi.mywid].respawn_count++;
-			uwsgi.workers[uwsgi.mywid].last_spawn = current_time;
-			uwsgi.workers[uwsgi.mywid].manage_next_request = 1;
-			break;
-		}
-		else if (pid < 1) {
-			uwsgi_error("fork()");
-		}
-		else {
-			uwsgi_log( "Respawned uWSGI worker %d (new pid: %d)\n", uwsgi.mywid, (int) pid);
-		}
+		if (uwsgi_respawn_worker(uwsgi.mywid)) return;
 
 	}
 }
+
 }

master_utils.c

@@ -0,0 +1,259 @@
+#include "uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+void master_check_cluster_nodes() {
+
+	int i;
+
+	for (i = 0; i < MAX_CLUSTER_NODES; i++) {
+		struct uwsgi_cluster_node *ucn = &uwsgi.shared->nodes[i];
+
+		if (ucn->name[0] != 0 && ucn->type == CLUSTER_NODE_STATIC && ucn->status == UWSGI_NODE_FAILED) {
+			// should i retry ?
+			if (uwsgi.master_cycles % ucn->errors == 0) {
+				if (!uwsgi_ping_node(i, uwsgi.wsgi_req)) {
+					ucn->status = UWSGI_NODE_OK;
+					uwsgi_log("re-enabled cluster node %d/%s\n", i, ucn->name);
+				}
+				else {
+					ucn->errors++;
+				}
+			}
+		}
+		else if (ucn->name[0] != 0 && ucn->type == CLUSTER_NODE_DYNAMIC) {
+			// if the last_seen attr is higher than 30 secs ago, mark the node as dead
+			if ((uwsgi.current_time - ucn->last_seen) > 30) {
+				uwsgi_log_verbose("no presence announce in the last 30 seconds by node %s, i assume it is dead.\n", ucn->name);
+				ucn->name[0] = 0;
+			}
+		}
+	}
+}
+
+
+int uwsgi_respawn_worker(int wid) {
+
+	int respawns = uwsgi.workers[wid].respawn_count;
+	int i;
+
+	if (uwsgi.master_process) {
+		if (uwsgi.signal_pipe[wid][0] != -1) close(uwsgi.signal_pipe[wid][0]);
+
+		if (socketpair(AF_UNIX, SOCK_STREAM, 0, uwsgi.signal_pipe[wid])) {
+        		uwsgi_error("socketpair()\n");
+		}
+	}
+
+
+	pid_t pid = fork();
+
+	if (pid == 0) {
+		uwsgi.mywid = wid;
+		uwsgi.mypid = getpid();
+		uwsgi.workers[uwsgi.mywid].pid = uwsgi.mypid;
+		uwsgi.workers[uwsgi.mywid].id = uwsgi.mywid;
+		uwsgi.workers[uwsgi.mywid].harakiri = 0;
+		uwsgi.workers[uwsgi.mywid].requests = 0;
+		uwsgi.workers[uwsgi.mywid].failed_requests = 0;
+		uwsgi.workers[uwsgi.mywid].respawn_count++;
+		uwsgi.workers[uwsgi.mywid].last_spawn = uwsgi.current_time;
+		uwsgi.workers[uwsgi.mywid].manage_next_request = 1;
+
+		// close the cache server
+		if (uwsgi.cache_server_fd != -1) {
+			close(uwsgi.cache_server_fd);
+		}
+
+		if (uwsgi.master_process) {
+			// fix the communication pipe
+			close(uwsgi.shared->worker_signal_pipe[0]);
+			for(i=1;i<=uwsgi.numproc;i++) {
+				if (uwsgi.signal_pipe[i][0] != -1) {
+					close(uwsgi.signal_pipe[i][0]);
+				}
+			}
+			uwsgi.my_signal_socket = uwsgi.signal_pipe[wid][1];
+#ifdef UWSGI_SPOOLER
+        		if (uwsgi.spool_dir && uwsgi.shared->spooler_pid > 0) {
+				if (uwsgi.shared->spooler_signal_pipe[0] != -1) close (uwsgi.shared->spooler_signal_pipe[0]);
+			}
+#endif
+			if ((uwsgi.workers[uwsgi.mywid].respawn_count || uwsgi.cheap)) {
+				for (i = 0; i < 0xFF; i++) {
+                			if (uwsgi.p[i]->master_fixup) {
+                        			uwsgi.p[i]->master_fixup(1);
+                			}
+        			}
+			}
+		}
+		return 1;
+	}
+	else if (pid < 1) {
+		uwsgi_error("fork()");
+	}
+	else {
+		if (uwsgi.master_process) {
+			close(uwsgi.signal_pipe[wid][1]);
+		}
+		if (respawns > 0) {
+			uwsgi_log("Respawned uWSGI worker %d (new pid: %d)\n", wid, (int) pid);
+		}
+		else {
+			uwsgi_log("spawned uWSGI worker %d (pid: %d, cores: %d)\n", wid, pid, uwsgi.cores);
+		}
+	}
+
+	return 0;
+}
+
+
+void uwsgi_manage_signal_cron(time_t now) {
+
+	struct tm *uwsgi_cron_delta;
+	int i;
+
+	uwsgi.current_time = now;
+	uwsgi_cron_delta = localtime(&uwsgi.current_time);
+
+	if (uwsgi_cron_delta) {
+
+		// fix month
+		uwsgi_cron_delta->tm_mon++;
+
+		uwsgi_lock(uwsgi.cron_table_lock);
+		for (i = 0; i < ushared->cron_cnt; i++) {
+
+			struct uwsgi_cron *ucron = &ushared->cron[i];
+			int uc_minute, uc_hour, uc_day, uc_month, uc_week;
+
+			uc_minute = ucron->minute;
+			uc_hour = ucron->hour;
+			uc_day = ucron->day;
+			uc_month = ucron->month;
+			uc_week = ucron->week;
+
+			if (ucron->minute == -1)
+				uc_minute = uwsgi_cron_delta->tm_min;
+			if (ucron->hour == -1)
+				uc_hour = uwsgi_cron_delta->tm_hour;
+			if (ucron->month == -1)
+				uc_month = uwsgi_cron_delta->tm_mon;
+
+			// mday and wday are ORed
+			if (ucron->day == -1 && ucron->week == -1) {
+				if (ucron->day == -1)
+					uc_day = uwsgi_cron_delta->tm_mday;
+				if (ucron->week == -1)
+					uc_week = uwsgi_cron_delta->tm_wday;
+			}
+			else if (ucron->day == -1) {
+				ucron->day = uwsgi_cron_delta->tm_mday;
+			}
+			else if (ucron->week == -1) {
+				ucron->week = uwsgi_cron_delta->tm_wday;
+			}
+			else {
+				if (ucron->day == uwsgi_cron_delta->tm_mday) {
+					ucron->week = uwsgi_cron_delta->tm_wday;
+				}
+				else if (ucron->week == uwsgi_cron_delta->tm_wday) {
+					ucron->day = uwsgi_cron_delta->tm_mday;
+				}
+			}
+
+			if (uwsgi_cron_delta->tm_min == uc_minute && uwsgi_cron_delta->tm_hour == uc_hour && uwsgi_cron_delta->tm_mon == uc_month && uwsgi_cron_delta->tm_mday == uc_day && uwsgi_cron_delta->tm_wday == uc_week) {
+
+
+				// date match, signal it ?
+				if (uwsgi.current_time - ucron->last_job > 60) {
+					uwsgi_route_signal(ucron->sig);
+					ucron->last_job = uwsgi.current_time;
+				}
+			}
+
+		}
+		uwsgi_unlock(uwsgi.cron_table_lock);
+	}
+	else {
+		uwsgi_error("localtime()");
+	}
+
+}
+
+void uwsgi_manage_command_cron(time_t now) {
+
+	struct tm *uwsgi_cron_delta;
+
+	struct uwsgi_cron *current_cron = uwsgi.crons;
+	int uc_minute, uc_hour, uc_day, uc_month, uc_week;
+
+	uwsgi.current_time = now;
+	uwsgi_cron_delta = localtime(&uwsgi.current_time);
+
+
+	if (!uwsgi_cron_delta) {
+		uwsgi_error("localtime()");
+		return;
+	}
+
+	while (current_cron) {
+
+
+		uc_minute = current_cron->minute;
+		uc_hour = current_cron->hour;
+		uc_day = current_cron->day;
+		uc_month = current_cron->month;
+		uc_week = current_cron->week;
+
+		if (current_cron->minute == -1)
+			uc_minute = uwsgi_cron_delta->tm_min;
+		if (current_cron->hour == -1)
+			uc_hour = uwsgi_cron_delta->tm_hour;
+		if (current_cron->month == -1)
+			uc_month = uwsgi_cron_delta->tm_mon;
+
+		// mday and wday are ORed
+		if (current_cron->day == -1 && current_cron->week == -1) {
+			if (current_cron->day == -1)
+				uc_day = uwsgi_cron_delta->tm_mday;
+			if (current_cron->week == -1)
+				uc_week = uwsgi_cron_delta->tm_wday;
+		}
+		else if (current_cron->day == -1) {
+			current_cron->day = uwsgi_cron_delta->tm_mday;
+		}
+		else if (current_cron->week == -1) {
+			current_cron->week = uwsgi_cron_delta->tm_wday;
+		}
+		else {
+			if (current_cron->day == uwsgi_cron_delta->tm_mday) {
+				current_cron->week = uwsgi_cron_delta->tm_wday;
+			}
+			else if (current_cron->week == uwsgi_cron_delta->tm_wday) {
+				current_cron->day = uwsgi_cron_delta->tm_mday;
+			}
+		}
+
+		if (uwsgi_cron_delta->tm_min == uc_minute && uwsgi_cron_delta->tm_hour == uc_hour && uwsgi_cron_delta->tm_mon == uc_month && uwsgi_cron_delta->tm_mday == uc_day && uwsgi_cron_delta->tm_wday == uc_week) {
+
+
+			// date match, run command ?
+			if (uwsgi.current_time - current_cron->last_job > 60) {
+				//call command
+				if (current_cron->command) {
+					if (uwsgi_run_command(current_cron->command) >=0) {
+						uwsgi_log_verbose("[uWSGI-cron] running %s\n", current_cron->command);
+					}
+				}
+				current_cron->last_job = uwsgi.current_time;
+			}
+		}
+
+
+
+		current_cron = current_cron->next;
+	}
+
+
+}

mongrel2-uwsgi.conf

@@ -0,0 +1,23 @@
+main = Server(
+    uuid="f400bf85-4538-4f7a-8908-67e313d515c2",
+    access_log="/logs/access.log",
+    error_log="/logs/error.log",
+    chroot="./",
+    default_host="192.168.173.18",
+    name="test",
+    pid_file="/run/mongrel2.pid",
+    port=6767,
+    hosts = [
+        Host(name="192.168.173.18", routes={
+            '/': Handler(send_spec='tcp://192.168.173.18:9999',
+                    send_ident='54c6755b-9628-40a4-9a2d-cc82a816345e', 
+                    recv_spec='tcp://192.168.173.18:9998', recv_ident='')
+        })
+    ]
+)
+
+settings = {'upload.temp_store':'tmp/mongrel2.upload.XXXXXX'}
+servers = [main]
+
+
+uwsgi = { 'socket':':3031', 'master':'true'}

multiapp.py

@@ -1,14 +1,9 @@
 import werkzeug
-
-def web3_app(environ):
-    status = b'200 OK'
-    headers = [(b'Content-type', b'text/plain')]
-    body = [b'I am a Web3 app\n']
-    return body, status, headers
+import uwsgi
 
 def zero_app(e,s):
     s('200 OK', [ ('Content-Type', 'text/plain') ])
-    return ""
+    return "0"
 
 def not_found(e,s):
     s('404 Not Found', [ ('Content-Type', 'text/plain') ])
@@ -24,4 +19,4 @@ def internal_server_error(e, s):
     s('500 Internal Server Error', [ ('Content-Type', 'text/plain') ])
     return ""
 
-applications = {'':web3_app, '/wsgi':wsgi_app, '/test':werkzeug.test_app, '/zero':zero_app, '/notfound':not_found, '/ise':internal_server_error}
+uwsgi.applications = {'/wsgi':wsgi_app, '/test':werkzeug.test_app, '/zero':zero_app, '/notfound':not_found, '/ise':internal_server_error}

myadmin.py

@@ -2,6 +2,16 @@ import uwsgi
 import struct
 import sys
 
+print sys.argv
+if len(sys.argv) == 3:
+	chunks = uwsgi.send_message(sys.argv[1], 10, int(sys.argv[2]), '')
 
-print uwsgi.send_uwsgi_message(sys.argv[1], int(sys.argv[2]), 10, int(sys.argv[3]), struct.pack("i", int(sys.argv[4])))
+	pkt = ''
+
+	for chunk in chunks:
+    		pkt += chunk
+
+	print "%d = %d" % (int(sys.argv[2]), struct.unpack("I", pkt)[0])
+elif len(sys.argv) == 4:
+	uwsgi.send_message(sys.argv[1], 10, int(sys.argv[2]), struct.pack("I", int(sys.argv[3])))
 

notify.c

@@ -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;
+	
+}

plugins.c

@@ -2,13 +2,15 @@
 
 extern struct uwsgi_server uwsgi;
 
-int uwsgi_load_plugin(int modifier, char *plugin, char *pargs, int absolute) {
+void *uwsgi_load_plugin(int modifier, char *plugin, char *has_option, int absolute) {
 
 	void *plugin_handle;
 
 	char *plugin_name;
 	char *plugin_entry_symbol;
 	struct uwsgi_plugin *up;
+	char linkpath_buf[1024], linkpath[1024];
+	int linkpath_size;
 	int i;
 
 	char *colon = strchr(plugin, ':');
@@ -23,7 +25,7 @@ check:
 #ifdef UWSGI_DEBUG
 				uwsgi_log("%s plugin already available\n", plugin);
 #endif
-				return 0;
+				return NULL;
 			}	
 		}
 		if (uwsgi.p[i]->alias) {
@@ -31,7 +33,7 @@ check:
 #ifdef UWSGI_DEBUG
 				uwsgi_log("%s plugin already available\n", plugin);
 #endif
-				return 0;
+				return NULL;
 			}	
 		}
 	}
@@ -43,7 +45,7 @@ check:
 #ifdef UWSGI_DEBUG
                                 uwsgi_log("%s plugin already available\n", plugin);
 #endif
-                                return 0;
+                                return NULL;
                         }       
                 }
                 if (uwsgi.gp[i]->alias) {
@@ -51,7 +53,7 @@ check:
 #ifdef UWSGI_DEBUG
                                 uwsgi_log("%s plugin already available\n", plugin);
 #endif
-                                return 0;
+                                return NULL;
                         }
                 }
         }
@@ -63,33 +65,86 @@ check:
 		goto check;
 	}
 
-	if (absolute) {
-		plugin_name = malloc(strlen(plugin) + 1);
-		memcpy(plugin_name, plugin, strlen(plugin) + 1);
+	if (absolute == 1) {
+		plugin_name = uwsgi_concat2(plugin, "");
+		// need to fix this... postpone until needed
+		plugin_entry_symbol = uwsgi_concat2n(plugin, strlen(plugin)-3 ,"", 0);
 	}	
+	else if (absolute == 2) {
+		plugin_name = uwsgi_concat3(UWSGI_PLUGIN_DIR, "/", plugin);
+		plugin_entry_symbol = uwsgi_concat2n(plugin, strlen(plugin)-3 ,"", 0);
+	}
 	else {
 		plugin_name = uwsgi_concat4(UWSGI_PLUGIN_DIR, "/", plugin, "_plugin.so");
+		plugin_entry_symbol = uwsgi_concat2(plugin, "_plugin");
 	}
 	plugin_handle = dlopen(plugin_name, RTLD_NOW | RTLD_GLOBAL);
-	free(plugin_name);
 
         if (!plugin_handle) {
                 uwsgi_log( "%s\n", dlerror());
         }
         else {
-		plugin_entry_symbol = uwsgi_concat2(plugin, "_plugin");
                 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_name, linkpath_buf, 1023)) > 0) {
+				do {
+					linkpath_buf[linkpath_size] = '\0';
+					strcpy(linkpath, linkpath_buf);
+				} while ((linkpath_size = readlink(linkpath, linkpath_buf, 1023)) > 0);
+				uwsgi_log("%s\n", linkpath);
+				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 (has_option) {
+				struct option *lopt = up->options, *aopt;
+				int found = 0;
+				while ((aopt = lopt)) {
+                			if (!aopt->name)
+                        			break;
+					if (!strcmp(has_option, aopt->name)) {
+						found = 1;
+						break;
+					}	
+                			lopt++;
+				}
+				if (!found) {
+					if (dlclose(plugin_handle)) {
+						uwsgi_error("dlclose()");
+					}
+					free(plugin_name);
+					free(plugin_entry_symbol);
+					return NULL;
+				}
+				
+			}
 			if (modifier != -1) {
 				fill_plugin_table(modifier, up);			
 			}
 			else {
 				fill_plugin_table(up->modifier1, up);			
 			}
-			return 1;
+			free(plugin_name);
+			free(plugin_entry_symbol);
+			return plugin_handle;
                 }
                 uwsgi_log( "%s\n", dlerror());
         }
 
-	return 0;
+	free(plugin_name);
+
+	return NULL;
 }

plugins/admin/admin_plugin.c

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

plugins/admin/uwsgiplugin.py

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

plugins/cache/cache.c

@@ -0,0 +1,104 @@
+#include "../../uwsgi.h"
+
+void cache_command(char *key, uint16_t keylen, char *val, uint16_t vallen, void *data) {
+
+        struct wsgi_request *wsgi_req = (struct wsgi_request *) data;
+        uint64_t tmp_vallen = 0;
+
+        if (vallen > 0) {
+                if (!uwsgi_strncmp(key, keylen, "key", 3)) {
+                        val = uwsgi_cache_get(val, vallen, &tmp_vallen);
+                        if (val && tmp_vallen > 0) {
+#ifdef UWSGI_DEBUG
+				uwsgi_log("cache value size: %llu\n", tmp_vallen);
+#endif
+                                wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, val, tmp_vallen);
+                        }
+
+                }
+                else if (!uwsgi_strncmp(key, keylen, "get", 3)) {
+                        val = uwsgi_cache_get(val, vallen, &tmp_vallen);
+                        if (val && vallen > 0) {
+                                wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, val, tmp_vallen);
+                        }
+                        else {
+                                wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, "HTTP/1.0 404 Not Found\r\n\r\n<h1>Not Found</h1>", 44);
+                        }
+                }
+        }
+}
+
+
+int uwsgi_cache_request(struct wsgi_request *wsgi_req) {
+
+        uint64_t vallen = 0;
+        char *value;
+        char *argv[3];
+        uint8_t argc = 0;
+
+        switch(wsgi_req->uh.modifier2) {
+                case 0:
+                        // get
+                        if (wsgi_req->uh.pktsize > 0) {
+                                value = uwsgi_cache_get(wsgi_req->buffer, wsgi_req->uh.pktsize, &vallen);
+                                if (value && vallen > 0) {
+                                        wsgi_req->uh.pktsize = vallen;
+                                        wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, (char *)&wsgi_req->uh, 4);
+                                        wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, value, vallen);
+                                }
+                        }
+                        break;
+                case 1:
+                        // set
+                        if (wsgi_req->uh.pktsize > 0) {
+                                argc = 3;
+                                if (!uwsgi_parse_array(wsgi_req->buffer, wsgi_req->uh.pktsize, argv, &argc)) {
+                                        if (argc > 1) {
+                                                uwsgi_cache_set(argv[0], strlen(argv[0]), argv[1], strlen(argv[1]), 0, 0);
+                                        }
+                                }
+                        }
+                        break;
+                case 2:
+                        // del
+                        if (wsgi_req->uh.pktsize > 0) {
+                                uwsgi_cache_del(wsgi_req->buffer, wsgi_req->uh.pktsize);
+                        }
+                        break;
+                case 3:
+                case 4:
+                        // dict
+                        if (wsgi_req->uh.pktsize > 0) {
+                                uwsgi_hooked_parse(wsgi_req->buffer, wsgi_req->uh.pktsize, cache_command, (void *) wsgi_req);
+                        }
+                        break;
+                case 5:
+                        // get (uwsgi + stream)
+                        if (wsgi_req->uh.pktsize > 0) {
+                                value = uwsgi_cache_get(wsgi_req->buffer, wsgi_req->uh.pktsize, &vallen);
+                                if (value && vallen > 0) {
+                                        wsgi_req->uh.pktsize = 0;
+                                        wsgi_req->uh.modifier2 = 1;
+                                        wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, (char *)&wsgi_req->uh, 4);
+                                        wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, value, vallen);
+                                }
+                                else {
+                                        wsgi_req->uh.pktsize = 0;
+                                        wsgi_req->uh.modifier2 = 0;
+                                        wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, (char *)&wsgi_req->uh, 4);
+                                }
+                        }
+                        break;
+        }
+
+        return 0;
+}
+
+struct uwsgi_plugin cache_plugin = {
+
+        .name = "cache",
+        .modifier1 = 111,
+        .request = uwsgi_cache_request,
+
+};
+

plugins/cache/uwsgiplugin.py

@@ -1,7 +1,7 @@
 
-NAME='proxy'
+NAME='cache'
 CFLAGS = []
 LDFLAGS = []
 LIBS = []
 
-GCC_LIST = ['proxy']
+GCC_LIST = ['cache']

plugins/cplusplus/base.cc

@@ -0,0 +1,63 @@
+#include "../../uwsgi.h"
+
+extern struct uwsgi_server uwsgi;
+
+class FakeClass {
+
+	public:
+		char *foobar;
+		uint16_t foobar_len;
+		void hello_world(struct wsgi_request *);
+
+};
+
+void FakeClass::hello_world(struct wsgi_request *wsgi_req) {
+
+	wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, (char *) "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n", 44);
+	wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, foobar, foobar_len);
+}
+
+extern "C" int uwsgi_cplusplus_init(){
+        uwsgi_log("Initializing example c++ plugin\n");
+        return 0;
+}
+
+extern "C" int uwsgi_cplusplus_request(struct wsgi_request *wsgi_req) {
+
+	FakeClass *fc;
+
+	// empty request ?
+	if (!wsgi_req->uh.pktsize) {
+                uwsgi_log( "Invalid request. skip.\n");
+		goto clear;
+        }
+
+	// get uwsgi variables
+        if (uwsgi_parse_vars(wsgi_req)) {
+                uwsgi_log("Invalid request. skip.\n");
+                goto clear;
+        }
+
+	fc = new FakeClass();
+	// get PATH_INFO
+        fc->foobar = uwsgi_get_var(wsgi_req, (char *) "PATH_INFO", &fc->foobar_len);
+
+	if (fc->foobar) {
+		// send output
+		fc->hello_world(wsgi_req);
+	}
+
+	delete fc;
+
+clear:
+        return UWSGI_OK;
+}
+
+
+extern "C" void uwsgi_cplusplus_after_request(struct wsgi_request *wsgi_req) {
+        uwsgi_log("logging c++ request\n");
+}
+
+
+
+

plugins/cplusplus/plugin.c

@@ -0,0 +1,17 @@
+#include "../../uwsgi.h"
+
+
+int uwsgi_cplusplus_init(void);
+int uwsgi_cplusplus_request(struct wsgi_request *);
+void uwsgi_cplusplus_after_request(struct wsgi_request *);
+
+struct uwsgi_plugin cplusplus_plugin = {
+
+        .name = "cplusplus",
+        .modifier1 = 250,
+        .init = uwsgi_cplusplus_init,
+        .request = uwsgi_cplusplus_request,
+        .after_request = uwsgi_cplusplus_after_request,
+
+};
+

plugins/cplusplus/uwsgiplugin.py

@@ -0,0 +1,6 @@
+NAME='cplusplus'
+
+CFLAGS = []
+LDFLAGS = []
+LIBS = ['-lstdc++']
+GCC_LIST = ['base.cc', 'plugin']

plugins/echo/echo_plugin.c

@@ -5,7 +5,7 @@ extern struct uwsgi_server uwsgi;
 
 int uwsgi_echo_request(struct wsgi_request *wsgi_req) {
 
-	wsgi_req->response_size = write(wsgi_req->poll.fd, wsgi_req->buffer, wsgi_req->uh.pktsize);
+	wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, wsgi_req->buffer, wsgi_req->uh.pktsize);
 	
 	return 0;
 }

plugins/example/example_plugin.c

@@ -2,21 +2,33 @@
 
 extern struct uwsgi_server uwsgi;
 
-int uwsgi_init(char *args){
-	uwsgi_log("i am the example plugin initialization function with arg: %s\n", args);
+int uwsgi_example_init(){
+	uwsgi_log("i am the example plugin initialization function\n");
 	return 0;
 }
 
-int uwsgi_request(struct wsgi_request *wsgi_req) {
+int uwsgi_example_request(struct wsgi_request *wsgi_req) {
 
 	char *http = "HTTP/1.1 200 Ok\r\nContent-type: text/html\r\n\r\n<h1>Hello World</h1>";
 
-	wsgi_req->response_size += write(wsgi_req->poll.fd, http, strlen(http));
+	wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, http, strlen(http));
 
 	return 0;
 }
 
 
-void uwsgi_after_request(struct wsgi_request *wsgi_req) {
+void uwsgi_example_after_request(struct wsgi_request *wsgi_req) {
 	uwsgi_log("i am the example plugin after request function\n");
 }
+
+
+struct uwsgi_plugin example_plugin = {
+
+        .name = "example",
+        .modifier1 = 250,
+        .init = uwsgi_example_init,
+        .request = uwsgi_example_request,
+        .after_request = uwsgi_example_after_request,
+
+};
+

plugins/example/uwsgiplugin.py

@@ -1,3 +1,6 @@
 NAME='example'
-CFLAGS = ''
-LDFLAGS = ''
+
+CFLAGS = []
+LDFLAGS = []
+LIBS = []
+GCC_LIST = ['example_plugin']

plugins/fastrouter/fastrouter.c

@@ -18,6 +18,8 @@
 #define LONG_ARGS_FASTROUTER_USE_BASE			150004
 #define LONG_ARGS_FASTROUTER_SUBSCRIPTION_SERVER	150005
 #define LONG_ARGS_FASTROUTER_TIMEOUT			150006
+#define LONG_ARGS_FASTROUTER_SUBSCRIPTION_SLOT		150007
+#define LONG_ARGS_FASTROUTER_USE_CODE_STRING		150008
 
 #define FASTROUTER_STATUS_FREE 0
 #define FASTROUTER_STATUS_CONNECTING 1
@@ -28,32 +30,75 @@
 #define add_timeout(x) uwsgi_add_rb_timer(ufr.timeouts, time(NULL)+ufr.socket_timeout, x)
 #define del_timeout(x) rb_erase(&x->timeout->rbt, ufr.timeouts); free(x->timeout);
 
+struct uwsgi_fastrouter_socket {
+	char *name;
+	int fd;
+	struct uwsgi_fastrouter_socket *next;
+};
+
 struct uwsgi_fastrouter {
-	char *socket_name;
-	int use_cache;
-	int nevents;
 
-	char *pattern;
-	int pattern_len;
+        struct uwsgi_fastrouter_socket *sockets;
 
-	char *base;
-	int base_len;
+        int use_cache;
+        int nevents;
 
-	char *subscription_server;
-	struct uwsgi_dict *subscription_dict;
+        int subscription_slot;
 
-	int socket_timeout;
+        char *pattern;
+        int pattern_len;
 
-	struct rb_root *timeouts;
+        char *base;
+        int base_len;
+
+        char *subscription_server;
+        struct uwsgi_dict *subscription_dict;
+
+        int socket_timeout;
+
+	uint8_t code_string_modifier1;
+	char *code_string_code;
+	char *code_string_function;
+
+        struct rb_root *timeouts;
 } ufr;
 
+
+static struct uwsgi_fastrouter_socket *uwsgi_fastrouter_new_socket(char *name) {
+
+        struct uwsgi_fastrouter_socket *uwsgi_sock = ufr.sockets, *old_uwsgi_sock;
+
+        if (!uwsgi_sock) {
+                ufr.sockets = uwsgi_malloc(sizeof(struct uwsgi_fastrouter_socket));
+                uwsgi_sock = ufr.sockets;
+        }
+        else {
+                while(uwsgi_sock) {
+                        old_uwsgi_sock = uwsgi_sock;
+                        uwsgi_sock = uwsgi_sock->next;
+                }
+
+                uwsgi_sock = uwsgi_malloc(sizeof(struct uwsgi_fastrouter_socket));
+                old_uwsgi_sock->next = uwsgi_sock;
+        }
+
+        memset(uwsgi_sock, 0, sizeof(struct uwsgi_fastrouter_socket));
+        uwsgi_sock->name = name;
+
+        return uwsgi_sock;
+}
+
+
+
 struct option fastrouter_options[] = {
 	{"fastrouter", required_argument, 0, LONG_ARGS_FASTROUTER},
 	{"fastrouter-use-cache", no_argument, &ufr.use_cache, 1},
 	{"fastrouter-use-pattern", required_argument, 0, LONG_ARGS_FASTROUTER_USE_PATTERN},
 	{"fastrouter-use-base", required_argument, 0, LONG_ARGS_FASTROUTER_USE_BASE},
+	{"fastrouter-use-code-string", required_argument, 0, LONG_ARGS_FASTROUTER_USE_CODE_STRING},
 	{"fastrouter-events", required_argument, 0, LONG_ARGS_FASTROUTER_EVENTS},
 	{"fastrouter-subscription-server", required_argument, 0, LONG_ARGS_FASTROUTER_SUBSCRIPTION_SERVER},
+	{"fastrouter-subscription-slot", required_argument, 0, LONG_ARGS_FASTROUTER_SUBSCRIPTION_SLOT},
 	{"fastrouter-timeout", required_argument, 0, LONG_ARGS_FASTROUTER_TIMEOUT},
 	{0, 0, 0, 0},	
 };
@@ -72,6 +117,10 @@ void fastrouter_manage_subscription(char *key, uint16_t keylen, char *val, uint1
 		usr->address = val;
 		usr->address_len = vallen;
 	}
+
+	else if (!uwsgi_strncmp("modifier1", 9, key, keylen)) {
+		usr->modifier1 = uwsgi_str_num(val, vallen);
+	}
 }
 
 struct fastrouter_session {
@@ -87,6 +136,8 @@ struct fastrouter_session {
 	char *hostname;
 	uint16_t hostname_len;
 
+	int has_key;
+
 	char *instance_address;
 	uint64_t instance_address_len;
 
@@ -95,6 +146,8 @@ struct fastrouter_session {
 
 	struct uwsgi_rb_timer *timeout;
 	int instance_failed;
+
+	uint8_t modifier1;
 };
 
 static void close_session(struct fastrouter_session **fr_table, struct fastrouter_session *fr_session) {
@@ -148,7 +201,14 @@ void fr_get_hostname(char *key, uint16_t keylen, char *val, uint16_t vallen, voi
 		return;
 	}
 
-	if (!uwsgi_strncmp("HTTP_HOST", 9, key, keylen)) {
+	if (!uwsgi_strncmp("HTTP_HOST", 9, key, keylen) && !fr_session->has_key) {
+		fr_session->hostname = val;
+		fr_session->hostname_len = vallen;
+		return;
+	}
+
+	if (!uwsgi_strncmp("UWSGI_FASTROUTER_KEY", 20, key, keylen)) {
+		fr_session->has_key = 1;
 		fr_session->hostname = val;
 		fr_session->hostname_len = vallen;
 		return;
@@ -163,7 +223,6 @@ struct fastrouter_session *alloc_fr_session() {
 void fastrouter_loop() {
 
 	int fr_queue;
-	int fr_server = -1;
 	int nevents;
 	int interesting_fd;
 	int new_connection;
@@ -210,37 +269,45 @@ void fastrouter_loop() {
 		fr_table[i] = NULL;
 	}
 
-	if (ufr.socket_name[0] == '=') {
-		int shared_socket = atoi(ufr.socket_name+1);
-		if (shared_socket >= 0 && shared_socket < uwsgi.shared_sockets_cnt) {
-			if (uwsgi.shared_sockets[shared_socket].name) {
-				fr_server = uwsgi.shared_sockets[shared_socket].fd;
-			}	
-			else {
-				uwsgi_log("unable to use shared socket %d\n", shared_socket);
+	fr_queue = event_queue_init();
+
+	struct uwsgi_fastrouter_socket *ufr_sock = ufr.sockets;
+
+	while(ufr_sock) {
+		if (ufr_sock->name[0] == '=') {
+			int shared_socket = atoi(ufr_sock->name+1);
+			if (shared_socket >= 0) {
+				ufr_sock->fd = uwsgi_get_shared_socket_fd_by_num(shared_socket);
+				if (ufr_sock->fd == -1) {
+					uwsgi_log("unable to use shared socket %d\n", shared_socket);
+				}
 			}
 		}
-	}
-	else {
-		tcp_port = strchr(ufr.socket_name, ':');
-		if (tcp_port) {
-			fr_server = bind_to_tcp(ufr.socket_name, uwsgi.listen_queue, tcp_port);
-		}
 		else {
-			fr_server = bind_to_unix(ufr.socket_name, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
+			tcp_port = strchr(ufr_sock->name, ':');
+			if (tcp_port) {
+				ufr_sock->fd = bind_to_tcp(ufr_sock->name, uwsgi.listen_queue, tcp_port);
+			}
+			else {
+				ufr_sock->fd = bind_to_unix(ufr_sock->name, uwsgi.listen_queue, uwsgi.chmod_socket, uwsgi.abstract_socket);
+			}
 		}
+
+		uwsgi_log("uwsgi fastrouter/proxy bound on %s\n", ufr_sock->name);
+
+		event_queue_add_fd_read(fr_queue, ufr_sock->fd);
+		ufr_sock = ufr_sock->next;
 	}
 
-	fr_queue = event_queue_init();
 
 	events = event_queue_alloc(ufr.nevents);
 
-	event_queue_add_fd_read(fr_queue, fr_server);
 
 	if (ufr.subscription_server) {
 		ufr_subserver = bind_to_udp(ufr.subscription_server, 0, 0);
 		event_queue_add_fd_read(fr_queue, ufr_subserver);
-		ufr.subscription_dict = uwsgi_dict_create(30, 0);
+		if (!ufr.subscription_slot) ufr.subscription_slot = 30;
+		ufr.subscription_dict = uwsgi_dict_create(ufr.subscription_slot, 0);
 	}
 
 	if (ufr.pattern) {
@@ -276,27 +343,40 @@ void fastrouter_loop() {
 			interesting_fd = event_queue_interesting_fd(events, i);
 
 
-			if (interesting_fd == fr_server) {
-				new_connection = accept(fr_server, (struct sockaddr *) &fr_addr, &fr_addr_len);
-				if (new_connection < 0) {
-					continue;
-				}
+			int taken = 0;
+			struct uwsgi_fastrouter_socket *uwsgi_sock = ufr.sockets;
+			while(uwsgi_sock) {
+				if (interesting_fd == uwsgi_sock->fd) {
+					new_connection = accept(interesting_fd, (struct sockaddr *) &fr_addr, &fr_addr_len);
+					if (new_connection < 0) {
+						continue;
+					}
 
-				fr_table[new_connection] = alloc_fr_session();
-				fr_table[new_connection]->fd = new_connection;
-				fr_table[new_connection]->instance_fd = -1; 
-				fr_table[new_connection]->status = FASTROUTER_STATUS_RECV_HDR;
-				fr_table[new_connection]->h_pos = 0;
-				fr_table[new_connection]->pos = 0;
-				fr_table[new_connection]->instance_failed = 0;
-				fr_table[new_connection]->instance_address_len = 0;
+					fr_table[new_connection] = alloc_fr_session();
+					fr_table[new_connection]->fd = new_connection;
+					fr_table[new_connection]->instance_fd = -1; 
+					fr_table[new_connection]->status = FASTROUTER_STATUS_RECV_HDR;
+					fr_table[new_connection]->h_pos = 0;
+					fr_table[new_connection]->pos = 0;
+					fr_table[new_connection]->un = NULL;
+					fr_table[new_connection]->instance_failed = 0;
+					fr_table[new_connection]->instance_address_len = 0;
 		
-				fr_table[new_connection]->timeout = add_timeout(fr_table[new_connection]);
+					fr_table[new_connection]->timeout = add_timeout(fr_table[new_connection]);
 
-				event_queue_add_fd_read(fr_queue, new_connection);
+					event_queue_add_fd_read(fr_queue, new_connection);
+					taken = 1;
+					break;
+				}
 				
+				uwsgi_sock = uwsgi_sock->next;
 			}	
-			else if (interesting_fd == ufr_subserver) {
+
+			if (taken) {
+				continue;
+			}
+
+			if (interesting_fd == ufr_subserver) {
 				len = recv(ufr_subserver, bbuf, 4096, 0);
 #ifdef UWSGI_EVENT_USE_PORT
 				event_queue_add_fd_read(fr_queue, ufr_subserver);
@@ -304,7 +384,7 @@ void fastrouter_loop() {
 				if (len > 0) {
 					memset(&usr, 0, sizeof(struct uwsgi_subscribe_req));
 					uwsgi_hooked_parse(bbuf+4, len-4, fastrouter_manage_subscription, &usr);
-					uwsgi_add_subscriber(ufr.subscription_dict, usr.key, usr.keylen, usr.address, usr.address_len);
+					uwsgi_add_subscriber(ufr.subscription_dict, &usr);
 				}
 			}
 			else {
@@ -358,9 +438,16 @@ void fastrouter_loop() {
                                                         	break;
 							}
 
-							//uwsgi_log("requested domain %.*s\n", fr_session->hostname_len, fr_session->hostname);
+#ifdef UWSGI_DEBUG
+							uwsgi_log("requested domain %.*s\n", fr_session->hostname_len, fr_session->hostname);
+#endif
 							if (ufr.use_cache) {
 								fr_session->instance_address = uwsgi_cache_get(fr_session->hostname, fr_session->hostname_len, &fr_session->instance_address_len);
+								char *cs_mod = uwsgi_str_contains(fr_session->instance_address, fr_session->instance_address_len, ',');
+                                                                if (cs_mod) {
+                                                                	fr_session->modifier1 = uwsgi_str_num(cs_mod+1, (fr_session->instance_address_len - (cs_mod - fr_session->instance_address))-1);
+                                                                        fr_session->instance_address_len = (cs_mod - fr_session->instance_address);
+                                                                }
 							}
 							else if (ufr.pattern) {
 								magic_table['s'] = uwsgi_concat2n(fr_session->hostname, fr_session->hostname_len, "", 0);	
@@ -374,6 +461,7 @@ void fastrouter_loop() {
 								if (fr_session->un && fr_session->un->len) {
 									fr_session->instance_address = fr_session->un->name;
 									fr_session->instance_address_len = fr_session->un->len;
+									fr_session->modifier1 = fr_session->un->modifier1;
 								}
 							}
 							else if (ufr.base) {
@@ -381,6 +469,19 @@ void fastrouter_loop() {
 								fr_session->instance_address_len = tmp_socket_name_len;
 								fr_session->instance_address = tmp_socket_name;
 							}
+							else if (ufr.code_string_code && ufr.code_string_function) {
+								if (uwsgi.p[ufr.code_string_modifier1]->code_string) {
+									fr_session->instance_address = uwsgi.p[ufr.code_string_modifier1]->code_string("uwsgi_fastrouter", ufr.code_string_code, ufr.code_string_function, fr_session->hostname, fr_session->hostname_len);
+									if (fr_session->instance_address) {
+										fr_session->instance_address_len = strlen(fr_session->instance_address);
+										char *cs_mod = uwsgi_str_contains(fr_session->instance_address, fr_session->instance_address_len, ',');
+										if (cs_mod) {
+											fr_session->modifier1 = uwsgi_str_num(cs_mod+1, (fr_session->instance_address_len - (cs_mod - fr_session->instance_address))-1);
+											fr_session->instance_address_len = (cs_mod - fr_session->instance_address);
+										}
+									}
+								}
+							}
 
 							// no address found
 							if (!fr_session->instance_address_len) {
@@ -431,13 +532,19 @@ void fastrouter_loop() {
                                                         	break;
 							}
 
+							fr_session->uh.modifier1 = fr_session->modifier1;
+
 							iov[0].iov_base = &fr_session->uh;
 							iov[0].iov_len = 4;
 							iov[1].iov_base = fr_session->buffer;
 							iov[1].iov_len = fr_session->uh.pktsize;
 
+							// increment node requests counter
+							if (fr_session->un)
+								fr_session->un->requests++;
+
 							// fd passing: PERFORMANCE EXTREME BOOST !!!
-							if (fr_session->pass_fd) {
+							if (fr_session->pass_fd && !uwsgi.no_fd_passing) {
 								msg.msg_name    = NULL;
                 						msg.msg_namelen = 0;
                 						msg.msg_iov     = iov;
@@ -491,6 +598,10 @@ void fastrouter_loop() {
 								close_session(fr_table, fr_session);
                                                         	break;
 							}
+
+							// update transfer statistics
+							if (fr_session->un)
+								fr_session->un->transferred += len;
 						}
 						// body from client
 						else if (interesting_fd == fr_session->fd) {
@@ -532,7 +643,7 @@ void fastrouter_loop() {
 
 int fastrouter_init() {
 
-	if (ufr.socket_name) {
+	if (ufr.sockets) {
 
 		if (ufr.use_cache && !uwsgi.cache_max_items) {
 			uwsgi_log("you need to create a uwsgi cache to use the fastrouter (add --cache <n>)\n");
@@ -541,9 +652,17 @@ int fastrouter_init() {
 
 		if (!ufr.nevents) ufr.nevents = 64;
 
-		if (register_gateway("fastrouter", fastrouter_loop) == NULL) {
-			uwsgi_log("unable to register the fastrouter gateway\n");
-			exit(1);
+		if (ufr.code_string_code && ufr.code_string_function) {
+			if (register_fat_gateway("fastrouter", fastrouter_loop) == NULL) {
+				uwsgi_log("unable to register the fastrouter gateway\n");
+				exit(1);
+			}
+		}
+		else {
+			if (register_gateway("fastrouter", fastrouter_loop) == NULL) {
+				uwsgi_log("unable to register the fastrouter gateway\n");
+				exit(1);
+			}
 		}
 	}
 
@@ -552,9 +671,13 @@ int fastrouter_init() {
 	
 int fastrouter_opt(int i, char *optarg) {
 
+	char *cs;
+	char *cs_code;
+	char *cs_func;
+
 	switch(i) {
 		case LONG_ARGS_FASTROUTER:
-			ufr.socket_name = optarg;
+			uwsgi_fastrouter_new_socket(generate_socket_name(optarg));
 			return 1;
 		case LONG_ARGS_FASTROUTER_SUBSCRIPTION_SERVER:
 			ufr.subscription_server = optarg;
@@ -572,9 +695,30 @@ int fastrouter_opt(int i, char *optarg) {
 			// optimization
 			ufr.base_len = strlen(ufr.base);
 			return 1;
+		case LONG_ARGS_FASTROUTER_USE_CODE_STRING:
+			cs = uwsgi_str(optarg);
+			cs_code = strchr(cs, ':');
+			if (!cs_code) {
+				uwsgi_log("invalid code_string option\n");
+				exit(1);	
+			}
+			cs_code[0] = 0;
+			cs_func = strchr(cs_code+1, ':');
+			if (!cs_func) {
+				uwsgi_log("invalid code_string option\n");
+				exit(1);	
+			}
+			cs_func[0] = 0;
+			ufr.code_string_modifier1 = atoi(cs);
+			ufr.code_string_code = cs_code+1;
+			ufr.code_string_function = cs_func+1;
+			return 1;
 		case LONG_ARGS_FASTROUTER_TIMEOUT:
 			ufr.socket_timeout = atoi(optarg);
 			return -1;
+		case LONG_ARGS_FASTROUTER_SUBSCRIPTION_SLOT:
+			ufr.subscription_slot = atoi(optarg);
+			return 1;
 	}
 	return 0;
 }

plugins/fiber/fiber.c

@@ -0,0 +1,85 @@
+#include "../rack/uwsgi_rack.h"
+
+extern struct uwsgi_server uwsgi;
+extern struct uwsgi_rack ur;
+
+struct ufib {
+	VALUE *fib;
+} ufiber;
+
+struct option fiber_options[] = {
+	{ 0, 0, 0, 0 }
+};
+
+VALUE uwsgi_fiber_request() {
+
+	uwsgi.wsgi_req->async_status = uwsgi.p[uwsgi.wsgi_req->uh.modifier1]->request(uwsgi.wsgi_req);
+	uwsgi.wsgi_req->suspended = 0;
+
+	return Qnil;
+}
+
+inline static void fiber_schedule_to_req() {
+
+	int id = uwsgi.wsgi_req->async_id;
+
+	if (!uwsgi.wsgi_req->suspended) {
+		ufiber.fib[id] = rb_fiber_new(uwsgi_fiber_request, Qnil);
+		rb_gc_register_address(&ufiber.fib[id]);
+		uwsgi.wsgi_req->suspended = 1;
+	}
+
+	rb_fiber_resume(ufiber.fib[id], 0, NULL);
+
+	if (uwsgi.wsgi_req->suspended) {
+		uwsgi.wsgi_req->async_status = UWSGI_AGAIN;
+	}
+
+}
+
+inline static void fiber_schedule_to_main(struct wsgi_request *wsgi_req) {
+
+	rb_fiber_yield(0, NULL);
+	uwsgi.wsgi_req = wsgi_req;
+}
+
+VALUE protected_async_loop() {
+
+	async_loop(NULL);
+	return Qnil;
+}
+
+void fiber_loop() {
+
+        int error = 0;
+
+	ufiber.fib = uwsgi_malloc( sizeof(VALUE) * uwsgi.async );
+
+        uwsgi.schedule_to_main = fiber_schedule_to_main;
+        uwsgi.schedule_to_req = fiber_schedule_to_req;
+
+	// must run all the rack/ruby plugins without protection
+	ur.unprotected = 1;
+
+        rb_protect(protected_async_loop, 0, &error);
+
+        if (error) {
+                uwsgi_ruby_exception();
+                exit(1);
+        }
+
+        // never here
+}
+
+int fiber_init() {
+	uwsgi_register_loop( (char *) "fiber", fiber_loop);
+	return 0;
+}
+
+
+struct uwsgi_plugin fiber_plugin = {
+
+	.name = "fiber",
+	.init = fiber_init,
+	.options = fiber_options,
+};

plugins/fiber/uwsgiplugin.py

@@ -0,0 +1,27 @@
+import os
+
+try:
+    RUBYPATH = os.environ['UWSGICONFIG_RUBYPATH']
+except:
+    RUBYPATH = 'ruby'
+
+NAME='fiber'
+CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print Config::CONFIG['CFLAGS']\"").read().rstrip().split()
+
+CFLAGS.append('-Wno-unused-parameter')
+
+includedir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print Config::CONFIG['rubyhdrdir']\"").read().rstrip()
+if includedir == 'nil':
+    includedir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print Config::CONFIG['archdir']\"").read().rstrip()
+    CFLAGS.append('-I' + includedir)
+else:
+    CFLAGS.append('-I' + includedir)
+    archdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print Config::CONFIG['archdir']\"").read().rstrip()
+    arch = os.popen(RUBYPATH + " -e \"require 'rbconfig';print Config::CONFIG['arch']\"").read().rstrip()
+    CFLAGS.append('-I' + archdir)
+    CFLAGS.append('-I' + archdir + '/' + arch)
+    CFLAGS.append('-I' + includedir + '/' + arch)
+LDFLAGS = []
+LIBS = []
+
+GCC_LIST = ['fiber']

plugins/http/http.c

@@ -403,6 +403,14 @@ int http_parse(struct http_session *h_session) {
 		ptr++;
 	}
 
+	int i;
+	for(i=0;i<uhttp.http_vars_cnt;i++) {
+		char *equal = strchr(uhttp.http_vars[i],'=');
+		if (equal) {
+			h_session->uh.pktsize += http_add_uwsgi_var(h_session->iov, h_session->uss+c, h_session->uss+c+2, uhttp.http_vars[i], equal-uhttp.http_vars[i], equal+1, strlen(equal+1), &c);
+		}
+	}
+
 #ifdef UWSGI_DEBUG
 	uwsgi_log("vec size: %d pkt size: %d load %d\n", c, h_session->uh.pktsize, uhttp.load);
 #endif
@@ -542,7 +550,7 @@ void http_loop() {
 				if (len > 0) {
 					memset(&usr, 0, sizeof(struct uwsgi_subscribe_req));
 					uwsgi_hooked_parse(bbuf+4, len-4, http_manage_subscription, &usr);
-					uwsgi_add_subscriber(uhttp.subscription_dict, usr.key, usr.keylen, usr.address, usr.address_len);
+					uwsgi_add_subscriber(uhttp.subscription_dict, &usr);
 				}
 			}
 			else {
@@ -628,9 +636,9 @@ void http_loop() {
 										uhttp_session->instance_address_len = uhttp_session->un->len;
 									}
 								}
-								else if (uwsgi.sockets_cnt > 0) {
-									uhttp_session->instance_address = uwsgi.sockets[0].name;
-									uhttp_session->instance_address_len = strlen(uwsgi.sockets[0].name);
+								else if (uwsgi.sockets) {
+									uhttp_session->instance_address = uwsgi.sockets->name;
+									uhttp_session->instance_address_len = strlen(uwsgi.sockets->name);
 								}
 
 								if (!uhttp_session->instance_address_len) {
@@ -710,7 +718,7 @@ void http_loop() {
 
 #ifndef __sun__
 							// fd passing: PERFORMANCE EXTREME BOOST !!!
-							if (uhttp_session->pass_fd && !uhttp_session->remains) {
+							if (uhttp_session->pass_fd && !uhttp_session->remains && !uwsgi.no_fd_passing) {
 								msg.msg_name    = NULL;
                 						msg.msg_namelen = 0;
                 						msg.msg_iov     = uhttp_session->iov;
@@ -868,10 +876,8 @@ int http_init() {
 
 		if (!uhttp.nevents) uhttp.nevents = 64;
 
-		if (!uhttp.base && !uhttp.use_cache && !uhttp.to && !uwsgi.sockets_cnt && !uhttp.subscription_server && !uhttp.use_cluster) {
-			uwsgi.sockets[0].name = uwsgi_malloc(64);
-			uwsgi.sockets_cnt++;
-			snprintf(uwsgi.sockets[0].name, 64, "%d_%d.sock", (int) time(NULL), (int) getpid());
+		if (!uhttp.base && !uhttp.use_cache && !uhttp.to && !uwsgi.sockets && !uhttp.subscription_server && !uhttp.use_cluster) {
+			uwsgi_new_socket(uwsgi_concat2("127.0.0.1:0", ""));
 		}
 
 		uhttp.server = bind_to_tcp(uhttp.socket_name, uwsgi.listen_queue, strchr(uhttp.socket_name,':'));

plugins/jvm/uwsgiplugin.py

@@ -16,6 +16,16 @@ NAME='jvm'
 JVM_INCPATH = "/usr/lib/jvm/java-6-sun-1.6.0.15/include/ -I/usr/lib/jvm/java-6-sun-1.6.0.15/include/linux"
 JVM_LIBPATH = "/usr/lib/jvm/java-6-sun-1.6.0.15/jre/lib/i386/server/"
 
+try: 
+    JVM_INCPATH = os.environ['UWSGICONFIG_JVM_INCPATH'] 
+except: 
+    pass 
+
+try: 
+    JVM_LIBPATH = os.environ['UWSGICONFIG_JVM_LIBPATH'] 
+except: 
+    pass 
+
 try:
     JVM_INCPATH = os.environ['UWSGICONFIG_JVM_INCPATH']
 except:

plugins/lua/lua_plugin.c

@@ -374,7 +374,7 @@ void uwsgi_lua_app() {
 			luaL_openlibs(ulua.L[i]);
 			luaL_register(ulua.L[i], "uwsgi", uwsgi_api);
 			if (luaL_loadfile(ulua.L[i], ulua.filename)) {
-				uwsgi_log("unable to load file %s\n", ulua.filename);
+				uwsgi_log("unable to load file %s: %s\n", ulua.filename, lua_tostring(ulua.L[i], -1));
 				exit(1);
 			}
 			// use a pcall
@@ -403,8 +403,7 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 		if ((i = lua_pcall(L, 0, 1, 0)) == 0) {
 			if (lua_type(L, -1) == LUA_TSTRING) {
 				http = lua_tolstring(L, -1, &slen);
-				if ( (rlen = write(wsgi_req->poll.fd, http, slen)) != (ssize_t) slen) {
-					perror("write()");
+				if ( (rlen = wsgi_req->socket->proto_write(wsgi_req, (char *)http, slen)) != (ssize_t) slen) {
 					return UWSGI_OK;
 				}
 				wsgi_req->response_size += rlen;
@@ -420,12 +419,12 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 	/* Standard WSAPI request */
 	if (!wsgi_req->uh.pktsize) {
 		uwsgi_log( "Invalid WSAPI request. skip.\n");
-		goto clear;
+		goto clear2;
 	}
 
 	if (uwsgi_parse_vars(wsgi_req)) {
 		uwsgi_log("Invalid WSAPI request. skip.\n");
-		goto clear;
+		goto clear2;
 	}
 
 	// put function in the stack
@@ -453,12 +452,16 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 	lua_setfield(L, -2, "read");
 	lua_setfield(L, -2, "input");
 
+#ifdef UWSGI_DEBUG
+	uwsgi_log("stack pos %d\n", lua_gettop(L));
+#endif
 
 	// call function
 	i = lua_pcall(L, 1, 3, 0);
 	if (i != 0) {
 		uwsgi_log("%s\n", lua_tostring(L, -1));
 		lua_pop(L, 1);
+                lua_pushvalue(L, -1);
 		goto clear;
 	}
 
@@ -468,26 +471,30 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 	// send status
 	if (lua_type(L, -3) == LUA_TSTRING || lua_type(L, -3) == LUA_TNUMBER) {
 		http = lua_tolstring(L, -3, &slen);
-		if (write(wsgi_req->poll.fd, wsgi_req->protocol, wsgi_req->protocol_len) != wsgi_req->protocol_len) {
-			perror("write()");
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, wsgi_req->protocol, wsgi_req->protocol_len)) != wsgi_req->protocol_len) {
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
-		if (write(wsgi_req->poll.fd, " ", 1) != 1) {
-			perror("write()");
+		wsgi_req->headers_size += rlen;
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, " ", 1)) != 1) {
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
-		if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
-			perror("write()");
+		wsgi_req->headers_size += rlen;
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, (char *)http, slen)) != (ssize_t) slen) {
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
+		wsgi_req->headers_size += rlen;
 		// a performance hack
 		ptrbuf = (char *) http;
 		ptrbuf[3] = 0;
 		wsgi_req->status = atoi(ptrbuf);
-		if (write(wsgi_req->poll.fd, "\r\n", 2) != 2) {
-			perror("write()");
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, "\r\n", 2)) != 2) {
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
+		wsgi_req->headers_size += rlen;
 	}
 	else {
 		raw = 1;
@@ -499,31 +506,41 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 	lua_pushnil(L);
 	while(lua_next(L, -3) != 0) {
 		http = lua_tolstring(L, -2, &slen);
-		if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
-			perror("write()");
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, (char *)http, slen)) != (ssize_t) slen) {
+			lua_pop(L, 2);
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
-		if (write(wsgi_req->poll.fd, ": ", 2) != 2) {
-			perror("write()");
+		wsgi_req->headers_size += rlen;
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, ": ", 2)) != 2) {
+			lua_pop(L, 2);
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
+		wsgi_req->headers_size += rlen;
 		http = lua_tolstring(L, -1, &slen);
-		if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
-			perror("write()");
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, (char *)http, slen)) != (ssize_t) slen) {
+			lua_pop(L, 2);
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
-		if (write(wsgi_req->poll.fd, "\r\n", 2) != 2) {
-			perror("write()");
+		wsgi_req->headers_size += rlen;
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, "\r\n", 2)) != 2) {
+			lua_pop(L, 2);
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
+		wsgi_req->headers_size += rlen;
 		lua_pop(L, 1);
+		wsgi_req->header_cnt++;
 	}
 
 	if (!raw) {
-		if (write(wsgi_req->poll.fd, "\r\n", 2) != 2) {
-			perror("write()");
+		if ( (rlen = wsgi_req->socket->proto_write_header(wsgi_req, "\r\n", 2)) != 2) {
+			lua_pushvalue(L, -1);
 			goto clear;
 		}
+		wsgi_req->headers_size += rlen;
 	}
 
 	// send body with coroutine
@@ -532,8 +549,9 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 	while ( (i = lua_pcall(L, 0, 1, 0)) == 0) {
 		if (lua_type(L, -1) == LUA_TSTRING) {
 			http = lua_tolstring(L, -1, &slen);
-			if ( (rlen = write(wsgi_req->poll.fd, http, slen)) != (ssize_t) slen) {
-				perror("write()");
+			if ( (rlen = wsgi_req->socket->proto_write(wsgi_req, (char *)http, slen)) != (ssize_t) slen) {
+				lua_pop(L, 1);
+                		lua_pushvalue(L, -1);
 				goto clear;
 			}
 			wsgi_req->response_size += rlen;
@@ -550,6 +568,7 @@ int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 clear:
 
 	lua_pop(L, 4);
+clear2:
 
 	// set frequency
 	lua_gc(L, LUA_GCCOLLECT, 0);
@@ -590,6 +609,55 @@ int uwsgi_lua_magic(char *mountpoint, char *lazy) {
 	return 0;
 }
 
+char *uwsgi_lua_code_string(char *id, char *code, char *func, char *key, uint16_t keylen) {
+
+	static struct lua_State *L = NULL;
+
+	if (!L) {
+		L = luaL_newstate();
+                luaL_openlibs(L);
+                if (luaL_loadfile(L, code) || lua_pcall(L, 0, 0, 0)) {
+                	uwsgi_log("unable to load file %s: %s\n", code, lua_tostring(L, -1));
+			lua_close(L);
+			L = NULL;
+			return NULL;
+                }
+		lua_getglobal(L, func);
+		if (!lua_isfunction(L,-1)) {
+			uwsgi_log("unable to find %s function in lua file %s\n", func, code);
+			lua_close(L);
+			L = NULL;
+			return NULL;
+		}
+		lua_pushnil(L);
+	}
+
+	
+	lua_pop(L, 1);
+
+	lua_pushvalue(L, -1);
+	lua_pushlstring(L, key, keylen);
+
+#ifdef UWSGI_DEBUG
+	uwsgi_log("stack pos %d %.*s\n", lua_gettop(L), keylen, key);
+#endif
+
+        if (lua_pcall(L, 1, 1, 0) != 0) {
+		uwsgi_log("CAZZO\n");
+                uwsgi_log("error running function `f': %s",
+                 lua_tostring(L, -1));
+                return NULL;
+
+        }
+
+	if (lua_isstring(L, -1)) {
+                const char *ret = lua_tolstring(L, -1, NULL);
+		return (char *)ret;
+        }
+
+        return NULL;
+}
+
 int uwsgi_lua_signal_handler(uint8_t sig, void *handler) {
 
 	struct wsgi_request *wsgi_req = current_wsgi_req();
@@ -664,6 +732,8 @@ struct uwsgi_plugin lua_plugin = {
 	.init_apps = uwsgi_lua_app,
 	.magic = uwsgi_lua_magic,
 	.signal_handler = uwsgi_lua_signal_handler,
+
+	.code_string = uwsgi_lua_code_string,
 	.rpc = uwsgi_lua_rpc,
 
 };

plugins/nagios/nagios.c

@@ -16,17 +16,17 @@ struct option nagios_options[] = {
 int nagios() {
 
 	char *tcp_port;
-	struct pollfd nagios_poll;
+	struct wsgi_request nagios_req;
 // connect and send
 
 	if (!use_nagios) {
 		return 1;
 	}
-	if (uwsgi.sockets[0].name == NULL) {
+	if (!uwsgi.sockets) {
 		fprintf(stdout, "UWSGI UNKNOWN: you have specified an invalid socket\n");
 		exit(3);
 	}
-	tcp_port = strchr(uwsgi.sockets[0].name, ':');
+	tcp_port = strchr(uwsgi.sockets->name, ':');
 	if (tcp_port == NULL) {
 		fprintf(stdout, "UWSGI UNKNOWN: you have specified an invalid socket\n");
 		exit(3);
@@ -34,27 +34,30 @@ int nagios() {
 
 	tcp_port[0] = 0;
 
-	nagios_poll.fd = connect_to_tcp(uwsgi.sockets[0].name, atoi(tcp_port + 1), uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
-	if (nagios_poll.fd < 0) {
+	int fd = connect_to_tcp(uwsgi.sockets->name, atoi(tcp_port + 1), uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], 0);
+	if (fd < 0) {
 		fprintf(stdout, "UWSGI CRITICAL: could not connect() to workers\n");
 		exit(2);
 	}
-	uwsgi.wsgi_req->uh.modifier1 = UWSGI_MODIFIER_PING;
-	uwsgi.wsgi_req->uh.pktsize = 0;
-	uwsgi.wsgi_req->uh.modifier2 = 0;
-	if (write(nagios_poll.fd, uwsgi.wsgi_req, 4) != 4) {
+	nagios_req.uh.modifier1 = UWSGI_MODIFIER_PING;
+	nagios_req.uh.pktsize = 0;
+	nagios_req.uh.modifier2 = 0;
+	if (write(fd, &nagios_req.uh, 4) != 4) {
 		uwsgi_error("write()");
 		fprintf(stdout, "UWSGI CRITICAL: could not send ping packet to workers\n");
 		exit(2);
 	}
-	nagios_poll.events = POLLIN;
-	if (!uwsgi_parse_response(&nagios_poll, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], (struct uwsgi_header *) uwsgi.wsgi_req, uwsgi.wsgi_req->buffer)) {
+
+	nagios_req.poll.fd = fd;
+	nagios_req.poll.events = POLLIN;
+
+	if (!uwsgi_parse_packet(&nagios_req, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
 		fprintf(stdout, "UWSGI CRITICAL: timed out waiting for response\n");
 		exit(2);
 	}
 	else {
-		if (uwsgi.wsgi_req->uh.pktsize > 0) {
-			fprintf(stdout, "UWSGI WARNING: %.*s\n", uwsgi.wsgi_req->uh.pktsize, uwsgi.wsgi_req->buffer);
+		if (nagios_req.uh.pktsize > 0) {
+			fprintf(stdout, "UWSGI WARNING: %.*s\n", nagios_req.uh.pktsize, nagios_req.buffer);
 			exit(1);
 		}
 		else {

plugins/ping/ping_plugin.c

@@ -15,32 +15,38 @@ struct option uwsgi_ping_options[] = {
 
 static void ping() {
 
-	struct uwsgi_header uh;
-	struct pollfd uwsgi_poll;
+	struct wsgi_request ping_req;
+	char *buf = uwsgi_malloc(uwsgi.buffer_size);
 
 	// use a 3 secs timeout by default
 	if (!uping.ping_timeout) uping.ping_timeout = 3;
 
 	uwsgi_log("PING uwsgi host %s (timeout: %d)\n", uping.ping, uping.ping_timeout);
 
-	uwsgi_poll.fd = uwsgi_connect(uping.ping, uping.ping_timeout, 0);
-	if (uwsgi_poll.fd < 0) {
+	int fd = uwsgi_connect(uping.ping, uping.ping_timeout, 0);
+	if (fd < 0) {
 		exit(1);
 	}
 
-	uh.modifier1 = UWSGI_MODIFIER_PING;
-	uh.pktsize = 0;
-	uh.modifier2 = 0;
-	if (write(uwsgi_poll.fd, &uh, 4) != 4) {
+	memset(&ping_req, 0, sizeof(struct wsgi_request));
+	ping_req.uh.modifier1 = UWSGI_MODIFIER_PING;
+	ping_req.uh.pktsize = 0;
+	ping_req.uh.modifier2 = 0;
+	if (write(fd, &ping_req.uh, 4) != 4) {
 		uwsgi_error("write()");
 		exit(2);
 	}
-	uwsgi_poll.events = POLLIN;
-	if (!uwsgi_parse_response(&uwsgi_poll, uping.ping_timeout, &uh, NULL)) {
+	ping_req.poll.fd = fd;
+	ping_req.poll.events = POLLIN;
+
+	ping_req.buffer = buf;
+
+	if (!uwsgi_parse_packet(&ping_req, uping.ping_timeout)) {
 		exit(1);
 	}
 	else {
-		if (uh.pktsize > 0) {
+		if (ping_req.uh.pktsize > 0) {
+			uwsgi_log("[WARNING] node %s message: %.*s\n", uping.ping, ping_req.uh.pktsize, buf);
 			exit(2);
 		}
 		else {
@@ -92,6 +98,7 @@ int uwsgi_ping_manage_options(int i, char *optarg) {
 
 	switch(i) {
 		case LONG_ARGS_PING:
+			uwsgi.no_server = 1;
 			uping.ping = optarg;
 			return 1;
 		case LONG_ARGS_PING_TIMEOUT:

plugins/proxy/proxy.c

@@ -1,490 +0,0 @@
-/*
-
-   uWSGI proxy
-
-   it needs one of this tecnology to work:
-
-   - epoll (linux 2.6)
-   - kqueue (various BSD and Darwin)
-   - /dev/poll (Solaris)
-
-*/
-
-#include "../../uwsgi.h"
-
-#define LONG_ARGS_PROXY_WORKERS 50000
-
-struct uwsgi_proxy {
-	char *socket_name;
-	int add_me;
-	int workers;
-	int fd;
-} uproxy;
-
-struct option proxy_options[] = {
-	{"proxy", required_argument, 0, LONG_ARGS_PROXY},
-        {"proxy-node", required_argument, 0, LONG_ARGS_PROXY_NODE},
-        {"proxy-max-connections", required_argument, 0, LONG_ARGS_PROXY_MAX_CONNECTIONS},
-        {"proxy-workers", required_argument, 0, LONG_ARGS_PROXY_WORKERS},
-	{0, 0, 0, 0},	
-};
-
-#define UWSGI_PROXY_CONNECTING	1
-#define UWSGI_PROXY_WAITING	2
-
-extern struct uwsgi_server uwsgi;
-
-struct uwsgi_proxy_connection {
-
-	int dest_fd;
-	int status;
-	int retry;
-	int node;
-};
-
-static void end_proxy(void) {
-	exit(UWSGI_END_CODE);
-}
-
-
-static void reload_proxy(void) {
-	exit(UWSGI_RELOAD_CODE);
-}
-
-static void uwsgi_proxy_close(struct uwsgi_proxy_connection *upcs, int fd) {
-
-	if (upcs[fd].dest_fd >= 0) {
-		close(upcs[fd].dest_fd);
-		upcs[upcs[fd].dest_fd].dest_fd = -1;
-		upcs[upcs[fd].dest_fd].status = 0;
-		upcs[upcs[fd].dest_fd].retry = 0;
-		if (upcs[upcs[fd].dest_fd].node > -1) {
-			if (uwsgi.shared->nodes[upcs[upcs[fd].dest_fd].node].connections > 0)
-				uwsgi.shared->nodes[upcs[upcs[fd].dest_fd].node].connections--;
-		}
-	}
-
-	if (fd >= 0) {
-		close(fd);
-		upcs[fd].dest_fd = -1;
-		upcs[fd].status = 0;
-		upcs[fd].retry = 0;
-		if (upcs[fd].node > -1) {
-			if (uwsgi.shared->nodes[upcs[fd].node].connections > 0)
-				uwsgi.shared->nodes[upcs[fd].node].connections--;
-		}
-	}
-}
-
-static int uwsgi_proxy_find_next_node(int current_node) {
-	int i;
-
-	current_node++;
-	if (current_node >= MAX_CLUSTER_NODES) {
-		current_node = 0;
-	}
-
-	// is it a good node ?
-	if (uwsgi.shared->nodes[current_node].name[0] != 0 && uwsgi.shared->nodes[current_node].status == UWSGI_NODE_OK) {
-		if (uwsgi.shared->nodes[current_node].connections < uwsgi.shared->nodes[current_node].workers)
-			return current_node;
-	}
-
-	// try to find a better one
-
-	for (i = 0; i < MAX_CLUSTER_NODES; i++) {
-		if (uwsgi.shared->nodes[i].name[0] != 0 && uwsgi.shared->nodes[i].status == UWSGI_NODE_OK) {
-			if (uwsgi.shared->nodes[i].connections < uwsgi.shared->nodes[i].workers)
-				return i;
-		}
-	}
-
-	// ok, it is a very loaded system, fallback to round robin
-	if (uwsgi.shared->nodes[current_node].name[0] != 0 && uwsgi.shared->nodes[current_node].status == UWSGI_NODE_OK) {
-		return current_node;
-	}
-
-	for (i = 0; i < MAX_CLUSTER_NODES; i++) {
-		if (uwsgi.shared->nodes[i].name[0] != 0 && uwsgi.shared->nodes[i].status == UWSGI_NODE_OK) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-void proxy_loop() {
-
-	int efd;
-
-#ifdef __linux__
-	struct epoll_event *eevents;
-	struct epoll_event ev;
-#elif defined(__sun__)
-	struct pollfd *eevents;
-	struct pollfd ev;
-#else
-	struct kevent *eevents;
-	struct kevent ev;
-#endif
-
-	int max_events = 64;
-	int nevents, i;
-	const int nonblocking = 1;
-	const int blocking = 0;
-
-	char buffer[4096];
-	ssize_t rlen;
-	ssize_t wlen;
-	int max_connections = sysconf(_SC_OPEN_MAX);
-
-	int soopt;
-	socklen_t solen = sizeof(int);
-
-	int rc;
-
-	struct uwsgi_proxy_connection *upcs;
-
-	struct sockaddr_in upc_addr;
-	socklen_t upc_len = sizeof(struct sockaddr_in);
-
-	int next_node = -1;
-
-#ifdef UWSGI_DEBUG
-	uwsgi_log( "allocating space for %d concurrent proxy connections\n", max_connections);
-#endif
-
-	// allocate memory for connections
-	upcs = malloc(sizeof(struct uwsgi_proxy_connection) * max_connections);
-	if (!upcs) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
-	memset(upcs, 0, sizeof(struct uwsgi_proxy_connection) * max_connections);
-
-	if (uproxy.add_me) {
-                uwsgi_cluster_simple_add_node(uwsgi.sockets[0].name, 1, CLUSTER_NODE_STATIC);
-        }
-
-	efd = async_queue_init(uproxy.fd);
-	if (efd < 0) {
-		exit(1);
-	}
-
-#ifdef __linux__
-	eevents = malloc(sizeof(struct epoll_event) * max_events);
-	memset(&ev, 0, sizeof(struct epoll_event));
-#elif defined(__sun)
-	eevents = malloc(sizeof(struct pollfd) * max_events);
-	memset(&ev, 0, sizeof(struct pollfd));
-#else
-	eevents = malloc(sizeof(struct kevent) * max_events);
-	memset(&ev, 0, sizeof(struct kevent));
-#endif
-
-	if (!eevents) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
-
-	signal(SIGINT, (void *) &end_proxy);
-	signal(SIGTERM, (void *) &reload_proxy);
-	signal(SIGHUP, (void *) &reload_proxy);
-	// and welcome to the loop...
-
-	for (;;) {
-
-		nevents = async_wait(efd, eevents, max_events, -1, 0);
-		if (nevents < 0) {
-			uwsgi_error("epoll_wait()");
-			continue;
-		}
-
-		for (i = 0; i < nevents; i++) {
-
-			if ( (int)eevents[i].ASYNC_FD == uproxy.fd) {
-
-				if (eevents[i].ASYNC_IS_IN) {
-					// new connection, accept it
-					ev.ASYNC_FD = accept(uproxy.fd, (struct sockaddr *) &upc_addr, &upc_len);
-					if ( (int) ev.ASYNC_FD < 0) {
-						uwsgi_error("accept()");
-						continue;
-					}
-					upcs[ev.ASYNC_FD].node = -1;
-
-					// now connect to the first worker available
-
-					upcs[ev.ASYNC_FD].dest_fd = socket(AF_INET, SOCK_STREAM, 0);
-					if (upcs[ev.ASYNC_FD].dest_fd < 0) {
-						uwsgi_error("socket()");
-						uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-						continue;
-					}
-					upcs[upcs[ev.ASYNC_FD].dest_fd].node = -1;
-
-					// set nonblocking
-					if (ioctl(upcs[ev.ASYNC_FD].dest_fd, FIONBIO, &nonblocking)) {
-						uwsgi_error("ioctl()");
-						uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-						continue;
-					}
-
-					upcs[ev.ASYNC_FD].status = 0;
-					upcs[ev.ASYNC_FD].retry = 0;
-					next_node = uwsgi_proxy_find_next_node(next_node);
-					if (next_node == -1) {
-						uwsgi_log( "unable to find an available worker in the cluster !\n");
-						uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-						continue;
-					}
-					upcs[upcs[ev.ASYNC_FD].dest_fd].node = next_node;
-					rc = connect(upcs[ev.ASYNC_FD].dest_fd, (struct sockaddr *) &uwsgi.shared->nodes[next_node].ucn_addr, sizeof(struct sockaddr_in));
-					uwsgi.shared->nodes[next_node].connections++;
-
-					if (!rc) {
-						// connected to worker, put it in the epoll_list
-
-						if (async_add(efd, ev.ASYNC_FD, ASYNC_IN)) {
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-
-						upcs[upcs[ev.ASYNC_FD].dest_fd].dest_fd = ev.ASYNC_FD;
-						upcs[upcs[ev.ASYNC_FD].dest_fd].status = 0;
-						upcs[upcs[ev.ASYNC_FD].dest_fd].retry = 0;
-
-						ev.ASYNC_FD = upcs[ev.ASYNC_FD].dest_fd;
-
-						if (async_add(efd, ev.ASYNC_FD, ASYNC_IN)) {
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-
-						// re-set blocking
-						if (ioctl(upcs[upcs[ev.ASYNC_FD].dest_fd].dest_fd, FIONBIO, &blocking)) {
-							uwsgi_error("ioctl()");
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-
-					}
-					else if (errno == EINPROGRESS) {
-						// the socket is waiting, set status to CONNECTING
-						upcs[ev.ASYNC_FD].status = UWSGI_PROXY_WAITING;
-						upcs[upcs[ev.ASYNC_FD].dest_fd].dest_fd = ev.ASYNC_FD;
-						upcs[upcs[ev.ASYNC_FD].dest_fd].status = UWSGI_PROXY_CONNECTING;
-						upcs[upcs[ev.ASYNC_FD].dest_fd].retry = 0;
-
-						ev.ASYNC_FD = upcs[ev.ASYNC_FD].dest_fd;
-						if (async_add(efd, ev.ASYNC_FD, ASYNC_OUT)) {
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-					}
-					else {
-						// connection failed, retry with the next node ?
-						uwsgi_error("connect()");
-						// close only when all node are tried
-						uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-						continue;
-					}
-
-
-				}
-				else {
-					uwsgi_log( "!!! something horrible happened to the uWSGI proxy, reloading it !!!\n");
-					exit(1);
-				}
-			}
-			else {
-				// this is for clients/workers
-				if (eevents[i].ASYNC_IS_IN) {
-
-					// is this a connected client/worker ?
-					//uwsgi_log("ready %d\n", upcs[eevents[i].data.fd].status);
-
-					if (!upcs[eevents[i].ASYNC_FD].status) {
-						if (upcs[eevents[i].ASYNC_FD].dest_fd >= 0) {
-
-							rlen = read(eevents[i].ASYNC_FD, buffer, 4096);
-							if (rlen < 0) {
-								uwsgi_error("read()");
-								uwsgi_proxy_close(upcs, eevents[i].ASYNC_FD);
-								continue;
-							}
-							else if (rlen == 0) {
-								uwsgi_proxy_close(upcs, eevents[i].ASYNC_FD);
-								continue;
-							}
-							else {
-								wlen = write(upcs[eevents[i].ASYNC_FD].dest_fd, buffer, rlen);
-								if (wlen != rlen) {
-									uwsgi_error("write()");
-									uwsgi_proxy_close(upcs, eevents[i].ASYNC_FD);
-									continue;
-								}
-							}
-						}
-						else {
-							uwsgi_proxy_close(upcs, eevents[i].ASYNC_FD);
-							continue;
-						}
-					}
-					else if (upcs[eevents[i].ASYNC_FD].status == UWSGI_PROXY_WAITING) {
-						// disconnected node
-						continue;
-					}
-					else {
-						uwsgi_log( "UNKNOWN STATUS %d\n", upcs[eevents[i].ASYNC_FD].status);
-						continue;
-					}
-				}
-				else if (eevents[i].ASYNC_IS_OUT) {
-					if (upcs[eevents[i].ASYNC_FD].status == UWSGI_PROXY_CONNECTING) {
-
-
-#ifdef UWSGI_PROXY_USE_KQUEUE
-						if (getsockopt(eevents[i].ASYNC_FD, SOL_SOCKET, SO_ERROR, (void *) (&soopt), &solen) < 0) {
-							uwsgi_error("getsockopt()");
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-						/* is something bad ? */
-						if (soopt) {
-							uwsgi_log( "connect() %s\n", strerror(soopt));
-							// increase errors on node
-							uwsgi_log( "*** marking cluster node %d/%s as failed ***\n", upcs[eevents[i].ASYNC_FD].node, uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].name);
-							if (uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].type == CLUSTER_NODE_DYNAMIC) {
-								uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].name[0] = 0 ;	
-							}
-							else {
-								uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].errors++;
-								uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].status = UWSGI_NODE_FAILED;
-							}
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-
-						// increase errors on node
-#endif
-						ev.ASYNC_FD = upcs[eevents[i].ASYNC_FD].dest_fd;
-						upcs[ev.ASYNC_FD].status = 0;
-						if (async_add(efd, ev.ASYNC_FD, ASYNC_IN)) {
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-
-						ev.ASYNC_FD = upcs[ev.ASYNC_FD].dest_fd;
-						upcs[ev.ASYNC_FD].status = 0;
-
-						if (async_mod(efd, ev.ASYNC_FD, ASYNC_IN)) {
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-						// re-set blocking
-						if (ioctl(ev.ASYNC_FD, FIONBIO, &blocking)) {
-							uwsgi_error("ioctl()");
-							uwsgi_proxy_close(upcs, ev.ASYNC_FD);
-							continue;
-						}
-					}
-					else {
-						uwsgi_log( "strange event for %d\n", (int) eevents[i].ASYNC_FD);
-					}
-				}
-				else {
-					if (upcs[eevents[i].ASYNC_FD].status == UWSGI_PROXY_CONNECTING) {
-						if (getsockopt(eevents[i].ASYNC_FD, SOL_SOCKET, SO_ERROR, (void *) (&soopt), &solen) < 0) {
-							uwsgi_error("getsockopt()");
-						}
-						/* is something bad ? */
-						if (soopt) {
-							uwsgi_log( "connect() %s\n", strerror(soopt));
-						}
-
-						// increase errors on node
-						uwsgi_log( "*** marking cluster node %d/%s as failed ***\n", upcs[eevents[i].ASYNC_FD].node, uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].name);
-							if (uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].type == CLUSTER_NODE_DYNAMIC) {
-								uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].name[0] = 0;
-							}
-							else {
-								uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].errors++;
-								uwsgi.shared->nodes[upcs[eevents[i].ASYNC_FD].node].status = UWSGI_NODE_FAILED;
-							}
-					}
-					else {
-						uwsgi_log( "STRANGE EVENT !!! %d %d %d\n", (int) eevents[i].ASYNC_FD, (int) eevents[i].ASYNC_EV, upcs[eevents[i].ASYNC_FD].status);
-					}
-					uwsgi_proxy_close(upcs, eevents[i].ASYNC_FD);
-					continue;
-				}
-			}
-		}
-	}
-}
-
-int proxy_init() {
-	int i;
-	char *tcp_port;
-
-	if (!uproxy.workers) uproxy.workers = 1 ;
-
-	if (uproxy.socket_name) {
-
-		tcp_port = strchr(uproxy.socket_name, ':');
-
-        	if (tcp_port == NULL) {
-                	uproxy.fd = bind_to_unix(uproxy.socket_name, UWSGI_LISTEN_QUEUE, uwsgi.chmod_socket, uwsgi.abstract_socket);
-        	}
-        	else {
-                	uproxy.fd = bind_to_tcp(uproxy.socket_name, UWSGI_LISTEN_QUEUE, tcp_port);
-                	tcp_port[0] = ':';
-        	}
-
-        	if (uproxy.fd < 0) {
-                	uwsgi_log( "unable to create the proxy server socket.\n");
-                	exit(1);
-        	}
-
-		for(i=0;i<uproxy.workers;i++) {
-			if (register_gateway("proxy", proxy_loop) == NULL) {
-				uwsgi_log("unable to register the proxy gateway\n");
-			}
-		}
-	}
-
-	return 0;
-}
-	
-int proxy_opt(int i, char *optarg) {
-
-        switch(i) {
-
-		case LONG_ARGS_PROXY_NODE:
-                        if (uwsgi.cluster_fd >= 0 && !strcmp(optarg, "@self")) {
-                                uproxy.add_me = 1;
-                        }
-                        else {
-                                uwsgi_cluster_simple_add_node(optarg, 1, CLUSTER_NODE_STATIC);
-                        }
-                        return 1;
-                case LONG_ARGS_PROXY:
-                        uproxy.socket_name = optarg;
-                        return 1;
-		case LONG_ARGS_PROXY_WORKERS:
-			uproxy.workers = atoi(optarg);
-			return 1;
-	}
-
-	return 0;
-}
-
-
-struct uwsgi_plugin proxy_plugin = {
-
-        .options = proxy_options,
-        .manage_opt = proxy_opt,
-        .init = proxy_init,
-};
-

plugins/psgi/psgi.h

@@ -1,7 +1,9 @@
 #undef __USE_GNU
 #include "../../uwsgi.h"
 
+#ifdef __APPLE__
 #define HAS_BOOL 1
+#endif
 #include <EXTERN.h>
 #include <perl.h>
 #include "XSUB.h"
@@ -12,17 +14,30 @@ struct uwsgi_perl {
         int fd;
         char *psgibuffer;
         char *psgi;
+	char *locallib;
+	char *embedding[3];
         PerlInterpreter *main;
         pthread_key_t u_interpreter;
         PerlInterpreter **interp;
         SV *psgi_main;
         SV **psgi_func;
         CV *stream_responder;
+	HV *streaming_stash;
+	HV *input_stash;
+	HV *error_stash;
 
 };
 
-#define LONG_ARGS_PERL_BASE      17000 + ((5 + 1) * 100)
-#define LONG_ARGS_PSGI           LONG_ARGS_PERL_BASE + 1
+#define LONG_ARGS_PERL_BASE      	17000 + ((5 + 1) * 1000)
+#define LONG_ARGS_PSGI           	LONG_ARGS_PERL_BASE + 1
+#define LONG_ARGS_PERL_LOCAL_LIB	LONG_ARGS_PERL_BASE + 2
 
 void init_perl_embedded_module(void);
+void uwsgi_psgi_app(void);
 int psgi_response(struct wsgi_request *, PerlInterpreter *, AV*);
+
+#define psgi_xs(func) newXS("uwsgi::" #func, XS_##func, "uwsgi")
+#define psgi_check_args(x) if (items < x) Perl_croak(aTHX_ "Usage: uwsgi::%s takes %d arguments", __FUNCTION__ + 3, x)
+
+SV *uwsgi_perl_obj_call(SV *, char *);
+int uwsgi_perl_obj_can(SV *, char *, size_t);

plugins/psgi/psgi_loader.c

@@ -0,0 +1,315 @@
+#include "psgi.h" 
+
+extern struct uwsgi_server uwsgi;
+struct uwsgi_perl uperl;
+
+
+
+XS(XS_input_seek) {
+
+        dXSARGS;
+
+        psgi_check_args(1);
+        XSRETURN(0);
+}
+
+XS(XS_error) {
+	dXSARGS;
+
+        psgi_check_args(0);
+
+        ST(0) = sv_bless(newRV(sv_newmortal()), uperl.error_stash);
+        XSRETURN(1);
+}
+
+XS(XS_input) {
+
+        dXSARGS;
+        psgi_check_args(0);
+
+        ST(0) = sv_bless(newRV(sv_newmortal()), uperl.input_stash);
+        XSRETURN(1);
+}
+
+XS(XS_stream)
+{
+    dXSARGS;
+    struct wsgi_request *wsgi_req = current_wsgi_req();
+
+    psgi_check_args(1);
+
+    AV *response = (AV* ) SvREFCNT_inc(SvRV(ST(0))) ;
+
+	if (av_len(response) == 2) {
+
+#ifdef my_perl
+		while (psgi_response(wsgi_req, my_perl, response) != UWSGI_OK);
+#else
+		while (psgi_response(wsgi_req, uperl.main, response) != UWSGI_OK);
+#endif
+	}
+	else if (av_len(response) == 1) {
+#ifdef my_perl
+		while (psgi_response(wsgi_req, my_perl, response) != UWSGI_OK);
+#else
+		while (psgi_response(wsgi_req, uperl.main, response) != UWSGI_OK);
+#endif
+		SvREFCNT_dec(response);
+                ST(0) = sv_bless(newRV(sv_newmortal()), uperl.streaming_stash);
+                XSRETURN(1);
+	}
+	else {
+		uwsgi_log("invalid PSGI response: array size %d\n", av_len(response));
+	}
+
+	SvREFCNT_dec(response);
+	XSRETURN(0);
+
+}
+
+
+XS(XS_input_read) {
+
+        dXSARGS;
+        struct wsgi_request *wsgi_req = current_wsgi_req();
+        int fd = -1;
+        char *tmp_buf;
+        ssize_t bytes = 0, len;
+        size_t remains;
+        SV *read_buf;
+
+        psgi_check_args(3);
+
+
+        read_buf = ST(1);
+        len = SvIV(ST(2));
+
+        // return empty string if no post_cl or pos >= post_cl
+        if (!wsgi_req->post_cl || (size_t) wsgi_req->post_pos >= wsgi_req->post_cl) {
+                sv_setpvn(read_buf, "", 0);
+                goto ret;
+        }
+
+        if (wsgi_req->body_as_file) {
+                fd = fileno((FILE *)wsgi_req->async_post);
+        }
+        else if (uwsgi.post_buffering > 0) {
+                fd = -1;
+                if (wsgi_req->post_cl <= (size_t) uwsgi.post_buffering) {
+                        fd = fileno((FILE *)wsgi_req->async_post);
+                }
+        }
+        else {
+                fd = wsgi_req->poll.fd;
+        }
+        // return the whole input
+        if (len <= 0) {
+                remains = wsgi_req->post_cl;
+        }
+        else {
+                remains = len ;
+        }
+
+        if (remains + wsgi_req->post_pos > wsgi_req->post_cl) {
+                remains = wsgi_req->post_cl - wsgi_req->post_pos;
+        }
+
+        if (remains <= 0) {
+                sv_setpvn(read_buf, "", 0);
+                goto ret;
+        }
+
+        // data in memory ?
+        if (fd == -1) {
+                sv_setpvn(read_buf, wsgi_req->post_buffering_buf, remains);
+                bytes = remains;
+                wsgi_req->post_pos += remains;
+
+        }
+
+        tmp_buf = uwsgi_malloc(remains);
+
+        if (uwsgi_waitfd(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]) <= 0) {
+                free(tmp_buf);
+                croak("error waiting for wsgi.input data");
+                goto ret;
+        }
+
+        bytes = read(fd, tmp_buf, remains);
+        if (bytes < 0) {
+                free(tmp_buf);
+                croak("error reading wsgi.input data");
+                goto ret;
+        }
+
+        wsgi_req->post_pos += bytes;
+        sv_setpvn(read_buf, tmp_buf, bytes);
+
+        free(tmp_buf);
+
+ret:
+        XSRETURN_IV(bytes);
+}
+
+
+XS(XS_streaming_close) {
+
+        dXSARGS;
+        psgi_check_args(0);
+
+        XSRETURN(0);
+}
+
+XS(XS_streaming_write) {
+
+        dXSARGS;
+        struct wsgi_request *wsgi_req = current_wsgi_req();
+        STRLEN blen;
+        char *body;
+
+        psgi_check_args(2);
+
+        body = SvPV(ST(1), blen);
+
+        wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, body, blen);
+
+        XSRETURN(0);
+}
+
+XS(XS_error_print) {
+
+	dXSARGS;
+        STRLEN blen;
+        char *body;
+
+        psgi_check_args(1);
+
+	if (items > 1) {
+        	body = SvPV(ST(1), blen);
+		uwsgi_log("%.*s", blen, body);
+	}
+
+        XSRETURN(0);
+}
+
+/* automatically generated */
+
+EXTERN_C void xs_init (pTHX);
+
+EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
+
+        EXTERN_C void
+xs_init(pTHX)
+{
+        char *file = __FILE__;
+        dXSUB_SYS;
+
+        /* DynaLoader is a special case */
+        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+
+        newXS("uwsgi::input::new", XS_input, "uwsgi::input");
+        newXS("uwsgi::input::read", XS_input_read, "uwsgi::input");
+        newXS("uwsgi::input::seek", XS_input_seek, "uwsgi::input");
+
+        uperl.input_stash = gv_stashpv("uwsgi::input", 0);
+
+        newXS("uwsgi::error::new", XS_error, "uwsgi::error");
+        newXS("uwsgi::error::print", XS_error_print, "uwsgi::print");
+        uperl.error_stash = gv_stashpv("uwsgi::error", 0);
+
+        uperl.stream_responder = newXS("uwsgi::stream", XS_stream, "uwsgi");
+
+        newXS("uwsgi::streaming::write", XS_streaming_write, "uwsgi::streaming");
+        newXS("uwsgi::streaming::close", XS_streaming_close, "uwsgi::streaming");
+
+        uperl.streaming_stash = gv_stashpv("uwsgi::streaming", 0);
+
+#ifdef UWSGI_EMBEDDED
+        init_perl_embedded_module();
+#endif
+
+}
+
+/* end of automagically generated part */
+
+
+void uwsgi_psgi_app() {
+
+        struct stat stat_psgi;
+
+        if (uperl.psgi) {
+
+                // two-pass loading: parse the script -> eval the script
+
+
+
+                if (uperl.locallib) {
+                        uwsgi_log("using %s as local::lib directory\n", uperl.locallib);
+                        uperl.embedding[1] = uwsgi_concat2("-Mlocal::lib=", uperl.locallib);
+                        uperl.embedding[2] = uperl.psgi;
+                        if (perl_parse(uperl.main, xs_init, 3, uperl.embedding, NULL)) {
+                                exit(1);
+                        }
+                }
+                else {
+                        uperl.embedding[1] = uperl.psgi;
+                        if (perl_parse(uperl.main, xs_init, 2, uperl.embedding, NULL)) {
+                                exit(1);
+                        }
+                }
+
+                perl_eval_pv("use IO::Handle;", 0);
+                perl_eval_pv("use IO::File;", 0);
+
+                SV *dollar_zero = get_sv("0", GV_ADD);
+                sv_setsv(dollar_zero, newSVpv(uperl.psgi, 0));
+
+                SV *dollar_slash = get_sv("/", GV_ADD);
+                sv_setsv(dollar_slash, newRV_inc(newSViv(uwsgi.buffer_size)));
+
+                uperl.fd = open(uperl.psgi, O_RDONLY);
+                if (uperl.fd < 0) {
+                        uwsgi_error_open(uperl.psgi);
+                        exit(1);
+                }
+
+                if (fstat(uperl.fd, &stat_psgi)) {
+                        uwsgi_error("fstat()");
+                        exit(1);
+                }
+
+                uperl.psgibuffer = malloc(stat_psgi.st_size + 1);
+                if (!uperl.psgibuffer) {
+                        uwsgi_error("malloc()");
+                        exit(1);
+                }
+
+                if (read(uperl.fd, uperl.psgibuffer, stat_psgi.st_size) != stat_psgi.st_size) {
+                        uwsgi_error("read()");
+                        exit(1);
+                }
+
+                uperl.psgibuffer[stat_psgi.st_size] = 0;
+
+                if (uwsgi.threads < 2) {
+                        uperl.psgi_main = perl_eval_pv(uwsgi_concat4("#line 1 ", uperl.psgi, "\n", uperl.psgibuffer), 0);
+                        if (!uperl.psgi_main) {
+                                uwsgi_log("unable to find PSGI function entry point.\n");
+                                exit(1);
+                        }
+
+                        if(SvTRUE(ERRSV)) {
+                                uwsgi_log("%s\n", SvPV_nolen(ERRSV));
+                                exit(1);
+                        }
+
+                        free(uperl.psgibuffer);
+                        close(uperl.fd);
+                }
+
+                uwsgi_log("PSGI app (%s) loaded at %p\n", uperl.psgi, uperl.psgi_main);
+        }
+
+
+}
+

plugins/psgi/psgi_plugin.c

@@ -3,75 +3,302 @@
 extern char **environ;
 extern struct uwsgi_server uwsgi;
 
+#ifdef __APPLE__
+extern struct uwsgi_perl uperl;
+#else
 struct uwsgi_perl uperl;
+#endif
 
 struct option uwsgi_perl_options[] = {
 
         {"psgi", required_argument, 0, LONG_ARGS_PSGI},
+        {"perl-local-lib", required_argument, 0, LONG_ARGS_PERL_LOCAL_LIB},
         {0, 0, 0, 0},
 
 };
 
 extern struct http_status_codes hsc[];
 
-XS(XS_stream)
-{
-    dXSARGS;
-    struct wsgi_request *wsgi_req = current_wsgi_req();
-    SV *stack;
-    AV *response;
+SV *uwsgi_perl_obj_new(char *class, size_t class_len) {
 
-    uwsgi_log("args: %d %p\n", items, wsgi_req);
-    stack = ST(0);
-    uwsgi_log("type %d\n", SvTYPE(stack));
-    response = (AV* ) SvRV(stack) ;
+	SV *newobj;
+	// set current context ?
+	//dTHX;
+	dSP;
 
-#ifdef my_perl
-    psgi_response(wsgi_req, my_perl, response);
+	ENTER;
+	SAVETMPS;
+	PUSHMARK(SP);
+	XPUSHs(sv_2mortal(newSVpv( class, class_len)));
+	PUTBACK;
+
+	call_method( "new", G_SCALAR);
+
+	SPAGAIN;
+
+	newobj = POPs;	
+	PUTBACK;
+	FREETMPS;
+	LEAVE;
+
+	return newobj;
+	
+}
+
+SV *uwsgi_perl_call_stream(SV *func) {
+
+	SV *ret = NULL;
+        // set current context ?
+        //dTHX;
+        dSP;
+
+        ENTER;
+        SAVETMPS;
+        PUSHMARK(SP);
+        XPUSHs( sv_2mortal(newRV((SV*) uperl.stream_responder)));
+        PUTBACK;
+
+	call_sv( func, G_SCALAR | G_EVAL);
+
+	SPAGAIN;
+        if(SvTRUE(ERRSV)) {
+                uwsgi_log("%s\n", SvPV_nolen(ERRSV));
+        }
+        else {
+                ret = SvREFCNT_inc(POPs);
+        }
+
+        PUTBACK;
+        FREETMPS;
+        LEAVE;
+
+        return ret;
+}
+
+int uwsgi_perl_obj_can(SV *obj, char *method, size_t len) {
+
+	int ret;
+        // set current context ? needed for threading
+        //dTHX;
+        dSP;
+
+        ENTER;
+        SAVETMPS;
+        PUSHMARK(SP);
+        XPUSHs(obj);
+        XPUSHs(sv_2mortal(newSVpv(method, len)));
+        PUTBACK;
+
+        call_method( "can", G_SCALAR);
+
+        SPAGAIN;
+
+        ret = SvROK(POPs);
+        PUTBACK;
+        FREETMPS;
+        LEAVE;
+
+        return ret;
+
+}
+
+
+SV *uwsgi_perl_obj_call(SV *obj, char *method) {
+
+        SV *ret = NULL;
+
+        dSP;
+
+        ENTER;
+        SAVETMPS;
+        PUSHMARK(SP);
+
+        XPUSHs(obj);
+
+        PUTBACK;
+
+        call_method( method, G_SCALAR | G_EVAL);
+
+        SPAGAIN;
+	if(SvTRUE(ERRSV)) {
+        	uwsgi_log("%s\n", SvPV_nolen(ERRSV));
+        }
+	else {
+        	ret = SvREFCNT_inc(POPs);
+	}
+
+        PUTBACK;
+        FREETMPS;
+        LEAVE;
+
+        return ret;
+
+}
+
+
+AV *psgi_call(struct wsgi_request *wsgi_req, SV *psgi_func, SV *env) {
+
+	AV *ret = NULL;
+
+        dSP;
+
+        ENTER;
+        SAVETMPS;
+        PUSHMARK(SP);
+        XPUSHs(env);
+	PUTBACK;
+
+	call_sv(psgi_func, G_SCALAR | G_EVAL);
+	SPAGAIN;
+
+        if(SvTRUE(ERRSV)) {
+                internal_server_error(wsgi_req, "exception raised");
+                uwsgi_log("%s\n", SvPV_nolen(ERRSV));
+        }
+	else {
+		ret = (AV *) SvREFCNT_inc(SvRV(POPs));
+	}
+
+	PUTBACK;
+        FREETMPS;
+        LEAVE;
+
+        return (AV *)ret;
+	
+}
+
+SV *build_psgi_env(struct wsgi_request *wsgi_req) {
+	int i;
+	HV *env = newHV();
+
+	// fill perl hash
+        for(i=0;i<wsgi_req->var_cnt;i++) {
+                if (wsgi_req->hvec[i+1].iov_len > 0) {
+
+                        // check for multiline header
+                        if (hv_exists(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len)) {
+                                SV **already_avalable_header = hv_fetch(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, 0);
+                                STRLEN hlen;
+                                char *old_value = SvPV(*already_avalable_header, hlen );
+                                char *multiline_header = uwsgi_concat3n(old_value, hlen, ", ", 2, wsgi_req->hvec[i+1].iov_base, wsgi_req->hvec[i+1].iov_len);
+                                if (!hv_store(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len,
+                                        newSVpv(multiline_header, hlen+wsgi_req->hvec[i+1].iov_len+2), 0))  { free(multiline_header); goto clear;}
+                                free(multiline_header);
+
+
+                        }
+                        else {
+                                if (!hv_store(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len,
+                                        newSVpv(wsgi_req->hvec[i+1].iov_base, wsgi_req->hvec[i+1].iov_len), 0)) goto clear;
+                        }
+                }
+                else {
+                        if (!hv_store(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, newSVpv("", 0), 0)) goto clear;
+                }
+                //uwsgi_log("%.*s = %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
+                i++;
+        }
+
+        // psgi.version
+        AV *av = newAV();
+        av_store( av, 0, newSViv(1));
+        av_store( av, 1, newSViv(1));
+        if (!hv_store(env, "psgi.version", 12, newRV_noinc((SV *)av ), 0)) goto clear;
+
+        if (uwsgi.numproc > 1) {
+                if (!hv_store(env, "psgi.multiprocess", 17, newSViv(1), 0)) goto clear;
+        }
+        else {
+                if (!hv_store(env, "psgi.multiprocess", 17, newSViv(0), 0)) goto clear;
+        }
+
+        if (uwsgi.threads > 1) {
+                if (!hv_store(env, "psgi.multithread", 16, newSViv(1), 0)) goto clear;
+        }
+        else {
+                if (!hv_store(env, "psgi.multithread", 16, newSViv(0), 0)) goto clear;
+        }
+
+        if (!hv_store(env, "psgi.run_once", 13, newSViv(0), 0)) goto clear;
+
+#ifdef UWSGI_ASYNC
+        if (uwsgi.async > 1) {
+                if (!hv_store(env, "psgi.nonblocking", 16, newSViv(1), 0)) goto clear;
+        }
+        else {
 #else
-    psgi_response(wsgi_req, uperl.main, response);
+                if (!hv_store(env, "psgi.nonblocking", 16, newSViv(0), 0)) goto clear;
 #endif
 
-    //mXPUSHp("x", 1);
-    XSRETURN(0);
-
-}
-
-/* automatically generated */
-
-EXTERN_C void xs_init (pTHX);
-
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
-
-	EXTERN_C void
-xs_init(pTHX)
-{
-	char *file = __FILE__;
-	dXSUB_SYS;
-
-	/* DynaLoader is a special case */
-	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-
-	uperl.stream_responder = newXS("uwsgi::stream", XS_stream, "uwsgi");
-
-#ifdef UWSGI_EMBEDDED
-	init_perl_embedded_module();
+#ifdef UWSGI_ASYNC
+        }
 #endif
+
+        if (!hv_store(env, "psgi.streaming", 14, newSViv(1), 0)) goto clear;
+
+	SV *us;
+        // psgi.url_scheme, honour HTTPS var or UWSGI_SCHEME
+        if (wsgi_req->scheme_len > 0) {
+                us = newSVpv(wsgi_req->scheme, wsgi_req->scheme_len);
+        }
+        else if (wsgi_req->https_len > 0) {
+                if (!strncasecmp(wsgi_req->https, "on", 2) || wsgi_req->https[0] == '1') {
+                        us = newSVpv("https", 5);
+                }
+                else {
+                        us = newSVpv("http", 4);
+                }
+        }
+        else {
+                us = newSVpv("http", 4);
+        }
+
+        if (!hv_store(env, "psgi.url_scheme", 15, us, 0)) goto clear;
+
+
+	SV *pi = uwsgi_perl_obj_new("uwsgi::input", 12);
+        if (!hv_store(env, "psgi.input", 10, pi, 0)) goto clear;
+	
+	if (!hv_store(env, "psgix.input.buffered", 20, newSViv(wsgi_req->body_as_file), 0)) goto clear;
+
+	if (uwsgi.master_process) {
+		if (!hv_store(env, "psgix.harakiri", 14, newSViv(1), 0)) goto clear;
+	}
+
+	SV *pe = uwsgi_perl_obj_new("uwsgi::error", 12);
+        if (!hv_store(env, "psgi.errors", 11, pe, 0)) goto clear;
+
+	return newRV_noinc((SV *)env);
+
+clear:
+	SvREFCNT_dec((SV *)env);
+	return NULL;
 }
 
-/* end of automagically generated part */
-
-
 int uwsgi_perl_init(){
 
 
 	struct http_status_codes *http_sc;
 
-	int argc = 4;
-	char *embedding[] = { "", "-e", "-e", "0" };
+	int argc = 3;
+	uperl.embedding[0] = "";
+	uperl.embedding[1] = "-e";
+	uperl.embedding[2] = "0";
 
+	if (setenv("PLACK_ENV", "uwsgi", 0)) {
+		uwsgi_error("setenv()");
+	}
+
+	if (setenv("PLACK_SERVER", "uwsgi", 0)) {
+		uwsgi_error("setenv()");
+	}
+
+#ifdef PERL_VERSION_STRING
+	uwsgi_log("initializing Perl %s environment\n", PERL_VERSION_STRING);
+#else
 	uwsgi_log("initializing Perl environment\n");
-	PERL_SYS_INIT3(&argc, (char ***) &embedding, &environ);
+#endif
+	PERL_SYS_INIT3(&argc, (char ***) &uperl.embedding, &environ);
 	uperl.main = perl_alloc();
 	if (!uperl.main) {
 		uwsgi_log("unable to allocate perl interpreter\n");
@@ -82,6 +309,7 @@ int uwsgi_perl_init(){
 	PERL_SET_CONTEXT(uperl.main);
 
 	PL_perl_destruct_level = 2;
+	PL_origalen = 1;
 	perl_construct(uperl.main);
 
 	// filling http status codes
@@ -90,65 +318,11 @@ int uwsgi_perl_init(){
 	}
 
 	PL_origalen = 1;
-	perl_parse(uperl.main, xs_init, 4, embedding, NULL);
-
-	perl_eval_pv("use IO::Handle;", 0);
 
 	return 1;
 
 }
 
-void uwsgi_psgi_app() {
-
-	struct stat stat_psgi;
-
-	if (uperl.psgi) {
-		uperl.fd = open(uperl.psgi, O_RDONLY);
-		if (uperl.fd < 0) {
-			uwsgi_error_open(uperl.psgi);
-			exit(1);
-		}
-
-		if (fstat(uperl.fd, &stat_psgi)) {
-			uwsgi_error("fstat()");
-			exit(1);
-		}
-
-		uperl.psgibuffer = malloc(stat_psgi.st_size + 1);
-		if (!uperl.psgibuffer) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
-
-		if (read(uperl.fd, uperl.psgibuffer, stat_psgi.st_size) != stat_psgi.st_size) {
-			uwsgi_error("read()");
-			exit(1);
-		}
-
-		uperl.psgibuffer[stat_psgi.st_size] = 0;
-
-		if (uwsgi.threads < 2) {
-			uperl.psgi_main = perl_eval_pv(uperl.psgibuffer, 0);
-			if (!uperl.psgi_main) {
-				uwsgi_log("unable to find PSGI function entry point.\n");
-				exit(1);
-			}
-
-			if(SvTRUE(ERRSV)) {
-				uwsgi_log("%s\n", SvPV_nolen(ERRSV));
-				exit(1);
-			}
-
-			free(uperl.psgibuffer);
-			close(uperl.fd);
-		}
-
-		uwsgi_log("PSGI app (%s) loaded at %p\n", uperl.psgi, uperl.psgi_main);
-	}
-
-
-}
-
 #ifdef my_perl
 void uwsgi_perl_enable_threads() {
 	
@@ -202,19 +376,16 @@ void uwsgi_perl_enable_threads() {
 
 int uwsgi_perl_request(struct wsgi_request *wsgi_req) {
 
-	HV *env;
-	SV **item;
-
-	AV *response;
-
-	SV *io_new, *io_err;
-	int i;
-
+	SV **harakiri;
 	SV *psgi_func = uperl.psgi_main;
 	// ugly hack
 	register PerlInterpreter *my_perl = uperl.main;
-	dSP;
 
+#ifdef UWSGI_ASYNC
+	if (wsgi_req->async_status == UWSGI_AGAIN) {
+		return psgi_response(wsgi_req, my_perl, wsgi_req->async_placeholder);	
+	}
+#endif
 
 	/* Standard PSGI request */
 	if (!wsgi_req->uh.pktsize) {
@@ -224,7 +395,6 @@ int uwsgi_perl_request(struct wsgi_request *wsgi_req) {
 
 
 	if (uwsgi_parse_vars(wsgi_req)) {
-		uwsgi_log("Invalid PSGI request. skip.\n");
 		return -1;
 	}
 
@@ -241,116 +411,48 @@ int uwsgi_perl_request(struct wsgi_request *wsgi_req) {
 	SAVETMPS;
 
 
-	env = (HV*) sv_2mortal((SV*)newHV());
+	wsgi_req->async_environ = build_psgi_env(wsgi_req);
+	if (!wsgi_req->async_environ) goto clear;
 
+	wsgi_req->async_result = psgi_call(wsgi_req, psgi_func, wsgi_req->async_environ);
+	if (!wsgi_req->async_result) goto clear;
 
-	// fill perl hash
-	for(i=0;i<wsgi_req->var_cnt;i++) {
-		if (wsgi_req->hvec[i+1].iov_len > 0) {
-
-			item = hv_store(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len,
-					newSVpv(wsgi_req->hvec[i+1].iov_base, wsgi_req->hvec[i+1].iov_len), 0);
+	if (SvTYPE((AV *)wsgi_req->async_result) == SVt_PVCV) {
+		SV *stream_result = uwsgi_perl_call_stream((SV*)wsgi_req->async_result);		
+		if (!stream_result) {
+			internal_server_error(wsgi_req, "exception raised");
 		}
 		else {
-			item = hv_store(env, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, newSVpv("", 0), 0);
+			SvREFCNT_dec(stream_result);
 		}
-		//uwsgi_log("%.*s = %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
-		i++;
+		goto clear2;
 	}
 
-
-	SV *us = newSVpv("http", 4);
-	item = hv_store(env, "psgi.url_scheme", 15, us, 0);
-
-
-	SV* iohandle = newSVpv( "IO::Handle", 10 );
-
-
-	PUSHMARK(SP);
-	XPUSHs( sv_2mortal(iohandle));
-	PUTBACK;
-	perl_call_method( "new", G_SCALAR);
-	SPAGAIN;
-	io_new = POPs;
-
-	PUSHMARK(SP);
-	XPUSHs( io_new );
-	XPUSHs( sv_2mortal(newSViv( wsgi_req->poll.fd)));
-	XPUSHs( sv_2mortal(newSVpv( "r", 1)));
-	PUTBACK;
-	perl_call_method( "fdopen", G_SCALAR);
-	SPAGAIN;
-
-
-
-
-	SV *pi = SvREFCNT_inc(POPs);
-	item = hv_store(env, "psgi.input", 10, pi, 0);
-
-
-	PUSHMARK(SP);
-	XPUSHs( newSVpv( "IO::Handle", 10 ));
-	PUTBACK;
-	perl_call_method( "new", G_SCALAR);
-	SPAGAIN;
-	io_err = POPs;
-
-	PUSHMARK(SP);
-	XPUSHs( io_err );
-	XPUSHs( sv_2mortal( newSViv( 2 )));
-	XPUSHs( sv_2mortal( newSVpv( "w", 1)));
-	PUTBACK;
-	perl_call_method( "fdopen", G_SCALAR);
-	SPAGAIN;
-
-	SV *pe = SvREFCNT_inc(POPs);
-	item = hv_store(env, "psgi.errors", 11, pe, 0);
-
-
-	PUSHMARK(SP);
-	XPUSHs( sv_2mortal(newRV((SV *)env )) );
-	PUTBACK;
-
-
-	perl_call_sv(psgi_func, G_SCALAR);
-
-	
-	if(SvTRUE(ERRSV)) {
-		uwsgi_log("%s\n", SvPV_nolen(ERRSV));
-		goto clear;
-	}
-	SPAGAIN;
-	// no leaks to here
-
-	// dereference output
-	response = (AV *) SvRV( POPs );
-
-	//uwsgi_log("response: %p %d\n", response, SvTYPE(response));
-
-	if (SvTYPE(response) == SVt_PVCV) {
-		uwsgi_log("streaming response\n");
-			
-		PUSHMARK(SP);
-        	XPUSHs( newRV((SV*) uperl.stream_responder));
-        	PUTBACK;
-
-        	perl_call_sv( (SV*)response, G_SCALAR);
-
-		if(SvTRUE(ERRSV)) {
-			uwsgi_log("%s\n", SvPV_nolen(ERRSV));
+	while (psgi_response(wsgi_req, my_perl, wsgi_req->async_result) != UWSGI_OK) {
+#ifdef UWSGI_ASYNC
+		if (uwsgi.async > 1) {
+			FREETMPS;
+			LEAVE;
+			return UWSGI_AGAIN;
 		}
-
-		goto clear;
+#endif
 	}
 
-	psgi_response(wsgi_req, my_perl, response);
+clear2:
+	// check for psgix.harakiri
+        harakiri = hv_fetch((HV*)SvRV( (SV*)wsgi_req->async_environ), "psgix.harakiri.commit", 21, 0);
+        if (harakiri) {
+                if (SvTRUE(*harakiri)) wsgi_req->async_plagued = 1;
+        }
 
+	SvREFCNT_dec(wsgi_req->async_environ);
+	SvREFCNT_dec(wsgi_req->async_result);
 clear:
 
 	FREETMPS;
 	LEAVE;
 
-	return 0;
+	return UWSGI_OK;
 }
 
 
@@ -358,6 +460,12 @@ void uwsgi_perl_after_request(struct wsgi_request *wsgi_req) {
 
 	if (uwsgi.shared->options[UWSGI_OPTION_LOGGING])
 		log_request(wsgi_req);
+
+	if (wsgi_req->async_plagued) {
+		uwsgi_log("*** psgix.harakiri.commit requested ***\n");
+		goodbye_cruel_world();
+	}
+
 }
 
 void uwsgi_perl_init_thread(int core_id) {
@@ -387,6 +495,9 @@ int uwsgi_perl_manage_options(int i, char *optarg) {
                 case LONG_ARGS_PSGI:
                         uperl.psgi = optarg;
                         return 1;
+                case LONG_ARGS_PERL_LOCAL_LIB:
+                        uperl.locallib = optarg;
+                        return 1;
         }
 
         return 0;

plugins/psgi/psgi_response.c

@@ -1,51 +1,8 @@
 #include "psgi.h"
 
-/* statistically ordered */
-struct http_status_codes hsc[] = {
-        {"200", "OK"},
-        {"302", "Found"},
-        {"404", "Not Found"},
-        {"500", "Internal Server Error"},
-        {"301", "Moved Permanently"},
-        {"304", "Not Modified"},
-        {"303", "See Other"},
-        {"403", "Forbidden"},
-        {"307", "Temporary Redirect"},
-        {"401", "Unauthorized"},
-        {"400", "Bad Request"},
-        {"405", "Method Not Allowed"},
-        {"408", "Request Timeout"},
-
-        {"100", "Continue"},
-        {"101", "Switching Protocols"},
-        {"201", "Created"},
-        {"202", "Accepted"},
-        {"203", "Non-Authoritative Information"},
-        {"204", "No Content"},
-        {"205", "Reset Content"},
-        {"206", "Partial Content"},
-        {"300", "Multiple Choices"},
-        {"305", "Use Proxy"},
-        {"402", "Payment Required"},
-        {"406", "Not Acceptable"},
-        {"407", "Proxy Authentication Required"},
-        {"409", "Conflict"},
-        {"410", "Gone"},
-        {"411", "Length Required"},
-        {"412", "Precondition Failed"},
-        {"413", "Request Entity Too Large"},
-        {"414", "Request-URI Too Long"},
-        {"415", "Unsupported Media Type"},
-        {"416", "Requested Range Not Satisfiable"},
-        {"417", "Expectation Failed"},
-        {"501", "Not Implemented"},
-        {"502", "Bad Gateway"},
-        {"503", "Service Unavailable"},
-        {"504", "Gateway Timeout"},
-        {"505", "HTTP Version Not Supported"},
-        { "", NULL },
-};
+extern struct uwsgi_server uwsgi;
 
+extern struct http_status_codes hsc[];
 
 int psgi_response(struct wsgi_request *wsgi_req, PerlInterpreter *my_perl, AV *response) {
 
@@ -55,16 +12,61 @@ int psgi_response(struct wsgi_request *wsgi_req, PerlInterpreter *my_perl, AV *r
 	struct http_status_codes *http_sc;
 	int i,vi, base;
 	char *chitem;
-	dSP;
+	SV **harakiri;
+
+#ifdef UWSGI_ASYNC
+	if (wsgi_req->async_status == UWSGI_AGAIN) {
+
+		wsgi_req->async_force_again = 0;
+
+		wsgi_req->switches++;
+                SV *chunk = uwsgi_perl_obj_call(wsgi_req->async_placeholder, "getline");
+		if (!chunk) {
+			internal_server_error(wsgi_req, "exception raised");
+			return UWSGI_OK;
+		}
+
+		if (wsgi_req->async_force_again) {
+			SvREFCNT_dec(chunk);
+			return UWSGI_AGAIN;
+		}
+
+                chitem = SvPV( chunk, hlen);
+
+                if (hlen <= 0) {
+			SvREFCNT_dec(chunk);
+			SV *closed = uwsgi_perl_obj_call(wsgi_req->async_placeholder, "close");
+                	if (closed) {
+                        	SvREFCNT_dec(closed);
+                	}
+
+			// check for psgix.harakiri
+        		harakiri = hv_fetch((HV*)SvRV( (SV*)wsgi_req->async_environ), "psgix.harakiri.commit", 21, 0);
+        		if (harakiri) {
+                		if (SvTRUE(*harakiri)) wsgi_req->async_plagued = 1;
+        		}
+
+			SvREFCNT_dec(wsgi_req->async_environ);
+        		SvREFCNT_dec(wsgi_req->async_result);
+
+			return UWSGI_OK;
+                }
+
+                wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, chitem, hlen);
+		SvREFCNT_dec(chunk);
+
+		return UWSGI_AGAIN;
+	}
+#endif
 
 	status_code = av_fetch(response, 0, 0);
+	if (!status_code) { uwsgi_log("invalid PSGI status code\n"); return UWSGI_OK;}
 
         wsgi_req->hvec[0].iov_base = "HTTP/1.1 ";
         wsgi_req->hvec[0].iov_len = 9;
 
-        //uwsgi_log("setting status %d %d\n", SvTYPE(*status_code), SvIV(*status_code));
-
         wsgi_req->hvec[1].iov_base = SvPV(*status_code, hlen);
+
         wsgi_req->hvec[1].iov_len = 3;
 
         wsgi_req->status = atoi(wsgi_req->hvec[1].iov_base);
@@ -92,8 +94,10 @@ int psgi_response(struct wsgi_request *wsgi_req, PerlInterpreter *my_perl, AV *r
         wsgi_req->hvec[4].iov_len = 2;
 
         hitem = av_fetch(response, 1, 0);
+	if (!hitem) { uwsgi_log("invalid PSGI headers\n"); return UWSGI_OK;}
 
         headers = (AV *) SvRV(*hitem);
+	if (!headers) { uwsgi_log("invalid PSGI headers\n"); return UWSGI_OK;}
 
         base = 5;
 
@@ -122,34 +126,76 @@ int psgi_response(struct wsgi_request *wsgi_req, PerlInterpreter *my_perl, AV *r
 	vi = (i*2)+base;
         wsgi_req->hvec[vi].iov_base = "\r\n"; wsgi_req->hvec[vi].iov_len = 2;
 
-        if ( !(wsgi_req->headers_size = writev(wsgi_req->poll.fd, wsgi_req->hvec, vi+1)) ) {
+        if ( !(wsgi_req->headers_size += wsgi_req->socket->proto_writev_header(wsgi_req, wsgi_req->hvec, vi+1)) ) {
                 uwsgi_error("writev()");
         }
 
         hitem = av_fetch(response, 2, 0);
 
-        if (SvTYPE(SvRV(*hitem)) == SVt_PVGV || SvTYPE(SvRV(*hitem)) == SVt_PVHV) {
+	if (!hitem) {
+		return UWSGI_OK;
+	}
+
+	if (!SvRV(*hitem)) { uwsgi_log("invalid PSGI response body\n") ; return UWSGI_OK; }
+	
+        if (SvTYPE(SvRV(*hitem)) == SVt_PVGV || SvTYPE(SvRV(*hitem)) == SVt_PVHV || SvTYPE(SvRV(*hitem)) == SVt_PVMG) {
+
+		// respond to fileno ?
+		if (uwsgi.async < 2) {
+			if (uwsgi_perl_obj_can(*hitem, "fileno", 6)) {
+				SV *fn = uwsgi_perl_obj_call(*hitem, "fileno");
+				wsgi_req->sendfile_fd = SvIV(fn);
+				SvREFCNT_dec(fn);	
+				wsgi_req->response_size += uwsgi_sendfile(wsgi_req);
+				return UWSGI_OK;
+			}
+			
+			if (uwsgi_perl_obj_can(*hitem, "path", 4)) {
+				SV *p = uwsgi_perl_obj_call(*hitem, "path");
+				wsgi_req->sendfile_fd = open(SvPV_nolen(p), O_RDONLY);
+				SvREFCNT_dec(p);	
+				wsgi_req->response_size += uwsgi_sendfile(wsgi_req);
+				close(wsgi_req->sendfile_fd);
+				return UWSGI_OK;
+			}
+		}
 
                 for(;;) {
-                        PUSHMARK(SP);
-                        XPUSHs(*hitem);
-                        PUTBACK;
-                        perl_call_method("getline", G_SCALAR);
-                        SPAGAIN;
 
-                        if(SvTRUE(ERRSV)) {
-                                uwsgi_log("%s\n", SvPV_nolen(ERRSV));
-                                break;
-                        }
-
-                        SV *chunk = POPs;
+			wsgi_req->switches++;
+                        SV *chunk = uwsgi_perl_obj_call(*hitem, "getline");
+			if (!chunk) {
+				internal_server_error(wsgi_req, "exception raised");
+				break;
+			}
                         chitem = SvPV( chunk, hlen);
+#ifdef UWSGI_ASYNC
+			if (uwsgi.async > 1 && wsgi_req->async_force_again) {
+				SvREFCNT_dec(chunk);
+				wsgi_req->async_status = UWSGI_AGAIN;
+				wsgi_req->async_placeholder = (SV *) *hitem;
+				return UWSGI_AGAIN;
+			}
+#endif
                         if (hlen <= 0) {
+				SvREFCNT_dec(chunk);
                                 break;
                         }
-                        wsgi_req->response_size = write(wsgi_req->poll.fd, chitem, hlen);
+                        wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, chitem, hlen);
+			SvREFCNT_dec(chunk);
+#ifdef UWSGI_ASYNC
+			if (uwsgi.async > 1) {
+				wsgi_req->async_status = UWSGI_AGAIN;
+				wsgi_req->async_placeholder = (SV *) *hitem;
+				return UWSGI_AGAIN;
+			}
+#endif
                 }
 
+		SV *closed = uwsgi_perl_obj_call(*hitem, "close");
+		if (closed) {
+			SvREFCNT_dec(closed);
+		}
 
         }
         else if (SvTYPE(SvRV(*hitem)) == SVt_PVAV)  {
@@ -159,7 +205,7 @@ int psgi_response(struct wsgi_request *wsgi_req, PerlInterpreter *my_perl, AV *r
                 for(i=0; i<=av_len(body); i++) {
                         hitem = av_fetch(body,i,0);
                         chitem = SvPV(*hitem, hlen);
-                        wsgi_req->response_size = write(wsgi_req->poll.fd, chitem, hlen);
+                        wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, chitem, hlen);
                 }
 
         }
@@ -167,6 +213,6 @@ int psgi_response(struct wsgi_request *wsgi_req, PerlInterpreter *my_perl, AV *r
                 uwsgi_log("unsupported response body type: %d\n", SvTYPE(SvRV(*hitem)));
         }
 	
-	return 1;
+	return UWSGI_OK;
 
 }

plugins/psgi/uwsgi_plmodule.c

@@ -2,12 +2,85 @@
 
 extern struct uwsgi_server uwsgi;
 
-#define psgi_xs(func) newXS("uwsgi::" #func, XS_##func, "uwsgi")
-#define psgi_check_args(x) if (items < x) Perl_croak(aTHX_ "Usage: uwsgi::%s takes %d arguments", __FUNCTION__ + 3, x)
+#ifdef UWSGI_ASYNC
+
+
+XS(XS_async_sleep) {
+
+        dXSARGS;
+        int timeout ;
+
+        psgi_check_args(1);
+
+        struct wsgi_request *wsgi_req = current_wsgi_req();
+
+        timeout = SvIV(ST(0));
+
+        if (timeout >= 0) {
+		async_add_timeout(wsgi_req, timeout);
+        }
+
+	wsgi_req->async_force_again = 1;
+
+	XSRETURN_UNDEF;
+}
+
+
+
+XS(XS_wait_fd_read) {
+
+	dXSARGS;
+        int fd, timeout = 0;
+
+	psgi_check_args(1);
+
+        struct wsgi_request *wsgi_req = current_wsgi_req();
+
+	fd = SvIV(ST(0));
+	if (items > 1) {
+		timeout = SvIV(ST(1));
+	} 
+
+        if (fd >= 0) {
+                async_add_fd_read(wsgi_req, fd, timeout);
+        }
+
+	wsgi_req->async_force_again = 1;
+
+	XSRETURN_UNDEF;
+}
+
+
+XS(XS_wait_fd_write) {
+
+        dXSARGS;
+        int fd, timeout = 0;
+
+        psgi_check_args(1);
+
+        struct wsgi_request *wsgi_req = current_wsgi_req();
+
+        fd = SvIV(ST(0));
+        if (items > 1) {
+                timeout = SvIV(ST(1));
+        }
+
+        if (fd >= 0) {
+                async_add_fd_write(wsgi_req, fd, timeout);
+        }
+
+	wsgi_req->async_force_again = 1;
+
+	XSRETURN_UNDEF;
+}
+
+#endif
+
 
 XS(XS_reload) {
     dXSARGS;
-    items = 0;
+
+	psgi_check_args(0);
 
     uwsgi_log("SENDING HUP TO %d\n", (int) uwsgi.workers[0].pid);
     if (kill(uwsgi.workers[0].pid, SIGHUP)) {
@@ -57,6 +130,27 @@ XS(XS_cache_get) {
 	
 }
 
+XS(XS_log) {
+
+	dXSARGS;
+
+	psgi_check_args(1);
+
+	uwsgi_log("%s", SvPV_nolen(ST(0)));
+
+	XSRETURN_UNDEF;
+}
+
+XS(XS_async_connect) {
+
+	dXSARGS;
+	psgi_check_args(1);
+
+	ST(0) = newSViv(uwsgi_connect(SvPV_nolen(ST(0)), 0, 1));
+
+	XSRETURN(1);
+}
+
 XS(XS_call) {
 
 	dXSARGS;
@@ -88,11 +182,30 @@ XS(XS_call) {
 }
 
 
+XS(XS_suspend) {
+
+	dXSARGS;
+	psgi_check_args(0);
+
+	struct wsgi_request *wsgi_req = current_wsgi_req();
+
+	wsgi_req->async_force_again = 0;
+
+        if (uwsgi.schedule_to_main) uwsgi.schedule_to_main(wsgi_req);
+
+	XSRETURN_UNDEF;
+}
 
 void init_perl_embedded_module() {
 	psgi_xs(reload);
 	psgi_xs(cache_set);
 	psgi_xs(cache_get);
 	psgi_xs(call);
+	psgi_xs(wait_fd_read);
+	psgi_xs(wait_fd_write);
+	psgi_xs(async_sleep);
+	psgi_xs(log);
+	psgi_xs(async_connect);
+	psgi_xs(suspend);
 }
 

plugins/psgi/uwsgiplugin.py

@@ -4,4 +4,4 @@ NAME='psgi'
 CFLAGS = [os.popen('perl -MExtUtils::Embed -e ccopts').read().rstrip()]
 LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts').read().rstrip()]
 LIBS = []
-GCC_LIST = ['uwsgi_plmodule', 'psgi_response', 'psgi_plugin']
+GCC_LIST = ['uwsgi_plmodule', 'psgi_loader', 'psgi_response', 'psgi_plugin']

plugins/pyerl/pyerl.c

@@ -301,11 +301,10 @@ recv:
 void pyerl_call_registered(void *func, ei_x_buff *x) {
 
 	PyObject *pyargs = PyTuple_New(1);
-        PyObject *ret;
 
 	PyTuple_SetItem(pyargs, 0, erl_to_py(x));
 	
-        ret = python_call((PyObject *) func, pyargs, 0);
+        python_call((PyObject *) func, pyargs, 0);
 }
 
 PyObject *pyerl_register_process(PyObject * self, PyObject * args) {

plugins/python/gil.c

@@ -4,15 +4,19 @@ extern struct uwsgi_server uwsgi;
 extern struct uwsgi_python up;
 
 void gil_real_get() {
+	//uwsgi_log("LOCK %d\n", uwsgi.mywid);
 #ifndef PYTHREE
 	PyEval_AcquireLock();
 	PyThreadState_Swap((PyThreadState *) pthread_getspecific(up.upt_gil_key));
 #else
 	PyEval_RestoreThread((PyThreadState *) pthread_getspecific(up.upt_gil_key));
 #endif
+
+	//uwsgi_log("LOCKED !!! %d\n", uwsgi.mywid);
 }
 
 void gil_real_release() {
+	//uwsgi_log("UNLOCK %d\n", uwsgi.mywid);
 #ifndef PYTHREE
 	pthread_setspecific(up.upt_gil_key, (void *) PyThreadState_Swap(NULL));
 	PyEval_ReleaseLock();	

plugins/python/profiler.c

@@ -0,0 +1,34 @@
+#include "uwsgi_python.h"
+
+extern struct uwsgi_server uwsgi;
+
+#ifdef HAS_NOT_PyFrame_GetLineNumber
+int PyFrame_GetLineNumber(PyFrameObject *frame) {
+	if (frame->f_trace) {
+		return frame->f_lineno;
+	}
+	else {
+		return PyCode_Addr2Line(frame->f_code, frame->f_lasti);
+	}
+}
+#endif
+
+int uwsgi_python_profiler_call(PyObject *obj, PyFrameObject *frame, int what, PyObject *arg) {
+
+	switch(what) {
+		case PyTrace_CALL:
+			uwsgi_log("[uWSGI Python profiler] CALL: %s (line %d) -> %s %d args, stacksize %d\n",
+				PyString_AsString(frame->f_code->co_filename),
+				PyFrame_GetLineNumber(frame),
+				PyString_AsString(frame->f_code->co_name), frame->f_code->co_argcount, frame->f_code->co_stacksize);
+			break;
+		case PyTrace_C_CALL:
+			uwsgi_log("[uWSGI Python profiler] C CALL: %s (line %d) -> %s %d args, stacksize %d\n",
+				PyString_AsString(frame->f_code->co_filename),
+				PyFrame_GetLineNumber(frame),
+				PyEval_GetFuncName(arg), frame->f_code->co_argcount, frame->f_code->co_stacksize);
+			break;
+	}
+
+	return 0;
+}

plugins/python/pump_subhandler.c

@@ -0,0 +1,388 @@
+#include "uwsgi_python.h"
+
+extern struct uwsgi_server uwsgi;
+extern struct uwsgi_python up;
+extern PyTypeObject uwsgi_InputType;
+
+
+extern struct http_status_codes hsc[];
+
+
+void *uwsgi_request_subhandler_pump(struct wsgi_request *wsgi_req, struct uwsgi_app *wi) {
+
+	PyObject *zero;
+
+	int i;
+        PyObject *pydictkey, *pydictvalue;
+
+	char *port = memchr(wsgi_req->host, ':', wsgi_req->host_len);
+	if (port) {
+
+		zero = PyString_FromStringAndSize(wsgi_req->host, (port-wsgi_req->host));
+		PyDict_SetItemString(wsgi_req->async_environ, "server_name", zero);
+		Py_DECREF(zero);
+
+		zero = PyString_FromStringAndSize(port, wsgi_req->host_len-((port+1)-wsgi_req->host));
+		PyDict_SetItemString(wsgi_req->async_environ, "server_port", zero);
+		Py_DECREF(zero);
+	}
+	else {
+
+		zero = PyString_FromStringAndSize(wsgi_req->host, wsgi_req->host_len);
+		PyDict_SetItemString(wsgi_req->async_environ, "server_name", zero);
+		Py_DECREF(zero);
+
+		zero = PyString_FromStringAndSize("80", 2);
+		PyDict_SetItemString(wsgi_req->async_environ, "server_port", zero);
+		Py_DECREF(zero);
+	}
+
+	zero = PyString_FromStringAndSize(wsgi_req->remote_addr, wsgi_req->remote_addr_len);
+	PyDict_SetItemString(wsgi_req->async_environ, "remote_addr", zero);
+	Py_DECREF(zero);
+
+	zero = PyString_FromStringAndSize(wsgi_req->path_info, wsgi_req->path_info_len);
+	PyDict_SetItemString(wsgi_req->async_environ, "uri", zero);
+	Py_DECREF(zero);
+
+	if (wsgi_req->query_string_len > 0) {
+		zero = PyString_FromStringAndSize(wsgi_req->query_string, wsgi_req->query_string_len);
+		PyDict_SetItemString(wsgi_req->async_environ, "query_string", zero);
+		Py_DECREF(zero);
+	}
+
+	zero = PyString_FromStringAndSize(uwsgi_lower(wsgi_req->method, wsgi_req->method_len), wsgi_req->method_len);
+	PyDict_SetItemString(wsgi_req->async_environ, "method", zero);
+	Py_DECREF(zero);
+
+	if (wsgi_req->post_cl > 0) {
+		PyDict_SetItemString(wsgi_req->async_environ, "content_length", PyInt_FromLong(wsgi_req->post_cl));
+		if (wsgi_req->content_type_len > 0) {
+			zero = PyString_FromStringAndSize(wsgi_req->content_type, wsgi_req->content_type_len);
+                	PyDict_SetItemString(wsgi_req->async_environ, "content_type", zero);
+                	Py_DECREF(zero);
+		}
+	}
+
+
+
+	PyObject *headers = PyDict_New();
+
+        for (i = 0; i < wsgi_req->var_cnt; i += 2) {
+#ifdef UWSGI_DEBUG
+                uwsgi_debug("%.*s: %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
+#endif
+		if (wsgi_req->hvec[i].iov_len < 6) continue;
+		if (!uwsgi_startswith(wsgi_req->hvec[i].iov_base, "HTTP_", 5)) {
+			(void) uwsgi_lower(wsgi_req->hvec[i].iov_base+5, wsgi_req->hvec[i].iov_len-5);
+#ifdef PYTHREE
+                	pydictkey = PyUnicode_DecodeLatin1(wsgi_req->hvec[i].iov_base+5, wsgi_req->hvec[i].iov_len-5, NULL);
+                	pydictvalue = PyUnicode_DecodeLatin1(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len, NULL);
+#else
+                	pydictkey = PyString_FromStringAndSize(wsgi_req->hvec[i].iov_base+5, wsgi_req->hvec[i].iov_len-5);
+                	pydictvalue = PyString_FromStringAndSize(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len);
+#endif
+			PyObject *old_value = PyDict_GetItem(headers, pydictkey);
+			if (old_value) {
+				if (PyString_Check(old_value)) {
+					PyObject *new_value = PyList_New(0);
+					PyList_Append(new_value, old_value);
+					old_value = new_value;
+                			PyDict_SetItem(headers, pydictkey, old_value);
+					Py_DECREF(old_value);
+				}
+				PyList_Append(old_value, pydictvalue);
+			}
+			else {
+                		PyDict_SetItem(headers, pydictkey, pydictvalue);
+			}
+                	Py_DECREF(pydictkey);
+                	Py_DECREF(pydictvalue);
+		}
+        }
+
+	PyDict_SetItemString(wsgi_req->async_environ, "headers", headers);
+	Py_DECREF(headers);
+
+        // if async_post is mapped as a file, directly use it as wsgi.input
+        if (wsgi_req->async_post) {
+#ifdef PYTHREE
+                wsgi_req->async_input = PyFile_FromFd(fileno(wsgi_req->async_post), "pump_body", "rb", 0, NULL, NULL, NULL, 0);
+#else
+                wsgi_req->async_input = PyFile_FromFile(wsgi_req->async_post, "pump_body", "r", NULL);
+#endif
+        }
+        else {
+                // create wsgi.input custom object
+                wsgi_req->async_input = (PyObject *) PyObject_New(uwsgi_Input, &uwsgi_InputType);
+                ((uwsgi_Input*)wsgi_req->async_input)->wsgi_req = wsgi_req;
+                ((uwsgi_Input*)wsgi_req->async_input)->pos = 0;
+                ((uwsgi_Input*)wsgi_req->async_input)->readline_pos = 0;
+                ((uwsgi_Input*)wsgi_req->async_input)->readline_max_size = 0;
+
+        }
+
+        PyDict_SetItemString(wsgi_req->async_environ, "body", wsgi_req->async_input);
+
+
+	if (wsgi_req->scheme_len > 0) {
+		zero = PyString_FromStringAndSize(wsgi_req->scheme, wsgi_req->scheme_len);
+	}
+	else if (wsgi_req->https_len > 0) {
+		if (!strncasecmp(wsgi_req->https, "on", 2) || wsgi_req->https[0] == '1') {
+			zero = PyString_FromString("https");
+		}
+		else {
+			zero = PyString_FromString("http");
+		}
+	}
+	else {
+		zero = PyString_FromString("http");
+	}
+	PyDict_SetItemString(wsgi_req->async_environ, "scheme", zero);
+	Py_DECREF(zero);
+
+
+	wsgi_req->async_app = wi->callable;
+
+	// export .env only in non-threaded mode
+        if (uwsgi.threads < 2) {
+        	PyDict_SetItemString(up.embedded_dict, "env", wsgi_req->async_environ);
+        }
+
+        PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.version", wi->uwsgi_version);
+
+        if (uwsgi.cores > 1) {
+                PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.core", PyInt_FromLong(wsgi_req->async_id));
+        }
+
+        // cache this ?
+        if (uwsgi.cluster_fd >= 0) {
+                zero = PyString_FromString(uwsgi.cluster);
+                PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.cluster", zero);
+                Py_DECREF(zero);
+                zero = PyString_FromString(uwsgi.hostname);
+                PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.cluster_node", zero);
+                Py_DECREF(zero);
+        }
+
+        PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.node", wi->uwsgi_node);
+
+
+	// call
+
+	PyTuple_SetItem(wsgi_req->async_args, 0, wsgi_req->async_environ);
+	return python_call(wsgi_req->async_app, wsgi_req->async_args, uwsgi.catch_exceptions, wsgi_req);
+}
+
+
+int uwsgi_response_subhandler_pump(struct wsgi_request *wsgi_req) {
+
+	PyObject *pychunk;
+	ssize_t wsize;
+	int i;
+
+	struct http_status_codes *http_sc;
+	char sc[4];
+
+	UWSGI_GET_GIL
+
+	// ok its a yield
+	if (!wsgi_req->async_placeholder) {
+		if (PyDict_Check((PyObject *)wsgi_req->async_result)) {
+
+
+			PyObject *status = PyDict_GetItemString((PyObject *)wsgi_req->async_result, "status");
+			if (!status) {
+				uwsgi_log("invalid Pump response (status code).\n"); 
+				goto clear; 
+			}
+
+			PyObject *headers = PyDict_GetItemString((PyObject *)wsgi_req->async_result, "headers");
+			if (!headers) {
+				uwsgi_log("invalid Pump response (headers).\n"); 
+				goto clear; 
+			}
+
+
+			wsgi_req->async_placeholder =  PyDict_GetItemString((PyObject *)wsgi_req->async_result, "body");
+			if (!wsgi_req->async_placeholder) {
+				uwsgi_log("invalid Pump response (body).\n"); 
+				goto clear; 
+			}
+
+			// get the status code
+			if (!PyInt_Check(status)) {
+				uwsgi_log("invalid Pump response (status code).\n"); 
+				goto clear; 
+			}
+
+			if (uwsgi_num2str2n(PyInt_AsLong(status), sc, 4) != 3) {
+				uwsgi_log("invalid Pump response (status code).\n"); 
+				goto clear; 
+			}
+
+			int found = 0;
+			for (http_sc = hsc; http_sc->message != NULL; http_sc++) {
+                		if (http_sc->key[0] == sc[0] && http_sc->key[1] == sc[1] && http_sc->key[2] == sc[2]) {
+                        		wsgi_req->hvec[4].iov_base = (char *) http_sc->message;
+                        		wsgi_req->hvec[4].iov_len = http_sc->message_size;
+					found = 1;
+                        		break;
+                		}
+        		}
+		
+			if (!found) {
+				uwsgi_log("invalid Pump response (status code).\n"); 
+				goto clear; 
+			}
+
+			wsgi_req->hvec[0].iov_base = wsgi_req->protocol;
+			wsgi_req->hvec[0].iov_len = wsgi_req->protocol_len;
+			wsgi_req->hvec[1].iov_base = " ";
+			wsgi_req->hvec[1].iov_len = 1;
+			wsgi_req->hvec[2].iov_base = sc;
+			wsgi_req->hvec[2].iov_len = 3;
+			wsgi_req->hvec[3].iov_base = " ";
+			wsgi_req->hvec[3].iov_len = 1;
+			wsgi_req->hvec[5].iov_base = "\r\n";
+			wsgi_req->hvec[5].iov_len = 2;
+
+			UWSGI_RELEASE_GIL
+                	wsize = wsgi_req->socket->proto_writev_header(wsgi_req, wsgi_req->hvec, 6);
+                	UWSGI_GET_GIL
+                	if (wsize < 0) {
+                        	uwsgi_error("writev()");
+                	}
+                	wsgi_req->headers_size += wsize;
+
+			PyObject *hhkey, *hhvalue;
+			Py_ssize_t hhpos = 0;
+			while (PyDict_Next(headers, &hhpos, &hhkey, &hhvalue)) {
+				if (!PyString_Check(hhkey)) continue;
+
+				wsgi_req->hvec[0].iov_base = PyString_AsString(hhkey);
+				wsgi_req->hvec[0].iov_len = PyString_Size(hhkey);	
+				((char*)wsgi_req->hvec[0].iov_base)[0] = toupper((int) ((char*)wsgi_req->hvec[0].iov_base)[0]);
+
+				wsgi_req->hvec[1].iov_base = ": ";
+                        	wsgi_req->hvec[1].iov_len = 2;
+
+				wsgi_req->hvec[3].iov_base = "\r\n";
+                        	wsgi_req->hvec[3].iov_len = 2;
+				if (PyList_Check(hhvalue)) {
+					for(i=0;i<PyList_Size(hhvalue);i++) {
+						PyObject *item = PyList_GetItem(hhvalue, i);
+						if (PyString_Check(item)) {
+							wsgi_req->hvec[2].iov_base = PyString_AsString(item);
+                                        		wsgi_req->hvec[2].iov_len = PyString_Size(item);
+                                        		UWSGI_RELEASE_GIL
+                                        		wsize = wsgi_req->socket->proto_writev_header(wsgi_req, wsgi_req->hvec, 4);
+                                        		UWSGI_GET_GIL
+                                        		if (wsize < 0) {
+                                                		uwsgi_error("writev()");
+                                        		}
+                                        		wsgi_req->headers_size += wsize;
+						}
+					}	
+				}
+				else if (PyString_Check(hhvalue)) {
+					wsgi_req->hvec[2].iov_base = PyString_AsString(hhvalue);
+                                	wsgi_req->hvec[2].iov_len = PyString_Size(hhvalue);
+					UWSGI_RELEASE_GIL
+                        		wsize = wsgi_req->socket->proto_writev_header(wsgi_req, wsgi_req->hvec, 4);
+                        		UWSGI_GET_GIL
+                        		if (wsize < 0) {
+                                		uwsgi_error("writev()");
+                        		}
+                        		wsgi_req->headers_size += wsize;
+				}
+			}
+
+			wsgi_req->socket->proto_write(wsgi_req, "\r\n", 2);
+			Py_INCREF((PyObject *)wsgi_req->async_placeholder);
+
+			if (PyString_Check((PyObject *)wsgi_req->async_placeholder)) {
+                		if ((wsize = wsgi_req->socket->proto_write(wsgi_req, PyString_AsString(wsgi_req->async_placeholder), PyString_Size(wsgi_req->async_placeholder))) < 0) {
+                        		uwsgi_error("write()");
+                        		goto clear;
+                		}
+                		wsgi_req->response_size += wsize;
+                		goto clear;
+        		}
+#ifdef PYTHREE
+			else if ((wsgi_req->sendfile_fd = PyObject_AsFileDescriptor((PyObject *)wsgi_req->async_placeholder)) > -1) {
+#else
+			else if (PyFile_Check((PyObject *)wsgi_req->async_placeholder)) {
+				wsgi_req->sendfile_fd = fileno(PyFile_AsFile((PyObject *)wsgi_req->async_placeholder));
+#endif
+                		wsize = uwsgi_sendfile(wsgi_req);
+				if (wsize < 0) {
+					goto clear;
+				}
+                		wsgi_req->response_size += wsize;
+				goto clear;
+			}
+
+			PyObject *tmp = (PyObject *)wsgi_req->async_placeholder;
+
+			wsgi_req->async_placeholder = PyObject_GetIter( (PyObject *)wsgi_req->async_placeholder );
+
+			Py_DECREF(tmp);
+
+			if (!wsgi_req->async_placeholder) {
+				goto clear;
+			}
+#ifdef UWSGI_ASYNC
+			if (uwsgi.async > 1) {
+				UWSGI_RELEASE_GIL
+				return UWSGI_AGAIN;
+			}
+		}
+		else {
+			uwsgi_log("invalid Pump response.\n"); 
+			goto clear; 
+		}
+#endif
+	}
+
+
+
+	pychunk = PyIter_Next(wsgi_req->async_placeholder);
+
+	if (!pychunk) {
+		if (PyErr_Occurred()) PyErr_Print();
+		goto clear;
+	}
+
+
+	if (PyString_Check(pychunk)) {
+		if ((wsize = wsgi_req->socket->proto_write(wsgi_req,  PyString_AsString(pychunk), PyString_Size(pychunk))) < 0) {
+			uwsgi_error("write()");
+			Py_DECREF(pychunk);
+			goto clear;
+		}
+		wsgi_req->response_size += wsize;
+	}
+
+
+	Py_DECREF(pychunk);
+	UWSGI_RELEASE_GIL
+	return UWSGI_AGAIN;
+
+clear:
+	if (wsgi_req->async_input) {
+                Py_DECREF((PyObject *)wsgi_req->async_input);
+        }
+	if (wsgi_req->async_environ) {
+		PyDict_Clear(wsgi_req->async_environ);
+	}
+	Py_XDECREF((PyObject *)wsgi_req->async_placeholder);
+
+	Py_DECREF((PyObject *)wsgi_req->async_result);
+	PyErr_Clear();
+
+	UWSGI_RELEASE_GIL
+	return UWSGI_OK;
+}
+

plugins/python/pyloader.c

@@ -4,6 +4,8 @@
 
    exit(1) on every malloc error: apps can be dinamically loaded so on memory problem
    it is better to let the master process manager respawn the worker.
+
+   TODO dynamic loading on prefork+thread looks flaky... NEED TO FIX IT
    */
 
 extern struct uwsgi_server uwsgi;
@@ -20,12 +22,11 @@ PyMethodDef uwsgi_eventfd_read_method[] = { {"uwsgi_eventfd_read", py_eventfd_re
 PyMethodDef uwsgi_eventfd_write_method[] = { {"uwsgi_eventfd_write", py_eventfd_write, METH_VARARGS, ""}};
 #endif
 
-int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThreadState *interpreter) {
+int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThreadState *interpreter, int app_type) {
 
-	PyObject *zero;
 	PyObject *app_list = NULL, *applications = NULL;
 
-	int id = uwsgi.apps_cnt;
+	int id = uwsgi_apps_cnt;
 	int multiapp = 0;
 
 #ifdef UWSGI_ASYNC
@@ -37,23 +38,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 	struct uwsgi_app *wi;
 
 
-	if (wsgi_req->script_name_len == 0) {
-		wsgi_req->script_name = "";
-	}
-	else if (wsgi_req->script_name_len == 1) {
-		if (wsgi_req->script_name[0] == '/') {
-			wsgi_req->script_name = "";
-			wsgi_req->script_name_len = 0;
-		}
-	}
-
-
-	if (uwsgi.vhost && wsgi_req->host_len > 0) {
-		mountpoint = uwsgi_concat3n(wsgi_req->host, wsgi_req->host_len, "|", 1, wsgi_req->script_name, wsgi_req->script_name_len);
-	}
-	else {
-		mountpoint = uwsgi_strncopy(wsgi_req->script_name, wsgi_req->script_name_len);
-	}
+	mountpoint = uwsgi_strncopy(wsgi_req->appid, wsgi_req->appid_len);
 
 	if (uwsgi_get_app_id(mountpoint, strlen(mountpoint), -1) != -1) {
 		uwsgi_log( "mountpoint %.*s already configured. skip.\n", strlen(mountpoint), mountpoint);
@@ -62,7 +47,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 	}
 
 
-	wi = &uwsgi.apps[id];
+	wi = &uwsgi_apps[id];
 
 	memset(wi, 0, sizeof(struct uwsgi_app));
 	wi->mountpoint = mountpoint;
@@ -112,7 +97,6 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 					uwsgi_log("%s = %s\n", PyString_AsString(k), PyString_AsString(env_value));
 
                         		if (PyObject_SetItem(py_environ, k, env_value)) {
-						uwsgi_log("cazzo\n");
                                 		PyErr_Print();
                         		}
 
@@ -125,7 +109,6 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
         	}
 	}
 
-
 	if (interpreter == NULL && id) {
 		wi->interpreter = Py_NewInterpreter();
 		if (!wi->interpreter) {
@@ -161,7 +144,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 	wi->callable = up.loaders[loader](arg1);
 
 	if (!wi->callable) {
-		uwsgi_log("unable to load app SCRIPT_NAME=%s\n", mountpoint);
+		uwsgi_log("unable to load app mountpoint=%s\n", mountpoint);
 		goto doh;
 	}
 
@@ -185,12 +168,14 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 		}
 		wi->mountpoint = PyString_AsString(app_mnt);
 		wi->mountpoint_len = strlen(wi->mountpoint);
-		wsgi_req->script_name = wi->mountpoint;
-		wsgi_req->script_name_len = wi->mountpoint_len;
+		wsgi_req->appid = wi->mountpoint;
+		wsgi_req->appid_len = wi->mountpoint_len;
 		uwsgi_log("main mountpoint = %s\n", wi->mountpoint);
 		wi->callable = PyDict_GetItem(applications, app_mnt);
 	}
 
+	Py_INCREF((PyObject *)wi->callable);
+
 #ifdef UWSGI_ASYNC
 	wi->environ = malloc(sizeof(PyObject*)*uwsgi.cores);
 	if (!wi->environ) {
@@ -213,47 +198,29 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 	}
 #endif
 
-	// check function args
-	// by defaut it is a WSGI app
-	wi->argc = 2;
-	zero = PyObject_GetAttrString(wi->callable, "__code__");
-	if (!zero) {
-		zero = PyObject_GetAttrString(wi->callable, "__call__");
-		if (zero) {
-			zero = PyObject_GetAttrString(wi->callable, "__code__");
-		}
-		else {
-			uwsgi_log("WARNING: unable to get the number of callable args. Fallback to WSGI\n");
-		}
-	}
+	wi->argc = 1;
 
-	// avoid __code__ attr error propagation
-	PyErr_Clear();
-
-	if (zero) {
-		zero = PyObject_GetAttrString(zero, "co_argcount");
-		wi->argc = (int) PyInt_AsLong(zero);
-	}
-
-	if (wi->argc == 2) {
+	if (app_type == PYTHON_APP_TYPE_WSGI) {
 #ifdef UWSGI_DEBUG
-		uwsgi_log("-- WSGI callable detected --\n");
+		uwsgi_log("-- WSGI callable selected --\n");
 #endif
 		wi->request_subhandler = uwsgi_request_subhandler_wsgi;
 		wi->response_subhandler = uwsgi_response_subhandler_wsgi;
+		wi->argc = 2;
 	}
-#ifdef UWSGI_WEB3
-	else if (wi->argc == 1) {
+	else if (app_type == PYTHON_APP_TYPE_WEB3) {
 #ifdef UWSGI_DEBUG
-		uwsgi_log("-- Web3 callable detected --\n");
+		uwsgi_log("-- Web3 callable selected --\n");
 #endif
 		wi->request_subhandler = uwsgi_request_subhandler_web3;
 		wi->response_subhandler = uwsgi_response_subhandler_web3;
 	}
+	else if (app_type == PYTHON_APP_TYPE_PUMP) {
+#ifdef UWSGI_DEBUG
+		uwsgi_log("-- Pump callable selected --\n");
 #endif
-	else {
-		uwsgi_log("-- INVALID callable detected --\n");
-		goto doh;
+		wi->request_subhandler = uwsgi_request_subhandler_pump;
+		wi->response_subhandler = uwsgi_response_subhandler_pump;
 	}
 
 #ifdef UWSGI_ASYNC
@@ -271,7 +238,8 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 		}
 
 		// add start_response on WSGI app
-		if (wi->argc == 2) {
+		Py_INCREF((PyObject *)up.wsgi_spitout);
+		if (app_type == PYTHON_APP_TYPE_WSGI) {
 			if (PyTuple_SetItem(wi->args[i], 1, up.wsgi_spitout)) {
 				uwsgi_log("unable to set start_response in args tuple\n");
 				exit(1);
@@ -281,7 +249,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 #else
 
 	wi->wsgi_args = PyTuple_New(wi->argc);
-	if (wi->argc == 2) {
+	if (app_type == PYTHON_APP_TYPE_WSGI) {
 		if (PyTuple_SetItem(wi->wsgi_args, 1, up.wsgi_spitout)) {
 			uwsgi_log("unable to set start_response in args tuple\n");
 			exit(1);
@@ -289,7 +257,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 	}
 #endif
 
-	if (wi->argc == 2) {
+	if (app_type == PYTHON_APP_TYPE_WSGI) {
 #ifdef UWSGI_SENDFILE
 		// prepare sendfile() for WSGI app
 		wi->sendfile = PyCFunction_New(uwsgi_sendfile_method, NULL);
@@ -301,9 +269,23 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 #endif
 	}
 
+	// cache most used values
+
+	wi->gateway_version = PyTuple_New(2);
+        PyTuple_SetItem(wi->gateway_version, 0, PyInt_FromLong(1));
+        PyTuple_SetItem(wi->gateway_version, 1, PyInt_FromLong(0));
+	Py_INCREF((PyObject *)wi->gateway_version);
+
+	wi->uwsgi_version = PyString_FromString(UWSGI_VERSION);
+	Py_INCREF((PyObject *)wi->uwsgi_version);
+
+	wi->uwsgi_node = PyString_FromString(uwsgi.hostname);
+	Py_INCREF((PyObject *)wi->uwsgi_node);
+
 	if (uwsgi.threads > 1 && id) {
 		// if we have multiple threads we need to initialize a PyThreadState for each one
 		for(i=0;i<uwsgi.threads;i++) {
+			//uwsgi_log("%p\n", uwsgi.core[i]->ts[id]);
 			uwsgi.core[i]->ts[id] = PyThreadState_New( ((PyThreadState *)wi->interpreter)->interp);
 			if (!uwsgi.core[i]->ts[id]) {
 				uwsgi_log("unable to allocate new PyThreadState structure for app %s", mountpoint);
@@ -316,19 +298,22 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 		PyThreadState_Swap(up.main_thread);
 	}
 
-	if (wi->argc == 1) {
-		uwsgi_log( "Web3 application %d (SCRIPT_NAME=%.*s) ready on interpreter %p", id, wi->mountpoint_len, wi->mountpoint, wi->interpreter);
+	if (app_type == PYTHON_APP_TYPE_WSGI) {
+		uwsgi_log( "WSGI application %d (mountpoint=%.*s) ready on interpreter %p pid: %d", id, wi->mountpoint_len, wi->mountpoint, wi->interpreter, (int) getpid());
 	}
-	else {
-		uwsgi_log( "WSGI application %d (SCRIPT_NAME=%.*s) ready on interpreter %p", id, wi->mountpoint_len, wi->mountpoint, wi->interpreter);
+	else if (app_type == PYTHON_APP_TYPE_WEB3) {
+		uwsgi_log( "Web3 application %d (mountpoint=%.*s) ready on interpreter %p pid: %d", id, wi->mountpoint_len, wi->mountpoint, wi->interpreter, (int) getpid());
+	}
+	else if (app_type == PYTHON_APP_TYPE_PUMP) {
+		uwsgi_log( "Pump application %d (mountpoint=%.*s) ready on interpreter %p pid: %d", id, wi->mountpoint_len, wi->mountpoint, wi->interpreter, (int) getpid());
 	}
 
-	if (!wsgi_req->script_name_len) {
+	if (!wsgi_req->appid_len) {
 		uwsgi_rawlog(" (default app)");
 		uwsgi.default_app = id;
 	}
 
-	uwsgi.apps_cnt++;
+	uwsgi_apps_cnt++;
 
 	uwsgi_rawlog("\n");
 
@@ -340,9 +325,17 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre
 				continue;
 			}
 
-			wsgi_req->script_name = PyString_AsString(app_mnt);
-			wsgi_req->script_name_len = strlen(wsgi_req->script_name);
-			init_uwsgi_app(LOADER_CALLABLE, PyDict_GetItem(applications, app_mnt), wsgi_req, wi->interpreter);
+			wsgi_req->appid = PyString_AsString(app_mnt);
+			wsgi_req->appid_len = strlen(wsgi_req->appid);
+			init_uwsgi_app(LOADER_CALLABLE, PyDict_GetItem(applications, app_mnt), wsgi_req, wi->interpreter, app_type);
+		}
+	}
+
+	// check if we need to emulate fork() COW
+	if (uwsgi.mywid == 0) {
+		for(i=1;i<=uwsgi.numproc;i++) {
+			memcpy(&uwsgi.workers[i].apps[id], &uwsgi.workers[0].apps[id], sizeof(struct uwsgi_app));
+			uwsgi.workers[i].apps_cnt = uwsgi_apps_cnt;
 		}
 	}
 
@@ -439,9 +432,9 @@ PyObject *uwsgi_uwsgi_loader(void *arg1) {
 	if (quick_callable[strlen(quick_callable) -2 ] == '(' && quick_callable[strlen(quick_callable) -1] ==')') {
 		quick_callable[strlen(quick_callable) -2 ] = 0;
 		tmp_callable = PyDict_GetItemString(wsgi_dict, quick_callable);
-		quick_callable[strlen(quick_callable) -2 ] = '(';
+		quick_callable[strlen(quick_callable)] = '(';
 		if (tmp_callable) {
-			return python_call(tmp_callable, PyTuple_New(0), 0);
+			return python_call(tmp_callable, PyTuple_New(0), 0, NULL);
 		}
 	}
 
@@ -520,8 +513,14 @@ PyObject *uwsgi_file_loader(void *arg1) {
 	PyObject *wsgi_file_module, *wsgi_file_dict;
 	PyObject *wsgi_file_callable;
 
-	wsgi_file_module = uwsgi_pyimport_by_filename("uwsgi_wsgi_file", filename);
-	// no need to check here for module import as it is already done by uwsgi_pyimport_by_file
+	char *callable = up.callable;
+	if (!callable) callable = "application";
+
+	wsgi_file_module = uwsgi_pyimport_by_filename(uwsgi_concat2("uwsgi_file_", uwsgi_pythonize(filename)), filename);
+	if (!wsgi_file_module) {
+		PyErr_Print();
+		exit(1);
+	}
 
 	wsgi_file_dict = PyModule_GetDict(wsgi_file_module);
 	if (!wsgi_file_dict) {
@@ -529,7 +528,7 @@ PyObject *uwsgi_file_loader(void *arg1) {
 		exit(1);
 	}
 
-	wsgi_file_callable = PyDict_GetItemString(wsgi_file_dict, "application");
+	wsgi_file_callable = PyDict_GetItemString(wsgi_file_dict, callable);
 	if (!wsgi_file_callable) {
 		PyErr_Print();
 		uwsgi_log( "unable to find \"application\" callable in file %s\n", filename);

plugins/python/python_plugin.c

@@ -3,6 +3,10 @@
 extern struct uwsgi_server uwsgi;
 struct uwsgi_python up;
 
+extern struct http_status_codes hsc[];
+
+#include <glob.h>
+
 extern PyTypeObject uwsgi_InputType;
 
 struct option uwsgi_python_options[] = {
@@ -10,6 +14,7 @@ struct option uwsgi_python_options[] = {
 	{"file", required_argument, 0, LONG_ARGS_FILE_CONFIG},
 	{"eval", required_argument, 0, LONG_ARGS_EVAL_CONFIG},
 	{"module", required_argument, 0, 'w'},
+	{"wsgi", required_argument, 0, 'w'},
 	{"callable", required_argument, 0, LONG_ARGS_CALLABLE},
 	{"test", required_argument, 0, 'j'},
 	{"home", required_argument, 0, 'H'},
@@ -19,10 +24,22 @@ struct option uwsgi_python_options[] = {
 	{"pythonpath", required_argument, 0, LONG_ARGS_PYTHONPATH},
 	{"python-path", required_argument, 0, LONG_ARGS_PYTHONPATH},
 	{"pymodule-alias", required_argument, 0, LONG_ARGS_PYMODULE_ALIAS},
+	{"post-pymodule-alias", required_argument, 0, LONG_ARGS_POST_PYMODULE_ALIAS},
+	{"import", required_argument, 0, LONG_ARGS_PYIMPORT},
+	{"pyimport", required_argument, 0, LONG_ARGS_PYIMPORT},
+	{"py-import", required_argument, 0, LONG_ARGS_PYIMPORT},
+	{"python-import", required_argument, 0, LONG_ARGS_PYIMPORT},
+	{"spooler-import", required_argument, 0, LONG_ARGS_SPOOLER_PYIMPORT},
+	{"spooler-pyimport", required_argument, 0, LONG_ARGS_SPOOLER_PYIMPORT},
+	{"spooler-py-import", required_argument, 0, LONG_ARGS_SPOOLER_PYIMPORT},
+	{"spooler-python-import", required_argument, 0, LONG_ARGS_SPOOLER_PYIMPORT},
 	{"pp", required_argument, 0, LONG_ARGS_PYTHONPATH},
 	{"pyargv", required_argument, 0, LONG_ARGS_PYARGV},
 	{"optimize", required_argument, 0, 'O'},
 	{"paste", required_argument, 0, LONG_ARGS_PASTE},
+	{"web3", required_argument, 0, LONG_ARGS_WEB3},
+	{"pump", required_argument, 0, LONG_ARGS_PUMP},
+	{"wsgi-lite", required_argument, 0, LONG_ARGS_WSGI_LITE},
 #ifdef UWSGI_INI
 	{"ini-paste", required_argument, 0, LONG_ARGS_INI_PASTE},
 #endif
@@ -31,6 +48,7 @@ struct option uwsgi_python_options[] = {
 	{"pep3333-input", no_argument, &up.pep3333_input, 1},
 	{"reload-os-env", no_argument, &up.reload_os_env, 1},
 	{"no-site", no_argument, &Py_NoSiteFlag, 1},
+	{"pyshell", no_argument, 0, LONG_ARGS_PYSHELL},
 
 	{0, 0, 0, 0},
 };
@@ -87,14 +105,15 @@ int uwsgi_python_init() {
 	if (up.home != NULL) {
 #ifdef PYTHREE
 		wchar_t *wpyhome;
-		wpyhome = malloc((sizeof(wchar_t) * strlen(up.home)) + 2);
+		wpyhome = malloc((sizeof(wchar_t) * strlen(up.home)) + sizeof(wchar_t) );
 		if (!wpyhome) {
 			uwsgi_error("malloc()");
 			exit(1);
 		}
 		mbstowcs(wpyhome, up.home, strlen(up.home));
 		Py_SetPythonHome(wpyhome);
-		free(wpyhome);
+		// do not free this memory !!!
+		//free(wpyhome);
 #else
 		Py_SetPythonHome(up.home);
 #endif
@@ -130,34 +149,44 @@ int uwsgi_python_init() {
 
 	uwsgi_log("Python main interpreter initialized at %p\n", up.main_thread);
 
-	// add the hacky modifier1 30
-	uwsgi.p[30]->request = uwsgi.p[0]->request;
-
 	return 1;
 
 }
 
-void uwsgi_python_post_fork() {
+void uwsgi_python_reset_random_seed() {
 
 	PyObject *random_module, *random_dict, *random_seed;
 
-	// reinitialize the random seed (thanks Jonas Borgström)
-	random_module = PyImport_ImportModule("random");
-	if (random_module) {
-		random_dict = PyModule_GetDict(random_module);
-		if (random_dict) {
-			random_seed = PyDict_GetItemString(random_dict, "seed");
-			if (random_seed) {
-				PyObject *random_args = PyTuple_New(1);
-				// pass no args
-				PyTuple_SetItem(random_args, 0, Py_None);
-				PyEval_CallObject(random_seed, random_args);
-				if (PyErr_Occurred()) {
-					PyErr_Print();
-				}
-			}
+        // reinitialize the random seed (thanks Jonas Borgström)
+        random_module = PyImport_ImportModule("random");
+        if (random_module) {
+                random_dict = PyModule_GetDict(random_module);
+                if (random_dict) {
+                        random_seed = PyDict_GetItemString(random_dict, "seed");
+                        if (random_seed) {
+                                PyObject *random_args = PyTuple_New(1);
+                                // pass no args
+                                PyTuple_SetItem(random_args, 0, Py_None);
+                                PyEval_CallObject(random_seed, random_args);
+                                if (PyErr_Occurred()) {
+                                        PyErr_Print();
+                                }
+                        }
+                }
+        }
+}
+
+void uwsgi_python_post_fork() {
+
+#ifdef UWSGI_SPOOLER
+	if (uwsgi.shared->spooler_pid > 0) {
+		if (uwsgi.shared->spooler_pid == getpid()) {
+			UWSGI_GET_GIL
 		}
-	}
+	}	
+#endif
+
+	uwsgi_python_reset_random_seed();
 
 #ifdef UWSGI_EMBEDDED
 	// call the post_fork_hook
@@ -165,7 +194,7 @@ void uwsgi_python_post_fork() {
 	if (uwsgi_dict) {
 		PyObject *pfh = PyDict_GetItemString(uwsgi_dict, "post_fork_hook");
 		if (pfh) {
-			python_call(pfh, PyTuple_New(0), 0);
+			python_call(pfh, PyTuple_New(0), 0, NULL);
 		}
 	}
 	PyErr_Clear();
@@ -185,17 +214,17 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
 	char *real_filename = filename;
 
 
-	if (strncmp(filename, "http://", 7)) {
+	if (strncmp(filename, "http://", 7) && strncmp(filename, "sym://", 6) && strncmp(filename, "data://", 7)) {
 
 		pyfile = fopen(filename, "r");
 		if (!pyfile) {
 			uwsgi_log("failed to open python file %s\n", filename);
-			exit(1);
+			return NULL;
 		}
 
 		if (fstat(fileno(pyfile), &pystat)) {
 			uwsgi_error("fstat()");
-			exit(1);
+			return NULL;
 		}
 
 		if (S_ISDIR(pystat.st_mode)) {
@@ -205,7 +234,9 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
 			pyfile = fopen(real_filename, "r");
 			if (!pyfile) {
 				uwsgi_error_open(real_filename);
-				exit(1);
+				free(real_filename);
+				fclose(pyfile);
+				return NULL;
 			}
 		}
 
@@ -213,7 +244,10 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
 		if (!py_file_node) {
 			PyErr_Print();
 			uwsgi_log("failed to parse file %s\n", real_filename);
-			exit(1);
+			if (is_a_package)
+				free(real_filename);
+			fclose(pyfile);
+			return NULL;
 		}
 
 		fclose(pyfile);
@@ -227,7 +261,7 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
 			if (!py_file_node) {
 				PyErr_Print();
 				uwsgi_log("failed to parse url %s\n", real_filename);
-				exit(1);
+				return NULL;
 			}
 		}
 	}
@@ -237,13 +271,13 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
 	if (!py_compiled_node) {
 		PyErr_Print();
 		uwsgi_log("failed to compile python file %s\n", real_filename);
-		exit(1);
+		return NULL;
 	}
 
 	py_file_module = PyImport_ExecCodeModule(name, py_compiled_node);
 	if (!py_file_module) {
 		PyErr_Print();
-		exit(1);
+		return NULL;
 	}
 
 	Py_DECREF(py_compiled_node);
@@ -281,6 +315,15 @@ void init_uwsgi_vars() {
 		exit(1);
 	}
 	pysys_dict = PyModule_GetDict(pysys);
+
+#ifdef PYTHREE
+	// fix stdout and stderr
+	PyObject *new_stdprint = PyFile_NewStdPrinter(2);
+	PyDict_SetItemString(pysys_dict, "stdout", new_stdprint);
+	PyDict_SetItemString(pysys_dict, "__stdout__", new_stdprint);
+	PyDict_SetItemString(pysys_dict, "stderr", new_stdprint);
+	PyDict_SetItemString(pysys_dict, "__stderr__", new_stdprint);
+#endif
 	pypath = PyDict_GetItemString(pysys_dict, "path");
 	if (!pypath) {
 		PyErr_Print();
@@ -324,13 +367,16 @@ void init_uwsgi_vars() {
 		PyErr_Print();
 	}
 
-	for (i = 0; i < up.python_path_cnt; i++) {
-		if (PyList_Insert(pypath, 0, UWSGI_PYFROMSTRING(up.python_path[i])) != 0) {
+	struct uwsgi_string_list *uppp = up.python_path;
+	while(uppp) {
+		if (PyList_Insert(pypath, 0, UWSGI_PYFROMSTRING(uppp->value)) != 0) {
 			PyErr_Print();
 		}
 		else {
-			uwsgi_log("added %s to pythonpath.\n", up.python_path[i]);
+			uwsgi_log("added %s to pythonpath.\n", uppp->value);
 		}
+
+		uppp = uppp->next;
 	}
 
 	for (i = 0; i < up.pymodule_alias_cnt; i++) {
@@ -354,6 +400,10 @@ void init_uwsgi_vars() {
 		else {
 			// this is a filepath that need to be mapped
 			tmp_module = uwsgi_pyimport_by_filename(up.pymodule_alias[i], value + 1);
+			if (!tmp_module) {
+				PyErr_Print();
+				exit(1);
+			}
 		}
 		uwsgi_log("mapped virtual pymodule \"%s\" to real pymodule \"%s\"\n", up.pymodule_alias[i], value + 1);
 		// reset original value
@@ -412,11 +462,33 @@ void init_uwsgi_embedded_module() {
 		exit(1);
 	}
 
+	// just for safety
+	Py_INCREF(up.embedded_dict);
+
 	if (PyDict_SetItemString(up.embedded_dict, "version", PyString_FromString(UWSGI_VERSION))) {
 		PyErr_Print();
 		exit(1);
 	}
 
+	PyObject *uwsgi_py_version_info = PyTuple_New(5);
+
+	PyTuple_SetItem(uwsgi_py_version_info, 0, PyInt_FromLong(UWSGI_VERSION_BASE));
+	PyTuple_SetItem(uwsgi_py_version_info, 1, PyInt_FromLong(UWSGI_VERSION_MAJOR));
+	PyTuple_SetItem(uwsgi_py_version_info, 2, PyInt_FromLong(UWSGI_VERSION_MINOR));
+	PyTuple_SetItem(uwsgi_py_version_info, 3, PyInt_FromLong(UWSGI_VERSION_REVISION));
+	PyTuple_SetItem(uwsgi_py_version_info, 4, PyString_FromString(UWSGI_VERSION_CUSTOM));
+
+	if (PyDict_SetItemString(up.embedded_dict, "version_info", uwsgi_py_version_info)) {
+		PyErr_Print();
+		exit(1);
+	}
+
+
+	if (PyDict_SetItemString(up.embedded_dict, "hostname", PyString_FromStringAndSize(uwsgi.hostname, uwsgi.hostname_len))) {
+		PyErr_Print();
+		exit(1);
+	}
+
 	if (uwsgi.mode) {
 		if (PyDict_SetItemString(up.embedded_dict, "mode", PyString_FromString(uwsgi.mode))) {
 			PyErr_Print();
@@ -452,6 +524,11 @@ void init_uwsgi_embedded_module() {
 		exit(1);
 	}
 
+	if (PyDict_SetItemString(up.embedded_dict, "has_threads", PyInt_FromLong(uwsgi.has_threads))) {
+		PyErr_Print();
+		exit(1);
+	}
+
 	if (PyDict_SetItemString(up.embedded_dict, "cores", PyInt_FromLong(uwsgi.cores))) {
 		PyErr_Print();
 		exit(1);
@@ -464,39 +541,6 @@ void init_uwsgi_embedded_module() {
 		}
 	}
 
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_NULL", PyInt_FromLong(KIND_NULL))) {
-		PyErr_Print();
-		exit(1);
-	}
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_WORKER", PyInt_FromLong(KIND_WORKER))) {
-		PyErr_Print();
-		exit(1);
-	}
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_EVENT", PyInt_FromLong(KIND_EVENT))) {
-		PyErr_Print();
-		exit(1);
-	}
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_SPOOLER", PyInt_FromLong(KIND_SPOOLER))) {
-		PyErr_Print();
-		exit(1);
-	}
-
-/*
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_ERLANG", PyInt_FromLong(KIND_ERLANG))) {
-		PyErr_Print();
-		exit(1);
-	}
-*/
-
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_PROXY", PyInt_FromLong(KIND_PROXY))) {
-		PyErr_Print();
-		exit(1);
-	}
-	if (PyDict_SetItemString(up.embedded_dict, "KIND_MASTER", PyInt_FromLong(KIND_MASTER))) {
-		PyErr_Print();
-		exit(1);
-	}
-
 	PyObject *py_opt_dict = PyDict_New();
 	for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
 		if (PyDict_Contains(py_opt_dict, PyString_FromString(uwsgi.exported_opts[i]->key))) {
@@ -653,6 +697,9 @@ int uwsgi_python_magic(char *mountpoint, char *lazy) {
 
 int uwsgi_python_manage_options(int i, char *optarg) {
 
+	glob_t g;
+	int j;
+
 	switch (i) {
 	case 'w':
 		up.wsgi_config = optarg;
@@ -673,13 +720,28 @@ int uwsgi_python_manage_options(int i, char *optarg) {
 			uwsgi_log("you can specify at most %d --pymodule-alias options\n", MAX_PYMODULE_ALIAS);
 		}
 		return 1;
+	case LONG_ARGS_PYSHELL:
+		uwsgi.honour_stdin = 1;
+		up.pyshell = 1;
+		uwsgi.to_hell = 1;
+		return 1;
+	case LONG_ARGS_PYIMPORT:
+		uwsgi_string_new_list(&up.import_list, optarg);
+		return 1;
+	case LONG_ARGS_SPOOLER_PYIMPORT:
+		uwsgi_string_new_list(&up.spooler_import_list, optarg);
+		return 1;
+	case LONG_ARGS_POST_PYMODULE_ALIAS:
+		uwsgi_string_new_list(&up.post_pymodule_alias, optarg);
+		return 1;
 	case LONG_ARGS_PYTHONPATH:
-		if (up.python_path_cnt < MAX_PYTHONPATH) {
-			up.python_path[up.python_path_cnt] = optarg;
-			up.python_path_cnt++;
+		if (glob(optarg, GLOB_MARK, NULL, &g)) {
+			uwsgi_string_new_list(&up.python_path, optarg);
 		}
 		else {
-			uwsgi_log("you can specify at most %d --pythonpath options\n", MAX_PYTHONPATH);
+			for (j = 0; j < (int) g.gl_pathc; j++) {
+				uwsgi_string_new_list(&up.python_path, g.gl_pathv[j]);
+			}
 		}
 		return 1;
 	case LONG_ARGS_PYARGV:
@@ -699,6 +761,7 @@ int uwsgi_python_manage_options(int i, char *optarg) {
 		return 1;
 
 
+#ifdef UWSGI_INI
 	case LONG_ARGS_INI_PASTE:
 		uwsgi.ini = optarg;
 		if (uwsgi.ini[0] != '/') {
@@ -708,6 +771,16 @@ int uwsgi_python_manage_options(int i, char *optarg) {
 			up.paste = uwsgi_concat2("config:", uwsgi.ini);
 		}
 		return 1;
+#endif
+	case LONG_ARGS_WEB3:
+		up.web3 = optarg;
+		return 1;
+	case LONG_ARGS_PUMP:
+		up.pump = optarg;
+		return 1;
+	case LONG_ARGS_WSGI_LITE:
+		up.wsgi_lite = optarg;
+		return 1;
 	case LONG_ARGS_PASTE:
 		up.paste = optarg;
 		return 1;
@@ -721,27 +794,96 @@ int uwsgi_python_manage_options(int i, char *optarg) {
 
 int uwsgi_python_mount_app(char *mountpoint, char *app) {
 
-	uwsgi.wsgi_req->script_name = mountpoint;
-	uwsgi.wsgi_req->script_name_len = strlen(mountpoint);
+	uwsgi.wsgi_req->appid = mountpoint;
+	uwsgi.wsgi_req->appid_len = strlen(mountpoint);
 	if (uwsgi.single_interpreter) {
-		return init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, up.main_thread);
+		return init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
 	}
-	return init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, NULL);
+	return init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, NULL, PYTHON_APP_TYPE_WSGI);
+
+}
+
+char *uwsgi_pythonize(char *orig) {
+
+	char *name = uwsgi_concat2(orig, "");
+	size_t i;
+	size_t len = 0;
+
+	if (!strncmp(name, "sym://", 6)) {
+		name+=6;
+	}
+	else if (!strncmp(name, "http://", 7)) {
+		name+=7;
+	}
+	else if (!strncmp(name, "data://", 7)) {
+		name+=7;
+	}
+
+	len = strlen(name);
+	for(i=0;i<len;i++) {
+		if (name[i] == '.') {
+			name[i] = '_';
+		}
+		else if (name[i] == '/') {
+			name[i] = '.';
+		}
+	}
+
+
+	if ((name[len-3] == '.' || name[len-3] == '_') && name[len-2] == 'p' && name[len-1] == 'y') {
+		name[len-3] = 0;
+	}
+
+	return name;
+
+}
+
+void uwsgi_python_spooler_init(void) {
+
+	struct uwsgi_string_list *upli = up.spooler_import_list;
+
+	
+	UWSGI_GET_GIL
+
+        while(upli) {
+                if (strchr(upli->value, '/') || uwsgi_endswith(upli->value, ".py")) {
+                        uwsgi_pyimport_by_filename(uwsgi_pythonize(upli->value), upli->value);
+                }
+                else {
+                        if (PyImport_ImportModule(upli->value) == NULL) {
+                                PyErr_Print();
+                        }
+                }
+                upli = upli->next;
+        }
+
+	UWSGI_RELEASE_GIL
+	
 
 }
 
 void uwsgi_python_init_apps() {
 
+	struct http_status_codes *http_sc;
+
+
 	if (uwsgi.async > 1) {
 		up.current_recursion_depth = uwsgi_malloc(sizeof(int)*uwsgi.async);
         	up.current_frame = uwsgi_malloc(sizeof(struct _frame)*uwsgi.async);
 	}
 
 	init_pyargv();
+
 #ifdef UWSGI_MINTERPRETERS
         init_uwsgi_embedded_module();
 #endif
 
+#ifdef __linux__
+#ifndef PYTHREE
+	uwsgi_init_symbol_import();
+#endif
+#endif
+
         if (up.test_module != NULL) {
                 if (PyImport_ImportModule(up.test_module)) {
                         exit(0);
@@ -764,20 +906,112 @@ void uwsgi_python_init_apps() {
         up.loaders[LOADER_STRING_CALLABLE] = uwsgi_string_callable_loader;
 
 
+	struct uwsgi_string_list *upli = up.import_list;
+	while(upli) {
+		if (strchr(upli->value, '/') || uwsgi_endswith(upli->value, ".py")) {
+			uwsgi_pyimport_by_filename(uwsgi_pythonize(upli->value), upli->value);
+		}
+		else {
+			if (PyImport_ImportModule(upli->value) == NULL) {
+				PyErr_Print();
+			}
+		}
+		upli = upli->next;
+	}
+
+	struct uwsgi_string_list *uppa = up.post_pymodule_alias;
+	PyObject *modules = PyImport_GetModuleDict();
+	PyObject *tmp_module;
+	while(uppa) {
+                // split key=value
+                char *value = strchr(uppa->value, '=');
+                if (!value) {
+                        uwsgi_log("invalid pymodule-alias syntax\n");
+                        continue;
+                }
+                value[0] = 0;
+                if (!strchr(value + 1, '/')) {
+                        // this is a standard pymodule
+                        tmp_module = PyImport_ImportModule(value + 1);
+                        if (!tmp_module) {
+                                PyErr_Print();
+                                exit(1);
+                        }
+
+                        PyDict_SetItemString(modules, uppa->value, tmp_module);
+                }
+                else {
+                        // this is a filepath that need to be mapped
+                        tmp_module = uwsgi_pyimport_by_filename(uppa->value, value + 1);
+                        if (!tmp_module) {
+                                PyErr_Print();
+                                exit(1);
+                        }
+                }
+                uwsgi_log("mapped virtual pymodule \"%s\" to real pymodule \"%s\"\n", uppa->value, value + 1);
+                // reset original value
+                value[0] = '=';
+
+		uppa = uppa->next;
+        }
+
+
 	if (up.wsgi_config != NULL) {
-		init_uwsgi_app(LOADER_UWSGI, up.wsgi_config, uwsgi.wsgi_req, up.main_thread);
+		init_uwsgi_app(LOADER_UWSGI, up.wsgi_config, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
 	}
 
 	if (up.file_config != NULL) {
-		init_uwsgi_app(LOADER_FILE, up.file_config, uwsgi.wsgi_req, up.main_thread);
+		init_uwsgi_app(LOADER_FILE, up.file_config, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
 	}
 	if (up.paste != NULL) {
-		init_uwsgi_app(LOADER_PASTE, up.paste, uwsgi.wsgi_req, up.main_thread);
+		init_uwsgi_app(LOADER_PASTE, up.paste, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
 	}
 	if (up.eval != NULL) {
-		init_uwsgi_app(LOADER_EVAL, up.eval, uwsgi.wsgi_req, up.main_thread);
+		init_uwsgi_app(LOADER_EVAL, up.eval, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
+	}
+	if (up.web3 != NULL) {
+		init_uwsgi_app(LOADER_UWSGI, up.web3, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WEB3);
+	}
+	if (up.pump != NULL) {
+		init_uwsgi_app(LOADER_UWSGI, up.pump, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_PUMP);
+		// filling http status codes
+        	for (http_sc = hsc; http_sc->message != NULL; http_sc++) {
+                	http_sc->message_size = (int) strlen(http_sc->message);
+        	}
+	}
+	if (up.wsgi_lite != NULL) {
+		init_uwsgi_app(LOADER_UWSGI, up.wsgi_lite, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI_LITE);
 	}
 
+	if (uwsgi.profiler) {
+		if (!strcmp(uwsgi.profiler, "pycall")) {
+			PyEval_SetProfile(uwsgi_python_profiler_call, NULL);
+		}
+	}
+
+}
+
+void uwsgi_python_master_fixup(int step) {
+
+	static int master_fixed = 0;
+	static int worker_fixed = 0;
+
+	if (!uwsgi.master_process) return;
+
+	if (uwsgi.has_threads) {
+		if (step == 0) {
+			if (!master_fixed) {
+				UWSGI_RELEASE_GIL;
+				master_fixed = 1;
+			}
+		}	
+		else {
+			if (!worker_fixed) {
+				UWSGI_GET_GIL;
+				worker_fixed = 1;
+			}
+		}
+	}
 }
 
 void uwsgi_python_enable_threads() {
@@ -799,9 +1033,12 @@ void uwsgi_python_enable_threads() {
 	up.gil_get = gil_real_get;
 	up.gil_release = gil_real_release;
 
-	up.swap_ts = threaded_swap_ts;
-	up.reset_ts = threaded_reset_ts;
+	if (uwsgi.threads > 1) {
+		up.swap_ts = threaded_swap_ts;
+		up.reset_ts = threaded_reset_ts;
+	}
 	uwsgi_log("threads support enabled\n");
+
 }
 
 void uwsgi_python_init_thread(int core_id) {
@@ -823,16 +1060,16 @@ int uwsgi_python_xml(char *node, char *content) {
 	}
 
 	if (!strcmp("script", node)) {
-		return init_uwsgi_app(LOADER_UWSGI, content, uwsgi.wsgi_req, interpreter);
+		return init_uwsgi_app(LOADER_UWSGI, content, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 	}
 	else if (!strcmp("file", node)) {
-		return init_uwsgi_app(LOADER_FILE, content, uwsgi.wsgi_req, interpreter);
+		return init_uwsgi_app(LOADER_FILE, content, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 	}
 	else if (!strcmp("eval", node)) {
-		return init_uwsgi_app(LOADER_EVAL, content, uwsgi.wsgi_req, interpreter);
+		return init_uwsgi_app(LOADER_EVAL, content, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 	}
 	else if (!strcmp("wsgi", node)) {
-		return init_uwsgi_app(LOADER_EVAL, content, uwsgi.wsgi_req, interpreter);
+		return init_uwsgi_app(LOADER_EVAL, content, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 	}
 	else if (!strcmp("module", node)) {
 		uwsgi.wsgi_req->module = content;
@@ -843,10 +1080,10 @@ int uwsgi_python_xml(char *node, char *content) {
 			uwsgi.wsgi_req->callable++;
 			uwsgi.wsgi_req->callable_len = strlen(uwsgi.wsgi_req->callable);
 			uwsgi.wsgi_req->module_len = strlen(uwsgi.wsgi_req->module);
-			return init_uwsgi_app(LOADER_DYN, uwsgi.wsgi_req, uwsgi.wsgi_req, interpreter);
+			return init_uwsgi_app(LOADER_DYN, uwsgi.wsgi_req, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 		}
 		else {
-			return init_uwsgi_app(LOADER_UWSGI, content, uwsgi.wsgi_req, interpreter);
+			return init_uwsgi_app(LOADER_UWSGI, content, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 		}
 		return 1;
 	}
@@ -858,7 +1095,7 @@ int uwsgi_python_xml(char *node, char *content) {
 	else if (!strcmp("callable", node)) {
 		uwsgi.wsgi_req->callable = content;
 		uwsgi.wsgi_req->callable_len = strlen(content);
-		return init_uwsgi_app(LOADER_DYN, uwsgi.wsgi_req, uwsgi.wsgi_req, interpreter);
+		return init_uwsgi_app(LOADER_DYN, uwsgi.wsgi_req, uwsgi.wsgi_req, interpreter, PYTHON_APP_TYPE_WSGI);
 	}
 
 	return 0;
@@ -879,25 +1116,80 @@ void uwsgi_python_suspend(struct wsgi_request *wsgi_req) {
 
 }
 
+char *uwsgi_python_code_string(char *id, char *code, char *function, char *key, uint16_t keylen) {
+
+	PyObject *cs_module = NULL;
+	PyObject *cs_dict = NULL;
+
+	UWSGI_GET_GIL;
+
+	cs_module = PyImport_ImportModule(id);
+	if (!cs_module) {
+		PyErr_Clear();
+		cs_module = uwsgi_pyimport_by_filename(id, code);
+	}
+
+	if (!cs_module) {
+		UWSGI_RELEASE_GIL;
+		return NULL;
+	}
+
+	cs_dict = PyModule_GetDict(cs_module);
+	if (!cs_dict) {
+		PyErr_Print();
+		UWSGI_RELEASE_GIL;
+		return NULL;
+	}
+	
+	PyObject *func = PyDict_GetItemString(cs_dict, function);
+	if (!func) {
+		uwsgi_log("function %s not available in %s\n", function, code);
+		PyErr_Print();
+		UWSGI_RELEASE_GIL;
+		return NULL;
+	}
+
+	PyObject *args = PyTuple_New(1);
+
+	PyTuple_SetItem(args, 0, PyString_FromStringAndSize(key, keylen));
+
+	PyObject *ret = python_call(func, args, 0, NULL);
+	Py_DECREF(args);
+	if (ret && PyString_Check(ret)) {
+		char *val = PyString_AsString(ret);
+		UWSGI_RELEASE_GIL;
+		return val;
+	}
+
+	UWSGI_RELEASE_GIL;
+	return NULL;
+	
+}
+
 int uwsgi_python_signal_handler(uint8_t sig, void *handler) {
 
+	UWSGI_GET_GIL;
+
 	PyObject *args = PyTuple_New(1);
 	PyObject *ret;
 
 	if (!args)
-		return -1;
+		goto clear;
 
-	if (!handler) return -1;
+	if (!handler) goto clear;
 
 
 	PyTuple_SetItem(args, 0, PyInt_FromLong(sig));
 
-	ret = python_call(handler, args, 0);
-
+	ret = python_call(handler, args, 0, NULL);
+	Py_DECREF(args);
 	if (ret) {
+		UWSGI_RELEASE_GIL;
 		return 0;
 	}
 
+clear:
+	UWSGI_RELEASE_GIL;
 	return -1;
 }
 
@@ -916,7 +1208,7 @@ uint16_t uwsgi_python_rpc(void *func, uint8_t argc, char **argv, char *buffer) {
 		PyTuple_SetItem(pyargs, i, PyString_FromString(argv[i]));
 	}
 
-	ret = python_call((PyObject *) func, pyargs, 0);
+	ret = python_call((PyObject *) func, pyargs, 0, NULL);
 
 	if (ret) {
 		if (PyString_Check(ret)) {
@@ -945,44 +1237,68 @@ void uwsgi_python_add_item(char *key, uint16_t keylen, char *val, uint16_t valle
 	PyDict_SetItem(pydict, PyString_FromStringAndSize(key, keylen), PyString_FromStringAndSize(val, vallen));
 }
 
-int uwsgi_python_spooler(char *buf, uint16_t len) {
+int uwsgi_python_spooler(char *filename, char *buf, uint16_t len, char *body, size_t body_len) {
+
+	static int random_seed_reset = 0;
+
+	UWSGI_GET_GIL;
 
 	PyObject *spool_dict = PyDict_New();
 	PyObject *spool_func, *pyargs, *ret;
 
+	if (!random_seed_reset) {
+		uwsgi_python_reset_random_seed();
+		random_seed_reset = 1;	
+	}
+
 	if (!up.embedded_dict) {
 		// ignore
+		UWSGI_RELEASE_GIL;
 		return 0;
 	}
 
 	spool_func = PyDict_GetItemString(up.embedded_dict, "spooler");
 	if (!spool_func) {
 		// ignore
+		UWSGI_RELEASE_GIL;
 		return 0;
 	}
 
 	if (uwsgi_hooked_parse(buf, len, uwsgi_python_add_item, spool_dict)) {
 		// malformed packet, destroy it
+		UWSGI_RELEASE_GIL;
 		return -2;
 	}
 
 	pyargs = PyTuple_New(1);
+
+	PyDict_SetItemString(spool_dict, "spooler_task_name", PyString_FromString(filename));
+
+	if (body && body_len > 0) {
+		PyDict_SetItemString(spool_dict, "body", PyString_FromStringAndSize(body, body_len));
+	}
 	PyTuple_SetItem(pyargs, 0, spool_dict);
-	
-	ret = python_call(spool_func, pyargs, 0);
+
+	ret = python_call(spool_func, pyargs, 0, NULL);
+
 	if (ret) {
 		if (!PyInt_Check(ret)) {
 			// error, retry
+			UWSGI_RELEASE_GIL;
 			return -1;
 		}	
 
-		return PyInt_AsLong(ret);
+		int retval = (int) PyInt_AsLong(ret);
+		UWSGI_RELEASE_GIL;
+		return retval;
+		
 	}
 	
 	if (PyErr_Occurred())
 		PyErr_Print();
 
 	// error, retry
+	UWSGI_RELEASE_GIL;
 	return -1;
 }
 
@@ -1001,6 +1317,22 @@ void uwsgi_python_resume(struct wsgi_request *wsgi_req) {
 
 }
 
+void uwsgi_python_fixup() {
+	// set hacky modifier 30
+	uwsgi.p[30] = uwsgi.p[0];
+}
+
+void uwsgi_python_hijack(void) {
+	// the pyshell will be execute only in the first worker
+
+	if (up.pyshell && uwsgi.mywid == 1) {
+		UWSGI_GET_GIL;
+		PyImport_ImportModule("readline");
+		PyRun_InteractiveLoop(stdin, "uwsgi");
+		exit(0);
+	}
+}
+
 struct uwsgi_plugin python_plugin = {
 
 	.name = "python",
@@ -1015,6 +1347,9 @@ struct uwsgi_plugin python_plugin = {
 	.after_request = uwsgi_after_request_wsgi,
 	.init_apps = uwsgi_python_init_apps,
 
+	.fixup = uwsgi_python_fixup,
+	.master_fixup = uwsgi_python_master_fixup,
+
 	.mount_app = uwsgi_python_mount_app,
 
 	.enable_threads = uwsgi_python_enable_threads,
@@ -1026,11 +1361,16 @@ struct uwsgi_plugin python_plugin = {
 	.suspend = uwsgi_python_suspend,
 	.resume = uwsgi_python_resume,
 
+	.hijack_worker = uwsgi_python_hijack,
+	.spooler_init = uwsgi_python_spooler_init,
+
 	.signal_handler = uwsgi_python_signal_handler,
 	.rpc = uwsgi_python_rpc,
 
 	.spooler = uwsgi_python_spooler,
 
+	.code_string = uwsgi_python_code_string,
+
 	.help = uwsgi_python_help,
 
 };

plugins/python/pyutils.c

@@ -8,17 +8,27 @@ int manage_python_response(struct wsgi_request *wsgi_req) {
 	return uwsgi_response_subhandler_wsgi(wsgi_req);
 }
 
-PyObject *python_call(PyObject *callable, PyObject *args, int catch) {
+PyObject *python_call(PyObject *callable, PyObject *args, int catch, struct wsgi_request *wsgi_req) {
 
 	PyObject *pyret;
 
+	//uwsgi_log("ready to call %p %p\n", callable, args);
+
 	pyret =  PyEval_CallObject(callable, args);
 
+	//uwsgi_log("called\n");
+
 	if (PyErr_Occurred()) {
 		if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
 			uwsgi_log("Memory Error detected !!!\n");
 		}
-		uwsgi.workers[uwsgi.mywid].exceptions++;
+		// this can be in a spooler or in the master
+		if (uwsgi.mywid > 0) {
+			uwsgi.workers[uwsgi.mywid].exceptions++;
+			if (wsgi_req) {
+				uwsgi_apps[wsgi_req->app_id].exceptions++;
+			}
+		}
 		if (!catch) {
 			PyErr_Print();
 		}
@@ -35,7 +45,7 @@ PyObject *python_call(PyObject *callable, PyObject *args, int catch) {
 
 int uwsgi_python_call(struct wsgi_request *wsgi_req, PyObject *callable, PyObject *args) {
 
-	wsgi_req->async_result = python_call(callable, args, 0);
+	wsgi_req->async_result = python_call(callable, args, 0, wsgi_req);
 
 	if (wsgi_req->async_result) {
 		while ( manage_python_response(wsgi_req) != UWSGI_OK) {

plugins/python/symimporter.c

@@ -0,0 +1,746 @@
+#include "uwsgi_python.h"
+
+#ifndef PYTHREE
+
+extern struct uwsgi_server uwsgi;
+extern struct uwsgi_python up;
+
+
+struct _symimporter {
+	PyObject_HEAD;
+} uwsgi_symbol_importer_object;
+
+struct _symzipimporter {
+	PyObject_HEAD;
+	char *prefix;
+	PyObject *zip;
+        PyObject *items;
+} uwsgi_symbol_zip_importer_object;
+
+
+static char *symbolize(char *name) {
+
+	char *base = uwsgi_concat2(name, "");
+	char *ptr = base;
+	while(*ptr != 0) {
+		if (*ptr == '.') {
+			*ptr = '_';
+		}
+		ptr++;
+	}
+
+	return base;
+}
+
+static char *name_to_py(char *prefix, char *name) {
+
+	char *base;
+	char *ptr;
+
+	if (prefix) {
+		if (prefix[strlen(prefix)-1] == '/') { 
+        		base = uwsgi_concat3(prefix, name, ".py");
+			ptr = base + strlen(prefix);
+		}
+		else {
+        		base = uwsgi_concat4(prefix, "/", name, ".py");
+			ptr = base + strlen(prefix) + 1;
+		}
+	}
+	else {
+        	base = uwsgi_concat2(name, ".py");
+		ptr = base;
+	}
+        while(*ptr != 0) {
+                if (*ptr == '.') {
+                        *ptr = '/';
+                }
+                ptr++;
+        }
+
+	// fix .py
+	ptr-=3;
+	*ptr = '.';
+        return base;
+}
+
+static char *name_to_init_py(char *prefix, char *name) {
+
+	char *base;
+	char *ptr;
+
+	if (prefix) {
+		if (prefix[strlen(prefix)-1] == '/') { 
+        		base = uwsgi_concat3(prefix, name, "/__init__.py");
+			ptr = base + strlen(prefix);
+		}
+		else {
+        		base = uwsgi_concat4(prefix, "/", name, "/__init__.py");
+			ptr = base + strlen(prefix) + 1;
+		}
+	}
+	else {
+        	base = uwsgi_concat2(name, "/__init__.py");
+		ptr = base;
+	}
+
+        while(*ptr != 0) {
+                if (*ptr == '.') {
+                        *ptr = '/';
+                }
+                ptr++;
+        }
+
+        // fix .py
+        ptr-=3;
+        *ptr = '.';
+
+        return base;
+}
+
+
+
+
+static char *name_to_symbol(char *name, char *what) {
+
+        char *symbol = uwsgi_concat4("_binary_", name, "_", what);
+        char *sym_ptr_start = dlsym(RTLD_DEFAULT, symbol);
+        free(symbol);
+        return sym_ptr_start;
+}
+
+
+static char *name_to_symbol_module(char *name, char *what) {
+
+	char *symbol = uwsgi_concat4("_binary_", name, "_py_", what);
+        char *sym_ptr_start = dlsym(RTLD_DEFAULT, symbol);
+	free(symbol);
+	return sym_ptr_start;
+}
+
+static char *name_to_symbol_pkg(char *name, char *what) {
+
+	char *symbol = uwsgi_concat4("_binary_", name, "___init___py_", what);
+        char *sym_ptr_start = dlsym(RTLD_DEFAULT, symbol);
+	free(symbol);
+	return sym_ptr_start;
+}
+
+int py_list_has_string(PyObject *obj, char *name) {
+
+	Py_ssize_t i, len = PyList_Size(obj);
+	int found = 0;
+	for(i=0;i<len;i++) {
+		PyObject *current = PyList_GetItem(obj, i);
+		char *filename = PyString_AsString(current);
+		if (!strcmp(filename, name)) {
+			found = 1;
+			break;
+		}
+	}
+
+	return found;
+}
+
+static PyObject* symzipimporter_find_module(PyObject *self, PyObject *args) {
+
+	char *fullname;
+	PyObject *path = NULL;
+	struct _symzipimporter *this = (struct _symzipimporter *) self;
+
+	if (!PyArg_ParseTuple(args, "s|O:find_module", &fullname, &path)) {
+		return NULL;
+	}
+
+	char *filename = name_to_py(this->prefix, fullname);
+
+	if (py_list_has_string(this->items, filename)) {
+		free(filename);
+		return self;
+	}
+
+	PyErr_Clear();
+	free(filename);
+
+	filename = name_to_init_py(this->prefix, fullname);
+
+	if (py_list_has_string(this->items, filename)) {
+		free(filename);
+		return self;
+	}
+
+	PyErr_Clear();
+	free(filename);
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static PyObject* symzipimporter_load_module(PyObject *self, PyObject *args) {
+
+	char *fullname;
+	char *modname;
+        struct _symzipimporter *this = (struct _symzipimporter *) self;
+
+        if (!PyArg_ParseTuple(args, "s:load_module", &fullname)) {
+                return NULL;
+        }
+
+        char *filename = name_to_py(this->prefix, fullname);
+
+        if (py_list_has_string(this->items, filename)) {
+		PyObject *mod = PyImport_AddModule(fullname);
+                if (!mod) goto clear;
+                PyObject *dict = PyModule_GetDict(mod);
+                if (!dict) goto clear;
+
+                PyDict_SetItemString(dict, "__loader__", self);
+
+                modname = uwsgi_concat2("symzip://", fullname);
+
+		PyObject *source = PyObject_CallMethod(this->zip, "read", "(s)", filename);
+                free(filename);
+                PyObject *code = Py_CompileString(PyString_AsString(source), modname, Py_file_input);
+                mod = PyImport_ExecCodeModuleEx(fullname, code, modname);
+
+                Py_DECREF(code);
+                Py_DECREF(source);
+                free(modname);
+                return mod;
+        }
+
+        PyErr_Clear();
+        free(filename);
+
+        filename = name_to_init_py(this->prefix, fullname);
+
+        if (py_list_has_string(this->items, filename)) {
+		PyObject *mod = PyImport_AddModule(fullname);
+                if (!mod) goto clear;
+                PyObject *dict = PyModule_GetDict(mod);
+                if (!dict) goto clear;
+
+                modname = uwsgi_concat2("symzip://", fullname);
+
+		PyObject *pkgpath = Py_BuildValue("[O]", PyString_FromString(modname));
+
+                PyDict_SetItemString(dict, "__path__", pkgpath);
+                PyDict_SetItemString(dict, "__loader__", self);
+
+
+                PyObject *source = PyObject_CallMethod(this->zip, "read", "(s)", filename);
+                free(filename);
+                PyObject *code = Py_CompileString(PyString_AsString(source), modname, Py_file_input);
+                mod = PyImport_ExecCodeModuleEx(fullname, code, modname);
+
+                Py_DECREF(code);
+                Py_DECREF(source);
+                free(modname);
+                return mod;
+        }
+
+clear:
+        PyErr_Clear();
+        free(filename);
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static PyObject* symimporter_find_module(PyObject *self, PyObject *args) {
+
+	char *fullname;
+	PyObject *path = NULL;
+
+	if (!PyArg_ParseTuple(args, "s|O:find_module", &fullname, &path)) {
+		return NULL;
+	}
+
+	char *fullname2 = symbolize(fullname);
+
+	char *code_start = name_to_symbol_module(fullname2, "start");
+	if (code_start) {
+		free(fullname2);
+		Py_INCREF(self);
+		return self;
+	}
+	code_start = name_to_symbol_pkg(fullname2, "start");
+	if (code_start) {
+		free(fullname2);
+		Py_INCREF(self);
+		return self;
+	}
+	
+	
+	free(fullname2);
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static PyObject* symimporter_load_module(PyObject *self, PyObject *args) {
+
+	char *code_start;
+	char *code_end;
+	char *fullname;
+	char *source;
+	char *modname;
+	PyObject *code;
+	if (!PyArg_ParseTuple(args, "s:load_module", &fullname)) {
+                return NULL;
+        }
+
+	char *fullname2 = symbolize(fullname);
+
+	code_start = name_to_symbol_module(fullname2, "start");
+	if (code_start) {
+		code_end = name_to_symbol_module(fullname2, "end");
+		if (code_end) {
+			PyObject *mod = PyImport_AddModule(fullname);
+			if (!mod) goto clear;
+			PyObject *dict = PyModule_GetDict(mod);
+			if (!dict) goto clear;
+
+			PyDict_SetItemString(dict, "__loader__", self);
+
+			source = uwsgi_concat2n(code_start, code_end-code_start, "", 0);
+			modname = uwsgi_concat3("sym://", fullname2, "_py");
+
+			code = Py_CompileString(source, modname, Py_file_input);
+			mod = PyImport_ExecCodeModuleEx(fullname, code, modname);
+
+			Py_DECREF(code);
+			free(source);
+			free(modname);
+			free(fullname2);
+			return mod;	
+		}
+	}
+
+	code_start = name_to_symbol_pkg(fullname2, "start");
+        if (code_start) {
+                code_end = name_to_symbol_pkg(fullname2, "end");
+                if (code_end) {
+                        PyObject *mod = PyImport_AddModule(fullname);
+			if (!mod) goto clear;
+                        PyObject *dict = PyModule_GetDict(mod);
+			if (!dict) goto clear;
+
+                        source = uwsgi_concat2n(code_start, code_end-code_start, "", 0);
+			modname = uwsgi_concat3("sym://", symbolize(fullname), "___init___py");
+
+			PyObject *pkgpath = Py_BuildValue("[O]", PyString_FromString(modname));
+
+			PyDict_SetItemString(dict, "__path__", pkgpath);
+			PyDict_SetItemString(dict, "__loader__", self);
+
+                        code = Py_CompileString(source, modname, Py_file_input);
+                        mod = PyImport_ExecCodeModuleEx(fullname, code, modname);
+
+			Py_DECREF(code);
+			free(source);
+			free(modname);
+			free(fullname2);
+                        return mod;
+                }
+        }
+
+clear:
+	free(fullname2);
+	Py_INCREF(Py_None);
+        return Py_None;
+}
+
+static PyMethodDef symimporter_methods[] = {
+    {"find_module", symimporter_find_module, METH_VARARGS},
+    {"load_module", symimporter_load_module, METH_VARARGS},
+};
+
+static PyMethodDef symzipimporter_methods[] = {
+    {"find_module", symzipimporter_find_module, METH_VARARGS},
+    {"load_module", symzipimporter_load_module, METH_VARARGS},
+};
+
+static void uwsgi_symimporter_free(struct _symimporter *self) {
+        PyObject_Del(self);
+}
+
+
+static PyTypeObject SymImporter_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "uwsgi.SymbolsImporter",
+    sizeof(struct _symimporter),
+    0,                                          /* tp_itemsize */
+    (destructor) uwsgi_symimporter_free,            /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_compare */
+    0,                                          /* tp_repr */
+    0,                                          /* tp_as_number */
+    0,                                          /* tp_as_sequence */
+    0,                                          /* tp_as_mapping */
+    0,                                          /* tp_hash */
+    0,                                          /* tp_call */
+    0,                                          /* tp_str */
+    0,                    /* tp_getattro */
+    0,                                          /* tp_setattro */
+    0,                                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,
+    "uwsgi symbols importer",                                          /* tp_doc */
+    0,                                          /* tp_traverse */
+    0,                                          /* tp_clear */
+    0,                                          /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    0,                                          /* tp_iter */
+    0,                                          /* tp_iternext */
+    symimporter_methods,                        /* tp_methods */
+    0,                                          /* tp_members */
+    0,                                          /* tp_getset */
+    0,                                          /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    0,                 /* tp_init */
+    PyType_GenericAlloc,                        /* tp_alloc */
+    PyType_GenericNew,                          /* tp_new */
+    PyObject_GC_Del,                            /* tp_free */
+};
+
+static int
+zipimporter_init(struct _symzipimporter *self, PyObject *args, PyObject *kwds)
+{
+
+
+        char *name;
+        char *prefix = NULL;
+	int len = 0;
+
+        if (!PyArg_ParseTuple(args, "s", &name))
+                return -1;
+
+        // avoid GC !!!
+        name = uwsgi_concat2(name, "");
+
+	if (!uwsgi_startswith(name, "http://", 7) || !uwsgi_startswith(name, "data://", 7) || !uwsgi_startswith(name, "sym://", 6) ) {
+                prefix = uwsgi_get_last_char(name, '/');
+                prefix = uwsgi_get_last_char(prefix, ':');
+        }
+        else {
+                prefix = uwsgi_get_last_char(name, ':');
+        }
+
+	if (prefix) {
+		prefix[0] = 0;
+	}
+
+
+	char *body = uwsgi_open_and_read(name, &len, 0, NULL);
+	if (!body) {
+		return -1;
+	}
+
+	PyObject *stringio = PyImport_ImportModule("StringIO");
+        if (!stringio) {
+                return -1;
+        }
+
+        PyObject *stringio_dict = PyModule_GetDict(stringio);
+        if (!stringio_dict) {
+                return -1;
+        }
+
+        PyObject *stringio_stringio = PyDict_GetItemString(stringio_dict, "StringIO");
+        if (!stringio_stringio) {
+                return -1;
+        }
+
+        PyObject *stringio_args = PyTuple_New(1);
+        PyTuple_SetItem(stringio_args, 0, PyString_FromStringAndSize(body, len));
+
+        PyObject *source_code = PyInstance_New(stringio_stringio, stringio_args, NULL);
+        if (!source_code) {
+                return -1;
+        }
+
+        PyObject *zipfile = PyImport_ImportModule("zipfile");
+        if (!zipfile) {
+                return -1;
+        }
+
+        PyObject *zipfile_dict = PyModule_GetDict(zipfile);
+        if (!zipfile_dict) {
+                return -1;
+        }
+
+        PyObject *zipfile_zipfile = PyDict_GetItemString(zipfile_dict, "ZipFile");
+        if (!zipfile_zipfile) {
+                return -1;
+        }
+
+        PyObject *zipfile_args = PyTuple_New(1);
+        PyTuple_SetItem(zipfile_args, 0, source_code);
+
+        self->zip = PyInstance_New(zipfile_zipfile, zipfile_args, NULL);
+        if (!self->zip) {
+                return -1;
+        }
+
+        Py_INCREF(self->zip);
+
+        self->items = PyObject_CallMethod(self->zip, "namelist", NULL);
+        if (!self->items) {
+                return -1;
+        }
+
+        Py_INCREF(self->items);
+
+        self->prefix = NULL;
+        if (prefix) {
+                self->prefix = prefix+1;
+                prefix[0] = ':';
+        }
+
+
+        return 0;
+}
+
+
+
+static int
+symzipimporter_init(struct _symzipimporter *self, PyObject *args, PyObject *kwds)
+{
+
+
+	char *name;
+	char *prefix = NULL;
+
+	if (!PyArg_ParseTuple(args, "s", &name))
+        	return -1; 
+
+	// avoid GC !!!
+	name = uwsgi_concat2(name, "");
+
+	prefix = strchr(name, ':');
+	if (prefix) {
+		prefix[0] = 0;
+	}
+
+	char *code_start = name_to_symbol(name, "start");
+	if (!code_start) {
+		PyErr_Format(PyExc_ValueError, "unable to find symbol");
+		return -1;
+	}
+
+	char *code_end = name_to_symbol(name, "end");
+	if (!code_end) {
+		PyErr_Format(PyExc_ValueError, "unable to find symbol");
+		return -1;
+	}
+
+	PyObject *stringio = PyImport_ImportModule("StringIO");
+	if (!stringio) {
+		return -1;
+	}
+
+	PyObject *stringio_dict = PyModule_GetDict(stringio);
+	if (!stringio_dict) {
+		return -1;
+	}
+
+	PyObject *stringio_stringio = PyDict_GetItemString(stringio_dict, "StringIO");
+	if (!stringio_stringio) {
+		return -1;
+	}
+
+	PyObject *stringio_args = PyTuple_New(1);
+	PyTuple_SetItem(stringio_args, 0, PyString_FromStringAndSize(code_start, code_end-code_start));
+
+	PyObject *source_code = PyInstance_New(stringio_stringio, stringio_args, NULL);
+	if (!source_code) {
+		return -1;
+	}
+
+	PyObject *zipfile = PyImport_ImportModule("zipfile");
+	if (!zipfile) {
+		return -1;
+	}
+	
+	PyObject *zipfile_dict = PyModule_GetDict(zipfile);
+        if (!zipfile_dict) {
+                return -1;
+        }
+
+        PyObject *zipfile_zipfile = PyDict_GetItemString(zipfile_dict, "ZipFile");
+        if (!zipfile_zipfile) {
+                return -1;
+        }
+
+        PyObject *zipfile_args = PyTuple_New(1);
+        PyTuple_SetItem(zipfile_args, 0, source_code);
+
+	self->zip = PyInstance_New(zipfile_zipfile, zipfile_args, NULL);
+        if (!self->zip) {
+                return -1;
+        }
+
+	Py_INCREF(self->zip);
+
+	self->items = PyObject_CallMethod(self->zip, "namelist", NULL);
+        if (!self->items) {
+                return -1;
+        }
+
+	Py_INCREF(self->items);
+
+	self->prefix = NULL;
+	if (prefix) {
+		self->prefix = prefix+1;
+		prefix[0] = ':';
+	}
+
+
+	return 0;
+}
+
+static PyTypeObject SymZipImporter_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "uwsgi.SymbolsZipImporter",
+    sizeof(struct _symzipimporter),
+    0,                                          /* tp_itemsize */
+    (destructor) uwsgi_symimporter_free,            /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_compare */
+    0,                                          /* tp_repr */
+    0,                                          /* tp_as_number */
+    0,                                          /* tp_as_sequence */
+    0,                                          /* tp_as_mapping */
+    0,                                          /* tp_hash */
+    0,                                          /* tp_call */
+    0,                                          /* tp_str */
+    0,                    /* tp_getattro */
+    0,                                          /* tp_setattro */
+    0,                                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,
+    "uwsgi symbols zip importer",                                          /* tp_doc */
+    0,                                          /* tp_traverse */
+    0,                                          /* tp_clear */
+    0,                                          /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    0,                                          /* tp_iter */
+    0,                                          /* tp_iternext */
+    symzipimporter_methods,                        /* tp_methods */
+    0,                                          /* tp_members */
+    0,                                          /* tp_getset */
+    0,                                          /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    (initproc) symzipimporter_init,                 /* tp_init */
+    PyType_GenericAlloc,                        /* tp_alloc */
+    PyType_GenericNew,                          /* tp_new */
+    PyObject_GC_Del,                            /* tp_free */
+};
+
+static PyTypeObject ZipImporter_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "uwsgi.ZipImporter",
+    sizeof(struct _symzipimporter),
+    0,                                          /* tp_itemsize */
+    (destructor) uwsgi_symimporter_free,            /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_compare */
+    0,                                          /* tp_repr */
+    0,                                          /* tp_as_number */
+    0,                                          /* tp_as_sequence */
+    0,                                          /* tp_as_mapping */
+    0,                                          /* tp_hash */
+    0,                                          /* tp_call */
+    0,                                          /* tp_str */
+    0,                    /* tp_getattro */
+    0,                                          /* tp_setattro */
+    0,                                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,
+    "uwsgi zip importer",                                          /* tp_doc */
+    0,                                          /* tp_traverse */
+    0,                                          /* tp_clear */
+    0,                                          /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    0,                                          /* tp_iter */
+    0,                                          /* tp_iternext */
+    symzipimporter_methods,                        /* tp_methods */
+    0,                                          /* tp_members */
+    0,                                          /* tp_getset */
+    0,                                          /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    (initproc) zipimporter_init,                 /* tp_init */
+    PyType_GenericAlloc,                        /* tp_alloc */
+    PyType_GenericNew,                          /* tp_new */
+    PyObject_GC_Del,                            /* tp_free */
+};
+
+
+
+int uwsgi_init_symbol_import() {
+
+
+	if (PyType_Ready(&SymImporter_Type) < 0) {
+		PyErr_Print();
+		uwsgi_log("unable to initialize symbols importer module\n");
+		exit(1);
+	}
+
+	if (PyType_Ready(&ZipImporter_Type) < 0) {
+		PyErr_Print();
+		uwsgi_log("unable to initialize zip importer module\n");
+		exit(1);
+	}
+
+	if (PyType_Ready(&SymZipImporter_Type) < 0) {
+		PyErr_Print();
+		uwsgi_log("unable to initialize symbols zip importer module\n");
+		exit(1);
+	}
+
+	PyObject *uwsgi_em = PyImport_ImportModule("uwsgi");
+	if (!uwsgi_em) {
+		PyErr_Print();
+		uwsgi_log("unable to get uwsgi module\n");
+		exit(1);
+	}
+
+	if (PyModule_AddObject(uwsgi_em, "SymbolsImporter",
+                           (PyObject *)&SymImporter_Type) < 0) {
+		PyErr_Print();
+		uwsgi_log("unable to initialize symbols importer object\n");
+		exit(1);
+	}
+
+	if (PyModule_AddObject(uwsgi_em, "ZipImporter",
+                           (PyObject *)&ZipImporter_Type) < 0) {
+		PyErr_Print();
+		uwsgi_log("unable to initialize zip importer object\n");
+		exit(1);
+	}
+
+	if (PyModule_AddObject(uwsgi_em, "SymbolsZipImporter",
+                           (PyObject *)&SymZipImporter_Type) < 0) {
+		PyErr_Print();
+		uwsgi_log("unable to initialize symbols zip importer object\n");
+		exit(1);
+	}
+
+
+        return 0;
+	
+}
+
+#endif

plugins/python/uwsgi_pymodule.c

@@ -2,16 +2,74 @@
 
 #include "uwsgi_python.h"
 
-char *spool_buffer = NULL;
-
 extern struct uwsgi_server uwsgi;
 extern struct uwsgi_python up;
 
 PyObject *py_uwsgi_signal_wait(PyObject * self, PyObject * args) {
 
         struct wsgi_request *wsgi_req = current_wsgi_req();
+	int wait_for_specific_signal = 0;
+	uint8_t uwsgi_signal = 0;
+	uint8_t received_signal;
+	int ret;
+	struct pollfd pfd[2];
+
+	wsgi_req->signal_received = -1;
+
+	if (PyTuple_Size(args) > 0) {
+		if (!PyArg_ParseTuple(args, "|B:", &uwsgi_signal)) {
+                	return NULL;
+        	}
+		wait_for_specific_signal = 1;	
+	}
+
+#ifdef UWSGI_ASYNC
+	if (uwsgi.async > 1) {
+        	wsgi_req->sigwait = 1;
+	}
+	else {
+#endif
+		pfd[0].fd = uwsgi.signal_socket;
+		pfd[0].events = POLLIN;
+		pfd[1].fd = uwsgi.my_signal_socket;
+		pfd[1].events = POLLIN;
+cycle:
+		ret = poll(pfd, 2, -1);
+		if (ret > 0) {
+			if (pfd[0].revents == POLLIN) {
+				if (read(uwsgi.signal_socket, &received_signal, 1) != 1) {
+					uwsgi_error("read()");
+				}		
+				else {
+					if (uwsgi_signal_handler(received_signal)) {
+                                		uwsgi_log_verbose("error managing signal %d on worker %d\n", received_signal, uwsgi.mywid);
+                        		}
+					wsgi_req->signal_received = received_signal;			
+					if (wait_for_specific_signal) {
+						if (received_signal != uwsgi_signal) goto cycle;
+					}
+				}
+			}
+			if (pfd[1].revents == POLLIN) {
+                                if (read(uwsgi.my_signal_socket, &received_signal, 1) != 1) {
+                                        uwsgi_error("read()");
+                                }
+                                else {
+					if (uwsgi_signal_handler(received_signal)) {
+                                		uwsgi_log_verbose("error managing signal %d on worker %d\n", received_signal, uwsgi.mywid);
+                        		}
+                                        wsgi_req->signal_received = received_signal;
+                                        if (wait_for_specific_signal) {
+                                                if (received_signal != uwsgi_signal) goto cycle;
+                                        }
+                                }
+                        }
+		}
+
+#ifdef UWSGI_ASYNC
+	}
+#endif
 
-        wsgi_req->sigwait = 1;
 
         return PyString_FromString("");
 }
@@ -115,6 +173,7 @@ char *uwsgi_encode_pydict(PyObject * pydict, uint16_t * size) {
 
 		if (!key || !val) {
 			PyErr_Print();
+			continue;
 		}
 
 		if (!PyString_Check(key) || !PyString_Check(val)) {
@@ -309,15 +368,15 @@ PyObject *py_uwsgi_rpc(PyObject * self, PyObject * args) {
 	char *node, *func;
 	uint16_t size = 0;
 	PyObject *py_node, *py_func;
-	struct uwsgi_header uh;
+	struct wsgi_request rpc_req;
 	int argc = PyTuple_Size(args);
 	char *argv[0xff];
 	int i, fd;
 	uint16_t pktsize = 0, ulen;
 	char *bufptr;
 	int rlen;
+	int rpc_args = 0;
 
-	struct pollfd upoll;
 
 	// TODO better error reporting
 	if (argc < 2)
@@ -341,10 +400,16 @@ PyObject *py_uwsgi_rpc(PyObject * self, PyObject * args) {
 
 	for (i = 0; i < (argc - 2); i++) {
 		argv[i] = PyString_AsString(PyTuple_GetItem(args, i + 2));
+		rpc_args++;
 	}
 
-	if (node == (char *) "") {
-		size = uwsgi_rpc(func, 0, NULL, buffer);
+	if (!strcmp(node, "")) {
+		if (!rpc_args) {
+			size = uwsgi_rpc(func, 0, NULL, buffer);
+		}
+		else {
+			size = uwsgi_rpc(func, rpc_args, argv, buffer);
+		}
 	}
 	else {
 
@@ -361,9 +426,11 @@ PyObject *py_uwsgi_rpc(PyObject * self, PyObject * args) {
 			pktsize += 2 + strlen(argv[i]);
 		}
 
-		uh.modifier1 = 173;
-		uh.pktsize = pktsize;
-		uh.modifier2 = 0;
+		memset(&rpc_req, 0, sizeof(struct wsgi_request));
+
+		rpc_req.uh.modifier1 = 173;
+		rpc_req.uh.pktsize = pktsize;
+		rpc_req.uh.modifier2 = 0;
 
 		bufptr = buffer;
 
@@ -381,7 +448,7 @@ PyObject *py_uwsgi_rpc(PyObject * self, PyObject * args) {
 			bufptr += ulen;
 		}
 
-		if (write(fd, &uh, 4) != 4) {
+		if (write(fd, &rpc_req.uh, 4) != 4) {
 			uwsgi_error("write()");
 			close(fd);
 			goto clear;
@@ -395,10 +462,11 @@ PyObject *py_uwsgi_rpc(PyObject * self, PyObject * args) {
 
 		rlen = uwsgi_waitfd(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		if (rlen > 0) {
-			upoll.fd = fd;
-			upoll.events = POLLIN;
-			if (uwsgi_parse_response(&upoll, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], &uh, buffer)) {
-				size = uh.pktsize;
+			rpc_req.poll.fd = fd;
+			rpc_req.poll.events = POLLIN;
+			rpc_req.buffer = buffer;
+			if (uwsgi_parse_packet(&rpc_req, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT])) {
+				size = rpc_req.uh.pktsize;
 			}
 		}
 
@@ -426,8 +494,7 @@ PyObject *py_uwsgi_register_rpc(PyObject * self, PyObject * args) {
 
 
 	if (uwsgi_register_rpc(name, 0, argc, func)) {
-		Py_INCREF(Py_None);
-		return Py_None;
+		return PyErr_Format(PyExc_ValueError, "unable to register rpc function");
 	}
 
 	Py_INCREF(Py_True);
@@ -451,6 +518,22 @@ PyObject *py_uwsgi_attach_daemon(PyObject * self, PyObject * args) {
 	return Py_True;
 }
 
+PyObject *py_uwsgi_signal_registered(PyObject * self, PyObject * args) {
+	uint8_t uwsgi_signal;
+
+	if (!PyArg_ParseTuple(args, "B:signal_registered", &uwsgi_signal)) {
+                return NULL;
+        }
+
+	if (uwsgi_signal_registered(uwsgi_signal)) {
+		Py_INCREF(Py_True);
+		return Py_True;
+	}
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
 PyObject *py_uwsgi_register_signal(PyObject * self, PyObject * args) {
 
 	uint8_t uwsgi_signal;
@@ -478,9 +561,11 @@ PyObject *py_uwsgi_signal(PyObject * self, PyObject * args) {
 		return NULL;
 	}
 
+#ifdef UWSGI_DEBUG
 	uwsgi_log("sending %d to master\n", uwsgi_signal);
+#endif
 
-	rlen = write(uwsgi.shared->worker_signal_pipe[1], &uwsgi_signal, 1);
+	rlen = write(uwsgi.signal_socket, &uwsgi_signal, 1);
 	if (rlen != 1) {
 		uwsgi_error("write()");
 	}
@@ -745,7 +830,7 @@ PyObject *py_uwsgi_advanced_sendfile(PyObject * self, PyObject * args) {
 	size_t chunk;
 	off_t pos = 0;
 	size_t filesize = 0;
-	struct stat stat_buf;
+	struct wsgi_request *wsgi_req = current_wsgi_req();
 
 	int fd = -1;
 
@@ -770,36 +855,35 @@ PyObject *py_uwsgi_advanced_sendfile(PyObject * self, PyObject * args) {
 			goto clear;
 
 		// check for mixing file_wrapper and sendfile
-		if (fd == uwsgi.wsgi_req->sendfile_fd) {
+		if (fd == wsgi_req->sendfile_fd) {
 			Py_INCREF(what);
 		}
 	}
 
-	if (!filesize) {
-		if (fstat(fd, &stat_buf)) {
-			uwsgi_error("fstat()");
-			goto clear2;
-		}
-		else {
-			filesize = stat_buf.st_size;
-		}
+	int tmp_fd = wsgi_req->sendfile_fd;
+	size_t tmp_filesize = wsgi_req->sendfile_fd_size;
+	size_t tmp_chunk = wsgi_req->sendfile_fd_chunk;
+	off_t tmp_pos = wsgi_req->sendfile_fd_pos;
 
-	}
+	wsgi_req->sendfile_fd = fd;
+	wsgi_req->sendfile_fd_size = filesize;
+	wsgi_req->sendfile_fd_chunk = chunk;
+	wsgi_req->sendfile_fd_pos = pos;
 
-	if (!filesize)
-		goto clear2;
+	// do sendfile
+	wsgi_req->response_size += uwsgi_sendfile(wsgi_req);
 
-	if (!chunk)
-		chunk = 4096;
-
-	uwsgi.wsgi_req->response_size += uwsgi_do_sendfile(uwsgi.wsgi_req->poll.fd, fd, filesize, chunk, &pos, 0);
+	// revert to old values
+	wsgi_req->sendfile_fd = tmp_fd;
+	wsgi_req->sendfile_fd_size = tmp_filesize;
+	wsgi_req->sendfile_fd_chunk = tmp_chunk;
+	wsgi_req->sendfile_fd_pos = tmp_pos;
+	
 
 	close(fd);
 	Py_INCREF(Py_True);
 	return Py_True;
 
-      clear2:
-	close(fd);
       clear:
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -867,15 +951,13 @@ PyObject *py_uwsgi_log(PyObject * self, PyObject * args) {
 
 PyObject *py_uwsgi_lock(PyObject * self, PyObject * args) {
 
-	// the spooler, the master process or single process environment cannot lock resources
+	// the spooler cannot lock resources
 #ifdef UWSGI_SPOOLER
-	if (uwsgi.numproc > 1 && uwsgi.mypid != uwsgi.workers[0].pid && uwsgi.mypid != uwsgi.shared->spooler_pid) {
-#else
-	if (uwsgi.numproc > 1 && uwsgi.mypid != uwsgi.workers[0].pid) {
-#endif
-		uwsgi_lock(uwsgi.user_lock);
-		UWSGI_SET_LOCKING;
+	if (uwsgi.mypid == uwsgi.shared->spooler_pid) {
+		return PyErr_Format(PyExc_ValueError, "The spooler cannot lock/unlock resources");
 	}
+#endif
+	uwsgi_lock(uwsgi.user_lock);
 
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -883,13 +965,47 @@ PyObject *py_uwsgi_lock(PyObject * self, PyObject * args) {
 
 PyObject *py_uwsgi_unlock(PyObject * self, PyObject * args) {
 
+#ifdef UWSGI_SPOOLER
+	if (uwsgi.mypid == uwsgi.shared->spooler_pid) {
+		return PyErr_Format(PyExc_ValueError, "The spooler cannot lock/unlock resources");
+	}
+#endif
+
 	uwsgi_unlock(uwsgi.user_lock);
-	UWSGI_UNSET_LOCKING;
 
 	Py_INCREF(Py_None);
 	return Py_None;
 }
 
+PyObject *py_uwsgi_embedded_data(PyObject * self, PyObject * args) {
+
+	char *name;
+	char *symbol;
+	void *sym_ptr_start = NULL;
+	void *sym_ptr_end = NULL;
+
+	if (!PyArg_ParseTuple(args, "s:embedded_data", &name)) {
+		return NULL;
+	}
+
+	symbol = uwsgi_concat3("_binary_", name, "_start");
+	sym_ptr_start = dlsym(RTLD_DEFAULT, symbol);
+	free(symbol);
+	if (!sym_ptr_start)
+		return PyErr_Format(PyExc_ValueError, "unable to find symbol %s", name);
+
+
+
+	symbol = uwsgi_concat3("_binary_", name, "_end");
+	sym_ptr_end = dlsym(RTLD_DEFAULT, symbol);
+	free(symbol);
+	if (!sym_ptr_end)
+		return PyErr_Format(PyExc_ValueError, "unable to find symbol %s", name);
+
+	return PyString_FromStringAndSize(sym_ptr_start, sym_ptr_end - sym_ptr_start);
+
+}
+
 PyObject *py_uwsgi_sharedarea_inclong(PyObject * self, PyObject * args) {
 	int pos = 0;
 	long value = 0;
@@ -1129,6 +1245,11 @@ PyObject *py_uwsgi_send_spool(PyObject * self, PyObject * args, PyObject *kw) {
 	int i;
 	char spool_filename[1024];
 	struct wsgi_request *wsgi_req = current_wsgi_req();
+	char *priority = NULL;
+	long numprio = 0;
+	time_t at = 0;
+	char *body = NULL;
+	size_t body_len= 0;
 
 	spool_dict = PyTuple_GetItem(args, 0);
 
@@ -1149,12 +1270,47 @@ PyObject *py_uwsgi_send_spool(PyObject * self, PyObject * args, PyObject *kw) {
 		return PyErr_Format(PyExc_ValueError, "The argument of spooler callable must be a dictionary");
 	}
 
+	PyObject *pyprio = uwsgi_py_dict_get(spool_dict, "priority");
+	if (pyprio) {
+		if (PyInt_Check(pyprio)) {
+			numprio = PyInt_AsLong(pyprio);
+			uwsgi_py_dict_del(spool_dict, "priority");
+		}
+	}
+
+	PyObject *pyat = uwsgi_py_dict_get(spool_dict, "at");
+	if (pyat) {
+		if (PyInt_Check(pyat)) {
+			at = (time_t) PyInt_AsLong(pyat);
+			uwsgi_py_dict_del(spool_dict, "at");
+		}
+		else if (PyLong_Check(pyat)) {
+			at = (time_t) PyLong_AsLong(pyat);
+			uwsgi_py_dict_del(spool_dict, "at");
+		}
+		else if (PyFloat_Check(pyat)) {
+			at = (time_t) PyFloat_AsDouble(pyat);
+			uwsgi_py_dict_del(spool_dict, "at");
+		}
+	}
+
+	PyObject *pybody = uwsgi_py_dict_get(spool_dict, "body");
+	if (pybody) {
+		if (PyString_Check(pybody)) {
+			body = PyString_AsString(pybody);
+			body_len = PyString_Size(pybody);
+			uwsgi_py_dict_del(spool_dict, "body");
+		}
+	}
+
 	spool_vars = PyDict_Items(spool_dict);
 	if (!spool_vars) {
 		Py_INCREF(Py_None);
 		return Py_None;
 	}
 
+	char *spool_buffer = uwsgi_malloc(UMAX16);
+
 	cur_buf = spool_buffer;
 
 	for (i = 0; i < PyList_Size(spool_vars); i++) {
@@ -1164,12 +1320,16 @@ PyObject *py_uwsgi_send_spool(PyObject * self, PyObject * args, PyObject *kw) {
 				key = PyTuple_GetItem(zero, 0);
 				val = PyTuple_GetItem(zero, 1);
 
+#ifdef UWSGI_DEBUG
+				uwsgi_log("ob_type %s %s\n", key->ob_type->tp_name, val->ob_type->tp_name);
+#endif
+
 				if (PyString_Check(key) && PyString_Check(val)) {
 
 
 					keysize = PyString_Size(key);
 					valsize = PyString_Size(val);
-					if (cur_buf + keysize + 2 + valsize + 2 <= spool_buffer + uwsgi.buffer_size) {
+					if (cur_buf + keysize + 2 + valsize + 2 <= spool_buffer + UMAX16) {
 
 #ifdef __BIG_ENDIAN__
 						keysize = uwsgi_swap16(keysize);
@@ -1194,37 +1354,54 @@ PyObject *py_uwsgi_send_spool(PyObject * self, PyObject * args, PyObject *kw) {
 					}
 					else {
 						Py_DECREF(zero);
-						Py_INCREF(Py_None);
-						return Py_None;
+						free(spool_buffer);	
+						return PyErr_Format(PyExc_ValueError, "spooler packet cannot be more than %d bytes", UMAX16);
 					}
 				}
 				else {
 					Py_DECREF(zero);
+					free(spool_buffer);
 					return PyErr_Format(PyExc_ValueError, "spooler callable dictionary must contains only strings");
 				}
 			}
 			else {
+				free(spool_buffer);
 				Py_DECREF(zero);
 				Py_INCREF(Py_None);
 				return Py_None;
 			}
 		}
 		else {
+			free(spool_buffer);
 			Py_INCREF(Py_None);
 			return Py_None;
 		}
 	}
 
-	i = spool_request(spool_filename, uwsgi.workers[0].requests + 1, wsgi_req->async_id, spool_buffer, cur_buf - spool_buffer);
+	if (numprio) {
+		priority = uwsgi_num2str(numprio);
+	} 
+	i = spool_request(spool_filename, uwsgi.workers[0].requests + 1, wsgi_req->async_id, spool_buffer, cur_buf - spool_buffer, priority, at, body, body_len);
+	if (priority) {
+		free(priority);
+	}
+		
+	free(spool_buffer);
 
 	Py_DECREF(spool_vars);
 
 	if (i > 0) {
-		Py_INCREF(Py_True);
-		return Py_True;
+		char *slash = uwsgi_get_last_char(spool_filename, '/');
+		if (slash) {
+			return PyString_FromString(slash+1);
+		}
+		return PyString_FromString(spool_filename);
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+	return PyErr_Format(PyExc_ValueError, "unable to spool job");
+}
+
+PyObject *py_uwsgi_spooler_pid(PyObject * self, PyObject * args) {
+	return PyInt_FromLong(uwsgi.shared->spooler_pid ? uwsgi.shared->spooler_pid : 0);
 }
 #endif
 
@@ -1237,7 +1414,7 @@ PyObject *py_uwsgi_send_multi_message(PyObject * self, PyObject * args) {
 	int managed;
 	struct pollfd *multipoll;
 	char *buffer;
-	struct uwsgi_header uh;
+
 	PyObject *arg_cluster;
 
 	PyObject *cluster_node;
@@ -1351,9 +1528,11 @@ PyObject *py_uwsgi_send_multi_message(PyObject * self, PyObject * args) {
 			goto megamulticlear;
 		}
 		else {
+			// TODO fix
+/*
 			for (i = 0; i < clen; i++) {
 				if (multipoll[i].revents & POLLIN) {
-					if (!uwsgi_parse_response(&multipoll[i], PyInt_AsLong(arg_timeout), &uh, &buffer[i])) {
+					if (!uwsgi_parse_packet(&multipoll[i], PyInt_AsLong(arg_timeout), &uh, &buffer[i], uwsgi_proto_uwsgi_parser)) {
 						goto megamulticlear;
 					}
 					else {
@@ -1366,6 +1545,7 @@ PyObject *py_uwsgi_send_multi_message(PyObject * self, PyObject * args) {
 					}
 				}
 			}
+*/
 		}
 	}
 
@@ -1557,7 +1737,6 @@ PyObject *uwsgi_Iter_next(PyObject * self) {
 				ui->has_cl = 1;
 				ui->size = uh.pktsize;
 				ui->sent = 0;
-				uwsgi_log("NEED TO READ %d\n", uh.pktsize);
 			}
 		}
 
@@ -1660,8 +1839,6 @@ PyObject *py_uwsgi_async_send_message(PyObject * self, PyObject * args) {
 	int modifier1 = 0;
 	int modifier2 = 0;
 
-	ssize_t ret;
-
 	char *encoded;
 	uint16_t esize = 0;
 
@@ -1676,14 +1853,14 @@ PyObject *py_uwsgi_async_send_message(PyObject * self, PyObject * args) {
 	if (PyDict_Check(pyobj)) {
 		encoded = uwsgi_encode_pydict(pyobj, &esize);
 		if (esize > 0) {
-			UWSGI_RELEASE_GIL ret = uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, -1, 0, 0);
+			UWSGI_RELEASE_GIL uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, -1, 0, 0);
 			free(encoded);
 		}
 	}
 	else if (PyString_Check(pyobj)) {
 		encoded = PyString_AsString(pyobj);
 		esize = PyString_Size(pyobj);
-		UWSGI_RELEASE_GIL ret = uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, -1, 0, 0);
+		UWSGI_RELEASE_GIL uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, -1, 0, 0);
 	}
 	else {
 		marshalled = PyMarshal_WriteObjectToString(pyobj, 1);
@@ -1694,7 +1871,7 @@ PyObject *py_uwsgi_async_send_message(PyObject * self, PyObject * args) {
 
 		encoded = PyString_AsString(marshalled);
 		esize = PyString_Size(marshalled);
-		UWSGI_RELEASE_GIL ret = uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, -1, 0, 0);
+		UWSGI_RELEASE_GIL uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, -1, 0, 0);
 	}
 
       UWSGI_GET_GIL clear:
@@ -1804,8 +1981,6 @@ PyObject *py_uwsgi_send_message(PyObject * self, PyObject * args) {
 	int fd = -1;
 	int cl = 0;
 
-	ssize_t ret;
-
 	int uwsgi_fd = -1;
 	char *encoded;
 	uint16_t esize = 0;
@@ -1834,14 +2009,14 @@ PyObject *py_uwsgi_send_message(PyObject * self, PyObject * args) {
 	if (PyDict_Check(pyobj)) {
 		encoded = uwsgi_encode_pydict(pyobj, &esize);
 		if (esize > 0) {
-			UWSGI_RELEASE_GIL ret = uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, fd, cl, timeout);
+			UWSGI_RELEASE_GIL uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, fd, cl, timeout);
 			free(encoded);
 		}
 	}
 	else if (PyString_Check(pyobj)) {
 		encoded = PyString_AsString(pyobj);
 		esize = PyString_Size(pyobj);
-		UWSGI_RELEASE_GIL ret = uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, fd, cl, timeout);
+		UWSGI_RELEASE_GIL uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, fd, cl, timeout);
 	}
 	else {
 		marshalled = PyMarshal_WriteObjectToString(pyobj, 1);
@@ -1852,7 +2027,7 @@ PyObject *py_uwsgi_send_message(PyObject * self, PyObject * args) {
 
 		encoded = PyString_AsString(marshalled);
 		esize = PyString_Size(marshalled);
-		UWSGI_RELEASE_GIL ret = uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, fd, cl, timeout);
+		UWSGI_RELEASE_GIL uwsgi_send_message(uwsgi_fd, (uint8_t) modifier1, (uint8_t) modifier2, encoded, esize, fd, cl, timeout);
 	}
 
 	UWSGI_GET_GIL
@@ -1906,8 +2081,9 @@ PyObject *py_uwsgi_total_requests(PyObject * self, PyObject * args) {
 	/* uWSGI workers */
 PyObject *py_uwsgi_workers(PyObject * self, PyObject * args) {
 
-	PyObject *worker_dict, *zero;
-	int i;
+	PyObject *worker_dict, *apps_dict, *apps_tuple, *zero;
+	int i, j;
+	struct uwsgi_app *ua;
 
 	for (i = 0; i < uwsgi.numproc; i++) {
 		worker_dict = PyTuple_GetItem(up.workers_tuple, i);
@@ -1980,6 +2156,43 @@ PyObject *py_uwsgi_workers(PyObject * self, PyObject * args) {
 		   Py_DECREF(zero);
 		 */
 
+		apps_tuple = PyTuple_New(uwsgi.workers[i+1].apps_cnt);
+
+		for(j=0;j<uwsgi.workers[i+1].apps_cnt;j++) {
+			apps_dict = PyDict_New();
+			ua = &uwsgi.workers[i+1].apps[j];
+
+			PyDict_SetItemString(apps_dict, "id", PyInt_FromLong(j));
+
+			PyDict_SetItemString(apps_dict, "modifier1", PyInt_FromLong(ua->modifier1));
+
+			zero = PyString_FromStringAndSize(ua->mountpoint, ua->mountpoint_len);
+			PyDict_SetItemString(apps_dict, "mountpoint", zero);
+			Py_DECREF(zero);
+
+			PyDict_SetItemString(apps_dict, "interpreter", PyInt_FromLong((long)ua->interpreter));
+			PyDict_SetItemString(apps_dict, "callable", PyInt_FromLong((long)ua->interpreter));
+
+			PyDict_SetItemString(apps_dict, "requests", PyInt_FromLong(ua->requests));
+			PyDict_SetItemString(apps_dict, "exceptions", PyInt_FromLong(ua->exceptions));
+
+			if (ua->chdir) {
+				zero = PyString_FromString(ua->chdir);
+			}
+			else {
+				zero = PyString_FromString("");
+			}
+			PyDict_SetItemString(apps_dict, "chdir", zero);
+			Py_DECREF(zero);
+
+			PyTuple_SetItem(apps_tuple, j, apps_dict);
+
+		}
+	
+
+		PyDict_SetItemString(worker_dict, "apps", apps_tuple);
+		Py_DECREF(apps_tuple);
+
 	}
 
 
@@ -1994,6 +2207,7 @@ PyObject *py_uwsgi_workers(PyObject * self, PyObject * args) {
 
 }
 
+
 	/* uWSGI reload */
 PyObject *py_uwsgi_reload(PyObject * self, PyObject * args) {
 
@@ -2011,7 +2225,6 @@ PyObject *py_uwsgi_reload(PyObject * self, PyObject * args) {
 PyObject *py_uwsgi_set_blocking(PyObject * self, PyObject * args) {
 
 	if (uwsgi.master_process) {
-		uwsgi.workers[uwsgi.mywid].status |= UWSGI_STATUS_BLOCKING;
 		Py_INCREF(Py_True);
 		return Py_True;
 	}
@@ -2181,7 +2394,6 @@ PyObject *py_uwsgi_parse_file(PyObject * self, PyObject * args) {
 PyObject *py_uwsgi_grunt(PyObject * self, PyObject * args) {
 
 	pid_t grunt_pid;
-	int i;
 	struct wsgi_request *wsgi_req = current_wsgi_req();
 
 	if (uwsgi.grunt) {
@@ -2198,9 +2410,7 @@ PyObject *py_uwsgi_grunt(PyObject * self, PyObject * args) {
 		goto clear;
 	}
 	else if (grunt_pid == 0) {
-		for (i = 0; i < uwsgi.sockets_cnt; i++) {
-			close(uwsgi.sockets[i].fd);
-		}
+		uwsgi_close_all_sockets();
 		// create a new session
 		setsid();
 		// exit on SIGPIPE
@@ -2212,6 +2422,9 @@ PyObject *py_uwsgi_grunt(PyObject * self, PyObject * args) {
 		uwsgi.workers[uwsgi.mywid].id = uwsgi.mywid;
 		// this field will be overwrite after each call
 		uwsgi.workers[uwsgi.mywid].pid = uwsgi.mypid;
+
+		// reset the random seed
+		uwsgi_python_reset_random_seed();
 		// TODO
 		// manage thread in grunt processes
 		Py_INCREF(Py_True);
@@ -2219,8 +2432,10 @@ PyObject *py_uwsgi_grunt(PyObject * self, PyObject * args) {
 	}
 
 	// close connection on the worker
-	fclose(wsgi_req->async_post);
-	wsgi_req->fd_closed = 1;
+	if (PyTuple_Size(args) == 0) {
+		fclose(wsgi_req->async_post);
+		wsgi_req->fd_closed = 1;
+	}
 
       clear:
 	Py_INCREF(Py_None);
@@ -2229,10 +2444,16 @@ PyObject *py_uwsgi_grunt(PyObject * self, PyObject * args) {
 
 #ifdef UWSGI_SPOOLER
 static PyMethodDef uwsgi_spooler_methods[] = {
+#ifdef PYTHREE
+	{"send_to_spooler", (PyCFunction) py_uwsgi_send_spool, METH_VARARGS | METH_KEYWORDS, ""},
+	{"spool", (PyCFunction) py_uwsgi_send_spool, METH_VARARGS | METH_KEYWORDS, ""},
+#else
 	{"send_to_spooler", (PyCFunction) py_uwsgi_send_spool, METH_KEYWORDS, ""},
 	{"spool", (PyCFunction) py_uwsgi_send_spool, METH_KEYWORDS, ""},
+#endif
 	{"set_spooler_frequency", py_uwsgi_spooler_freq, METH_VARARGS, ""},
 	{"spooler_jobs", py_uwsgi_spooler_jobs, METH_VARARGS, ""},
+	{"spooler_pid", py_uwsgi_spooler_pid, METH_VARARGS, ""},
 	{NULL, NULL},
 };
 #endif
@@ -2277,7 +2498,9 @@ PyObject *py_uwsgi_cluster_node_name(PyObject * self, PyObject * args) {
 	for (i = 0; i < MAX_CLUSTER_NODES; i++) {
 		ucn = &uwsgi.shared->nodes[i];
 		if (ucn->name[0] != 0) {
+#ifdef UWSGI_DEBUG
 			uwsgi_log("node_name: %s %s\n", node, ucn->name);
+#endif
 			if (!strcmp(ucn->name, node)) {
 				return PyString_FromString(ucn->nodename);
 			}
@@ -2348,7 +2571,6 @@ static PyMethodDef uwsgi_advanced_methods[] = {
 	{"load_plugin", py_uwsgi_load_plugin, METH_VARARGS, ""},
 	{"lock", py_uwsgi_lock, METH_VARARGS, ""},
 	{"unlock", py_uwsgi_unlock, METH_VARARGS, ""},
-	{"send", py_uwsgi_send, METH_VARARGS, ""},
 	{"cl", py_uwsgi_cl, METH_VARARGS, ""},
 
 	{"listen_queue", py_uwsgi_listen_queue, METH_VARARGS, ""},
@@ -2358,6 +2580,7 @@ static PyMethodDef uwsgi_advanced_methods[] = {
 	{"register_signal", py_uwsgi_register_signal, METH_VARARGS, ""},
 	{"signal", py_uwsgi_signal, METH_VARARGS, ""},
 	{"signal_wait", py_uwsgi_signal_wait, METH_VARARGS, ""},
+	{"signal_registered", py_uwsgi_signal_registered, METH_VARARGS, ""},
 	{"signal_received", py_uwsgi_signal_received, METH_VARARGS, ""},
 	{"add_file_monitor", py_uwsgi_add_file_monitor, METH_VARARGS, ""},
 	{"add_timer", py_uwsgi_add_timer, METH_VARARGS, ""},
@@ -2404,6 +2627,7 @@ static PyMethodDef uwsgi_advanced_methods[] = {
 	{"fcgi", py_uwsgi_fcgi, METH_VARARGS, ""},
 
 	{"parsefile", py_uwsgi_parse_file, METH_VARARGS, ""},
+	{"embedded_data", py_uwsgi_embedded_data, METH_VARARGS, ""},
 	//{"call_hook", py_uwsgi_call_hook, METH_VARARGS, ""},
 
 	{NULL, NULL},
@@ -2486,6 +2710,43 @@ PyObject *py_uwsgi_cache_set(PyObject * self, PyObject * args) {
 
 }
 
+PyObject *py_uwsgi_cache_update(PyObject * self, PyObject * args) {
+
+        char *key;
+        char *value;
+        Py_ssize_t vallen = 0;
+        Py_ssize_t keylen = 0;
+        char *remote = NULL;
+
+        uint64_t expires = 0;
+
+        if (!PyArg_ParseTuple(args, "s#s#|is:cache_update", &key, &keylen, &value, &vallen, &expires, &remote)) {
+                return NULL;
+        }
+
+        if ((uint64_t)vallen > uwsgi.cache_blocksize) {
+                return PyErr_Format(PyExc_ValueError, "uWSGI cache items size must be < %llu, requested %d bytes", (unsigned long long)uwsgi.cache_blocksize, (int) vallen);
+        }
+
+        if (remote && strlen(remote) > 0) {
+                uwsgi_simple_send_string2(remote, 111, 1, key, keylen, value, vallen, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+        }
+        else if (uwsgi.cache_max_items) {
+                uwsgi_wlock(uwsgi.cache_lock);
+                if (uwsgi_cache_set(key, keylen, value, vallen, expires, UWSGI_CACHE_FLAG_UPDATE)) {
+                        uwsgi_rwunlock(uwsgi.cache_lock);
+                        Py_INCREF(Py_None);
+                        return Py_None;
+                }
+                uwsgi_rwunlock(uwsgi.cache_lock);
+        }
+
+        Py_INCREF(Py_True);
+        return Py_True;
+
+}
+
+
 
 PyObject *py_uwsgi_cache_exists(PyObject * self, PyObject * args) {
 
@@ -2501,6 +2762,7 @@ PyObject *py_uwsgi_cache_exists(PyObject * self, PyObject * args) {
 	}
 	
 	if (remote && strlen(remote) > 0) {
+		// TODO FIX THIS !!!
 		uwsgi_simple_message_string(remote, 111, 0, key, keylen, buffer, &valsize, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
 		if (valsize > 0) {
 			Py_INCREF(Py_True);
@@ -2663,6 +2925,7 @@ PyObject *py_uwsgi_cache_get(PyObject * self, PyObject * args) {
 
 	char *key;
 	uint64_t valsize;
+	uint16_t valsize16;
 	Py_ssize_t keylen = 0;
 	char *value = NULL;
 	char *remote = NULL;
@@ -2678,8 +2941,8 @@ PyObject *py_uwsgi_cache_get(PyObject * self, PyObject * args) {
 	}
 
 	if (remote && strlen(remote) > 0) {
-		//uwsgi_simple_message_string(remote, 111, 0, key, keylen, buffer, &valsize, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
-		if (valsize > 0) {
+		uwsgi_simple_message_string(remote, 111, 0, key, keylen, buffer, &valsize16, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
+		if (valsize16 > 0) {
 			value = buffer;
 		}
 	}
@@ -2717,6 +2980,7 @@ PyObject *py_uwsgi_cache_get(PyObject * self, PyObject * args) {
 static PyMethodDef uwsgi_cache_methods[] = {
 	{"cache_get", py_uwsgi_cache_get, METH_VARARGS, ""},
 	{"cache_set", py_uwsgi_cache_set, METH_VARARGS, ""},
+	{"cache_update", py_uwsgi_cache_update, METH_VARARGS, ""},
 	{"cache_del", py_uwsgi_cache_del, METH_VARARGS, ""},
 	{"cache_exists", py_uwsgi_cache_exists, METH_VARARGS, ""},
 	{NULL, NULL},
@@ -2744,13 +3008,6 @@ void init_uwsgi_module_spooler(PyObject * current_uwsgi_module) {
 		exit(1);
 	}
 
-	spool_buffer = malloc(uwsgi.buffer_size);
-	if (!spool_buffer) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
-
-
 	for (uwsgi_function = uwsgi_spooler_methods; uwsgi_function->ml_name != NULL; uwsgi_function++) {
 		PyObject *func = PyCFunction_New(uwsgi_function, NULL);
 		PyDict_SetItemString(uwsgi_module_dict, uwsgi_function->ml_name, func);

plugins/python/uwsgi_python.h

@@ -3,21 +3,42 @@
 
 #include <frameobject.h>
 
-#define MAX_PYTHONPATH 64
 #define MAX_PYMODULE_ALIAS 64
+#define MAX_PYARGV 10
 
-#define LONG_ARGS_PYTHON_BASE      17000 + ((0 + 1) * 100)
+#define LONG_ARGS_PYTHON_BASE      17000 + ((0 + 1) * 1000)
 
 #define LONG_ARGS_PYTHONPATH            LONG_ARGS_PYTHON_BASE + 1
 #define LONG_ARGS_PASTE                 LONG_ARGS_PYTHON_BASE + 2
 #define LONG_ARGS_PYARGV                LONG_ARGS_PYTHON_BASE + 3
 #define LONG_ARGS_PYMODULE_ALIAS        LONG_ARGS_PYTHON_BASE + 4
 #define LONG_ARGS_RELOAD_OS_ENV		LONG_ARGS_PYTHON_BASE + 5
+#define LONG_ARGS_PYIMPORT		LONG_ARGS_PYTHON_BASE + 6
+#define LONG_ARGS_POST_PYMODULE_ALIAS   LONG_ARGS_PYTHON_BASE + 7
+#define LONG_ARGS_WEB3			LONG_ARGS_PYTHON_BASE + 8
+#define LONG_ARGS_PUMP			LONG_ARGS_PYTHON_BASE + 9
+#define LONG_ARGS_WSGI_LITE		LONG_ARGS_PYTHON_BASE + 10
+#define LONG_ARGS_PYSHELL		LONG_ARGS_PYTHON_BASE + 11
+#define LONG_ARGS_SPOOLER_PYIMPORT	LONG_ARGS_PYTHON_BASE + 12
+
+#define PYTHON_APP_TYPE_WSGI		0
+#define PYTHON_APP_TYPE_WEB3		1
+#define PYTHON_APP_TYPE_WSGI2		2
+#define PYTHON_APP_TYPE_PUMP		3
+#define PYTHON_APP_TYPE_WSGI_LITE	4
 
 #if PY_MINOR_VERSION == 4 && PY_MAJOR_VERSION == 2
 #define Py_ssize_t ssize_t
 #endif
 
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7
+#define HAS_NOT_PyFrame_GetLineNumber 
+#endif
+
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 2
+#define HAS_NOT_PyFrame_GetLineNumber 
+#endif
+
 #if PY_MAJOR_VERSION > 2
 #define PYTHREE
 #endif
@@ -52,10 +73,14 @@ PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t);
 #define	PyString_Concat		PyBytes_Concat
 #define	PyString_AsString	(char *) PyBytes_AsString
 #define PyFile_FromFile(A,B,C,D) PyFile_FromFd(fileno((A)), (B), (C), -1, NULL, NULL, NULL, 0)
+#define uwsgi_py_dict_get(a, b) PyDict_GetItem(a, PyBytes_FromString(b));
+#define uwsgi_py_dict_del(a, b) PyDict_DelItem(a, PyBytes_FromString(b));
 
 #else
 #define UWSGI_PYFROMSTRING(x) PyString_FromString(x)
 #define UWSGI_PYFROMSTRINGSIZE(x, y) PyString_FromStringAndSize(x, y)
+#define uwsgi_py_dict_get(a, b) PyDict_GetItemString(a, b)
+#define uwsgi_py_dict_del(a, b) PyDict_DelItemString(a, b)
 #endif
 
 #define LOADER_DYN              0
@@ -69,6 +94,16 @@ PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t);
 
 #define LOADER_MAX              8
 
+typedef struct uwsgi_Input {
+        PyObject_HEAD
+        char readline[1024];
+        size_t readline_size;
+        size_t readline_max_size;
+        size_t readline_pos;
+        size_t pos;
+        struct wsgi_request *wsgi_req;
+} uwsgi_Input;
+
 struct uwsgi_python {
 
 	char *home;
@@ -90,8 +125,12 @@ struct uwsgi_python {
 
 	char *test_module;
 
-	char *python_path[MAX_PYTHONPATH];
-	int python_path_cnt;
+	int pyshell;
+
+	struct uwsgi_string_list *python_path;
+	struct uwsgi_string_list *import_list;
+	struct uwsgi_string_list *spooler_import_list;
+	struct uwsgi_string_list *post_pymodule_alias;
 
 	PyObject *loader_dict;
 	PyObject* (*loaders[LOADER_MAX]) (void *);
@@ -101,6 +140,9 @@ struct uwsgi_python {
 	char *paste;
 	char *eval;
 
+	char *web3;
+	char *pump;
+	char *wsgi_lite;
 
 	char *callable;
 
@@ -137,6 +179,7 @@ struct uwsgi_python {
 	void (*extension)(void);
 
 	int reload_os_env;
+
 };
 
 
@@ -150,7 +193,7 @@ void uwsgi_paste_config(char *);
 void uwsgi_file_config(char *);
 void uwsgi_eval_config(char *);
 
-int init_uwsgi_app(int, void *, struct wsgi_request *wsgi_req, PyThreadState *);
+int init_uwsgi_app(int, void *, struct wsgi_request *, PyThreadState *, int);
 
 
 PyObject *py_eventfd_read(PyObject *, PyObject *);
@@ -159,7 +202,7 @@ PyObject *py_eventfd_write(PyObject *, PyObject *);
 
 int manage_python_response(struct wsgi_request *);
 int uwsgi_python_call(struct wsgi_request *, PyObject *, PyObject *);
-PyObject *python_call(PyObject *, PyObject *, int);
+PyObject *python_call(PyObject *, PyObject *, int, struct wsgi_request *);
 
 #ifdef UWSGI_SENDFILE
 PyObject *py_uwsgi_sendfile(PyObject *, PyObject *);
@@ -172,10 +215,11 @@ PyObject *py_uwsgi_spit(PyObject *, PyObject *);
 
 void init_pyargv(void);
 
-#ifdef UWSGI_WEB3
 void *uwsgi_request_subhandler_web3(struct wsgi_request *, struct uwsgi_app *);
 int uwsgi_response_subhandler_web3(struct wsgi_request *);
-#endif
+
+void *uwsgi_request_subhandler_pump(struct wsgi_request *, struct uwsgi_app *);
+int uwsgi_response_subhandler_pump(struct wsgi_request *);
 
 PyObject *uwsgi_uwsgi_loader(void *);
 PyObject *uwsgi_dyn_loader(void *);
@@ -212,3 +256,15 @@ void threaded_swap_ts(struct wsgi_request *, struct uwsgi_app *);
 void simple_swap_ts(struct wsgi_request *, struct uwsgi_app *);
 void threaded_reset_ts(struct wsgi_request *, struct uwsgi_app *);
 void simple_reset_ts(struct wsgi_request *, struct uwsgi_app *);
+
+int uwsgi_python_profiler_call(PyObject *, PyFrameObject *, int, PyObject *);
+
+void uwsgi_python_reset_random_seed(void);
+
+char *uwsgi_pythonize(char *);
+
+#ifdef __linux__
+#ifndef PYTHREE
+int uwsgi_init_symbol_import(void);
+#endif
+#endif

plugins/python/uwsgiplugin.py

@@ -3,7 +3,7 @@ import os,sys
 from distutils import sysconfig
 
 NAME='python'
-GCC_LIST = ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule']
+GCC_LIST = ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']
 
 CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ] 
 LDFLAGS = []

plugins/python/web3_subhandler.c

@@ -1,20 +1,70 @@
-#include "uwsgi.h"
+#include "uwsgi_python.h"
 
 extern struct uwsgi_server uwsgi;
+extern struct uwsgi_python up;
+extern PyTypeObject uwsgi_InputType;
 
 void *uwsgi_request_subhandler_web3(struct wsgi_request *wsgi_req, struct uwsgi_app *wi) {
 
-	PyObject *zero, *wsgi_socket;
+	PyObject *zero;
 
-	wsgi_socket = PyFile_FromFile(wsgi_req->async_post, "web3_input", "r", NULL);
-	PyDict_SetItemString(wsgi_req->async_environ, "web3.input", wsgi_socket);
-	Py_DECREF(wsgi_socket);
+	int i;
+        PyObject *pydictkey, *pydictvalue;
+        char *path_info;
 
-	zero = PyTuple_New(2);
-	PyTuple_SetItem(zero, 0, PyInt_FromLong(1));
-	PyTuple_SetItem(zero, 1, PyInt_FromLong(0));
-	PyDict_SetItemString(wsgi_req->async_environ, "web3.version", zero);
-	Py_DECREF(zero);
+        for (i = 0; i < wsgi_req->var_cnt; i += 2) {
+#ifdef UWSGI_DEBUG
+                uwsgi_debug("%.*s: %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
+#endif
+#ifdef PYTHREE
+                pydictkey = PyUnicode_DecodeLatin1(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, NULL);
+                pydictvalue = PyUnicode_DecodeLatin1(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len, NULL);
+#else
+                pydictkey = PyString_FromStringAndSize(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len);
+                pydictvalue = PyString_FromStringAndSize(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len);
+#endif
+                PyDict_SetItem(wsgi_req->async_environ, pydictkey, pydictvalue);
+                Py_DECREF(pydictkey);
+                Py_DECREF(pydictvalue);
+        }
+
+        if (wsgi_req->uh.modifier1 == UWSGI_MODIFIER_MANAGE_PATH_INFO) {
+                wsgi_req->uh.modifier1 = 0;
+                pydictkey = PyDict_GetItemString(wsgi_req->async_environ, "SCRIPT_NAME");
+                if (pydictkey) {
+                        if (PyString_Check(pydictkey)) {
+                                pydictvalue = PyDict_GetItemString(wsgi_req->async_environ, "PATH_INFO");
+                                if (pydictvalue) {
+                                        if (PyString_Check(pydictvalue)) {
+                                                path_info = PyString_AsString(pydictvalue);
+                                                PyDict_SetItemString(wsgi_req->async_environ, "PATH_INFO", PyString_FromString(path_info + PyString_Size(pydictkey)));
+                                        }
+                                }
+                        }
+                }
+        }
+
+        // if async_post is mapped as a file, directly use it as wsgi.input
+        if (wsgi_req->async_post) {
+#ifdef PYTHREE
+                wsgi_req->async_input = PyFile_FromFd(fileno(wsgi_req->async_post), "web3_input", "rb", 0, NULL, NULL, NULL, 0);
+#else
+                wsgi_req->async_input = PyFile_FromFile(wsgi_req->async_post, "web3_input", "r", NULL);
+#endif
+        }
+        else {
+                // create wsgi.input custom object
+                wsgi_req->async_input = (PyObject *) PyObject_New(uwsgi_Input, &uwsgi_InputType);
+                ((uwsgi_Input*)wsgi_req->async_input)->wsgi_req = wsgi_req;
+                ((uwsgi_Input*)wsgi_req->async_input)->pos = 0;
+                ((uwsgi_Input*)wsgi_req->async_input)->readline_pos = 0;
+                ((uwsgi_Input*)wsgi_req->async_input)->readline_max_size = 0;
+
+        }
+
+        PyDict_SetItemString(wsgi_req->async_environ, "web3.input", wsgi_req->async_input);
+
+	PyDict_SetItemString(wsgi_req->async_environ, "web3.version", wi->gateway_version);
 
 	zero = PyFile_FromFile(stderr, "web3_input", "w", NULL);
 	PyDict_SetItemString(wsgi_req->async_environ, "web3.errors", zero);
@@ -31,35 +81,53 @@ void *uwsgi_request_subhandler_web3(struct wsgi_request *wsgi_req, struct uwsgi_
 	}
 
 	if (wsgi_req->scheme_len > 0) {
-		zero = PyString_FromStringAndSize(wsgi_req->scheme, wsgi_req->scheme_len);
+		zero = UWSGI_PYFROMSTRINGSIZE(wsgi_req->scheme, wsgi_req->scheme_len);
 	}
 	else if (wsgi_req->https_len > 0) {
 		if (!strncasecmp(wsgi_req->https, "on", 2) || wsgi_req->https[0] == '1') {
-			zero = PyString_FromString("https");
+			zero = UWSGI_PYFROMSTRING("https");
 		}
 		else {
-			zero = PyString_FromString("http");
+			zero = UWSGI_PYFROMSTRING("http");
 		}
 	}
 	else {
-		zero = PyString_FromString("http");
+		zero = UWSGI_PYFROMSTRING("http");
 	}
 	PyDict_SetItemString(wsgi_req->async_environ, "web3.url_scheme", zero);
 	Py_DECREF(zero);
 
 
-	wsgi_req->async_app = wi->wsgi_callable;
+	wsgi_req->async_app = wi->callable;
 
-	PyDict_SetItemString(uwsgi.embedded_dict, "env", wsgi_req->async_environ);
+	// export .env only in non-threaded mode
+        if (uwsgi.threads < 2) {
+        	PyDict_SetItemString(up.embedded_dict, "env", wsgi_req->async_environ);
+        }
 
-	// TODO: fix this
-	//PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.version", uwsgi_version);
+        PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.version", wi->uwsgi_version);
+
+        if (uwsgi.cores > 1) {
+                PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.core", PyInt_FromLong(wsgi_req->async_id));
+        }
+
+        // cache this ?
+        if (uwsgi.cluster_fd >= 0) {
+                zero = PyString_FromString(uwsgi.cluster);
+                PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.cluster", zero);
+                Py_DECREF(zero);
+                zero = PyString_FromString(uwsgi.hostname);
+                PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.cluster_node", zero);
+                Py_DECREF(zero);
+        }
+
+        PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.node", wi->uwsgi_node);
 
 
 	// call
 
 	PyTuple_SetItem(wsgi_req->async_args, 0, wsgi_req->async_environ);
-	return python_call(wsgi_req->async_app, wsgi_req->async_args, uwsgi.catch_exceptions);
+	return python_call(wsgi_req->async_app, wsgi_req->async_args, uwsgi.catch_exceptions, wsgi_req);
 }
 
 
@@ -68,16 +136,7 @@ int uwsgi_response_subhandler_web3(struct wsgi_request *wsgi_req) {
 	PyObject *pychunk;
 	ssize_t wsize;
 
-	// return or yield ? (PyString on python2 PyBytes on python3)
-	if (PyString_Check((PyObject *)wsgi_req->async_result)) {
-		if ((wsize = write(wsgi_req->poll.fd, PyString_AsString(wsgi_req->async_result), PyString_Size(wsgi_req->async_result))) < 0) {
-			uwsgi_error("write()");
-			goto clear;
-		}
-		wsgi_req->response_size += wsize;
-		goto clear;
-	}
-
+	UWSGI_GET_GIL
 
 	// ok its a yield
 	if (!wsgi_req->async_placeholder) {
@@ -86,19 +145,51 @@ int uwsgi_response_subhandler_web3(struct wsgi_request *wsgi_req) {
 				uwsgi_log("invalid Web3 response.\n"); 
 				goto clear; 
 			} 
-			if (py_uwsgi_spit(NULL, (PyObject *)wsgi_req->async_result) == Py_None) { 
+
+
+
+			wsgi_req->async_placeholder = PyTuple_GetItem((PyObject *)wsgi_req->async_result, 0); 
+			Py_INCREF((PyObject *)wsgi_req->async_placeholder);
+
+			PyObject *spit_args = PyTuple_New(2);
+
+			PyObject *status = PyTuple_GetItem((PyObject *)wsgi_req->async_result, 1);
+			Py_INCREF(status);
+			PyTuple_SetItem(spit_args, 0, status);
+
+			PyObject *headers = PyTuple_GetItem((PyObject *)wsgi_req->async_result, 2);
+			Py_INCREF(headers);
+			PyTuple_SetItem(spit_args, 1, headers);
+
+			if (py_uwsgi_spit(NULL, spit_args) == Py_None) { 
+				Py_DECREF(spit_args);
 				goto clear; 
 			} 
 
-			wsgi_req->async_result = PyTuple_GetItem((PyObject *)wsgi_req->async_result, 0); 
 
-			wsgi_req->async_placeholder = PyObject_GetIter( (PyObject *)wsgi_req->async_result );
+			Py_DECREF(spit_args);
+
+			if (PyString_Check((PyObject *)wsgi_req->async_placeholder)) {
+                		if ((wsize = wsgi_req->socket->proto_write(wsgi_req, PyString_AsString(wsgi_req->async_placeholder), PyString_Size(wsgi_req->async_placeholder))) < 0) {
+                        		uwsgi_error("write()");
+                        		goto clear;
+                		}
+                		wsgi_req->response_size += wsize;
+                		goto clear;
+        		}
+
+			PyObject *tmp = (PyObject *)wsgi_req->async_placeholder;
+
+			wsgi_req->async_placeholder = PyObject_GetIter( (PyObject *)wsgi_req->async_placeholder );
+
+			Py_DECREF(tmp);
 
 			if (!wsgi_req->async_placeholder) {
-				goto clear2;
+				goto clear;
 			}
 #ifdef UWSGI_ASYNC
 			if (uwsgi.async > 1) {
+				UWSGI_RELEASE_GIL
 				return UWSGI_AGAIN;
 			}
 		}
@@ -119,9 +210,8 @@ int uwsgi_response_subhandler_web3(struct wsgi_request *wsgi_req) {
 	}
 
 
-
 	if (PyString_Check(pychunk)) {
-		if ((wsize = write(wsgi_req->poll.fd, PyString_AsString(pychunk), PyString_Size(pychunk))) < 0) {
+		if ((wsize = wsgi_req->socket->proto_write(wsgi_req,  PyString_AsString(pychunk), PyString_Size(pychunk))) < 0) {
 			uwsgi_error("write()");
 			Py_DECREF(pychunk);
 			goto clear;
@@ -131,34 +221,22 @@ int uwsgi_response_subhandler_web3(struct wsgi_request *wsgi_req) {
 
 
 	Py_DECREF(pychunk);
+	UWSGI_RELEASE_GIL
 	return UWSGI_AGAIN;
 
 clear:
+	if (wsgi_req->async_input) {
+                Py_DECREF((PyObject *)wsgi_req->async_input);
+        }
 	if (wsgi_req->async_environ) {
 		PyDict_Clear(wsgi_req->async_environ);
 	}
-	if (wsgi_req->async_post && !wsgi_req->fd_closed) {
-		fclose(wsgi_req->async_post);
-		if (!uwsgi.post_buffering || wsgi_req->post_cl <= (size_t) uwsgi.post_buffering) {
-			wsgi_req->fd_closed = 1;
-		}
-	}
 	Py_XDECREF((PyObject *)wsgi_req->async_placeholder);
-clear2:
+
 	Py_DECREF((PyObject *)wsgi_req->async_result);
 	PyErr_Clear();
 
-#ifdef UWSGI_DEBUG
-	if (wsgi_req->async_placeholder) {
-		uwsgi_debug("wsgi_req->async_placeholder: %d\n", ((PyObject *)wsgi_req->async_placeholder)->ob_refcnt);
-	}
-	if (wsgi_req->async_result) {
-		uwsgi_debug("wsgi_req->async_result: %d\n", ((PyObject *)wsgi_req->async_result)->ob_refcnt);
-	}
-	if (wsgi_req->async_app) {
-		uwsgi_debug("wsgi_req->async_app: %d\n", ((PyObject *)wsgi_req->async_app)->ob_refcnt);
-	}
-#endif
+	UWSGI_RELEASE_GIL
 	return UWSGI_OK;
 }
 

plugins/python/wsgi_handlers.c

@@ -4,20 +4,86 @@ extern struct uwsgi_server uwsgi;
 extern struct uwsgi_python up;
 
 
-typedef struct uwsgi_Input {
-        PyObject_HEAD
-	off_t pos;
-	struct wsgi_request *wsgi_req;
-} uwsgi_Input;
-
-PyObject *uwsgi_Input_iter(PyObject * self) {
+PyObject *uwsgi_Input_iter(PyObject *self) {
         Py_INCREF(self);
         return self;
 }
 
-PyObject *uwsgi_Input_next(PyObject * self) {
+PyObject *uwsgi_Input_getline(uwsgi_Input *self) {
+	size_t i;
+	ssize_t rlen;
+	struct wsgi_request *wsgi_req = self->wsgi_req;
+	PyObject *res;
 
-	return PyErr_Format(PyExc_NotImplementedError, "wsgi.input __iter__() is not implemented");
+	char *ptr = self->readline;
+
+	if (uwsgi.post_buffering > 0) {
+		ptr = wsgi_req->post_buffering_buf;
+		self->readline_size = wsgi_req->post_cl;
+		if (!self->readline_pos) {
+			self->pos += self->readline_size;
+		}
+	}
+
+	if (self->readline_pos > 0 || uwsgi.post_buffering) {
+		for(i=self->readline_pos;i<self->readline_size;i++) {
+			if (ptr[i] == '\n') {
+				res = PyString_FromStringAndSize(ptr+self->readline_pos, (i-self->readline_pos)+1);
+				self->readline_pos = i+1;
+				if (self->readline_pos >= self->readline_size) self->readline_pos = 0;
+				return res;
+			}
+		}
+		res = PyString_FromStringAndSize(ptr + self->readline_pos, self->readline_size - self->readline_pos);
+		self->readline_pos = 0;
+		return res;
+	}
+
+
+	UWSGI_RELEASE_GIL;
+	if (uwsgi_waitfd(wsgi_req->poll.fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]) <= 0) {
+                UWSGI_GET_GIL
+                return PyErr_Format(PyExc_IOError, "error waiting for wsgi.input data");
+        }
+
+	if (self->readline_max_size > 0 && self->readline_max_size < 1024) {
+        	rlen = read(wsgi_req->poll.fd, self->readline, self->readline_max_size);
+	}
+	else {
+        	rlen = read(wsgi_req->poll.fd, self->readline, 1024);
+	}
+        if (rlen <= 0) {
+                UWSGI_GET_GIL
+                return PyErr_Format(PyExc_IOError, "error reading wsgi.input data");
+        }
+
+	self->readline_size = rlen;
+	self->readline_pos = 0;
+        self->pos += rlen;
+
+	UWSGI_GET_GIL;
+
+	for(i=0;i<(size_t)rlen;i++) {
+		if (self->readline[i] == '\n') {
+			res = PyString_FromStringAndSize(self->readline, i+1);
+			self->readline_pos+= i+1;
+			if (self->readline_pos >= self->readline_size) self->readline_pos = 0;
+			return res;
+		}
+	}
+	self->readline_pos = 0;
+	return PyString_FromStringAndSize(self->readline, self->readline_size);
+	
+}
+
+PyObject *uwsgi_Input_next(PyObject* self) {
+
+	if (!((uwsgi_Input *)self)->wsgi_req->post_cl || ((size_t) ((uwsgi_Input *)self)->pos >= ((uwsgi_Input *)self)->wsgi_req->post_cl && !((uwsgi_Input *)self)->readline_pos)) {
+		PyErr_SetNone(PyExc_StopIteration);
+		return NULL;
+	}
+
+	return uwsgi_Input_getline((uwsgi_Input *)self);
 
 }
 
@@ -28,10 +94,9 @@ static void uwsgi_Input_free(uwsgi_Input *self) {
 static PyObject *uwsgi_Input_read(uwsgi_Input *self, PyObject *args) {
 
 	long len = 0;
-	size_t remains;
+	size_t remains, tmp_pos = 0;
 	ssize_t rlen;
 	char *tmp_buf;
-	int fd;
 	PyObject *res;
 
 	if (!PyArg_ParseTuple(args, "|l:read", &len)) {
@@ -39,57 +104,70 @@ static PyObject *uwsgi_Input_read(uwsgi_Input *self, PyObject *args) {
 	}
 
 	// return empty string if no post_cl or pos >= post_cl
-	if (!self->wsgi_req->post_cl || (size_t) self->pos >= self->wsgi_req->post_cl) {
+	if ((!self->wsgi_req->post_cl || (size_t) self->pos >= self->wsgi_req->post_cl ) && !self->readline_pos) {
 		return PyString_FromString("");
 	}
 
-	if (uwsgi.post_buffering > 0) {
-		fd = -1;
-		if (self->wsgi_req->post_cl <= (size_t) uwsgi.post_buffering) {
-			fd = fileno((FILE *)self->wsgi_req->async_post);
+	// some residual data ?
+	if (self->readline_pos && self->readline_size) {
+		if (len > 0) {
+			if ((size_t) len < (self->readline_size - self->readline_pos)) {
+				res = PyString_FromStringAndSize(self->readline + self->readline_pos, len);
+				self->readline_pos+=len;
+				if (self->readline_pos >= self->readline_size) self->readline_pos = 0;
+				return res;	
+			}
 		}
+		self->readline_pos = 0;
+		return PyString_FromStringAndSize(self->readline + self->readline_pos, self->readline_size - self->readline_pos);
 	}
-	else {
-		fd = self->wsgi_req->poll.fd;
-	}
+
 	// return the whole input
-	if (len <= 0) {
-		remains = self->wsgi_req->post_cl;
-	}
-	else {
-		remains = len ;
-	}
+        if (len <= 0) {
+                remains = self->wsgi_req->post_cl;
+        }
+        else {
+                remains = len ;
+        }
 
 	if (remains + self->pos > self->wsgi_req->post_cl) {
-		remains = self->wsgi_req->post_cl - self->pos;
-	} 
+                remains = self->wsgi_req->post_cl - self->pos;
+        }
 
-	if (remains <= 0) {
-		return PyString_FromString("");
-	}
+        if (remains <= 0) {
+                return PyString_FromString("");
+        }
 
-	if (fd == -1) {
-		res = PyString_FromStringAndSize( self->wsgi_req->post_buffering_buf, remains);
-		self->pos += remains;	
+	if (uwsgi.post_buffering > 0) {
+		res = PyString_FromStringAndSize( self->wsgi_req->post_buffering_buf+self->pos, remains);
+		self->pos += remains;
 		return res;
 	}
 
+	UWSGI_RELEASE_GIL
+
 	tmp_buf = uwsgi_malloc(remains);	
 
-	if (uwsgi_waitfd(fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]) <= 0) {
-		free(tmp_buf);
-		return PyErr_Format(PyExc_IOError, "error waiting for wsgi.input data");
+	while(remains) {
+		if (uwsgi_waitfd(self->wsgi_req->poll.fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]) <= 0) {
+                       	free(tmp_buf);
+                       	UWSGI_GET_GIL
+                       	return PyErr_Format(PyExc_IOError, "error waiting for wsgi.input data");
+               	}
+
+		rlen = read(self->wsgi_req->poll.fd, tmp_buf+tmp_pos, remains);
+		if (rlen <= 0) {
+                       	free(tmp_buf);
+                       	UWSGI_GET_GIL
+                       	return PyErr_Format(PyExc_IOError, "error reading wsgi.input data");
+               	}
+		tmp_pos += rlen;
+		remains -= rlen;
 	}
 
-	rlen = read(fd, tmp_buf, remains);
-	if (rlen < 0) {
-		free(tmp_buf);
-		return PyErr_Format(PyExc_IOError, "error reading wsgi.input data");
-	}
-
-	self->pos += rlen;
-	res = PyString_FromStringAndSize(tmp_buf, rlen);
-
+	UWSGI_GET_GIL
+	self->pos += tmp_pos;
+	res = PyString_FromStringAndSize(tmp_buf, tmp_pos);
 	free(tmp_buf);
 	return res;
 		
@@ -97,13 +175,34 @@ static PyObject *uwsgi_Input_read(uwsgi_Input *self, PyObject *args) {
 
 static PyObject *uwsgi_Input_readline(uwsgi_Input *self, PyObject *args) {
 
-	return PyErr_Format(PyExc_NotImplementedError, "wsgi.input readline() is not implemented");
+	if (!PyArg_ParseTuple(args, "|l:readline", &((uwsgi_Input *)self)->readline_max_size)) {
+                return NULL;
+        }
+
+	if (!((uwsgi_Input *)self)->wsgi_req->post_cl || ((size_t) ((uwsgi_Input *)self)->pos >= ((uwsgi_Input *)self)->wsgi_req->post_cl && !((uwsgi_Input *)self)->readline_pos)) {
+		return PyString_FromString("");
+	}
+	return uwsgi_Input_getline(self);
 
 }
 
 static PyObject *uwsgi_Input_readlines(uwsgi_Input *self, PyObject *args) {
 
-	return PyErr_Format(PyExc_NotImplementedError, "wsgi.input readlines() is not implemented");
+	PyObject *res;
+
+	if (!((uwsgi_Input *)self)->wsgi_req->post_cl || ((size_t) ((uwsgi_Input *)self)->pos >= ((uwsgi_Input *)self)->wsgi_req->post_cl && !((uwsgi_Input *)self)->readline_pos)) {
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+
+	res = PyList_New(0);
+	while( ((size_t) ((uwsgi_Input *)self)->pos < ((uwsgi_Input *)self)->wsgi_req->post_cl || ((uwsgi_Input *)self)->readline_pos > 0)) {
+		PyObject *a_line = uwsgi_Input_getline(self);
+		PyList_Append(res, a_line);	
+		Py_DECREF(a_line);
+	}
+
+	return res;
 }
 
 static PyObject *uwsgi_Input_close(uwsgi_Input *self, PyObject *args) {
@@ -112,12 +211,18 @@ static PyObject *uwsgi_Input_close(uwsgi_Input *self, PyObject *args) {
 	return Py_None;
 }
 
+static PyObject *uwsgi_Input_fileno(uwsgi_Input *self, PyObject *args) {
+
+	return PyInt_FromLong(self->wsgi_req->poll.fd);
+}
+
 static PyMethodDef uwsgi_Input_methods[] = {
 	{ "read",      (PyCFunction)uwsgi_Input_read,      METH_VARARGS, 0 },
 	{ "readline",  (PyCFunction)uwsgi_Input_readline,  METH_VARARGS, 0 },
 	{ "readlines", (PyCFunction)uwsgi_Input_readlines, METH_VARARGS, 0 },
 // add close to allow mod_wsgi compatibility
 	{ "close",     (PyCFunction)uwsgi_Input_close,     METH_VARARGS, 0 },
+	{ "fileno",     (PyCFunction)uwsgi_Input_fileno,     METH_VARARGS, 0 },
 	{ NULL, NULL}
 };
 
@@ -171,7 +276,7 @@ PyObject *py_uwsgi_write(PyObject * self, PyObject * args) {
 		content = PyString_AsString(data);
 		len = PyString_Size(data);
 		UWSGI_RELEASE_GIL
-			wsgi_req->response_size = write(wsgi_req->poll.fd, content, len);
+			wsgi_req->response_size = wsgi_req->socket->proto_write(wsgi_req, content, len);
 		UWSGI_GET_GIL
 	}
 
@@ -218,19 +323,10 @@ PyObject *py_eventfd_write(PyObject * self, PyObject * args) {
 
 int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 
-	int i;
-
-	PyObject *pydictkey, *pydictvalue;
-
-	char *path_info;
 	struct uwsgi_app *wi;
 
 	int tmp_stderr;
-	char *what;
-	int what_len;
-
-	PyObject *wsgi_socket;
-
+	int free_appid = 0;
 
 #ifdef UWSGI_ASYNC
 	if (wsgi_req->async_status == UWSGI_AGAIN) {
@@ -257,7 +353,7 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 
 	/* Standard WSGI request */
 	if (!wsgi_req->uh.pktsize) {
-		uwsgi_log( "Invalid WSGI request. skip.\n");
+		uwsgi_log( "Empty python request. skip.\n");
 		return -1;
 	}
 
@@ -266,76 +362,59 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 	}
 
 
-	if (!up.ignore_script_name) {
-
-		if (!wsgi_req->script_name)
-			wsgi_req->script_name = "";
+	if (wsgi_req->appid_len == 0) {
+		if (!up.ignore_script_name) {
+			wsgi_req->appid = wsgi_req->script_name;
+			wsgi_req->appid_len = wsgi_req->script_name_len;
+		}
 
 		if (uwsgi.vhost) {
-			what = uwsgi_concat3n(wsgi_req->host, wsgi_req->host_len, "|",1, wsgi_req->script_name, wsgi_req->script_name_len);
-			what_len = wsgi_req->host_len + 1 + wsgi_req->script_name_len;
+			wsgi_req->appid = uwsgi_concat3n(wsgi_req->host, wsgi_req->host_len, "|",1, wsgi_req->script_name, wsgi_req->script_name_len);
+			wsgi_req->appid_len = wsgi_req->host_len + 1 + wsgi_req->script_name_len;
 #ifdef UWSGI_DEBUG
-			uwsgi_debug("VirtualHost SCRIPT_NAME=%s\n", what);
+			uwsgi_debug("VirtualHost KEY=%.*s\n", wsgi_req->appid_len, wsgi_req->appid);
 #endif
+			free_appid = 1;
 		}
-		else {
-			what = wsgi_req->script_name;
-			what_len = wsgi_req->script_name_len;
-		}
+	}
 
 
-		if ( (wsgi_req->app_id = uwsgi_get_app_id(what, what_len, 0))  == -1) {
-			if (wsgi_req->script_name_len > 1 || uwsgi.default_app < 0 || uwsgi.vhost) {
-				/* unavailable app for this SCRIPT_NAME */
-				wsgi_req->app_id = -1;
-				if (wsgi_req->script_len > 0
-						|| wsgi_req->module_len > 0
-						|| wsgi_req->file_len > 0
-						|| wsgi_req->paste_len > 0
-				   ) {
-					// a bit of magic: 1-1 = 0 / 0-1 = -1
-					// this part must be heavy locked in threaded modes
-					if (uwsgi.threads > 1) {
-						pthread_mutex_lock(&up.lock_pyloaders);
-					}
-					UWSGI_GET_GIL
-						if (uwsgi.single_interpreter) {
-							wsgi_req->app_id = init_uwsgi_app(LOADER_DYN, (void *) wsgi_req, wsgi_req, up.main_thread);
-						}
-						else {
-							wsgi_req->app_id = init_uwsgi_app(LOADER_DYN, (void *) wsgi_req, wsgi_req, NULL);
-						}
-					UWSGI_RELEASE_GIL
-						if (uwsgi.threads > 1) {
-							pthread_mutex_unlock(&up.lock_pyloaders);
-						}
-				}
+
+	if ( (wsgi_req->app_id = uwsgi_get_app_id(wsgi_req->appid, wsgi_req->appid_len, 0))  == -1) {
+		wsgi_req->app_id = uwsgi.default_app;
+		if (uwsgi.no_default_app) {
+                	wsgi_req->app_id = -1;
+        	}
+		if (wsgi_req->dynamic) {
+			// this part must be heavy locked in threaded modes
+			if (uwsgi.threads > 1) {
+				pthread_mutex_lock(&up.lock_pyloaders);
+			}
+
+			UWSGI_GET_GIL
+			if (uwsgi.single_interpreter) {
+				wsgi_req->app_id = init_uwsgi_app(LOADER_DYN, (void *) wsgi_req, wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
+			}
+			else {
+				wsgi_req->app_id = init_uwsgi_app(LOADER_DYN, (void *) wsgi_req, wsgi_req, NULL, PYTHON_APP_TYPE_WSGI);
+			}
+			UWSGI_RELEASE_GIL
+			if (uwsgi.threads > 1) {
+				pthread_mutex_unlock(&up.lock_pyloaders);
 			}
 		}
-
-		if (uwsgi.vhost) {
-			free(what);
-		}
-
-	}
-	else {
-		wsgi_req->app_id = 0;
 	}
 
+	if (free_appid) {
+		free(wsgi_req->appid);
+	}
 
 	if (wsgi_req->app_id == -1) {
-		// use default app ?
-		if (!uwsgi.no_default_app && uwsgi.default_app >= 0) {
-			wsgi_req->app_id = uwsgi.default_app;
-		}
-		else {
-			internal_server_error(wsgi_req->poll.fd, "wsgi application not found");
-			goto clear2;
-		}
-
+		internal_server_error(wsgi_req, "Python application not found");
+		goto clear2;
 	}
 
-	wi = &uwsgi.apps[wsgi_req->app_id];
+	wi = &uwsgi_apps[wsgi_req->app_id];
 
 	up.swap_ts(wsgi_req, wi);
 	
@@ -349,20 +428,6 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 	}
 
 
-	if (wsgi_req->protocol_len < 5) {
-		uwsgi_log( "INVALID PROTOCOL: %.*s\n", wsgi_req->protocol_len, wsgi_req->protocol);
-		internal_server_error(wsgi_req->poll.fd, "invalid HTTP protocol !!!");
-		goto clear;
-
-	}
-	if (strncmp(wsgi_req->protocol, "HTTP/", 5)) {
-		uwsgi_log( "INVALID PROTOCOL: %.*s\n", wsgi_req->protocol_len, wsgi_req->protocol);
-		internal_server_error(wsgi_req->poll.fd, "invalid HTTP protocol !!!");
-		goto clear;
-	}
-
-
-
 #ifdef UWSGI_ASYNC
 	wsgi_req->async_environ = wi->environ[wsgi_req->async_id];
 	wsgi_req->async_args = wi->args[wsgi_req->async_id];
@@ -378,86 +443,6 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 
 	Py_INCREF((PyObject *)wsgi_req->async_environ);
 
-	for (i = 0; i < wsgi_req->var_cnt; i += 2) {
-#ifdef UWSGI_DEBUG
-		uwsgi_debug("%.*s: %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
-#endif
-#ifdef PYTHREE
-		pydictkey = PyUnicode_DecodeLatin1(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, NULL);
-		pydictvalue = PyUnicode_DecodeLatin1(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len, NULL);
-#else
-		pydictkey = PyString_FromStringAndSize(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len);
-		pydictvalue = PyString_FromStringAndSize(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len);
-#endif
-		PyDict_SetItem(wsgi_req->async_environ, pydictkey, pydictvalue);
-		Py_DECREF(pydictkey);
-		Py_DECREF(pydictvalue);
-	}
-
-	if (wsgi_req->uh.modifier1 == UWSGI_MODIFIER_MANAGE_PATH_INFO) {
-		pydictkey = PyDict_GetItemString(wsgi_req->async_environ, "SCRIPT_NAME");
-		if (pydictkey) {
-			if (PyString_Check(pydictkey)) {
-				pydictvalue = PyDict_GetItemString(wsgi_req->async_environ, "PATH_INFO");
-				if (pydictvalue) {
-					if (PyString_Check(pydictvalue)) {
-						path_info = PyString_AsString(pydictvalue);
-						PyDict_SetItemString(wsgi_req->async_environ, "PATH_INFO", PyString_FromString(path_info + PyString_Size(pydictkey)));
-					}
-				}
-			}
-		}
-	}
-
-
-
-	if (uwsgi.post_buffering > 0) {
-		UWSGI_RELEASE_GIL
-		// read to disk if post_cl > post_buffering
-		if (!up.pep3333_input) {
-			if (wsgi_req->post_cl >= (size_t) uwsgi.post_buffering) {
-				if (!uwsgi_read_whole_body(wsgi_req, wsgi_req->post_buffering_buf, uwsgi.post_buffering_bufsize)) {
-					goto clear;
-				}
-			}
-			else {
-				wsgi_req->async_post = fdopen(wsgi_req->poll.fd, "r");
-			}
-		}
-		else {
-			// read to disk if post_cl > post_buffering
-			if (wsgi_req->post_cl >= (size_t) uwsgi.post_buffering) {
-				if (!uwsgi_read_whole_body(wsgi_req, wsgi_req->post_buffering_buf, uwsgi.post_buffering_bufsize)) {
-					goto clear;
-				}
-			}
-			// on tiny post use memory
-			else {		
-				if (!uwsgi_read_whole_body_in_mem(wsgi_req, wsgi_req->post_buffering_buf)) {
-					goto clear;
-				}
-			}
-		}
-		UWSGI_GET_GIL
-	}
-	else {
-		wsgi_req->async_post = fdopen(wsgi_req->poll.fd, "r");
-	}
-
-	if (!up.pep3333_input) {
-		wsgi_socket = PyFile_FromFile(wsgi_req->async_post, "wsgi_input", "r", NULL);
-		PyDict_SetItemString(wsgi_req->async_environ, "wsgi.input", wsgi_socket);
-		Py_DECREF(wsgi_socket);
-	}
-	else {
-		wsgi_socket = (PyObject *) PyObject_New(uwsgi_Input, &uwsgi_InputType);
-		((uwsgi_Input*)wsgi_socket)->wsgi_req = wsgi_req; 
-		((uwsgi_Input*)wsgi_socket)->pos = 0;
-		PyDict_SetItemString(wsgi_req->async_environ, "wsgi.input", wsgi_socket);
-	}
-
-	
-
 	wsgi_req->async_result = wi->request_subhandler(wsgi_req, wi);
 
 	UWSGI_RELEASE_GIL
@@ -485,9 +470,9 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 
 		// LOCK THIS PART
 
-		wsgi_req->response_size += write(wsgi_req->poll.fd, wsgi_req->protocol, wsgi_req->protocol_len);
-		wsgi_req->response_size += write(wsgi_req->poll.fd, " 500 Internal Server Error\r\n", 28 );
-		wsgi_req->response_size += write(wsgi_req->poll.fd, "Content-type: text/plain\r\n\r\n", 28 );
+		wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, wsgi_req->protocol, wsgi_req->protocol_len);
+		wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, " 500 Internal Server Error\r\n", 28 );
+		wsgi_req->response_size += wsgi_req->socket->proto_write(wsgi_req, "Content-type: text/plain\r\n\r\n", 28 );
 		wsgi_req->header_cnt = 1;
 
 		/*
@@ -516,9 +501,6 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 		close(tmp_stderr);
 	}
 
-	if (up.pep3333_input) {
-		Py_DECREF(wsgi_socket);
-	}
 clear:
 
 	up.reset_ts(wsgi_req, wi);
@@ -531,7 +513,6 @@ clear2:
 
 void uwsgi_after_request_wsgi(struct wsgi_request *wsgi_req) {
 
-
 	if (uwsgi.shared->options[UWSGI_OPTION_LOGGING] || wsgi_req->log_this) {
 		log_request(wsgi_req);
 	}

plugins/python/wsgi_headers.c

@@ -13,7 +13,6 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 	PyObject *headers, *head;
 	PyObject *h_key, *h_value;
 	int i, j;
-	struct uwsgi_header uh;
 	PyObject *exc_info = NULL;
 
 	struct wsgi_request *wsgi_req = current_wsgi_req();
@@ -39,7 +38,8 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 			// in this way, error will be reported to the log
 			PyErr_Restore(exc_type, exc_val, exc_tb);
 
-			goto clear;	
+			// the error is reported, let's continue...
+			//goto clear;	
 		}
 	}
 
@@ -70,10 +70,8 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 		}
 
 		wsgi_req->hvec[0].iov_len = wsgi_req->protocol_len;
-		uh.pktsize = wsgi_req->hvec[0].iov_len;
 		wsgi_req->hvec[1].iov_base = " ";
 		wsgi_req->hvec[1].iov_len = 1;
-		uh.pktsize += wsgi_req->hvec[1].iov_len;
 #ifdef PYTHREE
 		wsgi_req->hvec[2].iov_base = PyBytes_AsString(PyUnicode_AsASCIIString(head));
 		wsgi_req->hvec[2].iov_len = strlen(wsgi_req->hvec[2].iov_base);
@@ -81,18 +79,15 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 		wsgi_req->hvec[2].iov_base = PyString_AsString(head);
 		wsgi_req->hvec[2].iov_len = PyString_Size(head);
 #endif
-		uh.pktsize += wsgi_req->hvec[2].iov_len;
 		wsgi_req->status = uwsgi_str3_num(wsgi_req->hvec[2].iov_base);
 		wsgi_req->hvec[3].iov_base = nl;
 		wsgi_req->hvec[3].iov_len = NL_SIZE;
-		uh.pktsize += wsgi_req->hvec[3].iov_len;
 	}
 	else {
 		// drop http status on cgi mode
 		base = 3;
 		wsgi_req->hvec[0].iov_base = "Status: ";
 		wsgi_req->hvec[0].iov_len = 8;
-		uh.pktsize = wsgi_req->hvec[0].iov_len;
 #ifdef PYTHREE
 		wsgi_req->hvec[1].iov_base = PyBytes_AsString(PyUnicode_AsASCIIString(head));
 		wsgi_req->hvec[1].iov_len = strlen(wsgi_req->hvec[1].iov_base);
@@ -100,11 +95,9 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 		wsgi_req->hvec[1].iov_base = PyString_AsString(head);
 		wsgi_req->hvec[1].iov_len = PyString_Size(head);
 #endif
-		uh.pktsize += wsgi_req->hvec[1].iov_len;
 		wsgi_req->status = uwsgi_str3_num(wsgi_req->hvec[1].iov_base);
 		wsgi_req->hvec[2].iov_base = nl;
 		wsgi_req->hvec[2].iov_len = NL_SIZE;
-		uh.pktsize += wsgi_req->hvec[2].iov_len;
 	}
 
 	headers = PyTuple_GetItem(args, 1);
@@ -146,10 +139,8 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 		wsgi_req->hvec[j].iov_base = PyString_AsString(h_key);
 		wsgi_req->hvec[j].iov_len = PyString_Size(h_key);
 #endif
-		uh.pktsize += wsgi_req->hvec[j].iov_len;
 		wsgi_req->hvec[j + 1].iov_base = h_sep;
 		wsgi_req->hvec[j + 1].iov_len = H_SEP_SIZE;
-		uh.pktsize += wsgi_req->hvec[j+1].iov_len;
 #ifdef PYTHREE
 		wsgi_req->hvec[j + 2].iov_base = PyBytes_AsString(PyUnicode_AsASCIIString(h_value));
 		wsgi_req->hvec[j + 2].iov_len = strlen(wsgi_req->hvec[j + 2].iov_base);
@@ -158,29 +149,63 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 		wsgi_req->hvec[j + 2].iov_len = PyString_Size(h_value);
 #endif
 
-		uh.pktsize += wsgi_req->hvec[j+2].iov_len;
 
 		wsgi_req->hvec[j + 3].iov_base = nl;
 		wsgi_req->hvec[j + 3].iov_len = NL_SIZE;
 
-		uh.pktsize += wsgi_req->hvec[j+3].iov_len;
 		//uwsgi_log( "%.*s: %.*s\n", wsgi_req->hvec[j].iov_len, (char *)wsgi_req->hvec[j].iov_base, wsgi_req->hvec[j+2].iov_len, (char *) wsgi_req->hvec[j+2].iov_base);
 	}
 
+	j = (i * 4) + base;
+
+	struct uwsgi_string_list *ah = uwsgi.additional_headers;
+	while(ah) {
+		if (wsgi_req->header_cnt+1 <= uwsgi.max_vars) {
+			wsgi_req->header_cnt++;
+			wsgi_req->hvec[j].iov_base = ah->value;
+        		wsgi_req->hvec[j].iov_len = ah->len;
+			j++;
+			wsgi_req->hvec[j].iov_base = nl;
+        		wsgi_req->hvec[j].iov_len = NL_SIZE;
+			j++;
+			ah = ah->next;
+		}
+		else {
+			uwsgi_log("no more space in iovec. consider increasing max-vars...\n");
+			break;
+		}
+	}
+
 
 	// \r\n
-	j = (i * 4) + base;
 	wsgi_req->hvec[j].iov_base = nl;
 	wsgi_req->hvec[j].iov_len = NL_SIZE;
 
-	uh.pktsize += wsgi_req->hvec[j].iov_len;
-
+#ifdef __sun__
+	int remains = j + 1;
+	int iov_size;
+	struct iovec* iov_ptr = wsgi_req->hvec;
+	ssize_t iov_ret;
+	while(remains) {
+		iov_size = UMIN(remains, IOV_MAX);
+		UWSGI_RELEASE_GIL
+		iov_ret = wsgi_req->socket->proto_writev_header(wsgi_req, iov_ptr, iov_size);
+		UWSGI_GET_GIL
+		if (iov_ret < 0) {
+			uwsgi_error("writev()");
+		}
+		wsgi_req->headers_size += iov_ret;
+		iov_ptr += iov_size;
+		remains -= iov_size;
+	}
+#else
 	UWSGI_RELEASE_GIL
-		wsgi_req->headers_size = writev(wsgi_req->poll.fd, wsgi_req->hvec, j + 1);
+		wsgi_req->headers_size = wsgi_req->socket->proto_writev_header(wsgi_req, wsgi_req->hvec, j + 1);
 	UWSGI_GET_GIL
 		if (wsgi_req->headers_size < 0) {
 			uwsgi_error("writev()");
 		}
+#endif
 
 	//uwsgi_log("%d %p\n", wsgi_req->poll.fd, up.wsgi_writeout);
 	Py_INCREF(up.wsgi_writeout);

plugins/python/wsgi_subhandler.c

@@ -2,19 +2,67 @@
 
 extern struct uwsgi_server uwsgi;
 extern struct uwsgi_python up;
+extern PyTypeObject uwsgi_InputType;
 
 void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_app *wi) {
 
 	PyObject *zero;
+	int i;
+	PyObject *pydictkey, *pydictvalue;
+	char *path_info;
 
-	//static PyObject *uwsgi_version = NULL;
+        for (i = 0; i < wsgi_req->var_cnt; i += 2) {
+#ifdef UWSGI_DEBUG
+                uwsgi_debug("%.*s: %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
+#endif
+#ifdef PYTHREE
+                pydictkey = PyUnicode_DecodeLatin1(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, NULL);
+                pydictvalue = PyUnicode_DecodeLatin1(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len, NULL);
+#else
+                pydictkey = PyString_FromStringAndSize(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len);
+                pydictvalue = PyString_FromStringAndSize(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len);
+#endif
+                PyDict_SetItem(wsgi_req->async_environ, pydictkey, pydictvalue);
+                Py_DECREF(pydictkey);
+                Py_DECREF(pydictvalue);
+        }
 
-	/*
-	   if (uwsgi_version == NULL) {
-	   uwsgi_version = PyString_FromString(UWSGI_VERSION);
-	   }
-	   */
 
+        if (wsgi_req->uh.modifier1 == UWSGI_MODIFIER_MANAGE_PATH_INFO) {
+                wsgi_req->uh.modifier1 = 0;
+                pydictkey = PyDict_GetItemString(wsgi_req->async_environ, "SCRIPT_NAME");
+                if (pydictkey) {
+                        if (PyString_Check(pydictkey)) {
+                                pydictvalue = PyDict_GetItemString(wsgi_req->async_environ, "PATH_INFO");
+                                if (pydictvalue) {
+                                        if (PyString_Check(pydictvalue)) {
+                                                path_info = PyString_AsString(pydictvalue);
+                                                PyDict_SetItemString(wsgi_req->async_environ, "PATH_INFO", PyString_FromString(path_info + PyString_Size(pydictkey)));
+                                        }
+                                }
+                        }
+                }
+        }
+
+        // if async_post is mapped as a file, directly use it as wsgi.input
+        if (wsgi_req->async_post) {
+#ifdef PYTHREE
+                wsgi_req->async_input = PyFile_FromFd(fileno(wsgi_req->async_post), "wsgi_input", "rb", 0, NULL, NULL, NULL, 0);
+#else
+                wsgi_req->async_input = PyFile_FromFile(wsgi_req->async_post, "wsgi_input", "r", NULL);
+#endif
+        }
+        else {
+                // create wsgi.input custom object
+                wsgi_req->async_input = (PyObject *) PyObject_New(uwsgi_Input, &uwsgi_InputType);
+                ((uwsgi_Input*)wsgi_req->async_input)->wsgi_req = wsgi_req;
+                ((uwsgi_Input*)wsgi_req->async_input)->pos = 0;
+                ((uwsgi_Input*)wsgi_req->async_input)->readline_pos = 0;
+                ((uwsgi_Input*)wsgi_req->async_input)->readline_max_size = 0;
+
+        }
+
+        PyDict_SetItemString(wsgi_req->async_environ, "wsgi.input", wsgi_req->async_input);
 
 #ifdef UWSGI_SENDFILE
 	PyDict_SetItemString(wsgi_req->async_environ, "wsgi.file_wrapper", wi->sendfile);
@@ -28,12 +76,7 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_
 	}
 #endif
 
-	// cache this
-	zero = PyTuple_New(2);
-	PyTuple_SetItem(zero, 0, PyInt_FromLong(1));
-	PyTuple_SetItem(zero, 1, PyInt_FromLong(0));
-	PyDict_SetItemString(wsgi_req->async_environ, "wsgi.version", zero);
-	Py_DECREF(zero);
+	PyDict_SetItemString(wsgi_req->async_environ, "wsgi.version", wi->gateway_version);
 
 	zero = PyFile_FromFile(stderr, "wsgi_input", "w", NULL);
 	PyDict_SetItemString(wsgi_req->async_environ, "wsgi.errors", zero);
@@ -55,18 +98,18 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_
 	}
 
 	if (wsgi_req->scheme_len > 0) {
-		zero = PyString_FromStringAndSize(wsgi_req->scheme, wsgi_req->scheme_len);
+		zero = UWSGI_PYFROMSTRINGSIZE(wsgi_req->scheme, wsgi_req->scheme_len);
 	}
 	else if (wsgi_req->https_len > 0) {
 		if (!strncasecmp(wsgi_req->https, "on", 2) || wsgi_req->https[0] == '1') {
-			zero = PyString_FromString("https");
+			zero = UWSGI_PYFROMSTRING("https");
 		}
 		else {
-			zero = PyString_FromString("http");
+			zero = UWSGI_PYFROMSTRING("http");
 		}
 	}
 	else {
-		zero = PyString_FromString("http");
+		zero = UWSGI_PYFROMSTRING("http");
 	}
 	PyDict_SetItemString(wsgi_req->async_environ, "wsgi.url_scheme", zero);
 	Py_DECREF(zero);
@@ -79,14 +122,13 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_
 		PyDict_SetItemString(up.embedded_dict, "env", wsgi_req->async_environ);
 	}
 
-	zero = PyString_FromString(UWSGI_VERSION);
-	PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.version", zero);
-	Py_DECREF(zero);
+	PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.version", wi->uwsgi_version);
 
 	if (uwsgi.cores > 1) {
 		PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.core", PyInt_FromLong(wsgi_req->async_id));
 	}
 
+	// cache this ?
 	if (uwsgi.cluster_fd >= 0) {
 		zero = PyString_FromString(uwsgi.cluster);
 		PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.cluster", zero);
@@ -96,6 +138,8 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_
 		Py_DECREF(zero);
 	}
 
+	PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.node", wi->uwsgi_node);
+
 
 #ifdef UWSGI_ROUTING
 	uwsgi_log("routing %d routes %d\n", uwsgi.routing, uwsgi.nroutes);
@@ -109,7 +153,7 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_
 
 
 	PyTuple_SetItem(wsgi_req->async_args, 0, wsgi_req->async_environ);
-	return python_call(wsgi_req->async_app, wsgi_req->async_args, up.catch_exceptions);
+	return python_call(wsgi_req->async_app, wsgi_req->async_args, up.catch_exceptions, wsgi_req);
 }
 
 int uwsgi_response_subhandler_wsgi(struct wsgi_request *wsgi_req) {
@@ -124,7 +168,7 @@ int uwsgi_response_subhandler_wsgi(struct wsgi_request *wsgi_req) {
 
 	// return or yield ?
 	if (PyString_Check((PyObject *)wsgi_req->async_result)) {
-		if ((wsize = write(wsgi_req->poll.fd, PyString_AsString(wsgi_req->async_result), PyString_Size(wsgi_req->async_result))) < 0) {
+		if ((wsize = wsgi_req->socket->proto_write(wsgi_req, PyString_AsString(wsgi_req->async_result), PyString_Size(wsgi_req->async_result))) < 0) {
 			uwsgi_error("write()");
 			goto clear;
 		}
@@ -176,6 +220,7 @@ int uwsgi_response_subhandler_wsgi(struct wsgi_request *wsgi_req) {
 				uwsgi_log("Memory Error detected !!!\n");	
 			}		
 			uwsgi.workers[uwsgi.mywid].exceptions++;
+			uwsgi_apps[wsgi_req->app_id].exceptions++;
 			PyErr_Print();
 		}	
 		goto clear;
@@ -185,7 +230,7 @@ int uwsgi_response_subhandler_wsgi(struct wsgi_request *wsgi_req) {
 
 
 	if (PyString_Check(pychunk)) {
-		if ((wsize = write(wsgi_req->poll.fd, PyString_AsString(pychunk), PyString_Size(pychunk))) < 0) {
+		if ((wsize = wsgi_req->socket->proto_write(wsgi_req, PyString_AsString(pychunk), PyString_Size(pychunk))) < 0) {
 			uwsgi_error("write()");
 			Py_DECREF(pychunk);
 			goto clear;
@@ -211,15 +256,12 @@ clear:
 	if (wsgi_req->sendfile_fd != -1) {
 		Py_DECREF((PyObject *)wsgi_req->async_sendfile);
 	}
+	if (wsgi_req->async_input) {
+		Py_DECREF((PyObject *)wsgi_req->async_input);
+	}
 	if (wsgi_req->async_environ) {
 		PyDict_Clear(wsgi_req->async_environ);
 	}
-	if (wsgi_req->async_post && !wsgi_req->fd_closed) {
-		fclose(wsgi_req->async_post);
-		if (!uwsgi.post_buffering || wsgi_req->post_cl <= (size_t) uwsgi.post_buffering) {
-			wsgi_req->fd_closed = 1;
-		}
-	}
 	Py_XDECREF((PyObject *)wsgi_req->async_placeholder);
 clear2:
 	Py_DECREF((PyObject *)wsgi_req->async_result);

plugins/python24/uwsgiplugin.py

@@ -2,7 +2,7 @@ import os,sys
 
 NAME='python24'
 
-GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule'])
+GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter'])
 
 CFLAGS = os.popen('python2.4-config --cflags').read().rstrip().split()
 CFLAGS.append('-Wno-unused-parameter')

plugins/python25/uwsgiplugin.py

@@ -2,7 +2,7 @@ import os,sys
 
 NAME='python25'
 
-GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule'])
+GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter'])
 
 CFLAGS = os.popen('python2.5-config --cflags').read().rstrip().split()
 CFLAGS.append('-Wno-unused-parameter')

plugins/python26/uwsgiplugin.py

@@ -2,7 +2,7 @@ import os,sys
 
 NAME='python26'
 
-GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule'])
+GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter'])
 
 CFLAGS = os.popen('python2.6-config --cflags').read().rstrip().split()
 CFLAGS.append('-Wno-unused-parameter')