Skip to content

Reduce memory consumption by avoiding circular reference from stream reader #18

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 2 commits into from
Sep 4, 2017
Merged

Reduce memory consumption by avoiding circular reference from stream reader #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56cf65a
Remove circular reference from stream reader
valga Aug 31, 2017
a6816e5
Remove listener only on sucessful attempt
valga Aug 31, 2017
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
11 changes: 6 additions & 5 deletions src/ProxyConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,11 @@ public function connect($uri)

// keep buffering data until headers are complete
$buffer = '';
$fn = function ($chunk) use (&$buffer, &$fn, $deferred, $stream) {
$fn = function ($chunk) use (&$buffer, $deferred, $stream) {
$buffer .= $chunk;

$pos = strpos($buffer, "\r\n\r\n");
if ($pos !== false) {
// end of headers received => stop buffering
$stream->removeListener('data', $fn);

// try to parse headers as response message
try {
$response = Psr7\parse_response(substr($buffer, 0, $pos));
Expand Down Expand Up @@ -191,7 +188,11 @@ public function connect($uri)

$stream->write("CONNECT " . $host . ":" . $port . " HTTP/1.1\r\nHost: " . $host . ":" . $port . "\r\n" . $auth . "\r\n");

return $deferred->promise();
return $deferred->promise()->then(function (ConnectionInterface $stream) use ($fn) {
// Stop buffering when connection has been established.
$stream->removeListener('data', $fn);
return new Promise\FulfilledPromise($stream);
});
}, function (Exception $e) use ($proxyUri) {
throw new RuntimeException('Unable to connect to proxy (ECONNREFUSED)', defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111, $e);
});
Expand Down