This repository has been archived by the owner on Sep 20, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 22
fix(read stream) consume buffer multiple times #53
Open
Pierozi
wants to merge
5
commits into
hoaproject:master
Choose a base branch
from
Pierozi:fix/read-huge-data-from-stream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a709466
fix(read stream) consume buffer multiple times
Pierozi d0c10dc
fix(read stream) keep it simple
Pierozi f89af35
fix(read stream) parameter keepReading and chunk to control stream co…
Pierozi 41cb8bb
fix(read stream) dynamic default value
Pierozi 2aa5cb3
CS
Pierozi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -658,12 +658,14 @@ public function getRemoteAddress() | |
* Warning: if this method returns false, it means that the buffer is empty. | ||
* You should use the Hoa\Stream::setStreamBlocking(true) method. | ||
* | ||
* @param int $length Length. | ||
* @param int $flags Flags. | ||
* @param int $length Length. | ||
* @param int $flags Flags. | ||
* @param boolean $keepReading If we loop over stream to seek length data ot not. | ||
* @param int $chunk Length bloc read in the stream. | ||
* @return string | ||
* @throws \Hoa\Socket\Exception | ||
*/ | ||
public function read($length, $flags = 0) | ||
public function read($length, $flags = 0, $keepReading = true, $chunk = null) | ||
{ | ||
if (null === $this->getStream()) { | ||
throw new Socket\Exception( | ||
|
@@ -681,21 +683,31 @@ public function read($length, $flags = 0) | |
); | ||
} | ||
|
||
if (true === $this->isEncrypted()) { | ||
return fread($this->getStream(), $length); | ||
if (is_int($chunk)) { | ||
stream_set_chunk_size($this->getStream(), $chunk); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we collect the previous chunk size (returned by |
||
} | ||
|
||
if (false === $this->isRemoteAddressConsidered()) { | ||
return stream_socket_recvfrom($this->getStream(), $length, $flags); | ||
} | ||
$out = ''; | ||
|
||
$out = stream_socket_recvfrom( | ||
$this->getStream(), | ||
$length, | ||
$flags, | ||
$address | ||
); | ||
$this->_remoteAddress = !empty($address) ? $address : null; | ||
do { | ||
$readLength = $length - strlen($out); | ||
|
||
if (0 >= $readLength) { | ||
break; | ||
} | ||
|
||
if (true === $this->isEncrypted()) { | ||
$buffer = fread($this->getStream(), $readLength); | ||
} else { | ||
$buffer = stream_socket_recvfrom($this->getStream(), $readLength, $flags); | ||
} | ||
|
||
if ('' !== $buffer && is_string($buffer)) { | ||
$out .= $buffer; | ||
} else { | ||
break; | ||
} | ||
} while($keepReading); | ||
|
||
return $out; | ||
} | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to ensure the chunk is greater than zero. Could it be greater than or equal to zero?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You right! never trust the userland!