diff --git a/utils.c b/utils.c
index 72eb2235..4d81be12 100644
--- a/utils.c
+++ b/utils.c
@@ -218,8 +218,59 @@ void internal_server_error(int fd, char *message) {
 
 void uwsgi_as_root() {
 
+#ifdef __linux__
+	char *cgroup_taskfile;
+	int i;
+	FILE *cgroup;
+	char *cgroup_opt;
+#endif
+
 	if (!getuid()) {
                 uwsgi_log("uWSGI running as root, you can use --uid/--gid/--chroot options\n");
+
+#ifdef __linux__
+		if (uwsgi.cgroup) {
+			cgroup_taskfile = uwsgi_concat2(uwsgi.cgroup, "/tasks");	
+			cgroup = fopen(cgroup_taskfile, "w");
+                	if (!cgroup) {
+                        	uwsgi_error("fopen");
+                        	exit(1);
+                	}
+                	if (fprintf(cgroup, "%d\n", (int) getpid()) < 0) {
+                        	uwsgi_log( "could not set cgroup\n");
+				exit(1);
+                	}
+                	fclose(cgroup);
+			free(cgroup_taskfile);
+
+			for(i=0;i<uwsgi.cgroup_opt_cnt;i++) {
+				cgroup_opt = strchr( uwsgi.cgroup_opt[i], '=' );
+				if (!cgroup_opt) {
+					cgroup_opt = strchr( uwsgi.cgroup_opt[i], ':' );
+					if (!cgroup_opt) {
+						uwsgi_log("invalid cgroup-opt syntax\n");
+						exit(1);
+					}
+				}
+
+				cgroup_opt[0] = 0;
+				cgroup_opt++;
+
+				cgroup_taskfile = uwsgi_concat3(uwsgi.cgroup, "/", uwsgi.cgroup_opt[i]);
+				cgroup = fopen(cgroup_taskfile, "w");
+                		if (!cgroup) {
+                        		uwsgi_error("fopen");
+                        		exit(1);
+                		}
+                		if (fprintf(cgroup, "%s\n", cgroup_opt) < 0) {
+                        		uwsgi_log( "could not set cgroup option %s to %s\n", uwsgi.cgroup_opt[i], cgroup_opt);
+					exit(1);
+                		}
+                		fclose(cgroup);
+				free(cgroup_taskfile);
+			}
+		}
+#endif
                 if (uwsgi.chroot) {
                         uwsgi_log("chroot() to %s\n", uwsgi.chroot);
                         if (chroot(uwsgi.chroot)) {
@@ -586,6 +637,27 @@ char *uwsgi_concatn(int c, ...) {
 	
 }
 
+char *uwsgi_concat2(char *one, char *two) {
+
+        char *buf;
+        size_t len = strlen(one) + strlen(two) + 1;
+
+
+        buf = malloc(len);
+        if (buf == NULL) {
+                uwsgi_error("malloc()");
+                exit(1);
+        }
+        buf[len-1] = 0;
+
+        memcpy( buf, one, strlen(one));
+        memcpy( buf + strlen(one) , two, strlen(two));
+
+        return buf;
+
+}
+
+
 char *uwsgi_concat3(char *one, char *two, char *three) {
 
 	char *buf;
diff --git a/uwsgi.h b/uwsgi.h
index 2a5db300..b87a1f6d 100644
--- a/uwsgi.h
+++ b/uwsgi.h
@@ -1153,6 +1153,7 @@ inline int uwsgi_strncmp(char *, int , char *, int );
 
 char *uwsgi_concat(int, ...);
 char *uwsgi_concatn(int, ...);
+char *uwsgi_concat2(char *, char *);
 char *uwsgi_concat3(char *, char *, char *);
 char *uwsgi_concat3n(char *, int, char *, int, char *, int);
 
diff --git a/wsgi_headers.c b/wsgi_headers.c
index 9d7a80d8..f1f06a88 100644
--- a/wsgi_headers.c
+++ b/wsgi_headers.c
@@ -16,13 +16,13 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) {
 	int base = 0;
 	int shift = 0;
 
-	// if self is NULL than it is called by Web3 handler
-	if (self == NULL) {
-		shift = 1 ;
-	}
-
 	// use writev()
 
+	// is a Web3 response ?
+	if (PyTuple_Size(args) == 3) {
+		shift = 1;
+	}
+
 	head = PyTuple_GetItem(args, 0+shift);
 	if (!head) {
 		goto clear;