Merge branch 'rc/maint-http-local-slot-fix'

* rc/maint-http-local-slot-fix:
http*: cleanup slot->local after fclose

diff --combined http-push.c
index a7e28e345fb303534c4b99189096424bd7d9e887,673a61110e9653a312e3d11bcdb049d181a3898f..c25c4f9176ec266741b4c018558d02ab6b06bebe
--- 1/http-push.c
--- 2/http-push.c
+++ b/http-push.c
@@@ -315,9 -315,9 +315,9 @@@ static void start_fetch_loose(struct tr
                 "%s.temp", filename);
  
        snprintf(prevfile, sizeof(prevfile), "%s.prev", request->filename);
 -      unlink(prevfile);
 +      unlink_or_warn(prevfile);
        rename(request->tmpfile, prevfile);
 -      unlink(request->tmpfile);
 +      unlink_or_warn(request->tmpfile);
  
        if (request->local_fileno != -1)
                error("fd leakage in start: %d", request->local_fileno);
@@@ -372,7 -372,7 +372,7 @@@
                } while (prev_read > 0);
                close(prevlocal);
        }
 -      unlink(prevfile);
 +      unlink_or_warn(prevfile);
  
        /* Reset inflate/SHA1 if there was an error reading the previous temp
           file; also rewind to the beginning of the local file. */
@@@ -724,9 -724,11 +724,11 @@@ static void finish_request(struct trans
        struct stat st;
        struct packed_git *target;
        struct packed_git **lst;
+       struct active_request_slot *slot;
  
        request->curl_result = request->slot->curl_result;
        request->http_code = request->slot->http_code;
+       slot = request->slot;
        request->slot = NULL;
  
        /* Keep locks active */
@@@ -784,7 -786,7 +786,7 @@@
                    request->http_code != 416) {
                        if (stat(request->tmpfile, &st) == 0) {
                                if (st.st_size == 0)
 -                                      unlink(request->tmpfile);
 +                                      unlink_or_warn(request->tmpfile);
                        }
                } else {
                        if (request->http_code == 416)
@@@ -793,9 -795,9 +795,9 @@@
                        git_inflate_end(&request->stream);
                        git_SHA1_Final(request->real_sha1, &request->c);
                        if (request->zret != Z_STREAM_END) {
 -                              unlink(request->tmpfile);
 +                              unlink_or_warn(request->tmpfile);
                        } else if (hashcmp(request->obj->sha1, request->real_sha1)) {
 -                              unlink(request->tmpfile);
 +                              unlink_or_warn(request->tmpfile);
                        } else {
                                request->rename =
                                        move_temp_to_file(
@@@ -823,6 -825,7 +825,7 @@@
  
                        fclose(request->local_stream);
                        request->local_stream = NULL;
+                       slot->local = NULL;
                        if (!move_temp_to_file(request->tmpfile,
                                               request->filename)) {
                                target = (struct packed_git *)request->userData;
@@@ -1024,17 -1027,20 +1027,20 @@@ static int fetch_index(unsigned char *s
                if (results.curl_result != CURLE_OK) {
                        free(url);
                        fclose(indexfile);
+                       slot->local = NULL;
                        return error("Unable to get pack index %s\n%s", url,
                                     curl_errorstr);
                }
        } else {
                free(url);
                fclose(indexfile);
+               slot->local = NULL;
                return error("Unable to start request");
        }
  
        free(url);
        fclose(indexfile);
+       slot->local = NULL;
  
        return move_temp_to_file(tmpfile, filename);
  }
@@@ -1415,9 -1421,8 +1421,9 @@@ static void remove_locks(void
  
        fprintf(stderr, "Removing remote locks...\n");
        while (lock) {
 +              struct remote_lock *next = lock->next;
                unlock_remote(lock);
 -              lock = lock->next;
 +              lock = next;
        }
  }
  
@@@ -1844,7 -1849,7 +1850,7 @@@ static int update_remote(unsigned char 
        return 1;
  }
  
 -static struct ref *remote_refs, **remote_tail;
 +static struct ref *remote_refs;
  
  static void one_remote_ref(char *refname)
  {
@@@ -1874,15 -1879,27 +1880,15 @@@
                }
        }
  
 -      *remote_tail = ref;
 -      remote_tail = &ref->next;
 +      ref->next = remote_refs;
 +      remote_refs = ref;
  }
  
  static void get_dav_remote_heads(void)
  {
 -      remote_tail = &remote_refs;
        remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL);
  }
  
 -static int is_zero_sha1(const unsigned char *sha1)
 -{
 -      int i;
 -
 -      for (i = 0; i < 20; i++) {
 -              if (*sha1++)
 -                      return 0;
 -      }
 -      return 1;
 -}
 -
  static void add_remote_info_ref(struct remote_ls_ctx *ls)
  {
        struct strbuf *buf = (struct strbuf *)ls->userData;
@@@ -2108,13 -2125,13 +2114,13 @@@ static int delete_remote_branch(char *p
                /* Remote HEAD must resolve to a known object */
                if (symref)
                        return error("Remote HEAD symrefs too deep");
 -              if (is_zero_sha1(head_sha1))
 +              if (is_null_sha1(head_sha1))
                        return error("Unable to resolve remote HEAD");
                if (!has_sha1_file(head_sha1))
                        return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1));
  
                /* Remote branch must resolve to a known object */
 -              if (is_zero_sha1(remote_ref->old_sha1))
 +              if (is_null_sha1(remote_ref->old_sha1))
                        return error("Unable to resolve remote branch %s",
                                     remote_ref->name);
                if (!has_sha1_file(remote_ref->old_sha1))
