Skip to content

Emit end event for requests without body #136

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
Mar 3, 2017
Merged

Emit end event for requests without body #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41bcdb0
Handle events of simple requests
legionth Feb 22, 2017
26fb646
Use PSR-7 approach to handle bodiless data
legionth Mar 2, 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
8 changes: 5 additions & 3 deletions src/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,14 @@ public function handleRequest(ConnectionInterface $conn, RequestInterface $reque

$response = new Response($conn, $request->getProtocolVersion());

$contentLength = 0;
$stream = new CloseProtectionStream($conn);
if ($request->hasHeader('Transfer-Encoding')) {
$transferEncodingHeader = $request->getHeader('Transfer-Encoding');
// 'chunked' must always be the final value of 'Transfer-Encoding' according to: https://tools.ietf.org/html/rfc7230#section-3.3.1
if (strtolower(end($transferEncodingHeader)) === 'chunked') {
$stream = new ChunkedDecoder($stream);
$contentLength = null;
}
} elseif ($request->hasHeader('Content-Length')) {
$string = $request->getHeaderLine('Content-Length');
Expand All @@ -170,9 +172,9 @@ public function handleRequest(ConnectionInterface $conn, RequestInterface $reque

$this->emit('request', array($request, $response));

if ($stream instanceof LengthLimitedStream && $contentLength === 0) {
// Content-Length is 0 and won't emit further data,
// 'handleData' from LengthLimitedStream won't be called anymore
if ($contentLength === 0) {
// If Body is empty or Content-Length is 0 and won't emit further data,
// 'data' events from other streams won't be called anymore
$stream->emit('end');
$stream->close();
}
Expand Down
56 changes: 55 additions & 1 deletion tests/ServerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,12 @@ public function testRequestPauseWillbeForwardedToConnection()
$this->connection->expects($this->once())->method('pause');
$this->socket->emit('connection', array($this->connection));

$data = $this->createGetRequest();
$data = "GET / HTTP/1.1\r\n";
$data .= "Host: example.com:80\r\n";
$data .= "Connection: close\r\n";
$data .= "Content-Length: 5\r\n";
$data .= "\r\n";

$this->connection->emit('data', array($data));
}

Expand Down Expand Up @@ -1175,6 +1180,55 @@ public function testCloseRequestWillPauseConnection()
$this->connection->emit('data', array($data));
}

public function testEndEventWillBeEmittedOnSimpleRequest()
{
$dataEvent = $this->expectCallableNever();
$closeEvent = $this->expectCallableOnce();
$endEvent = $this->expectCallableOnce();
$errorEvent = $this->expectCallableNever();

$server = new Server($this->socket);
$server->on('request', function ($request, $response) use ($dataEvent, $closeEvent, $endEvent, $errorEvent){
$request->on('data', $dataEvent);
$request->on('close', $closeEvent);
$request->on('end', $endEvent);
$request->on('error', $errorEvent);
});

$this->connection->expects($this->once())->method('pause');
$this->connection->expects($this->never())->method('close');

$this->socket->emit('connection', array($this->connection));

$data = $this->createGetRequest();

$this->connection->emit('data', array($data));
}

public function testRequestWithoutDefinedLengthWillIgnoreDataEvent()
{
$server = new Server($this->socket);

$dataEvent = $this->expectCallableNever();
$endEvent = $this->expectCallableOnce();
$closeEvent = $this->expectCallableOnce();
$errorEvent = $this->expectCallableNever();

$server->on('request', function (Request $request, Response $response) use ($dataEvent, $endEvent, $closeEvent, $errorEvent) {
$request->on('data', $dataEvent);
$request->on('end', $endEvent);
$request->on('close', $closeEvent);
$request->on('error', $errorEvent);
});

$this->socket->emit('connection', array($this->connection));

$data = $this->createGetRequest();
$data .= "hello world";

$this->connection->emit('data', array($data));
}

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