From 0daff2cfe2616f3e3d672b6e2b8bb67d8883bb43 Mon Sep 17 00:00:00 2001
From: Roberto De Ioris <roberto@unbit.it>
Date: Mon, 21 Jan 2013 12:12:36 +0100
Subject: [PATCH] multithread corner case fixes

---
 core/master_utils.c | 5 +++++
 core/uwsgi.c        | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/master_utils.c b/core/master_utils.c
index 34703741..7da5d6f9 100644
--- a/core/master_utils.c
+++ b/core/master_utils.c
@@ -559,6 +559,11 @@ int uwsgi_respawn_worker(int wid) {
 		// reset the apps count with a copy from the master 
 		uwsgi.workers[uwsgi.mywid].apps_cnt = uwsgi.workers[0].apps_cnt;
 
+		// reset wsgi_request structures
+		for(i=0;i<uwsgi.cores;i++) {
+			memset(&uwsgi.workers[uwsgi.mywid].cores[i].req, 0, sizeof(struct wsgi_request));
+		}
+
 		uwsgi_fixup_fds(wid, 0, NULL);
 
 		uwsgi.my_signal_socket = uwsgi.workers[wid].signal_pipe[1];
diff --git a/core/uwsgi.c b/core/uwsgi.c
index 7b62ba0c..a6af0aa2 100644
--- a/core/uwsgi.c
+++ b/core/uwsgi.c
@@ -2957,8 +2957,8 @@ wait_for_call_of_duty:
 	if (uwsgi.snapshot) {
 		uwsgi_ignition();
 	}
-	// never here
-	pthread_exit(NULL);
+	// end of the process...
+	end_me(0);
 }
 
 /*