merge

apache2/mod_uwsgi.c

@@ -392,6 +392,13 @@ static int uwsgi_handler(request_rec *r) {
 			}
 		}
 	}
+
+	/* environment variables */
+	headers = apr_table_elts(r->subprocess_env);
+	h = (apr_table_entry_t*) headers->elts;
+	for (i = 0; i < headers->nelts; ++i) {
+		vecptr = uwsgi_add_var(uwsgi_vars, vecptr, h[i].key, h[i].val, &pkt_size) ;
+	}	
 	
 
 	uwsgi_vars[0].iov_base = pkt_header;

master.c

@@ -71,9 +71,11 @@ void master_loop(char **argv, char **environ) {
 
 	char *cluster_opt_buf = NULL;
 	int cluster_opt_size = 4;
+#ifdef UWSGI_MULTICAST
 	char *cptrbuf;
 	uint16_t ustrlen;
 	struct uwsgi_header *uh;
+#endif
 #endif
 
 	int i,j;

multi.xml

@@ -4,6 +4,9 @@
 
 	<http>:9090</http>
 
+	<socket>:3031</socket>
+	<socket>127.0.0.1:3032</socket>
+
 	<manage-script-name/>
 	
 	<master/>

uwsgi.c

@@ -415,6 +415,7 @@ int main(int argc, char *argv[], char *envp[])
 		uwsgi.p[i] = &unconfigured_plugin;
 	}
 
+	uwsgi.cluster_fd = -1;
 	uwsgi.cores = 1;
 
 	uwsgi.apps_cnt = 1;

werkzeug_strict.yml

@@ -0,0 +1,7 @@
+# werkzeug test module via YAML
+uwsgi:
+  module: werkzeug.testapp:test_app # a comment
+  socket: :3032 # another comment
+  master: 1
+  processes: 8 # the number of processes
+  memory-report: 1