# [PATCH 17/23] http.c::http_fetch_ref(): use the new http API 4 messages from 2009-06-05 to 2009-06-06. Participants: Tay Ray Chuan, Jakub Narebski. Thread: https://gitlist.dev/t/19692 ## Tay Ray Chuan, 2009-06-05 16:05 Subject: [PATCH 17/23] http.c::http_fetch_ref(): use the new http API Message-ID: <20090606000556.9cbf4ac0.rctay89@gmail.com> URL: https://gitlist.dev/e/20090606000556.9cbf4ac0.rctay89%40gmail.com ``` From: Mike Hommey Subject: [WIP Patch 04/12] Use the new http API in http_fetch_ref() Date: Sun, 18 Jan 2009 09:04:29 +0100 The error message ("Unable to start request") has been removed, since the http API already prints it. Signed-off-by: Mike Hommey Signed-off-by: Tay Ray Chuan --- http.c | 33 ++++++++------------------------- 1 files changed, 8 insertions(+), 25 deletions(-) diff --git a/http.c b/http.c index df22180..2a49372 100644 --- a/http.c +++ b/http.c @@ -773,34 +773,17 @@ int http_fetch_ref(const char *base, struct ref *ref) { char *url; struct strbuf buffer = STRBUF_INIT; - struct active_request_slot *slot; - struct slot_results results; - int ret; + int ret = -1; url = quote_ref_url(base, ref->name); - slot = get_active_slot(); - slot->results = &results; - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); - curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); - curl_easy_setopt(slot->curl, CURLOPT_URL, url); - if (start_active_slot(slot)) { - run_active_slot(slot); - if (results.curl_result == CURLE_OK) { - strbuf_rtrim(&buffer); - if (buffer.len == 40) - ret = get_sha1_hex(buffer.buf, ref->old_sha1); - else if (!prefixcmp(buffer.buf, "ref: ")) { - ref->symref = xstrdup(buffer.buf + 5); - ret = 0; - } else - ret = 1; - } else { - ret = error("Couldn't get %s for %s\n%s", - url, ref->name, curl_errorstr); + if (http_get_strbuf(url, &buffer, HTTP_NO_CACHE) == HTTP_OK) { + strbuf_rtrim(&buffer); + if (buffer.len == 40) + ret = get_sha1_hex(buffer.buf, ref->old_sha1); + else if (!prefixcmp(buffer.buf, "ref: ")) { + ref->symref = xstrdup(buffer.buf + 5); + ret = 0; } - } else { - ret = error("Unable to start request"); } strbuf_release(&buffer); -- 1.6.3.1 ``` ## Jakub Narebski, 2009-06-05 20:50 Subject: Re: [PATCH 17/23] http.c::http_fetch_ref(): use the new http API Message-ID: URL: https://gitlist.dev/e/m3eity5rtq.fsf%40localhost.localdomain In-Reply-To: <20090606000556.9cbf4ac0.rctay89@gmail.com> ``` Tay Ray Chuan writes: > From: Mike Hommey > Subject: [WIP Patch 04/12] Use the new http API in http_fetch_ref() What is the subject of this patch: "http.c::http_fetch_ref(): use the new http API" or "Use the new http API in http_fetch_ref()" Perhaps this and previous patch should be squashed? > Date: Sun, 18 Jan 2009 09:04:29 +0100 > > The error message ("Unable to start request") has been removed, since > the http API already prints it. > > Signed-off-by: Mike Hommey > Signed-off-by: Tay Ray Chuan > --- > http.c | 33 ++++++++------------------------- > 1 files changed, 8 insertions(+), 25 deletions(-) > > diff --git a/http.c b/http.c > index df22180..2a49372 100644 > --- a/http.c > +++ b/http.c > @@ -773,34 +773,17 @@ int http_fetch_ref(const char *base, struct ref *ref) > { > char *url; > struct strbuf buffer = STRBUF_INIT; > - struct active_request_slot *slot; > - struct slot_results results; > - int ret; > + int ret = -1; > > url = quote_ref_url(base, ref->name); > - slot = get_active_slot(); > - slot->results = &results; > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); > - curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); > - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); > - curl_easy_setopt(slot->curl, CURLOPT_URL, url); > - if (start_active_slot(slot)) { > - run_active_slot(slot); > - if (results.curl_result == CURLE_OK) { > - strbuf_rtrim(&buffer); > - if (buffer.len == 40) > - ret = get_sha1_hex(buffer.buf, ref->old_sha1); > - else if (!prefixcmp(buffer.buf, "ref: ")) { > - ref->symref = xstrdup(buffer.buf + 5); > - ret = 0; > - } else > - ret = 1; > - } else { > - ret = error("Couldn't get %s for %s\n%s", > - url, ref->name, curl_errorstr); > + if (http_get_strbuf(url, &buffer, HTTP_NO_CACHE) == HTTP_OK) { > + strbuf_rtrim(&buffer); > + if (buffer.len == 40) > + ret = get_sha1_hex(buffer.buf, ref->old_sha1); > + else if (!prefixcmp(buffer.buf, "ref: ")) { > + ref->symref = xstrdup(buffer.buf + 5); > + ret = 0; > } > - } else { > - ret = error("Unable to start request"); > } > > strbuf_release(&buffer); > -- > 1.6.3.1 > -- Jakub Narebski Poland ShadeHawk on #git ``` ## Tay Ray Chuan, 2009-06-06 01:04 Subject: Re: [PATCH 17/23] http.c::http_fetch_ref(): use the new http API Message-ID: URL: https://gitlist.dev/e/be6fef0d0906051804t704a802ane4921c56d4577401%40mail.gmail.com In-Reply-To: ``` Hi, On Sat, Jun 6, 2009 at 4:50 AM, Jakub Narebski wrote: >> From: Mike Hommey >> Subject: [WIP Patch 04/12] Use the new http API in http_fetch_ref() > > What is the subject of this patch: >  "http.c::http_fetch_ref(): use the new http API" > or >  "Use the new http API in http_fetch_ref()" See my reply for patch #12. > Perhaps this and previous patch should be squashed? Why should this and patch #16 (for get_refs_via_curl()) be squashed? Are you perhaps suggesting that all the use-the-new-http-API patches should be squashed? -- Cheers, Ray Chuan ``` ## Jakub Narebski, 2009-06-06 07:17 Subject: Re: [PATCH 17/23] http.c::http_fetch_ref(): use the new http API Message-ID: <200906060917.25362.jnareb@gmail.com> URL: https://gitlist.dev/e/200906060917.25362.jnareb%40gmail.com In-Reply-To: ``` On Sat, 6 Jun 2009, Tay Ray Chuan wrote: > On Sat, Jun 6, 2009 at 4:50 AM, Jakub Narebski wrote: [...] > > Perhaps this and previous patch should be squashed? > > Why should this and patch #16 (for get_refs_via_curl()) be squashed? > Are you perhaps suggesting that all the use-the-new-http-API patches > should be squashed? I'm sorry this was before I noticed that there are a few more patches which are about using newly introduced API. Please disregard this part of message. -- Jakub Narebski Poland ```