Skip to content

Commit 589835c

Browse files
author
Olga Kopylova
committed
Merge remote-tracking branch 'origin/MAGETWO-34649-private-content-profiler' into develop
2 parents c17882d + ffed782 commit 589835c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

app/code/Magento/PageCache/Controller/Block/Render.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public function execute()
1919
$this->_forward('noroute');
2020
return;
2121
}
22-
22+
// disable profiling during private content handling AJAX call
23+
\Magento\Framework\Profiler::reset();
2324
$blocks = $this->_getBlocks();
2425
$data = [];
2526
foreach ($blocks as $blockName => $blockInstance) {

lib/internal/Magento/Framework/App/StaticResource.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public function __construct(
9999
*/
100100
public function launch()
101101
{
102+
// disabling profiling when retrieving static resource
103+
\Magento\Framework\Profiler::reset();
102104
$appMode = $this->state->getMode();
103105
if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
104106
$this->response->setHttpResponseCode(404);

0 commit comments

Comments
 (0)