summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-04 13:33:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-04 13:33:35 -0800
commitea8620b40178a5130d674212901381f64ac970da (patch)
tree83025b96f04d1e42cff96e9469a4e0d25d547f0c
parentMerge branch 'sd/stash-wo-user-name' (diff)
parenthttp-backend: enable cleaning up forked upload/receive-pack on exit (diff)
downloadtgif-ea8620b40178a5130d674212901381f64ac970da.tar.xz
Merge branch 'mk/http-backend-kill-children-before-exit'
The http-backend CGI process did not correctly clean up the child processes it spawns to run upload-pack etc. when it dies itself, which has been corrected. * mk/http-backend-kill-children-before-exit: http-backend: enable cleaning up forked upload/receive-pack on exit
-rw-r--r--http-backend.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http-backend.c b/http-backend.c
index 9e894f197f..29e68e38b5 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -486,6 +486,8 @@ static void run_service(const char **argv, int buffer_input)
if (buffer_input || gzipped_request || req_len >= 0)
cld.in = -1;
cld.git_cmd = 1;
+ cld.clean_on_exit = 1;
+ cld.wait_after_clean = 1;
if (start_command(&cld))
exit(1);