Skip to content

Commit

Permalink
Merge pull request #476 from perftools/0.20.x-merge-up-into-0.21.x_zO…
Browse files Browse the repository at this point in the history
…VpPi2h

Merge release 0.20.5 into 0.21.x
  • Loading branch information
glensc committed May 31, 2022
2 parents 3fb7568 + 1e16517 commit 353ee03
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ server {
root /var/www/xhgui/webroot;
index index.php;

client_max_body_size 5M;

location / {
try_files $uri $uri/ /index.php$is_args$args;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceProvider/RouteProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ private function registerRoutes(Container $di, App $app): void
/** @var Controller\WaterfallController $controller */
$controller = $di[Controller\WaterfallController::class];

$data = $controller->query($di['response.proxy']);
$data = $controller->query($request);

$response
->setHeader('Content-Type', 'application/json')
Expand Down

0 comments on commit 353ee03

Please sign in to comment.