Skip to content

Commit 5ea0858

Browse files
committed
Simplify sending error response for invalid requests
1 parent f8bcdab commit 5ea0858

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

src/StreamingServer.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,11 @@ public function handleConnection(ConnectionInterface $conn)
185185
$conn->removeListener('data', $listener);
186186
$that->emit('error', array($e));
187187

188+
// parsing failed => assume dummy request and send appropriate error
188189
$that->writeError(
189190
$conn,
190-
$e->getCode() !== 0 ? $e->getCode() : 400
191+
$e->getCode() !== 0 ? $e->getCode() : 400,
192+
new ServerRequest('GET', '/')
191193
);
192194
});
193195
}
@@ -298,7 +300,7 @@ function ($error) use ($that, $conn, $request) {
298300
}
299301

300302
/** @internal */
301-
public function writeError(ConnectionInterface $conn, $code, ServerRequestInterface $request = null)
303+
public function writeError(ConnectionInterface $conn, $code, ServerRequestInterface $request)
302304
{
303305
$response = new Response(
304306
$code,
@@ -316,10 +318,6 @@ public function writeError(ConnectionInterface $conn, $code, ServerRequestInterf
316318
$body->write(': ' . $reason);
317319
}
318320

319-
if ($request === null) {
320-
$request = new ServerRequest('GET', '/', array(), null, '1.1');
321-
}
322-
323321
$this->handleResponse($conn, $request, $response);
324322
}
325323

0 commit comments

Comments
 (0)