Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-21 22:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7246 from libgit2/ethomson/redirect

Browse Source 
Handle redirects with `Content-Length: 0` correctly
This commit is contained in:
Edward Thomson
2026-05-04 21:39:51 +01:00
committed by GitHub
parent 07c737f235 242d66e931
commit cf028e7e9a
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/test.sh
View File

@@ -299,7 +299,7 @@ if should_run "ONLINE_TESTS"; then
echo "## Running networking (online) tests"
echo "##############################################################################"
export GITTEST_REMOTE_REDIRECT_INITIAL="http://localhost:9000/initial-redirect/libgit2/TestGitRepository"
export GITTEST_REMOTE_REDIRECT_INITIAL="http://localhost:9000/initial-redirect:none/libgit2/TestGitRepository"
export GITTEST_REMOTE_REDIRECT_SUBSEQUENT="http://localhost:9000/subsequent-redirect/libgit2/TestGitRepository"
export GITTEST_REMOTE_SPEED_SLOW="http://localhost:9000/speed:9600/test.git"
export GITTEST_REMOTE_SPEED_TIMESOUT="http://localhost:9000/speed:0.5/test.git"

19
src/libgit2/transports/httpclient.c
View File

@@ -379,7 +379,7 @@ static int on_headers_complete(git_http_parser *parser)
ctx->response->resend_credentials = resend_needed(ctx->client,
ctx->response);
if (ctx->response->content_type || ctx->response->chunked)
if (ctx->response->content_length || ctx->response->chunked)
ctx->client->state = READING_BODY;
else
ctx->client->state = DONE;
@@ -1243,13 +1243,16 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
}
/*
* See if we've consumed the entire response body. If the client was
* reading the body but did not consume it entirely, it's possible that
* they knew that the stream had finished (in a git response, seeing a
* final flush) and stopped reading. But if the response was chunked,
* we may have not consumed the final chunk marker. Consume it to
* ensure that we don't have it waiting in our socket. If there's
* more than just a chunk marker, close the connection.
* Try to consume any remaining response body. The client may have
* decided that it did not need to consume the entire response body.
* For example, the client saw a redirect in the header and ignored
* the body. Or the client saw a particular sequence (like a final
* flush in a git response) and stopped reading (but there were
* additional response bytes, perhaps because the response was chunked).
* Do one more read to try to clear this out; this takes care of small
* remainders, like a chunk response or a small redirect message. If
* there is too much data, we'll just leave it and close the
* connection.
*/
static void complete_response_body(git_http_client *client)
{