diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
commit | 762655010d6f051f632a77b8c5b95b9f5cad02c9 (patch) | |
tree | 8f9b2d9a72a1e1af33eaa26fd94516391f23ad62 /http-backend.c | |
parent | 8d676d85f772ce3a100b6f0dddd1c34a7e4313cf (diff) | |
parent | 3e333036ccbb97fddf54bd8fe74b12ba46f1687b (diff) | |
download | git-762655010d6f051f632a77b8c5b95b9f5cad02c9.tar.gz |
Merge branch 'js/async-thread'
* js/async-thread:
fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
Enable threaded async procedures whenever pthreads is available
Dying in an async procedure should only exit the thread, not the process.
Reimplement async procedures using pthreads
Windows: more pthreads functions
Fix signature of fcntl() compatibility dummy
Make report() from usage.c public as vreportf() and use it.
Modernize t5530-upload-pack-error.
Conflicts:
http-backend.c
Diffstat (limited to 'http-backend.c')
-rw-r--r-- | http-backend.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/http-backend.c b/http-backend.c index f0e787e37d..44ce6bb32b 100644 --- a/http-backend.c +++ b/http-backend.c @@ -488,14 +488,12 @@ static NORETURN void die_webcgi(const char *err, va_list params) static int dead; if (!dead) { - char buffer[1000]; dead = 1; - - vsnprintf(buffer, sizeof(buffer), err, params); - fprintf(stderr, "fatal: %s\n", buffer); http_status(500, "Internal Server Error"); hdr_nocache(); end_headers(); + + vreportf("fatal: ", err, params); } exit(0); /* we successfully reported a failure ;-) */ } |