Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / http-backend.c

diff --git a/http-backend.c b/http-backend.c
index 3d6e2ff17f83c7c5d1fd42578f9dc073686becab..81a7229ece00addacc4b2edce12dc79810c06c02 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -13,6 +13,7 @@
 #include "packfile.h"
 #include "object-store.h"
 #include "protocol.h"
+#include "date.h"
 
 static const char content_type[] = "Content-Type";
 static const char content_length[] = "Content-Length";
@@ -480,7 +481,7 @@ static void run_service(const char **argv, int buffer_input)
                strvec_pushf(&cld.env_array,
                             "GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
 
-       cld.argv = argv;
+       strvec_pushv(&cld.args, argv);
        if (buffer_input || gzipped_request || req_len >= 0)
                cld.in = -1;
        cld.git_cmd = 1;
@@ -659,8 +660,9 @@ static NORETURN void die_webcgi(const char *err, va_list params)
 {
        if (dead <= 1) {
                struct strbuf hdr = STRBUF_INIT;
+               report_fn die_message_fn = get_die_message_routine();
 
-               vreportf("fatal: ", err, params);
+               die_message_fn(err, params);
 
                http_status(&hdr, 500, "Internal Server Error");
                hdr_nocache(&hdr);