Only add server timing on ajax, when enabled

barryvdh · web-flow · commit 41df91e4a21a · 2017-03-31T11:20:51.000+02:00
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -648,6 +648,11 @@ public function modifyResponse(Request $request, Response $response)
         ) {
             try {
                 $this->sendDataInHeaders(true);
+
+                if ($app['config']->get('debugbar.add_ajax_timing', false)) {
+                    $this->addServerTimingHeaders($response);
+                }
+
             } catch (\Exception $e) {
                 $app['log']->error('Debugbar exception: ' . $e->getMessage());
             }
@@ -670,7 +675,7 @@ public function modifyResponse(Request $request, Response $response)
             }
         }
 
-        $this->addServerTimingHeaders($response);
+
 
         return $response;
     }
@@ -979,6 +984,7 @@ protected function addServerTimingHeaders(Response $response)
         if ($this->hasCollector('time')) {
             $collector = $this->getCollector('time');
 
+            $headers = [];
             foreach ($collector->collect()['measures'] as $k => $m) {
                 $headers[] = sprintf('%d=%F; "%s"', $k, $m['duration'], str_replace('"', "'", $m['label']));
             }

Original file line number	Diff line number	Diff line change
`@@ -648,6 +648,11 @@ public function modifyResponse(Request $request, Response $response)`
`648`	`648`	`) {`
`649`	`649`	`try {`
`650`	`650`	`$this->sendDataInHeaders(true);`
	`651`	`+`
	`652`	`+ if ($app['config']->get('debugbar.add_ajax_timing', false)) {`
	`653`	`+ $this->addServerTimingHeaders($response);`
	`654`	`+ }`
	`655`	`+`
`651`	`656`	`} catch (\Exception $e) {`
`652`	`657`	`$app['log']->error('Debugbar exception: ' . $e->getMessage());`
`653`	`658`	`}`
`@@ -670,7 +675,7 @@ public function modifyResponse(Request $request, Response $response)`
`670`	`675`	`}`
`671`	`676`	`}`
`672`	`677`
`673`		`- $this->addServerTimingHeaders($response);`
	`678`	`+`
`674`	`679`
`675`	`680`	`return $response;`
`676`	`681`	`}`
`@@ -979,6 +984,7 @@ protected function addServerTimingHeaders(Response $response)`
`979`	`984`	`if ($this->hasCollector('time')) {`
`980`	`985`	`$collector = $this->getCollector('time');`
`981`	`986`
	`987`	`+ $headers = [];`
`982`	`988`	`foreach ($collector->collect()['measures'] as $k => $m) {`
`983`	`989`	`$headers[] = sprintf('%d=%F; "%s"', $k, $m['duration'], str_replace('"', "'", $m['label']));`
`984`	`990`	`}`