Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into next

* sp/maint-http-backend-die-triggers-die-recursively:
  http-backend: Don't infinite loop during die()

Conflicts:
	http-backend.c
This commit is contained in:
Junio C Hamano
2010-03-28 21:59:52 -07:00

View File

@@ -538,12 +538,17 @@ static void service_rpc(char *service_name)
static NORETURN void die_webcgi(const char *err, va_list params)
{
http_status(500, "Internal Server Error");
hdr_nocache();
end_headers();
static int dead;
vreportf("fatal: ", err, params);
exit(0);
if (!dead) {
dead = 1;
http_status(500, "Internal Server Error");
hdr_nocache();
end_headers();
vreportf("fatal: ", err, params);
}
exit(0); /* we successfully reported a failure ;-) */
}
static char* getdir(void)