Skip to content

Fixes #81 issue: data listener is removed if HeaderParser emits error#83

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
WyriHaximus merged 1 commit into from
Feb 5, 2017
Merged

Fixes #81 issue: data listener is removed if HeaderParser emits error #83

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion src/Server.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,13 @@ public function __construct(SocketServerInterface $io)
});
});

$conn->on('data', array($parser, 'feed'));
$listener = [$parser, 'feed'];
$conn->on('data', $listener);
$parser->on('error', function() use ($conn, $listener) {
// TODO: return 400 response
$conn->removeListener('data', $listener);
$this->emit('error', func_get_args());
});
});
}

Expand Down
23 changes: 23 additions & 0 deletions tests/ServerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace React\Tests\Http;

use React\Http\RequestHeaderParser;
use React\Http\Server;

class ServerTest extends TestCase
Expand DownExpand Up@@ -66,6 +67,28 @@ public function testResponseContainsPoweredByHeader()
$this->assertContains("\r\nX-Powered-By: React/alpha\r\n", $conn->getData());
}

public function testParserErrorEmitted()
{
$io = new ServerStub();

$error = null;
$server = new Server($io);
$server->on('headers', $this->expectCallableNever());
$server->on('error', function ($message) use (&$error) {
$error = $message;
});

$conn = new ConnectionStub();
$io->emit('connection', [$conn]);

$data = $this->createGetRequest();
$data = str_pad($data, 4096 * 4);
$conn->emit('data', [$data]);

$this->assertInstanceOf('OverflowException', $error);
$this->assertEquals('', $conn->getData());
}

private function createGetRequest()
{
$data = "GET / HTTP/1.1\r\n";
Expand Down