merged branch schniper/patch-2 (PR #2622)

fabpot · fabpot · commit 1a2b3cffd81d · 2011-11-11T21:17:03.000+01:00
Commits ------- 7cba0a0 Also identify FirePHP by the X-FirePHP-Version header Discussion ---------- Also identify FirePHP by the X-FirePHP-Version header
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
@@ -42,7 +42,9 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))) {
+        if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))
+            && !$event->getRequest()->headers->has('X-FirePHP-Version')) {
+            
             $this->sendHeaders = false;
             $this->headers = array();
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ public function onKernelResponse(FilterResponseEvent $event)`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))) {`
	`45`	`+ if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))`
	`46`	`+ && !$event->getRequest()->headers->has('X-FirePHP-Version')) {`
	`47`	`+`
`46`	`48`	`$this->sendHeaders = false;`
`47`	`49`	`$this->headers = array();`
`48`	`50`