@@@ -2299,7 -2316,9 +2305,7 @@@ int main(int argc, char **argv
        }
  
        /* match them up */
 -      if (!remote_tail)
 -              remote_tail = &remote_refs;
 -      if (match_refs(local_refs, remote_refs, &remote_tail,
 +      if (match_refs(local_refs, &remote_refs,
                       nr_refspec, (const char **) refspec, push_all)) {
                rc = -1;
                goto cleanup;
@@@ -2313,14 -2332,14 +2319,14 @@@
        new_refs = 0;
        for (ref = remote_refs; ref; ref = ref->next) {
                char old_hex[60], *new_hex;
 -              const char *commit_argv[4];
 +              const char *commit_argv[5];
                int commit_argc;
                char *new_sha1_hex, *old_sha1_hex;
  
                if (!ref->peer_ref)
                        continue;
  
 -              if (is_zero_sha1(ref->peer_ref->new_sha1)) {
 +              if (is_null_sha1(ref->peer_ref->new_sha1)) {
                        if (delete_remote_branch(ref->name, 1) == -1) {
                                error("Could not remove %s", ref->name);
                                rc = -4;
@@@ -2336,7 -2355,7 +2342,7 @@@
                }
  
                if (!force_all &&
 -                  !is_zero_sha1(ref->old_sha1) &&
 +                  !is_null_sha1(ref->old_sha1) &&
                    !ref->force) {
                        if (!has_sha1_file(ref->old_sha1) ||
                            !ref_newer(ref->peer_ref->new_sha1,
@@@ -2386,14 -2405,13 +2392,14 @@@
                old_sha1_hex = NULL;
                commit_argv[1] = "--objects";
                commit_argv[2] = new_sha1_hex;
 -              if (!push_all && !is_zero_sha1(ref->old_sha1)) {
 +              if (!push_all && !is_null_sha1(ref->old_sha1)) {
                        old_sha1_hex = xmalloc(42);
                        sprintf(old_sha1_hex, "^%s",
                                sha1_to_hex(ref->old_sha1));
                        commit_argv[3] = old_sha1_hex;
                        commit_argc++;
                }
 +              commit_argv[commit_argc] = NULL;
                init_revisions(&revs, setup_git_directory());
                setup_revisions(commit_argc, commit_argv, &revs, NULL);
                revs.edge_hint = 0; /* just in case */

diff --combined http-walker.c
index 7321ccc9fe751a1e608c6620bcce401eac7ff98c,ec1c97f2ee04a116e3c1bd22f2f8e2ad2963f5d3..9377851925ae61d60ff6235e8bd8f1c4eeb092b8
--- 1/http-walker.c
--- 2/http-walker.c
+++ b/http-walker.c
@@@ -111,9 -111,9 +111,9 @@@ static void start_object_request(struc
        struct walker_data *data = walker->data;
  
        snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename);
 -      unlink(prevfile);
 +      unlink_or_warn(prevfile);
        rename(obj_req->tmpfile, prevfile);
 -      unlink(obj_req->tmpfile);
 +      unlink_or_warn(obj_req->tmpfile);
  
        if (obj_req->local != -1)
                error("fd leakage in start: %d", obj_req->local);
@@@ -177,7 -177,7 +177,7 @@@
                } while (prev_read > 0);
                close(prevlocal);
        }
 -      unlink(prevfile);
 +      unlink_or_warn(prevfile);
  
        /* Reset inflate/SHA1 if there was an error reading the previous temp
           file; also rewind to the beginning of the local file. */
@@@ -238,18 -238,18 +238,18 @@@ static void finish_object_request(struc
        } else if (obj_req->curl_result != CURLE_OK) {
                if (stat(obj_req->tmpfile, &st) == 0)
                        if (st.st_size == 0)
 -                              unlink(obj_req->tmpfile);
 +                              unlink_or_warn(obj_req->tmpfile);
                return;
        }
  
        git_inflate_end(&obj_req->stream);
        git_SHA1_Final(obj_req->real_sha1, &obj_req->c);
        if (obj_req->zret != Z_STREAM_END) {
 -              unlink(obj_req->tmpfile);
 +              unlink_or_warn(obj_req->tmpfile);
                return;
        }
        if (hashcmp(obj_req->sha1, obj_req->real_sha1)) {
 -              unlink(obj_req->tmpfile);
 +              unlink_or_warn(obj_req->tmpfile);
                return;
        }
        obj_req->rename =
@@@ -418,15 -418,18 +418,18 @@@ static int fetch_index(struct walker *w
                run_active_slot(slot);
                if (results.curl_result != CURLE_OK) {
                        fclose(indexfile);
+                       slot->local = NULL;
                        return error("Unable to get pack index %s\n%s", url,
                                     curl_errorstr);
                }
        } else {
                fclose(indexfile);
+               slot->local = NULL;
                return error("Unable to start request");
        }
  
        fclose(indexfile);
+       slot->local = NULL;
  
        return move_temp_to_file(tmpfile, filename);
  }
@@@ -776,16 -779,19 +779,19 @@@ static int fetch_pack(struct walker *wa
                run_active_slot(slot);
                if (results.curl_result != CURLE_OK) {
                        fclose(packfile);
+                       slot->local = NULL;
                        return error("Unable to get pack file %s\n%s", url,
                                     curl_errorstr);
                }
        } else {
                fclose(packfile);
+               slot->local = NULL;
                return error("Unable to start request");
        }
  
        target->pack_size = ftell(packfile);
        fclose(packfile);
+       slot->local = NULL;
  
        ret = move_temp_to_file(tmpfile, filename);
        if (ret)
@@@ -809,7 -815,7 +815,7 @@@ static void abort_object_request(struc
                close(obj_req->local);
                obj_req->local = -1;
        }
 -      unlink(obj_req->tmpfile);
 +      unlink_or_warn(obj_req->tmpfile);
        if (obj_req->slot) {
                release_active_slot(obj_req->slot);
                obj_req->slot = NULL;