Skip to content

Fix non-ascii characters present in the header #30614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2022
Merged

Fix non-ascii characters present in the header #30614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ public function createSessionToken(IRequest $request, $uid, $loginName, $passwor
// User does not exist
return false;
}
$name = isset($request->server['HTTP_USER_AGENT']) ? $request->server['HTTP_USER_AGENT'] : 'unknown browser';
$name = isset($request->server['HTTP_USER_AGENT']) ? utf8_encode($request->server['HTTP_USER_AGENT']) : 'unknown browser';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utf8_encode is a wrongly named php function, I’d feel better if either we have our own alias named iso-8859-1_to_utf8(), or if we use mb_convert_encoding instead (only possible if we depend upon mbstring).
There are frequent proposal to remove utf8_encode from PHP, all were rejected so far, but it shows this function is confusing.

Copy link
Contributor Author

@Marek-Wojtowicz Marek-Wojtowicz Jan 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there will be time to fix the problem as utf8_encode becomes obsolete. Until then, there may be newer mechanisms that can replace utf8_encode.

try {
$sessionId = $this->session->getId();
$pwd = $this->getPassword($password);
Expand Down