PHPC-1774 Fix truncation of PHP_VERSION constant in handshake metadata #1202
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
derickr
reviewed
Feb 17, 2021
| snprintf(php_version_string, 4 + php_version_string_len, "PHP %s", PHP_VERSION); | ||
| php_version_string_len = strlen(PHP_VERSION) + PHONGO_METADATA_PHP_VERSION_PREFIX_LEN + 1; | ||
| php_version_string = ecalloc(sizeof(char*), php_version_string_len); | ||
| snprintf(php_version_string, php_version_string_len, "%s%s", PHONGO_METADATA_PHP_VERSION_PREFIX, PHP_VERSION); |
There was a problem hiding this comment.
I think you're still missing the space that goes after the PHONGO_METADATA_PHP_VERSION_PREFIX + PHP_VERSION combo.
There was a problem hiding this comment.
You are indeed correct. This is an issue in libmongoc which seems to append platform data without a separating space. I'm working on a fix for that, but for the time being this PR will mitigate the issue.
jmikola
reviewed
Feb 22, 2021
| [2021-02-17T13:57:57.155182+00:00] socket: TRACE > 00110: 2e 31 35 20 2f 20 6d 69 6e 65 20 63 66 67 3d 30 . 1 5 / m i n e c f g = 0 | ||
|
|
||
| Since matching this is not trivial, we're happy matching the trailing space at | ||
| the end of each handshake data item. |
There was a problem hiding this comment.
The trailing space will ultimately be removed once you address a related ticket in libmongoc, correct?
There was a problem hiding this comment.
Yes, it can be removed once we fix that.
jmikola
approved these changes
Feb 23, 2021
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.
PHPC-1774
@jmikola testing this is notoriously difficult, as I can't add the expected value of
PHP_VERSIONinto theEXPECTFblock. If you have any suggestion how to prevent regressions against this, please let me know.