Re: Cloning from sites with 404 overridden
- From
- Nick Hengeveld <nickh@reactrix.com>
- Date
- Mar 22, 2006, 18:36 UTC
- Message-ID
- <20060322183621.GP3997@reactrix.com>
- In-Reply-To
- <20060322172227.GO3997@reactrix.com>
On Wed, Mar 22, 2006 at 09:22:27AM -0800, Nick Hengeveld wrote:
> It might be feasible to detect this condition using the Content-Type: > header in the server response. So far, all the GIT repositories I've > tried return text/plain for loose objects and a special 404 page will > likely be text/html.
Something like this:
http_fetch: report text/html responses for loose objects
Some HTTP server environments return a 200 status and text/html error document or a redirect to one rather than a 404 status if a loose object does not exist. This patch detects and reports this condition to differentiate between a misconfigured server and an actual corrupt object on the server.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
---
http-fetch.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-)
61069cc348640fef2b8c503b8b8f00f689872cab
diff --git a/http-fetch.c b/http-fetch.c index dc67218..ee5b585 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -41,6 +41,7 @@ struct object_request CURLcode curl_result; char errorstr[CURL_ERROR_SIZE]; long http_code; + char *content_type; unsigned char real_sha1[20]; SHA_CTX c; z_stream stream; @@ -258,9 +259,15 @@ static void finish_object_request(struct static void process_object_response(void *callback_data) { + char *content_type; struct object_request *obj_req = (struct object_request *)callback_data; + curl_easy_getinfo(obj_req->slot->curl, CURLINFO_CONTENT_TYPE, + &content_type); + if (content_type) + obj_req->content_type = strdup(content_type); + obj_req->curl_result = obj_req->slot->curl_result; obj_req->http_code = obj_req->slot->http_code; obj_req->slot = NULL; @@ -298,6 +305,8 @@ static void release_object_request(struc entry->next = entry->next->next; } + if (obj_req->content_type) + free(obj_req->content_type); free(obj_req->url); free(obj_req); } @@ -340,6 +349,7 @@ void prefetch(unsigned char *sha1) memcpy(newreq->sha1, sha1, 20); newreq->repo = alt; newreq->url = NULL; + newreq->content_type = NULL; newreq->local = -1; newreq->state = WAITING; snprintf(newreq->filename, sizeof(newreq->filename), "%s", filename); @@ -836,7 +846,14 @@ static int fetch_object(struct alt_base obj_req->http_code, hex); } else if (obj_req->zret != Z_STREAM_END) { corrupt_object_found++; - ret = error("File %s (%s) corrupt", hex, obj_req->url); + if (obj_req->content_type && + !strcmp(obj_req->content_type, "text/html")) { + ret = error("text/html response for file %s (%s)", + sha1_to_hex(obj_req->sha1), obj_req->url); + } else { + ret = error("File %s (%s) corrupt", + sha1_to_hex(obj_req->sha1), obj_req->url); + } } else if (memcmp(obj_req->sha1, obj_req->real_sha1, 20)) { ret = error("File %s has bad hash", hex); } else if (obj_req->rename < 0) {
-- 1.2.4.gb1bc1d-dirty