Skip to content
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

Jump to bottom

Fix behavior of Redis client #2874

Closed
wants to merge 1 commit into from
Closed

Fix behavior of Redis client #2874

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions hphp/system/php/redis/Redis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,15 @@ protected function sockReadLine() {
$line = fgets($this->connection);
if (substr($line, -2) == "\r\n") {
$line = substr($line, 0, -2);
} else if (substr($line, -1) == "\r") {
$line = substr($line, 0, -1);
$lf = fgetc($this->connection);
if ($lf === false) {
// A response must terminate with both CR and LF. Refuse to guess.
return false;
} else if ($lf !== "\n") {
throw new RedisException("Protocol error: CR not followed by LF");
}
}

return $line;
Expand Down