Clear data after negotiation #6947
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Just as well we have tests for this... I think I'm on the right lines here though. |
ethomson
reviewed
Dec 12, 2024
| @@ -433,6 +433,7 @@ int git_smart__negotiate_fetch( | |||
|
|
|||
| if ((error = git_smart__negotiation_step(&t->parent, data.ptr, data.size)) < 0) | |||
| goto on_error; | |||
| git_str_clear(&data); | |||
There was a problem hiding this comment.
You are indeed - I think that you need to differentiate the clearing of data based on whether we're in RPC mode (HTTP) or not (SSH).
Suggested change
| git_str_clear(&data); | |
| if (!t->rpc) | |
| git_str_clear(&data); |
?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6889.
I'm not sure why this works with https and not ssh. There are claims it works with the ssh "exec" backend but that wasn't the case for me.
Because we don't clear the data buffer, the "wants" get sent twice to the server. The second time is the call to git_smart__negotiation_step in line 568 of smart_protocol.c