Merge pull request #13269 from MrPetovan/bug/fix-exception-return-code
Fix exception module not setting the HTTP response code
This commit is contained in:
commit
2f7789e397
|
@ -706,11 +706,13 @@ class App
|
|||
$timestamp = microtime(true);
|
||||
$response = $module->run($httpException, $input);
|
||||
$this->profiler->set(microtime(true) - $timestamp, 'content');
|
||||
|
||||
// Wrapping HTML responses in the theme template
|
||||
if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
|
||||
$page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId());
|
||||
} else {
|
||||
$page->exit($response);
|
||||
$response = $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId());
|
||||
}
|
||||
|
||||
$page->exit($response);
|
||||
} catch (HTTPException $e) {
|
||||
$httpException->rawContent($e);
|
||||
}
|
||||
|
|
|
@ -39,6 +39,7 @@ use Friendica\Network\HTTPException;
|
|||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Profiler;
|
||||
use Friendica\Util\Strings;
|
||||
use GuzzleHttp\Psr7\Utils;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
||||
/**
|
||||
|
@ -499,20 +500,6 @@ class Page implements ArrayAccess
|
|||
$this->page['nav'] = $nav->getHtml();
|
||||
}
|
||||
|
||||
foreach ($response->getHeaders() as $key => $header) {
|
||||
if (is_array($header)) {
|
||||
$header_str = implode(',', $header);
|
||||
} else {
|
||||
$header_str = $header;
|
||||
}
|
||||
|
||||
if (empty($key)) {
|
||||
header($header_str);
|
||||
} else {
|
||||
header("$key: $header_str");
|
||||
}
|
||||
}
|
||||
|
||||
// Build the page - now that we have all the components
|
||||
if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
|
||||
$doc = new DOMDocument();
|
||||
|
@ -583,6 +570,10 @@ class Page implements ArrayAccess
|
|||
// Used as is in view/php/default.php
|
||||
$lang = $l10n->getCurrentLang();
|
||||
|
||||
ob_start();
|
||||
require_once $template;
|
||||
$body = ob_get_clean();
|
||||
|
||||
return $response->withBody(Utils::streamFor($body));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -251,6 +251,7 @@ abstract class BaseModule implements ICanHandleRequests
|
|||
throw $e;
|
||||
}
|
||||
|
||||
$this->response->setStatus($e->getCode(), $e->getMessage());
|
||||
$this->response->addContent($httpException->content($e));
|
||||
} finally {
|
||||
$this->profiler->set(microtime(true) - $timestamp, 'content');
|
||||
|
|
|
@ -126,8 +126,6 @@ class HTTPException
|
|||
*/
|
||||
public function content(\Friendica\Network\HTTPException $e): string
|
||||
{
|
||||
header($this->server['SERVER_PROTOCOL'] ?? 'HTTP/1.0' . ' ' . $e->getCode() . ' ' . $e->getDescription());
|
||||
|
||||
if ($e->getCode() >= 400) {
|
||||
$this->logger->debug('Exit with error',
|
||||
[
|
||||
|
|
Loading…
Reference in New Issue
Block a user