From b8dfd617f2b78b8a205f2329d0b2f2cb88710f34 Mon Sep 17 00:00:00 2001
From: Unbit <info@unbit.it>
Date: Thu, 26 Sep 2013 10:18:16 +0200
Subject: [PATCH] minor fixes

---
 core/emperor.c | 1 +
 core/uwsgi.c   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/emperor.c b/core/emperor.c
index ac27e61e..9734637c 100644
--- a/core/emperor.c
+++ b/core/emperor.c
@@ -1901,6 +1901,7 @@ next:
 			close(proxy_fd);
 			sleep(1);
 		}
+		unsetenv("UWSGI_EMPEROR_PROXY");
 	}
 
 	char *emperor_env = getenv("UWSGI_EMPEROR_FD");
diff --git a/core/uwsgi.c b/core/uwsgi.c
index f7815a79..13aad507 100644
--- a/core/uwsgi.c
+++ b/core/uwsgi.c
@@ -1055,6 +1055,7 @@ void config_magic_table_fill(char *filename, char **magic_table) {
 		fullname = minimal_name;
 	}
 
+	magic_table['b'] = uwsgi.binary_path;
 	magic_table['p'] = fullname;
 	magic_table['s'] = uwsgi_get_last_char(fullname, '/') + 1;
 	magic_table['d'] = uwsgi_concat2n(magic_table['p'], magic_table['s'] - magic_table['p'], "", 0);