1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-02-24 15:02:28 +01:00

Merge remote-tracking branch 'hver/firePhpRefactor'

This commit is contained in:
Jordi Boggiano 2014-04-23 15:48:23 +02:00
commit fe226bf15b
2 changed files with 10 additions and 5 deletions

View File

@ -155,8 +155,11 @@ class ChromePHPHandler extends AbstractProcessingHandler
*/ */
protected function headersAccepted() protected function headersAccepted()
{ {
return !isset($_SERVER['HTTP_USER_AGENT']) if (empty($_SERVER['HTTP_USER_AGENT'])) {
|| preg_match('{\bChrome/\d+[\.\d+]*\b}', $_SERVER['HTTP_USER_AGENT']); return false;
}
return preg_match('{\bChrome/\d+[\.\d+]*\b}', $_SERVER['HTTP_USER_AGENT']);
} }
/** /**

View File

@ -155,9 +155,11 @@ class FirePHPHandler extends AbstractProcessingHandler
*/ */
protected function headersAccepted() protected function headersAccepted()
{ {
return !isset($_SERVER['HTTP_USER_AGENT']) if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])) {
|| preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT']) return true;
|| isset($_SERVER['HTTP_X_FIREPHP_VERSION']); }
return isset($_SERVER['HTTP_X_FIREPHP_VERSION']);
} }
/** /**