user_ldap fix ldap connection resets #31421
Merged
Conversation
This file contains 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
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
PVince81
reviewed
Mar 8, 2022
PVince81
requested changes
Mar 8, 2022
blizzz
requested changes
Mar 10, 2022
| @@ -1183,7 +1147,7 @@ private function processPagedSearchStatus( | |||
| bool $pagedSearchOK, | |||
| bool $skipHandling | |||
| ): bool { | |||
| $cookie = null; | |||
| $cookie = ''; | |||
There was a problem hiding this comment.
I think we have to resort to null here for behaviour of LDAP servers, cf. comment on line 1175ff – null and empty string may have different meanings.
There was a problem hiding this comment.
controlPagedResultResponse is forcing $cookie to be a string.
null cookies are turned into empty string here: https://github.com/nextcloud/server/blob/master/apps/user_ldap/lib/PagedResults/Php73.php#L81
blizzz
approved these changes
Mar 16, 2022
come-nc
added a commit
that referenced
this pull request
Mar 31, 2022
[stable23] user_ldap fix ldap connection resets #31421
blizzz
added a commit
that referenced
this pull request
Apr 14, 2022
[stable22] user_ldap fix ldap connection resets #31421
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.
First commit is a patch sent to a customer to fix a problem where LDAP connection was reseted during executeRead, and because the connection resource var was not managed consistently the get first entry would fail.
Patch was tested and approved by customer.
The second commit is a clean up of typing.